commit: 772b2fda7f84299be20b8e4b9ed56337c0c0a4a9 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> AuthorDate: Wed Jul 5 06:08:00 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jul 16 18:33:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772b2fda
gnome-extra/cinnamon: add 5.8.4 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> Closes: https://github.com/gentoo/gentoo/pull/31827 Signed-off-by: Sam James <sam <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 insertions(+) diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index ec278b8af3d6..8e4b14968f4e 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -1 +1,2 @@ DIST cinnamon-5.6.8.tar.gz 2483519 BLAKE2B 0876bf097bbdb2b15b543a09d7d659995624d880a4c32a0d6bf580def4a72d33363c03525cd8072a238c624382c20bb66ce5ad5c05f8c21bbe5c06742209ca2b SHA512 33f7766f8d5df070cca7d4001be6a01dcb5cc57e60a320b0b2d14968af7bc0060575284f885de640ebe9297ea2bf9a6b97cb32dfb50fac37bb6d851d5f5d2237 +DIST cinnamon-5.8.4.tar.gz 2517117 BLAKE2B 4c3f452480b9e3ce7713221f1b76c475204b8dc1bb34d42a8faf492b0ca86416bb2fbd3849a7f048fef672ecf4613f06c645ec548159b6c3662b7602142e75e6 SHA512 2eaa253cdd01f00cca05ed123db59fde27f84cc24d7b8a3ec751a5f8252642870cbece941d1101f31fe0db43c15d9779bbdcacbf7037757569a4d17205cb10ad diff --git a/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild b/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild new file mode 100644 index 000000000000..a95477bd7e77 --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild @@ -0,0 +1,187 @@ +# 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 ~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 new file mode 100644 index 000000000000..c16db71c2e07 --- /dev/null +++ b/gnome-extra/cinnamon/files/cinnamon-pillow-10-support.patch @@ -0,0 +1,63 @@ +# 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)
