[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/files/, gnome-extra/cinnamon/

["Sam James" <sam@gentoo.org>]

commit:     f2a627bc55a934a437eb716d9e83d4383d41f386
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sun May  7 19:10:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May  7 22:13:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a627bc

gnome-extra/cinnamon: drop 5.2.7-r4

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Closes: https://github.com/gentoo/gentoo/pull/30922
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest                      |   1 -
 gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild      | 189 ---------------------
 .../files/cinnamon-5.2.7-eds-detection.patch       | 114 -------------
 .../files/cinnamon-5.2.7-meson-0.61-fix.patch      |  41 -----
 .../cinnamon-5.2.7-revert-meson-0.60-fix.patch     |  55 ------
 5 files changed, 400 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 30a842f05336..7a2c6a94c8cf 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
 DIST cinnamon-5.6.5.tar.gz 2481833 BLAKE2B af7f5010cba9afac9c37aca60f1d6a730fca9bcfe4860a79e8f7cc903cbff45cde4d650530309c4866eeedd52212a4287221e89e5616b3ab0d0903cad3a33afb SHA512 767a68683f2776a1216ec32c479a84203c8524e7bbf2bd65faf4249a46d1a2ccfae8feb55d664890c1b1cd2061895c79d9bec5a70f126b819baebb19804ac30c
 DIST cinnamon-5.6.8.tar.gz 2483519 BLAKE2B 0876bf097bbdb2b15b543a09d7d659995624d880a4c32a0d6bf580def4a72d33363c03525cd8072a238c624382c20bb66ce5ad5c05f8c21bbe5c06742209ca2b SHA512 33f7766f8d5df070cca7d4001be6a01dcb5cc57e60a320b0b2d14968af7bc0060575284f885de640ebe9297ea2bf9a6b97cb32dfb50fac37bb6d851d5f5d2237

diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild
deleted file mode 100644
index 3a84b9b0a81a..000000000000
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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+ GPL-3 LGPL-2.1"
-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-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	>=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/python-pam[${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/files/cinnamon-5.2.7-eds-detection.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch
deleted file mode 100644
index bda0feedceb7..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-5.2.7-eds-detection.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-https://github.com/linuxmint/cinnamon/commit/ef463cc0aaedd714f2956daab227aeda1d87897e
-
-From ef463cc0aaedd714f2956daab227aeda1d87897e Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-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 = '\
-             <arg type="s" direction="in" /> \
-             <arg type="s" direction="out" /> \
-         </method> \
-+        <method name="NameHasOwner"> \
-+            <arg type="s" direction="in" /> \
-+            <arg type="b" direction="out" /> \
-+        </method> \
-         <method name="ListNames"> \
-             <arg type="as" direction="out" /> \
-         </method> \

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
deleted file mode 100644
index 3645221cc7a3..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-5.2.7-meson-0.61-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/linuxmint/cinnamon/commit/9ccce54c29f7c78404e8819d7be7a051efff4df1
-
-From 9ccce54c29f7c78404e8819d7be7a051efff4df1 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-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-revert-meson-0.60-fix.patch b/gnome-extra/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch
deleted file mode 100644
index aa5503517ec7..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-5.2.7-revert-meson-0.60-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://github.com/linuxmint/cinnamon/commit/aac7baf119dc48b685aefb3438e5ba3e61c8cb09
-
-From aac7baf119dc48b685aefb3438e5ba3e61c8cb09 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-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',