commit: 3da04b78334de3e834a8eea2d150478c67dc62cf Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> AuthorDate: Wed Jul 29 16:19:10 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Sep 9 02:15:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da04b78
gnome-extra/cinnamon: 4.6.7 version bump Switch to EAPI=7. Closes: https://bugs.gentoo.org/733544 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> Signed-off-by: Sam James <sam <AT> gentoo.org> gnome-extra/cinnamon/Manifest | 1 + gnome-extra/cinnamon/cinnamon-4.6.7.ebuild | 181 +++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+) diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index 62012379d1a..c586ce36dba 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -1 +1,2 @@ DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978 +DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070 diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild new file mode 100644 index 00000000000..acc18a5644a --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,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 ~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 +}
