diff options
Diffstat (limited to 'gnome-extra/cinnamon')
-rw-r--r-- | gnome-extra/cinnamon/Manifest | 6 | ||||
-rw-r--r-- | gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild | 4 | ||||
-rw-r--r-- | gnome-extra/cinnamon/cinnamon-3.8.8.ebuild | 4 | ||||
-rw-r--r-- | gnome-extra/cinnamon/cinnamon-4.0.3.ebuild | 209 |
4 files changed, 217 insertions, 6 deletions
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index 77a2eb748c33..232c3d47d418 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -5,6 +5,8 @@ AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03 AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642 DIST cinnamon-3.8.8.tar.gz 2234388 BLAKE2B edc27a670d788673602536f960e2859f6cc15a52ebd12cd741821c4455664ca6bfc6f2b2e3282a0797b15bf93a33208f4f4458df7b2cbe17e50d90412811265c SHA512 5f8acf181fde8d9156ef8767f97b24e207f6c44975e5ef97e812fcdd3b2d5ce4c921297b679ad1ade6fa8e4f9c544b74143f4d925d022cc95d6c71561ab40b53 -EBUILD cinnamon-3.6.6-r2.ebuild 7646 BLAKE2B 15b814158431413272ec8a030141cf2874d64614a0a0a75ee6c09ec916b32397626fb5668527af039284eda72eeee68a4c21084a894aadaa1feeda1fe3f17b46 SHA512 f06a8fff3801480155d230dc962a6ab201cce072ae951f24f381e51087919961b3ac9f5ba5b0091410fe31aabae4d1715febe6bc354d6f14b1cdbd5a1f8dfe98 -EBUILD cinnamon-3.8.8.ebuild 6942 BLAKE2B df8d18bcecd1a8c7754e5026b496e7d0204a928e31829df96f2dfb0ac0803ab0578193964054eeac17355c668201fbeecf04c2a0fa237fc5db07ed2cca9912a6 SHA512 650c6e78a72cb0bdb19a4406f075da67bcedf0e48e4eec1dd32c31f068e8343e00cea2c49c9839aacfd2f671c44f827ca19507c8ae1ba39543441a0258eb17d1 +DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1 +EBUILD cinnamon-3.6.6-r2.ebuild 7596 BLAKE2B 998559af3842688b6749e323410078d43e09de935efe8e029f3289b843edaf59a1f96a5acfcabfad19266bd54b27cf79a1000b84fad0b5e163d4b46603d8b4d6 SHA512 370e74d24a6a4be927845befbd1f038728dc38f8de52f1c1e362a3b1420e09c937d10518d149548a3a37af6f64c17e6fe0b52a3f4cd037fedf03d19a15ddf086 +EBUILD cinnamon-3.8.8.ebuild 6891 BLAKE2B d5f90ddb1f3f447f5dbe7d790af2b2a6b3c6450eb4ec43034cc256e76accb07ca333e9a93ca50da4cda15ce4ab6b7dcebff6d5093acd546cea30b2300ffb6ba1 SHA512 5aba804f4a78cad774e9fabab6b33ab60e484c7f5b4d10af60d5722b07c454480716df8b2b32368be52ba74dfb9ca1cea2c11a644cbf02e2d37fe6877ace1b0f +EBUILD cinnamon-4.0.3.ebuild 6981 BLAKE2B 9eb1ea4fa72ee8ec818fa3ecb0f30ffd21eb3d08f6cb3a0d69de62c882c6d863781153b3b6a4ad96e4e4e8b7c38a3aec5c27ee72defb1af7a07933ed6dd5878f SHA512 af3e1ed72f43705b7ef9ecdef53f5f72cfeb1dfad8ff171647d822c02e3021e78dbce379bc1e8a18d1dca91aed9d5d504e5dfe5a328229c9feac5bcad610a93d MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild index 504464fac2ab..17cda9870556 100644 --- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild +++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -82,7 +82,7 @@ COMMON_DEPEND="${PYTHON_DEPS} RDEPEND="${COMMON_DEPEND} >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] - || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) + sys-power/upower[introspection] >=gnome-extra/cinnamon-session-3.6 >=gnome-extra/cinnamon-settings-daemon-3.6 diff --git a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild index 26e4c59984c4..5be067893687 100644 --- a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild +++ b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -76,7 +76,7 @@ COMMON_DEPEND="${PYTHON_DEPS} RDEPEND="${COMMON_DEPEND} >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] - || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) + sys-power/upower[introspection] >=gnome-extra/cinnamon-session-3.8 >=gnome-extra/cinnamon-settings-daemon-3.8 diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild new file mode 100644 index 000000000000..817f2262cd36 --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild @@ -0,0 +1,209 @@ +# Copyright 1999-2018 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_4,3_5,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/" + +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/gconf:2[introspection] + 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. gconf-python, 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/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') + $(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 + + # 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 +} |