From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- gnome-extra/cinnamon/Manifest | 8 +- gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild | 176 +++++++++++++++++++ gnome-extra/cinnamon/cinnamon-5.0.6.ebuild | 175 ------------------- gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild | 186 +++++++++++++++++++++ gnome-extra/cinnamon/cinnamon-5.2.7.ebuild | 182 -------------------- .../files/cinnamon-5.2.7-eds-detection.patch | 114 +++++++++++++ .../files/cinnamon-5.2.7-meson-0.61-fix.patch | 41 +++++ .../files/cinnamon-5.2.7-optional-eds.patch | 85 ---------- .../cinnamon-5.2.7-revert-meson-0.60-fix.patch | 55 ++++++ 9 files changed, 577 insertions(+), 445 deletions(-) create mode 100644 gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild delete mode 100644 gnome-extra/cinnamon/cinnamon-5.0.6.ebuild create mode 100644 gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild delete mode 100644 gnome-extra/cinnamon/cinnamon-5.2.7.ebuild create mode 100644 gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch create mode 100644 gnome-extra/cinnamon/files/cinnamon-5.2.7-meson-0.61-fix.patch delete mode 100644 gnome-extra/cinnamon/files/cinnamon-5.2.7-optional-eds.patch create mode 100644 gnome-extra/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch (limited to 'gnome-extra/cinnamon') diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index 2ca12ed50615..bed102e51dcb 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -1,9 +1,11 @@ AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74 AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03e202b76956c96df2dea7f2401d03c3c679ce19ec7e6ad046abf0fa1f1715ee94194a370605454dd3f3a777493c9cad9a88a3878093cda96b77b39 SHA512 a8b810f0aafab57984e8189bcc827e72dad7b9201ff88b36948b701cddb61c3bf003aa7b1986ad3ea526242800cbd183890218471fde7e7d7d2b9550b6688dcc -AUX cinnamon-5.2.7-optional-eds.patch 2550 BLAKE2B c6d1a8fcc476201b692869ea47bc2262b4a79d754ada3c7c9828eb5c48102c7ad79c81482805797fdf3418c8d1f91b833783a6e7e5139c0004fecdfba8539121 SHA512 18187b72bdec52f91fb10835aa4a00df8c392056c447513cb14f8d455243d5c1ea36d25b872b872e0bd23a74a68f1eb46e7214a3ff0277c58264499b1486c9c3 +AUX cinnamon-5.2.7-eds-detection.patch 5038 BLAKE2B 287cdf4bd91b8be422a471fd86dd6083d26cf9eabbcbc573d6efd27b55c58fb94b47f3c474b6dbb9dbc8d0da700bfccb56599e23995983d94b6f5b2aa4026ef7 SHA512 da73e53738987fbb045070061fbc88c21b9dac53fc4d35ecb5320661663ef0e4019e88cf362dd3eb8e172797f0a7dd93e33723bf727cb7db24042c0815933565 +AUX cinnamon-5.2.7-meson-0.61-fix.patch 1668 BLAKE2B bf0490423fcfa3d1228a3b1090264449c98f9beebdc064a5815e8603faa494473a46cf6be46e6003a32ab8610ff6e8621e815437052bb5b3d6cccd6c428088ba SHA512 69d8ca0413ad2d1b6e259eeb2d3538cff16b6c3a50491cb288c462363880f9ee9299547141120a3a8e9ab364049178eec0851ab972415e2845e9ed21d3075f9b +AUX cinnamon-5.2.7-revert-meson-0.60-fix.patch 2020 BLAKE2B 83060c16d8f91188bbfc9e784633ad4d40ba1ab91c1b980866b5d6870cffddbabdce6eceb7121543618e7d94b5f02ed115ea915b7371acb8f271ce6391b98759 SHA512 2c41deff381bc043eee05fc106a7c6b4177728b6500279d0185b99a8f5014ca04158b6348ab3f47c28938f2559193916abc80d387c8ffbb1528532ad26ce1f33 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360 DIST cinnamon-5.0.6.tar.gz 2397950 BLAKE2B e54f8ed02fc36c121d15d30aaed4633f7db30bcf3e0179fb5fa0b9f12b42f0a29b341f531eed7ba19f849c0400ee9887ee59b5218f4558586a360d173798aeea SHA512 3ed835b1c41a34dfd1e2eac7746bfa01fe48359c6c3e8085877a4c18b895ea065efc343a855cbdee3fcbfb63aa40166bbe40fa19154ae1544be675411d49a962 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733 -EBUILD cinnamon-5.0.6.ebuild 5054 BLAKE2B 52f7e2a5ec5beb15ae6126bacbd00b50a265fc5ce5d3001688b1a31e3c117b4c25d990ca1501d854198146d9350333bd590f198e5fbfd9e9a0156e41c8f11f75 SHA512 5fd51ead2890c68de3f02938dfd422503e163a1b38b9d95c45de3e25e285f2063ecb01acc68da85539b4b682ace4bd6d68f427f3d978372684a1ce7b262fd9d6 -EBUILD cinnamon-5.2.7.ebuild 5253 BLAKE2B 7a30123d42393780b6bb7c938e3ee23dd03b8fab6567a1385484327131e58f084c8b50381f978bcb41de4f7322028cee4db48aa78d773053fd78beb5cd356dbf SHA512 1df5b0ae6c058414310270ef58d77e21e529f52b0c264fb45aa83e78a8ce359154b4904083acc2e59e7fbd24452782a6c3d39b49f46df837d05ce83e3a3b0989 +EBUILD cinnamon-5.0.6-r1.ebuild 5094 BLAKE2B 6b3f64ffce5368b1ea6e725f0cfad7820b2b2e440d2da79087f3a2d26ea080d8312d220a735165c69ba13c1d7cef3fe60ca3638c570a654f627bdcb528e60c93 SHA512 e8bf1bbf34998df7df5b0fc31d1189d87a04c04cac91075a8cdb0608ec82cd1e277fb94f5477e804a45b3e267251a8e6a1d514a807d3396802073938d7eed10b +EBUILD cinnamon-5.2.7-r2.ebuild 5372 BLAKE2B 2aed6a3cfe360040929edd5fae5e86952c9437cb8d50c51d56b62902865c6e8ecb0fdec8723d03b0c51a0d8f14b4cba3797d58d26095ddfc0bcb3622cce8618c SHA512 07e18607696498980903980dc779bbccc1904c95667961c2ab33920060ed9cc54c9956d71716d40238d66d2691acb0c14c2585fc6c3fb42e3f02aec2a3c7ae67 MISC metadata.xml 488 BLAKE2B 422b0fe2eb6afbe708925e9fb6fa7f038497b11d51e06165e69e43515a27cf4a77c74a1a10156bbcfd6084704bbfa7f24d4e8a8409970c5d365aa6ba80ab5bd8 SHA512 5952deb426e8adcceb83a9bcaf94bbe96e4f065fbdfd6fa17b08988989f79c3f1de55e58ca13a26a6146b5cef90d8e3853d614d390c7afe0d2494d78ea3df744 diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild new file mode 100644 index 000000000000..d6c3792cf966 --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_REQ_USE="xml" + +inherit meson gnome2-utils pax-utils python-single-r1 xdg + +DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" +HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon" +SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="+gstreamer gtk-doc +nls +networkmanager" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +KEYWORDS="amd64 ~arm64 ~riscv x86" + +DEPEND=" + ${PYTHON_DEPS} + app-accessibility/at-spi2-atk:2 + >=dev-libs/glib-2.52.0:2[dbus] + >=dev-libs/gobject-introspection-1.29.15:= + dev-libs/libxml2:2 + >=gnome-extra/cinnamon-desktop-5.0:0= + >=gnome-extra/cinnamon-menus-5.0 + >=gnome-extra/cjs-5.0[cairo] + net-libs/libsoup:2.4[introspection] + sys-apps/dbus + >=sys-auth/polkit-0.100[introspection] + virtual/opengl + x11-libs/gdk-pixbuf:2[introspection] + >=x11-libs/gtk+-3.12.0:3[introspection] + >=x11-libs/libnotify-0.7.3:0=[introspection] + x11-libs/libX11 + >=x11-libs/libXfixes-5.0 + x11-libs/pango[introspection] + >=x11-libs/startup-notification-0.11 + >=x11-wm/muffin-5.0[introspection] + + gstreamer? ( + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + ) + networkmanager? ( + net-misc/networkmanager[introspection] + ) +" +# caribou used by onscreen keyboard +# libtimezonemap used by datetime settings +# iso-flag-png (unpackaged) used by keyboard layout settings +RDEPEND=" + ${DEPEND} + >=app-accessibility/caribou-0.3 + dev-libs/keybinder:3[introspection] + dev-libs/libtimezonemap + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + dev-python/pypam[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/tinycss2[${PYTHON_USEDEP}] + >=dev-python/python3-xapp-2.2.0[${PYTHON_USEDEP}] + ') + >=gnome-base/dconf-0.4.1 + >=gnome-base/gsettings-desktop-schemas-2.91.91 + >=gnome-base/libgnomekbd-2.91.4 + >=gnome-extra/cinnamon-control-center-5.0[networkmanager=] + >=gnome-extra/cinnamon-screensaver-5.0 + >=gnome-extra/cinnamon-session-5.0 + >=gnome-extra/cinnamon-settings-daemon-5.0 + >=gnome-extra/nemo-5.0 + gnome-extra/polkit-gnome + net-misc/wget + sys-apps/accountsservice[introspection] + sys-power/upower[introspection] + >=x11-libs/xapp-2.2.0[introspection] + x11-misc/xdg-utils + x11-themes/adwaita-icon-theme + x11-themes/gnome-themes-standard + + nls? ( + >=gnome-extra/cinnamon-translations-5.0 + ) +" +BDEPEND=" + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + + gtk-doc? ( dev-util/gtk-doc ) +" + +PATCHES=( + # Fix backgrounds path as cinnamon doesn't provide them + # https://github.com/linuxmint/Cinnamon/issues/3575 + "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch + + # Use wheel group instead of sudo (from Fedora/Arch) + # https://github.com/linuxmint/Cinnamon/issues/3576 + "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch +) + +src_prepare() { + xdg_src_prepare + + # Add polkit agent to required components + # https://github.com/linuxmint/Cinnamon/issues/3579 + sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die + + # shebang fixing craziness + local p + for p in $(grep -rl '#!.*python3' || die); do + python_fix_shebang "${p}" + done +} + +src_configure() { + local emesonargs=( + $(meson_use gstreamer build_recorder) + $(meson_use gtk-doc docs) + -Ddisable_networkmanager=$(usex networkmanager false true) + -Dpy3modules_dir="$(python_get_sitedir)" + ) + meson_src_configure +} + +src_install() { + meson_src_install + + python_optimize "${D}$(python_get_sitedir)" + python_optimize "${ED}"/usr/share/cinnamon/ + + # Required for gnome-shell on hardened/PaX, bug #398941 + pax-mark mr "${ED}"/usr/bin/cinnamon + + # Doesn't exist on Gentoo, causing this to be a dead symlink + rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die + + # Ensure authentication-agent is started, bug #523958 + # https://github.com/linuxmint/Cinnamon/issues/3579 + insinto /etc/xdg/autostart/ + doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if use gstreamer; then + if ! has_version 'media-libs/gst-plugins-good:1.0' || \ + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then + ewarn "To make use of Cinnamon's built-in screen recording utility," + ewarn "you need to either install media-libs/gst-plugins-good:1.0" + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" + ewarn "org.cinnamon.recorder/pipeline to what you want to use." + fi + else + ewarn "Cinnamon's built-in screen recording utility is not installed" + ewarn "because gstreamer support is disabled." + fi +} + +pkg_postrm() { + xdg_pkg_postinst + gnome2_schemas_update +} diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild deleted file mode 100644 index f07b7f6d2201..000000000000 --- a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="xml" - -inherit meson gnome2-utils pax-utils python-single-r1 xdg - -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" -HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon" -SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+gstreamer gtk-doc +nls +networkmanager" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="amd64 ~arm64 ~riscv x86" - -DEPEND=" - ${PYTHON_DEPS} - app-accessibility/at-spi2-atk:2 - >=dev-libs/glib-2.52.0:2[dbus] - >=dev-libs/gobject-introspection-1.29.15:= - dev-libs/libxml2:2 - >=gnome-extra/cinnamon-desktop-5.0:0= - >=gnome-extra/cinnamon-menus-5.0 - >=gnome-extra/cjs-5.0[cairo] - net-libs/libsoup:2.4[introspection] - sys-apps/dbus - >=sys-auth/polkit-0.100[introspection] - virtual/opengl - x11-libs/gdk-pixbuf:2[introspection] - >=x11-libs/gtk+-3.12.0:3[introspection] - >=x11-libs/libnotify-0.7.3:0=[introspection] - x11-libs/libX11 - >=x11-libs/libXfixes-5.0 - x11-libs/pango[introspection] - >=x11-libs/startup-notification-0.11 - >=x11-wm/muffin-5.0[introspection] - - gstreamer? ( - media-libs/gst-plugins-base:1.0 - media-libs/gstreamer:1.0 - ) - networkmanager? ( - net-misc/networkmanager[introspection] - ) -" -# caribou used by onscreen keyboard -# libtimezonemap used by datetime settings -# iso-flag-png (unpackaged) used by keyboard layout settings -RDEPEND=" - ${DEPEND} - >=app-accessibility/caribou-0.3 - dev-libs/keybinder:3[introspection] - dev-libs/libtimezonemap - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/pypam[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] - dev-python/tinycss2[${PYTHON_USEDEP}] - >=dev-python/python3-xapp-2.2.0[${PYTHON_USEDEP}] - ') - >=gnome-base/dconf-0.4.1 - >=gnome-base/gsettings-desktop-schemas-2.91.91 - >=gnome-base/libgnomekbd-2.91.4 - >=gnome-extra/cinnamon-control-center-5.0[networkmanager=] - >=gnome-extra/cinnamon-screensaver-5.0 - >=gnome-extra/cinnamon-session-5.0 - >=gnome-extra/cinnamon-settings-daemon-5.0 - >=gnome-extra/nemo-5.0 - gnome-extra/polkit-gnome - net-misc/wget - sys-apps/accountsservice[introspection] - sys-power/upower[introspection] - >=x11-libs/xapp-2.2.0[introspection] - x11-misc/xdg-utils - x11-themes/adwaita-icon-theme - x11-themes/gnome-themes-standard - - nls? ( - >=gnome-extra/cinnamon-translations-5.0 - ) -" -BDEPEND=" - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - - gtk-doc? ( dev-util/gtk-doc ) -" - -PATCHES=( - # Fix backgrounds path as cinnamon doesn't provide them - # https://github.com/linuxmint/Cinnamon/issues/3575 - "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch - - # Use wheel group instead of sudo (from Fedora/Arch) - # https://github.com/linuxmint/Cinnamon/issues/3576 - "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch -) - -src_prepare() { - xdg_src_prepare - - # Add polkit agent to required components - # https://github.com/linuxmint/Cinnamon/issues/3579 - sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die - - # shebang fixing craziness - local p - for p in $(grep -rl '#!.*python3' || die); do - python_fix_shebang "${p}" - done -} - -src_configure() { - local emesonargs=( - $(meson_use gstreamer build_recorder) - $(meson_use gtk-doc docs) - -Ddisable_networkmanager=$(usex networkmanager false true) - -Dpy3modules_dir="$(python_get_sitedir)" - ) - meson_src_configure -} - -src_install() { - meson_src_install - - python_optimize "${D}$(python_get_sitedir)" - python_optimize "${ED}"/usr/share/cinnamon/ - - # Required for gnome-shell on hardened/PaX, bug #398941 - pax-mark mr "${ED}"/usr/bin/cinnamon - - # Doesn't exist on Gentoo, causing this to be a dead symlink - rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die - - # Ensure authentication-agent is started, bug #523958 - # https://github.com/linuxmint/Cinnamon/issues/3579 - insinto /etc/xdg/autostart/ - doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if use gstreamer; then - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of Cinnamon's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "org.cinnamon.recorder/pipeline to what you want to use." - fi - else - ewarn "Cinnamon's built-in screen recording utility is not installed" - ewarn "because gstreamer support is disabled." - fi -} - -pkg_postrm() { - xdg_pkg_postinst - gnome2_schemas_update -} diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild new file mode 100644 index 000000000000..5237a3b90b2a --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_REQ_USE="xml" + +inherit meson gnome2-utils pax-utils python-single-r1 xdg + +DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" +HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon" +SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="+eds +gstreamer gtk-doc +nls +networkmanager" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + +DEPEND=" + ${PYTHON_DEPS} + app-accessibility/at-spi2-atk:2 + >=dev-libs/glib-2.52.0:2[dbus] + >=dev-libs/gobject-introspection-1.29.15:= + dev-libs/libxml2:2 + >=gnome-extra/cinnamon-desktop-5.2:0= + >=gnome-extra/cinnamon-menus-5.2 + >=gnome-extra/cjs-5.2[cairo] + net-libs/libsoup:2.4[introspection] + sys-apps/dbus + >=sys-auth/polkit-0.100[introspection] + virtual/opengl + x11-libs/gdk-pixbuf:2[introspection] + >=x11-libs/gtk+-3.12.0:3[introspection] + >=x11-libs/libnotify-0.7.3:0=[introspection] + x11-libs/libX11 + >=x11-libs/libXfixes-5.0 + x11-libs/pango[introspection] + >=x11-libs/startup-notification-0.11 + >=x11-wm/muffin-5.2[introspection] + + eds? ( + gnome-extra/evolution-data-server + ) + gstreamer? ( + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + ) + networkmanager? ( + net-misc/networkmanager[introspection] + ) +" +# caribou used by onscreen keyboard +# libtimezonemap used by datetime settings +# iso-flag-png (unpackaged) used by keyboard layout settings +RDEPEND=" + ${DEPEND} + >=app-accessibility/caribou-0.3 + dev-libs/keybinder:3[introspection] + dev-libs/libtimezonemap + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + dev-python/pypam[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/tinycss2[${PYTHON_USEDEP}] + >=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}] + ') + >=gnome-base/dconf-0.4.1 + >=gnome-base/gsettings-desktop-schemas-2.91.91 + >=gnome-base/libgnomekbd-2.91.4 + >=gnome-extra/cinnamon-control-center-5.2[networkmanager=] + >=gnome-extra/cinnamon-screensaver-5.2 + >=gnome-extra/cinnamon-session-5.2 + >=gnome-extra/cinnamon-settings-daemon-5.2 + >=gnome-extra/nemo-5.2 + gnome-extra/polkit-gnome + net-misc/wget + sys-apps/accountsservice[introspection] + sys-power/upower[introspection] + >=x11-libs/xapp-2.2.8[introspection] + x11-misc/xdg-utils + x11-themes/adwaita-icon-theme + x11-themes/gnome-themes-standard + + nls? ( + >=gnome-extra/cinnamon-translations-5.2 + ) +" +BDEPEND=" + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + + gtk-doc? ( dev-util/gtk-doc ) +" + +PATCHES=( + # Fix backgrounds path as cinnamon doesn't provide them + # https://github.com/linuxmint/Cinnamon/issues/3575 + "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch + + # Use wheel group instead of sudo (from Fedora/Arch) + # https://github.com/linuxmint/Cinnamon/issues/3576 + "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch + + # Make evolution-data-server integration optional + "${FILESDIR}"/${PN}-5.2.7-eds-detection.patch + + # Meson fixes + "${FILESDIR}"/${PN}-5.2.7-revert-meson-0.60-fix.patch + "${FILESDIR}"/${PN}-5.2.7-meson-0.61-fix.patch +) + +src_prepare() { + xdg_src_prepare + + # Add polkit agent to required components + # https://github.com/linuxmint/Cinnamon/issues/3579 + sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die + + # shebang fixing craziness + local p + for p in $(grep -rl '#!.*python3' || die); do + python_fix_shebang "${p}" + done +} + +src_configure() { + local emesonargs=( + $(meson_use gstreamer build_recorder) + $(meson_use gtk-doc docs) + -Ddisable_networkmanager=$(usex networkmanager false true) + -Dpy3modules_dir="$(python_get_sitedir)" + ) + meson_src_configure +} + +src_install() { + meson_src_install + + python_optimize "${D}$(python_get_sitedir)" + python_optimize "${ED}"/usr/share/cinnamon/ + + # Required for gnome-shell on hardened/PaX, bug #398941 + pax-mark mr "${ED}"/usr/bin/cinnamon + + # Doesn't exist on Gentoo, causing this to be a dead symlink + rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die + + # Ensure authentication-agent is started, bug #523958 + # https://github.com/linuxmint/Cinnamon/issues/3579 + insinto /etc/xdg/autostart/ + doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if use gstreamer; then + if ! has_version 'media-libs/gst-plugins-good:1.0' || \ + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then + ewarn "To make use of Cinnamon's built-in screen recording utility," + ewarn "you need to either install media-libs/gst-plugins-good:1.0" + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" + ewarn "org.cinnamon.recorder/pipeline to what you want to use." + fi + else + ewarn "Cinnamon's built-in screen recording utility is not installed" + ewarn "because gstreamer support is disabled." + fi +} + +pkg_postrm() { + xdg_pkg_postinst + gnome2_schemas_update +} diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7.ebuild deleted file mode 100644 index 976736f285f6..000000000000 --- a/gnome-extra/cinnamon/cinnamon-5.2.7.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -PYTHON_REQ_USE="xml" - -inherit meson gnome2-utils pax-utils python-single-r1 xdg - -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" -HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon" -SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+eds +gstreamer gtk-doc +nls +networkmanager" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - -DEPEND=" - ${PYTHON_DEPS} - app-accessibility/at-spi2-atk:2 - >=dev-libs/glib-2.52.0:2[dbus] - >=dev-libs/gobject-introspection-1.29.15:= - dev-libs/libxml2:2 - >=gnome-extra/cinnamon-desktop-5.2:0= - >=gnome-extra/cinnamon-menus-5.2 - >=gnome-extra/cjs-5.2[cairo] - net-libs/libsoup:2.4[introspection] - sys-apps/dbus - >=sys-auth/polkit-0.100[introspection] - virtual/opengl - x11-libs/gdk-pixbuf:2[introspection] - >=x11-libs/gtk+-3.12.0:3[introspection] - >=x11-libs/libnotify-0.7.3:0=[introspection] - x11-libs/libX11 - >=x11-libs/libXfixes-5.0 - x11-libs/pango[introspection] - >=x11-libs/startup-notification-0.11 - >=x11-wm/muffin-5.2[introspection] - - eds? ( - gnome-extra/evolution-data-server - ) - gstreamer? ( - media-libs/gst-plugins-base:1.0 - media-libs/gstreamer:1.0 - ) - networkmanager? ( - net-misc/networkmanager[introspection] - ) -" -# caribou used by onscreen keyboard -# libtimezonemap used by datetime settings -# iso-flag-png (unpackaged) used by keyboard layout settings -RDEPEND=" - ${DEPEND} - >=app-accessibility/caribou-0.3 - dev-libs/keybinder:3[introspection] - dev-libs/libtimezonemap - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/pypam[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] - dev-python/tinycss2[${PYTHON_USEDEP}] - >=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}] - ') - >=gnome-base/dconf-0.4.1 - >=gnome-base/gsettings-desktop-schemas-2.91.91 - >=gnome-base/libgnomekbd-2.91.4 - >=gnome-extra/cinnamon-control-center-5.2[networkmanager=] - >=gnome-extra/cinnamon-screensaver-5.2 - >=gnome-extra/cinnamon-session-5.2 - >=gnome-extra/cinnamon-settings-daemon-5.2 - >=gnome-extra/nemo-5.2 - gnome-extra/polkit-gnome - net-misc/wget - sys-apps/accountsservice[introspection] - sys-power/upower[introspection] - >=x11-libs/xapp-2.2.8[introspection] - x11-misc/xdg-utils - x11-themes/adwaita-icon-theme - x11-themes/gnome-themes-standard - - nls? ( - >=gnome-extra/cinnamon-translations-5.2 - ) -" -BDEPEND=" - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - - gtk-doc? ( dev-util/gtk-doc ) -" - -PATCHES=( - # Fix backgrounds path as cinnamon doesn't provide them - # https://github.com/linuxmint/Cinnamon/issues/3575 - "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch - - # Use wheel group instead of sudo (from Fedora/Arch) - # https://github.com/linuxmint/Cinnamon/issues/3576 - "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch - - # Make evolution-data-server integration optional - "${FILESDIR}"/${PN}-5.2.7-optional-eds.patch -) - -src_prepare() { - xdg_src_prepare - - # Add polkit agent to required components - # https://github.com/linuxmint/Cinnamon/issues/3579 - sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die - - # shebang fixing craziness - local p - for p in $(grep -rl '#!.*python3' || die); do - python_fix_shebang "${p}" - done -} - -src_configure() { - local emesonargs=( - $(meson_use eds build_calendar_server) - $(meson_use gstreamer build_recorder) - $(meson_use gtk-doc docs) - -Ddisable_networkmanager=$(usex networkmanager false true) - -Dpy3modules_dir="$(python_get_sitedir)" - ) - meson_src_configure -} - -src_install() { - meson_src_install - - python_optimize "${D}$(python_get_sitedir)" - python_optimize "${ED}"/usr/share/cinnamon/ - - # Required for gnome-shell on hardened/PaX, bug #398941 - pax-mark mr "${ED}"/usr/bin/cinnamon - - # Doesn't exist on Gentoo, causing this to be a dead symlink - rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die - - # Ensure authentication-agent is started, bug #523958 - # https://github.com/linuxmint/Cinnamon/issues/3579 - insinto /etc/xdg/autostart/ - doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if use gstreamer; then - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of Cinnamon's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "org.cinnamon.recorder/pipeline to what you want to use." - fi - else - ewarn "Cinnamon's built-in screen recording utility is not installed" - ewarn "because gstreamer support is disabled." - fi -} - -pkg_postrm() { - xdg_pkg_postinst - gnome2_schemas_update -} diff --git a/gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch new file mode 100644 index 000000000000..bda0feedceb7 --- /dev/null +++ b/gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch @@ -0,0 +1,114 @@ +https://github.com/linuxmint/cinnamon/commit/ef463cc0aaedd714f2956daab227aeda1d87897e + +From ef463cc0aaedd714f2956daab227aeda1d87897e Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Wed, 12 Jan 2022 14:50:47 -0500 +Subject: [PATCH] calendar events: Check if evolution-data-server is running + before enabling events. + +None of the e-d-s libraries actually depend on evolution-data-server +(which is what provides the backend to these libraries). Also, not +everyone may want this sort of thing in the first place. + +So, check if the e-d-s service we require is active before trying +to enable event support. + +ref: #10597, #10567 +--- + .../applets/calendar@cinnamon.org/calendar.js | 2 +- + .../calendar@cinnamon.org/eventView.js | 43 +++++++++++++++---- + js/misc/interfaces.js | 4 ++ + 3 files changed, 39 insertions(+), 10 deletions(-) + +diff --git a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js +index 460883c063..5078a201ed 100644 +--- a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js ++++ b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js +@@ -159,7 +159,7 @@ class Calendar { + this.desktop_settings = new Gio.Settings({ schema_id: DESKTOP_SCHEMA }); + this.desktop_settings.connect("changed::" + FIRST_WEEKDAY_KEY, Lang.bind(this, this._onSettingsChange)); + +- this.events_enabled = true; ++ this.events_enabled = false; + this.events_manager.connect("events-updated", this._events_updated.bind(this)); + this.events_manager.connect("events-manager-ready", this._update_events_enabled.bind(this)); + this.events_manager.connect("has-calendars-changed", this._update_events_enabled.bind(this)); +diff --git a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js +index 1d1035c605..2e73363fb7 100644 +--- a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js ++++ b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js +@@ -17,6 +17,7 @@ const Main = imports.ui.main; + const Util = imports.misc.util; + const Mainloop = imports.mainloop; + const Tweener = imports.ui.tweener; ++const Interfaces = imports.misc.interfaces; + + const STATUS_UNKNOWN = 0; + const STATUS_NO_CALENDARS = 1; +@@ -302,18 +303,42 @@ class EventsManager { + + start_events() { + if (this._calendar_server == null) { +- Cinnamon.CalendarServerProxy.new_for_bus( +- Gio.BusType.SESSION, +- // Gio.DBusProxyFlags.NONE, +- Gio.DBusProxyFlags.DO_NOT_AUTO_START_AT_CONSTRUCTION, +- "org.cinnamon.CalendarServer", +- "/org/cinnamon/CalendarServer", +- null, +- this._calendar_server_ready.bind(this) +- ); ++ Interfaces.getDBusAsync((proxy, error) => { ++ if (error) { ++ this.log_dbus_error(error); ++ return; ++ } ++ ++ proxy.NameHasOwnerRemote("org.gnome.evolution.dataserver.Calendar8", (has_owner, error) => { ++ if (error) { ++ this.log_dbus_error(error); ++ return; ++ } ++ ++ if (has_owner[0]) { ++ log("calendar@cinnamon.org: Calendar events supported.") ++ ++ Cinnamon.CalendarServerProxy.new_for_bus( ++ Gio.BusType.SESSION, ++ Gio.DBusProxyFlags.DO_NOT_AUTO_START_AT_CONSTRUCTION, ++ "org.cinnamon.CalendarServer", ++ "/org/cinnamon/CalendarServer", ++ null, ++ this._calendar_server_ready.bind(this) ++ ); ++ } else { ++ log("calendar@cinnamon.org: No calendar event support (needs evolution-data-server)") ++ ++ } ++ }); ++ }) + } + } + ++ log_dbus_error(e) { ++ global.logError(`calendar@cinnamon.org: Could not check for calendar event support: ${e.toString()}`); ++ } ++ + _calendar_server_ready(obj, res) { + try { + this._calendar_server = Cinnamon.CalendarServerProxy.new_for_bus_finish(res); +diff --git a/js/misc/interfaces.js b/js/misc/interfaces.js +index 8bc6e717d4..6bdb7b78c2 100644 +--- a/js/misc/interfaces.js ++++ b/js/misc/interfaces.js +@@ -13,6 +13,10 @@ const DBusIface = '\ + \ + \ + \ ++ \ ++ \ ++ \ ++ \ + \ + \ + \ diff --git a/gnome-extra/cinnamon/files/cinnamon-5.2.7-meson-0.61-fix.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-meson-0.61-fix.patch new file mode 100644 index 000000000000..3645221cc7a3 --- /dev/null +++ b/gnome-extra/cinnamon/files/cinnamon-5.2.7-meson-0.61-fix.patch @@ -0,0 +1,41 @@ +https://github.com/linuxmint/cinnamon/commit/9ccce54c29f7c78404e8819d7be7a051efff4df1 + +From 9ccce54c29f7c78404e8819d7be7a051efff4df1 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Thu, 3 Feb 2022 09:09:24 -0500 +Subject: [PATCH] gtkdoc: remove dependencies on custom target files (#10606) + +Sadly, the `dependencies` kwarg does not actually do what it seems to be +trying to be used for, here. It is for listing dependency or library +objects whose compiler flags should be added to gtkdoc-scangobj. + +It will not actually add ninja target dependencies. The similar kwarg in +other meson functions (e.g. genmarshal and compile_schemas) that *do* +allow adding target dependencies, is `depend_files`. + +Older versions of meson simply did nothing in an if/elif/elif block +where these custom_targets never matched anything, and were thus +silently ignored. + +Meson 0.61 type-validates the arguments and rejects CustomTarget as +invalid: + +``` +docs/reference/cinnamon-js/meson.build:11:6: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget] but should have been array[Dependency | SharedLibrary | StaticLibrary] +``` +--- + docs/reference/cinnamon-js/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/docs/reference/cinnamon-js/meson.build b/docs/reference/cinnamon-js/meson.build +index 7c96c875a0..66a5e156eb 100644 +--- a/docs/reference/cinnamon-js/meson.build ++++ b/docs/reference/cinnamon-js/meson.build +@@ -12,7 +12,6 @@ gnome.gtkdoc( + 'cinnamon-js', + mode: 'xml', + main_xml: 'cinnamon-js-docs.sgml', +- dependencies: parts_files, + src_dir: meson.current_build_dir(), + install: true, + ) diff --git a/gnome-extra/cinnamon/files/cinnamon-5.2.7-optional-eds.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-optional-eds.patch deleted file mode 100644 index c0646359552b..000000000000 --- a/gnome-extra/cinnamon/files/cinnamon-5.2.7-optional-eds.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js -index 1d1035c60..ebfd5a3a4 100644 ---- a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js -+++ b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/eventView.js -@@ -301,7 +301,7 @@ class EventsManager { - } - - start_events() { -- if (this._calendar_server == null) { -+ if (this._calendar_server == null && Cinnamon.CalendarServerProxy) { - Cinnamon.CalendarServerProxy.new_for_bus( - Gio.BusType.SESSION, - // Gio.DBusProxyFlags.NONE, -diff --git a/meson.build b/meson.build -index 2c1baf47d..aba5d5a30 100644 ---- a/meson.build -+++ b/meson.build -@@ -179,6 +179,9 @@ install_subdir( - strip_directory: true, - ) - --subdir('calendar-server') -+ -+if get_option('build_calendar_server') -+ subdir('calendar-server') -+endif - subdir('python3') - subdir('install-scripts') -diff --git a/meson_options.txt b/meson_options.txt -index 82422246b..752f7904e 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,6 +13,11 @@ option('build_recorder', - value: true, - description: 'Build the cinnamon recorder into source' - ) -+option('build_calendar_server', -+ type: 'boolean', -+ value: true, -+ description: 'Build the cinnamon EDS calendar server' -+) - option('disable_networkmanager', - type: 'boolean', - value: false, -diff --git a/src/meson.build b/src/meson.build -index 7999c0a67..1b22aa279 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -3,12 +3,6 @@ subdir('hotplug-sniffer') - - include_src = include_directories('.') - --calendar_generated = gnome.gdbus_codegen('cinnamon-calendar', -- sources: 'org.cinnamon.CalendarServer.xml', -- interface_prefix: 'org.cinnamon.', -- namespace: 'Cinnamon' --) -- - cinnamon_headers = [ - 'cinnamon-app.h', - 'cinnamon-app-system.h', -@@ -59,10 +53,21 @@ cinnamon_sources = [ - 'cinnamon-window-tracker.c', - 'cinnamon-wm.c', - 'cinnamon-xfixes-cursor.c', -- cinnamon_headers, -- calendar_generated -+ cinnamon_headers - ] - -+if get_option('build_calendar_server') -+ calendar_generated = gnome.gdbus_codegen('cinnamon-calendar', -+ sources: 'org.cinnamon.CalendarServer.xml', -+ interface_prefix: 'org.cinnamon.', -+ namespace: 'Cinnamon' -+ ) -+ -+ cinnamon_sources += [ -+ calendar_generated -+ ] -+endif -+ - cinnamon_enum_types = gnome.mkenums_simple( - 'cinnamon-enum-types', - sources: cinnamon_headers, diff --git a/gnome-extra/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch new file mode 100644 index 000000000000..aa5503517ec7 --- /dev/null +++ b/gnome-extra/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch @@ -0,0 +1,55 @@ +https://github.com/linuxmint/cinnamon/commit/aac7baf119dc48b685aefb3438e5ba3e61c8cb09 + +From aac7baf119dc48b685aefb3438e5ba3e61c8cb09 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Thu, 3 Feb 2022 09:11:39 -0500 +Subject: [PATCH] Revert "build: disable gir install via list to pacify meson + >= 0.60.2 (#10489)" (#10596) + +This reverts commit 8fc2df08b40aa3e1958ed2fde853c50676d8cf48. + +This commit was wrong, because it tried to work around a bug in a single +version of meson by using something that isn't, wasn't, and won't be a +valid value. + +The fixed version of meson 0.60.x has been out for a while now, which +once again accepts `false`, and 0.61.0 also accepts `false` but was +known at the time of this workaround to not work in meson-git master +(now meson 0.61.0). + +Using `false` is acceptable and the failure to accept it has been +qualified as a meson regression. Using `[false]` is just... trying to +fuzz meson with random objects until you get something that slips its +way through the argument checker and produces desired effects on the +python implementation level. +--- + src/meson.build | 2 +- + src/st/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 7999c0a67b..34b130d50f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -196,7 +196,7 @@ cinnamon_gir = gnome.generate_gir( + includes: cinnamon_gir_includes, + install: true, + install_dir_typelib: pkglibdir, +- install_dir_gir: [false], ++ install_dir_gir: false, + extra_args: [ + '-DST_COMPILATION', + '--quiet', +diff --git a/src/st/meson.build b/src/st/meson.build +index d299727d06..ec7d7b30a1 100644 +--- a/src/st/meson.build ++++ b/src/st/meson.build +@@ -213,7 +213,7 @@ st_gir = gnome.generate_gir( + includes: st_gir_includes, + install: true, + install_dir_typelib: pkglibdir, +- install_dir_gir: [false], ++ install_dir_gir: false, + extra_args: [ + '-DST_COMPILATION', + '--quiet', -- cgit v1.2.3