diff options
Diffstat (limited to 'gnome-extra/cinnamon')
| -rw-r--r-- | gnome-extra/cinnamon/Manifest | 3 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild | 209 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/cinnamon-5.8.4.ebuild | 187 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/cinnamon-6.0.4.ebuild | 199 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch | 43 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/files/cinnamon-pillow-10-support.patch | 63 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop | 1 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/metadata.xml | 15 |
8 files changed, 463 insertions, 257 deletions
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index 8e3d2161a955..7591256ae65b 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -1 +1,2 @@ -DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1 +DIST cinnamon-5.8.4.tar.gz 2517117 BLAKE2B 4c3f452480b9e3ce7713221f1b76c475204b8dc1bb34d42a8faf492b0ca86416bb2fbd3849a7f048fef672ecf4613f06c645ec548159b6c3662b7602142e75e6 SHA512 2eaa253cdd01f00cca05ed123db59fde27f84cc24d7b8a3ec751a5f8252642870cbece941d1101f31fe0db43c15d9779bbdcacbf7037757569a4d17205cb10ad +DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild deleted file mode 100644 index 5362f3afea64..000000000000 --- a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{2_7,3_6} ) -PYTHON_REQ_USE="xml" - -inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 - -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" -HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html" - -MY_PV="${PV/_p/-UP}" -MY_P="${PN}-${MY_PV}" - -SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" - -IUSE="+nls" - -# We need *both* python 2.x and 3.x -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( $(python_gen_useflags 'python2*') ) - || ( $(python_gen_useflags 'python3*') ) -" - -KEYWORDS="amd64 x86" - -COMMON_DEPEND="${PYTHON_DEPS} - app-accessibility/at-spi2-atk:2 - app-misc/ca-certificates - dev-libs/dbus-glib - >=dev-libs/glib-2.35.0:2[dbus] - >=dev-libs/gobject-introspection-0.10.1:= - >=dev-libs/json-glib-0.13.2 - >=dev-libs/libcroco-0.6.2:0.6 - dev-libs/libxml2:2 - gnome-base/librsvg - >=gnome-extra/cinnamon-desktop-4.0:0=[introspection] - >=gnome-extra/cinnamon-menus-4.0[introspection] - >=gnome-extra/cjs-4.0.0[cairo] - >=media-libs/clutter-1.10:1.0[introspection] - media-libs/cogl:1.0=[introspection] - >=gnome-base/gsettings-desktop-schemas-2.91.91 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - net-libs/libsoup:2.4[introspection] - >=sys-auth/polkit-0.100[introspection] - x11-libs/gdk-pixbuf:2[introspection] - >=x11-libs/gtk+-3.12.0:3[introspection] - x11-libs/pango[introspection] - >=x11-libs/startup-notification-0.11 - x11-libs/libX11 - >=x11-libs/libXfixes-5.0 - >=x11-wm/muffin-4.0.0[introspection] - dev-libs/keybinder:3[introspection] - >=x11-libs/libnotify-0.7.3:0=[introspection] -" -# Runtime-only deps are probably incomplete and approximate. -# Each block: -# 2. Introspection stuff + dconf needed via imports.gi.* -# 3. gnome-session is needed for gnome-session-quit -# 4. Control shell settings -# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast -# user switching with gdm-3.1.x) -# 6. caribou needed for on-screen keyboard -# 7. xdg-utils needed for xdg-open, used by extension tool -# 8. imaging, lxml needed for cinnamon-settings -# 9. gnome-icon-theme-symbolic needed for various icons -# 10. pygobject needed for menu editor -# 11. nemo - default file manager, tightly integrated with cinnamon -# 12. polkit-gnome - explicitly autostarted by us -# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory -RDEPEND="${COMMON_DEPEND} - >=gnome-base/dconf-0.4.1 - >=gnome-base/libgnomekbd-2.91.4[introspection] - sys-power/upower[introspection] - - >=gnome-extra/cinnamon-session-4.0 - >=gnome-extra/cinnamon-settings-daemon-4.0 - - >=app-accessibility/caribou-0.3 - - x11-misc/xdg-utils - x11-libs/xapps[introspection] - - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*') - - x11-themes/gnome-themes-standard - x11-themes/adwaita-icon-theme - - >=gnome-extra/nemo-4.0 - >=gnome-extra/cinnamon-control-center-4.0 - >=gnome-extra/cinnamon-screensaver-4.0 - - gnome-extra/polkit-gnome - - nls? ( >=gnome-extra/cinnamon-translations-4.0 ) -" -DEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*') - dev-util/gtk-doc - >=dev-util/intltool-0.4 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - gnome-base/gnome-common - !!=dev-lang/spidermonkey-1.8.2* -" -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time -# https://bugs.gentoo.org/show_bug.cgi?id=360413 - -S="${WORKDIR}/Cinnamon-${PV}" - -pkg_setup() { - python_setup -} - -src_prepare() { - # Fix backgrounds path as cinnamon doesn't provide them - # https://github.com/linuxmint/Cinnamon/issues/3575 - eapply "${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 - eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch - - eapply -p0 "${FILESDIR}"/${PN}-4.0-fix-pillow-settings.patch - - # Use pkexec instead of gksu (from Arch) - # https://github.com/linuxmint/Cinnamon/issues/3565 - sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die - - # Add polkit agent to required components (from Fedora/Arch), bug #523958 - # https://github.com/linuxmint/Cinnamon/issues/3579 - sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ - files/usr/share/cinnamon-session/sessions/cinnamon*.session || die - - # python 2-and-3 shebang fixing craziness - local p - python_setup 'python3*' - for p in $(grep -rl '#!.*python3'); do - python_fix_shebang "${p}" - done - - python_setup 'python2*' - for p in $(grep -rl '#!.*python[^3]'); do - python_fix_shebang "${p}" - done - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ - BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" -} - -src_install() { - gnome2_src_install - python_optimize "${ED}"usr/$(get_libdir)/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 -f "${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() { - gnome2_pkg_postinst - - 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 - - if ! has_version ">=x11-base/xorg-server-1.11"; then - ewarn "If you use multiple screens, it is highly recommended that you" - ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" - ewarn "pointer barriers which will make it easier to use hot corners." - fi - - if has_version "<x11-drivers/ati-drivers-12"; then - ewarn "Cinnamon has been reported to show graphical corruption under" - ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" - ewarn "open-source drivers." - fi -} 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..c48b4ae8c30e --- /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 ~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/cinnamon-6.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild new file mode 100644 index 000000000000..1c2639ba7d27 --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{10..12} ) +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="+desktop-portal +eds +gstreamer gtk-doc +nls +networkmanager wayland" +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-6.0:0= + >=gnome-extra/cinnamon-menus-6.0 + >=gnome-extra/cjs-6.0[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,wayland?] + >=x11-libs/libnotify-0.7.3:0=[introspection] + x11-libs/libX11 + >=x11-libs/libXfixes-5.0 + x11-libs/pango[introspection] + >=x11-libs/xapp-2.8.2[introspection] + >=x11-wm/muffin-6.0[introspection,wayland?] + + 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-r2[${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-6.0[networkmanager=,wayland?] + >=gnome-extra/cinnamon-screensaver-6.0 + >=gnome-extra/cinnamon-session-6.0 + >=gnome-extra/cinnamon-settings-daemon-6.0[wayland?] + >=gnome-extra/nemo-6.0[wayland?] + gnome-extra/polkit-gnome + media-libs/gsound + net-libs/libsoup:3.0[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 + + desktop-portal? ( + sys-apps/xdg-desktop-portal-gtk + sys-apps/xdg-desktop-portal-xapp + ) + nls? ( + >=gnome-extra/cinnamon-translations-6.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 + + if ! use desktop-portal; then + sed -i "s/subdir('xdg-portal')/#&/" data/meson.build || die + fi + + if ! use wayland; then + sed -i "s/, 'cinnamon-wayland.session'//" meson.build || die + sed -i "s/'cinnamon-wayland.desktop',//" data/meson.build || die + sed -i "s/subdir('wayland_sessions')/#&/" data/meson.build || die + sed -i "s/exec cinnamon-session --session cinnamon-wayland/echo 'wayland support disabled'; exit 1/" \ + files/usr/bin/cinnamon-session-cinnamon || die + fi +} + +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-4.0-fix-pillow-settings.patch b/gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch deleted file mode 100644 index e06c86b8f3d5..000000000000 --- a/gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py.orig 2019-03-21 16:46:14 UTC -+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py -@@ -620,31 +620,6 @@ def has_transparency(image): - has_alpha(image) - - --if Image.VERSION == '1.1.7': -- -- def split(image): -- """Work around for bug in Pil 1.1.7 -- -- :param image: input image -- :type image: PIL image object -- :returns: the different color bands of the image (eg R, G, B) -- :rtype: tuple -- """ -- image.load() -- return image.split() --else: -- -- def split(image): -- """Work around for bug in Pil 1.1.7 -- -- :param image: input image -- :type image: PIL image object -- :returns: the different color bands of the image (eg R, G, B) -- :rtype: tuple -- """ -- return image.split() -- -- - def get_alpha(image): - """Gets the image alpha band. Can handles P mode images with transpareny. - Returns a band with all values set to 255 if no alpha band exists. -@@ -655,7 +630,7 @@ def get_alpha(image): - :rtype: single band image object - """ - if has_alpha(image): -- return split(image)[-1] -+ return image.split()[-1] - if image.mode == 'P' and 'transparency' in image.info: - return image.convert('RGBA').split()[-1] - # No alpha layer, create one. 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) diff --git a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop index 24e14f267e23..c0cccca89d58 100644 --- a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop +++ b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=PolicyKit Authentication Agent +Comment=PolicyKit Authentication Agent Exec=/usr/libexec/polkit-gnome-authentication-agent-1 Terminal=false Type=Application diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml index 216784b94f4d..24e82c1c597d 100644 --- a/gnome-extra/cinnamon/metadata.xml +++ b/gnome-extra/cinnamon/metadata.xml @@ -1,11 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cinnamon@gentoo.org</email> - <name>Cinnamon Project</name> + <maintainer type="person" proxied="yes"> + <email>sparky@bluefang-logic.com</email> + <name>Matthew Turnbull</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <upstream> <remote-id type="github">linuxmint/Cinnamon</remote-id> </upstream> + <use> + <flag name="desktop-portal">Enable <pkg>sys-apps/xdg-desktop-portal</pkg> backend implementation for Cinnamon</flag> + </use> </pkgmetadata> |