diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /gnome-extra/cinnamon | |
parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) |
gentoo resync : 15.06.2021
Diffstat (limited to 'gnome-extra/cinnamon')
-rw-r--r-- | gnome-extra/cinnamon/Manifest | 6 | ||||
-rw-r--r-- | gnome-extra/cinnamon/cinnamon-4.6.7.ebuild | 181 | ||||
-rw-r--r-- | gnome-extra/cinnamon/cinnamon-4.8.6.ebuild | 2 | ||||
-rw-r--r-- | gnome-extra/cinnamon/cinnamon-5.0.2.ebuild | 175 |
4 files changed, 179 insertions, 185 deletions
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index 98ba081488eb..3fab4747190b 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -2,8 +2,8 @@ AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2 AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03e202b76956c96df2dea7f2401d03c3c679ce19ec7e6ad046abf0fa1f1715ee94194a370605454dd3f3a777493c9cad9a88a3878093cda96b77b39 SHA512 a8b810f0aafab57984e8189bcc827e72dad7b9201ff88b36948b701cddb61c3bf003aa7b1986ad3ea526242800cbd183890218471fde7e7d7d2b9550b6688dcc AUX cinnamon-4.8.6-build-fixes.patch 981 BLAKE2B 735028024dfe3b0d280875411d03a2a005efb6344650e2278778621e655818c074c894f0988c1f5974ee73e341f8a4304c9834e205701fb2fe0646fbf9b7c9a4 SHA512 6a9de0e477bec8cdddf302c0878dd213f02047a71cdd6b6090cf8ed6616d185880fa18033c24c13bed6e0e651224ddd9c779320c3f441398d6c36b2741a6bd4d AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360 -DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd -EBUILD cinnamon-4.6.7.ebuild 5657 BLAKE2B b3b49a03cf3829dbac90c966f4135964caf0ab1b45e6c28448a517a23c9dee2125a6206c2a34b9183c9750b8c760cb14b7fc993716ed4824ed21acae178a5db0 SHA512 a377c3c1d34c69238813960238733f512a67b6002fd47d215b0b80a4ed290e37511a41bd33af783b9506ca4698060e31c97b1574f54980a7295d08ea1ad0f318 -EBUILD cinnamon-4.8.6.ebuild 5030 BLAKE2B cd1656ff0daf268ee8cb172b2ac65497e4dcf5b0a3284619420093b150dad49a5b78a47248422c97ab342989176b1407878fd12ad8ef0c17f1ec523951e855b9 SHA512 e6bf27f1db6308f84b5efffcc57aa80e4c5faa39fb5ed41a7fa40fe7ef405c0e8ebd897f456ade8de8ba61cb57ec93a505278b421da17367f6cb8918465b678d +DIST cinnamon-5.0.2.tar.gz 2395838 BLAKE2B fe7962f4d6481a1584700b3ad5495d2cdc79c4f61aa01b7e330929ff83150ca9a024a00bece4df0fbd18dc68df164c5c27024320c8e46041ae1eaa7c36c8c620 SHA512 f75e9f8382b27b0b29d37274b8687f861c6b46a46b378ee297024069ad70e0e5b48089cd724210148d657d25bcce5d3f18b6ba4826b8ff582c0c1afb5fef9578 +EBUILD cinnamon-4.8.6.ebuild 5028 BLAKE2B 3afddcd102ded05641665b6b0ba2571119296a4d58aba59bea55824fcbf3e0eef53f84e0a3ed88d168ad4cb06b9169771819d75d46270a01503e0c0aed84ffc2 SHA512 398060a0c4e903a8ebccfc7995ac823f14518fcedf81a1ab771996e7e9314accadb84def76b557d72aaf56c4f43dbd4ca8c09fe1111526f0eb5b8c0c93cca2af +EBUILD cinnamon-5.0.2.ebuild 5001 BLAKE2B c17c9256615cfec063ffb525f253bb9f8661df31076a174bb8b2a3c22699304155bb37eced47d4a7b1d3ba7709e1040da5cb0c3521c8443f6fbb448c106169aa SHA512 5d5bd3ff9a7d7285b580eaed307d436e24339879688f0e327bf475d6afce51da6732eab175d9b0227d359488c4e28e2a0675163142520d1fe7d60f67791c0842 MISC metadata.xml 487 BLAKE2B ec4d9655fccd9121ddb07b22cbc1ad94ceaf48c1994b1e27f6b0e1d5866b70d9b058af3c36c20a3856770428b6c17c6f97973be2a2040dba63fb45406ede2f2c SHA512 f6d2d4bada61a51e2af982dea1d908d31eec02f794cd72cdb80935320c17b1c25dd91a80c8b28f1d4b7c92bf40e4ab958ec394d3fec6ea90d602d6df485cc3c0 diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild deleted file mode 100644 index eceb8c0e5f49..000000000000 --- a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) -PYTHON_REQ_USE="xml" - -inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils python-single-r1 xdg - -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" -HOMEPAGE="https://projects.linuxmint.com/cinnamon/" -SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="gtk-doc +nls +networkmanager" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="amd64 ~arm64 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-1.29.15:= - >=dev-libs/libcroco-0.6.2:0.6 - dev-libs/libxml2:2 - >=gnome-extra/cinnamon-desktop-4.6:0= - >=gnome-extra/cinnamon-menus-4.6 - >=gnome-extra/cjs-4.6[cairo] - >=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.3[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. adwaita-icon-theme 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 - sys-power/upower[introspection] - - >=gnome-extra/cinnamon-session-4.6 - >=gnome-extra/cinnamon-settings-daemon-4.6 - - >=app-accessibility/caribou-0.3 - - dev-libs/libtimezonemap - x11-misc/xdg-utils - x11-libs/xapps[introspection] - - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/pypam[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] - dev-python/tinycss2[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/xapp[${PYTHON_USEDEP}] - ') - - x11-themes/gnome-themes-standard - x11-themes/adwaita-icon-theme - - >=gnome-extra/nemo-4.6 - >=gnome-extra/cinnamon-control-center-4.6[networkmanager=] - >=gnome-extra/cinnamon-screensaver-4.6 - - gnome-extra/polkit-gnome - - nls? ( >=gnome-extra/cinnamon-translations-4.6 ) -" -DEPEND="${COMMON_DEPEND} - >=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 - eautoreconf - gnome2_disable_deprecation_warning - - # 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/cinnamon*.session.in || die - - # shebang fixing craziness - local p - for p in $(grep -rl '#!.*python3'); do - python_fix_shebang "${p}" - done -} - -src_configure() { - econf \ - --disable-maintainer-mode \ - --disable-schemas-compile \ - --enable-compile-warnings=minimum \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ - $(use_enable gtk-doc) \ - $(use_enable networkmanager) \ - BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - - 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 -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() { - xdg_pkg_postinst - gnome2_schemas_update - - 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 -} - -pkg_postrm() { - xdg_pkg_postinst - gnome2_schemas_update -} diff --git a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild index 8b959450d8de..768aacbecf1d 100644 --- a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild +++ b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild @@ -16,7 +16,7 @@ LICENSE="GPL-2+" SLOT="0" IUSE="+gstreamer gtk-doc +nls +networkmanager" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" DEPEND=" ${PYTHON_DEPS} diff --git a/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild new file mode 100644 index 000000000000..f8888fcdd160 --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +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+" +SLOT="0" +IUSE="+gstreamer gtk-doc +nls +networkmanager" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +KEYWORDS="~amd64 ~arm64 ~x86" + +DEPEND=" + ${PYTHON_DEPS} + app-accessibility/at-spi2-atk: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.0:0= + >=gnome-extra/cinnamon-menus-5.0 + >=gnome-extra/cjs-5.0[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.0[introspection] + + 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/pypam[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/tinycss2[${PYTHON_USEDEP}] + >=dev-python/xapp-2.2.0[${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.0[networkmanager=] + >=gnome-extra/cinnamon-screensaver-5.0 + >=gnome-extra/cinnamon-session-5.0 + >=gnome-extra/cinnamon-settings-daemon-5.0 + >=gnome-extra/nemo-5.0 + gnome-extra/polkit-gnome + net-misc/wget + sys-apps/accountsservice[introspection] + sys-power/upower[introspection] + >=x11-libs/xapps-2.2.0[introspection] + x11-misc/xdg-utils + x11-themes/adwaita-icon-theme + x11-themes/gnome-themes-standard + + nls? ( + >=gnome-extra/cinnamon-translations-5.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 +} + +src_configure() { + local emesonargs=( + $(meson_use gstreamer build_recorder) + $(meson_use gtk-doc docs) + -Ddisable_networkmanager=$(usex networkmanager false true) + ) + meson_src_configure +} + +src_install() { + python_domodule files/usr/lib/python3/dist-packages/cinnamon + rm -rf files/usr/lib/python3 || die + + meson_src_install + + 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 disabled." + fi +} + +pkg_postrm() { + xdg_pkg_postinst + gnome2_schemas_update +} |