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

["Eli Schwartz" <eschwartz@gentoo.org>]

commit:     43cc1a174802963c3eee748998220ca6ab5b3ae3
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Mon Jun 24 06:11:03 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Mon Aug  5 03:35:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43cc1a17

gnome-extra/cinnamon: drop 5.8.4

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Closes: https://github.com/gentoo/gentoo/pull/37417
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest                      |   1 -
 gnome-extra/cinnamon/cinnamon-5.8.4.ebuild         | 187 ---------------------
 .../files/cinnamon-pillow-10-support.patch         |  63 -------
 3 files changed, 251 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index b93a2052223f..e943e83ca6ca 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-5.8.4.tar.gz 2517117 BLAKE2B 4c3f452480b9e3ce7713221f1b76c475204b8dc1bb34d42a8faf492b0ca86416bb2fbd3849a7f048fef672ecf4613f06c645ec548159b6c3662b7602142e75e6 SHA512 2eaa253cdd01f00cca05ed123db59fde27f84cc24d7b8a3ec751a5f8252642870cbece941d1101f31fe0db43c15d9779bbdcacbf7037757569a4d17205cb10ad
 DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
 DIST cinnamon-6.2.7.tar.gz 2547822 BLAKE2B 67f15fdd39c7168bcaa03f637fa6a4b9e9076657a92ba92472c69960c0c26fcad7aa0b4e1f6926e57d76364bf4a42f28381b67a03cba75de87a4fc31ef9e7377 SHA512 d8617cf73dd754b91915826527e674a8084ad141831112def661eac6b39b1c39e61e06fdf79bd7f0a7045b2abc29e223f8616796f5e51d1354486f0d0e4faf5a

diff --git a/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild b/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
deleted file mode 100644
index c48b4ae8c30e..000000000000
--- a/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-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="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
-SLOT="0"
-IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.46.0: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.8:0=
-	>=gnome-extra/cinnamon-menus-5.8
-	>=gnome-extra/cjs-5.8[cairo]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/cairo
-	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/xapp-2.6.1[introspection]
-	>=x11-wm/muffin-5.8[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.4.1[${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.8[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.8
-	>=gnome-extra/cinnamon-session-5.8
-	>=gnome-extra/cinnamon-settings-daemon-5.8
-	>=gnome-extra/nemo-5.8
-	gnome-extra/polkit-gnome
-	media-libs/gsound
-	net-libs/libsoup:2.4[introspection]
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-apps/coreutils
-	sys-apps/pciutils
-	sys-apps/util-linux
-	sys-power/upower[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.8
-	)
-"
-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
-
-	# Fix pillow 10.0.0 compat
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-pillow-10-support.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-pillow-10-support.patch b/gnome-extra/cinnamon/files/cinnamon-pillow-10-support.patch
deleted file mode 100644
index c16db71c2e07..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-pillow-10-support.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-# https://github.com/linuxmint/cinnamon/issues/11746
-# https://github.com/linuxmint/cinnamon/commit/fce9aad1ebb290802dc550e8dae6344dddf9dec1
-diff --git a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-index 46dd63256a..fde9822dd8 100755
---- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -683,7 +683,7 @@ def _on_face_browse_menuitem_activated(self, menuitem):
-             if response == Gtk.ResponseType.OK:
-                 path = dialog.get_filename()
-                 image = PIL.Image.open(path)
--                image.thumbnail((96, 96), Image.ANTIALIAS)
-+                image.thumbnail((96, 96), Image.LANCZOS)
-                 face_path = os.path.join(user.get_home_dir(), ".face")
-                 try:
-                     try:
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 2ad0d8ce15..715cf4eb52 100644
---- a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -228,7 +228,7 @@ def create_corner(radius=100, opacity=255, factor=2):
-     draw = ImageDraw.Draw(corner)
-     draw.pieslice((0, 0, 2 * factor * radius, 2 * factor * radius),
-                   180, 270, fill=opacity)
--    corner = corner.resize((radius, radius), Image.ANTIALIAS)
-+    corner = corner.resize((radius, radius), Image.LANCZOS)
-     return corner
- 
- def get_format(ext):
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-index b6cdaa25c0..156506ac72 100755
---- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-@@ -628,7 +628,7 @@ def get_pix(self, filename, size=None):
-                             img = Image.alpha_composite(bg_img, img)
-                         img = img.convert("RGB")
-                     if size:
--                        img.thumbnail((size, size), Image.ANTIALIAS)
-+                        img.thumbnail((size, size), Image.LANCZOS)
- 
-                     import imtools
-                     img = imtools.round_image(img, {}, False, None, 3, 255)
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
-index fef4ef940a..582df385fe 100755
---- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
-@@ -165,7 +165,7 @@ def _on_face_photo_menuitem_activated(self, menuitem):
-         bottom = (height + new_height) / 2
- 
-         image = image.crop((left, top, right, bottom))
--        image.thumbnail((255, 255), Image.ANTIALIAS)
-+        image.thumbnail((255, 255), Image.LANCZOS)
- 
-         face_path = os.path.join(self.accountService.get_home_dir(), ".face")
- 
-@@ -202,7 +202,7 @@ def _on_face_browse_menuitem_activated(self, menuitem):
-         if response == Gtk.ResponseType.OK:
-             path = dialog.get_filename()
-             image = Image.open(path)
--            image.thumbnail((255, 255), Image.ANTIALIAS)
-+            image.thumbnail((255, 255), Image.LANCZOS)
-             face_path = os.path.join(self.accountService.get_home_dir(), ".face")
-             image.save(face_path, "png")
-             self.accountService.set_icon_file(face_path)