diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /gnome-extra/cinnamon | |
parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) |
gentoo resync : 30.05.2020
Diffstat (limited to 'gnome-extra/cinnamon')
-rw-r--r-- | gnome-extra/cinnamon/Manifest | 4 | ||||
-rw-r--r-- | gnome-extra/cinnamon/cinnamon-4.4.8.ebuild | 176 | ||||
-rw-r--r-- | gnome-extra/cinnamon/metadata.xml | 8 |
3 files changed, 187 insertions, 1 deletions
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index f17757e60c7f..ab1f755b53d2 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -3,5 +3,7 @@ AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03 AUX cinnamon-4.0-fix-pillow-settings.patch 1363 BLAKE2B 6683cdb92c4da3e09b8f6759216676d666ce832f3687f2775914e27a0f0a3d1427be7774aabc6525f601204682471da3479b35c2bcc3dce3e08929b7d4761b48 SHA512 cd86597c4c5009d8227774d96c375d52c8ab42b944e7dea7013f94c2616511be9b5e3b79b812c65714f58bc67c3a32f34ec71ff0afd4f9ea3c5aea6664817946 AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1 +DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978 EBUILD cinnamon-4.0.3-r2.ebuild 6935 BLAKE2B 41a1a5c262ce2484e95ada2fc8cbeb583547d5a3b384b11c20747b247c1c9804ca3b6510880aeca1a4d232308105cc0327ea9f70b6f5499844f0a5498c58a54c SHA512 4c47d0f3e807c279abfdc5e57413747d57016fb79cbf4383c1bf18a7a9c3806904ff929f043b87ac50fe4b248afb8a96aa14ef1f78ef4348097d0ce42982c660 -MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb +EBUILD cinnamon-4.4.8.ebuild 5622 BLAKE2B 89b253b06f80dc03bac458777059079cf7d331b0ae684917e02944d936ad875c2701fc016e0353cbc804988876e187fdaad8b430ff2018edbb9445f9c143ab38 SHA512 702307caa03256616eb68cec0a6d753c81064c68b5f9d7753154551418379251e43ce00f0d56f04896c9a5cc6d0cb0e506f241c8092f12ed2a99d5f7b4c83202 +MISC metadata.xml 570 BLAKE2B f486a9dc0b459f4c00dce4f43b7ac038f1f186a6a3904928d4110fa26521c5498567951aba2960d1227ef204a4b6dd0572a8d3afc2478a89828a606a815163c7 SHA512 eaa0827c0f6a6642ba1ac353a6a5bfdc83bb8f0a5c689064f2a5481e46b9df781393168f222d4918b6aacda6b04cee21bb23ed3cb33b7f5ffc7f1b350787c49c diff --git a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild new file mode 100644 index 000000000000..8fb8410e1ee3 --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_REQ_USE="xml" + +inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1 + +DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" +HOMEPAGE="https://projects.linuxmint.com/cinnamon/" + +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="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.4:0= + >=gnome-extra/cinnamon-menus-4.4 + >=gnome-extra/cjs-4.4.0[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. 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 + sys-power/upower[introspection] + + >=gnome-extra/cinnamon-session-4.4 + >=gnome-extra/cinnamon-settings-daemon-4.4 + + >=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/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/tinycss[${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.4 + >=gnome-extra/cinnamon-control-center-4.4[networkmanager=] + >=gnome-extra/cinnamon-screensaver-4.4 + + gnome-extra/polkit-gnome + + nls? ( >=gnome-extra/cinnamon-translations-4.4 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + !!=dev-lang/spidermonkey-1.8.2* + gtk-doc? ( dev-util/gtk-doc ) +" +# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time +# https://bugs.gentoo.org/show_bug.cgi?id=360413 + +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 + + # 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 + + eautoreconf + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --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() { + gnome2_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 -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 +} diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml index 216784b94f4d..5070fef67adf 100644 --- a/gnome-extra/cinnamon/metadata.xml +++ b/gnome-extra/cinnamon/metadata.xml @@ -5,6 +5,14 @@ <email>cinnamon@gentoo.org</email> <name>Cinnamon Project</name> </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="person"> + <email>sparky@bluefang-logic.com</email> + <name>Matthew Turnbull</name> + </maintainer> <upstream> <remote-id type="github">linuxmint/Cinnamon</remote-id> </upstream> |