diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-07-18 00:58:25 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-07-18 00:58:25 +0100 |
commit | 5e0a5ca921524f8859808527a57655eec16efa52 (patch) | |
tree | 7c58411b1e81478df4e20082a6adec2553c24c5c /gnome-extra/cinnamon | |
parent | 4c16e0a214824f15f09396e359db4f1f5c086fec (diff) |
gentoo auto-resync : 18:07:2023 - 00:58:24
Diffstat (limited to 'gnome-extra/cinnamon')
-rw-r--r-- | gnome-extra/cinnamon/Manifest | 3 | ||||
-rw-r--r-- | gnome-extra/cinnamon/cinnamon-5.8.4.ebuild | 187 | ||||
-rw-r--r-- | gnome-extra/cinnamon/files/cinnamon-pillow-10-support.patch | 63 |
3 files changed, 253 insertions, 0 deletions
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index 62cc77455fb3..453dccdb8f1d 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -1,6 +1,9 @@ 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-pillow-10-support.patch 3623 BLAKE2B edda19561231da485ef4f3ce018c8ca790c1c63b95649321c2d3c73ea31aecc173f6015a41348b4914fc61006d579ea19d33d55b67d8f12e5bbd386c892f8521 SHA512 c72141d60e93a1e6797eb92ca65a0cd93ee7b51230ee9c847f8fa335848c639d3d1f8917011982cac0fa1ac21a6e7bca3046e7125b5ea53bd3af708e62e7b59f AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360 DIST cinnamon-5.6.8.tar.gz 2483519 BLAKE2B 0876bf097bbdb2b15b543a09d7d659995624d880a4c32a0d6bf580def4a72d33363c03525cd8072a238c624382c20bb66ce5ad5c05f8c21bbe5c06742209ca2b SHA512 33f7766f8d5df070cca7d4001be6a01dcb5cc57e60a320b0b2d14968af7bc0060575284f885de640ebe9297ea2bf9a6b97cb32dfb50fac37bb6d851d5f5d2237 +DIST cinnamon-5.8.4.tar.gz 2517117 BLAKE2B 4c3f452480b9e3ce7713221f1b76c475204b8dc1bb34d42a8faf492b0ca86416bb2fbd3849a7f048fef672ecf4613f06c645ec548159b6c3662b7602142e75e6 SHA512 2eaa253cdd01f00cca05ed123db59fde27f84cc24d7b8a3ec751a5f8252642870cbece941d1101f31fe0db43c15d9779bbdcacbf7037757569a4d17205cb10ad EBUILD cinnamon-5.6.8.ebuild 5293 BLAKE2B 7f1860b81ebebb5b2350ebe45d125bfb34652620f3fd6de050fdb5ecd28c10201431e5d6e1d2772bb8407778bac0f7f6250cd63d9b2a84941c274e1844b03297 SHA512 44fea6e75f6dc71a76a5ace0339afe33e45068f0f5a7636ac499e8d83f6b74ed4262a3016c41caedc29dcbcfdbcef73efcb6d5c9c18c70dbce893866c343509e +EBUILD cinnamon-5.8.4.ebuild 5422 BLAKE2B c8e6b865f250a1dd709cf037459a4f7c7e3c2e641b65f77c77bdef2a07be9d3abcba16033c7f6027608bf08369f11b92f0d6c50d71823930f7c20ef0c37b6978 SHA512 469187bc6eaf2ecc62af487b6cf077dfd449e4a5ac696ed180dcc218f3bd5932501b0d9f46dec9b6d44e6b91786f6c9f700d0ef5efa142f42ac82796a6ab2cdf MISC metadata.xml 488 BLAKE2B 422b0fe2eb6afbe708925e9fb6fa7f038497b11d51e06165e69e43515a27cf4a77c74a1a10156bbcfd6084704bbfa7f24d4e8a8409970c5d365aa6ba80ab5bd8 SHA512 5952deb426e8adcceb83a9bcaf94bbe96e4f065fbdfd6fa17b08988989f79c3f1de55e58ca13a26a6146b5cef90d8e3853d614d390c7afe0d2494d78ea3df744 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) |