# ChangeLog for gnome-extra/cinnamon
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.52 2014/12/19 13:38:02 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.53 2015/01/11 22:46:15 eva Exp $
+
+*cinnamon-2.4.5 (11 Jan 2015)
+
+ 11 Jan 2015; Gilles Dartiguelongue <eva@gentoo.org> +cinnamon-2.4.5.ebuild,
+ +files/cinnamon-2.4.5-background.patch,
+ +files/cinnamon-2.4.5-gnome-3.14.patch,
+ +files/cinnamon-2.4.5-optional-networkmanager.patch,
+ +files/cinnamon-2.4.5-set-wheel.patch:
+ Version bump for Cinnamon 2.4, bug #529880.
19 Dec 2014; Pacho Ramos <pacho@gentoo.org> cinnamon-2.2.16-r2.ebuild:
amd64 stable, bug 529964
AUX cinnamon-2.2.16-set-wheel.patch 2570 SHA256 3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444 SHA512 451f7802be176b98834164bd8b61736edbbb3655459c1e713ff77bda4917a3cf96cfd2ed455bec0ddf739adc996303ea2d8fb8b8884d1bd3ac9fc7ab22cd59c1 WHIRLPOOL 27e5d0a35a0c8ac5b0d8c0228b2d36d97e9779bf813bf1b91dfc0e994975e54ef76e893ec08cf57b363113162a689e64971d12c61e4876579ebfed7154105a6a
AUX cinnamon-2.2.6-automagic-gnome-bluetooth.patch 1715 SHA256 094c4d22e6eb53558aeeeec7eb12a3d35e9921daf2c851655d6463e550a0db96 SHA512 a4344afe29799dbd4e6d88907c2906702c861e1409fb95d29fcc52f9b75be379ffd5a4682dde4a82fe40c898bb2468590d1241adb1a2415c473a3d75459e3460 WHIRLPOOL eb1df3d101c9085a9f1ec3c0eeb64cb66175471a99688ffdfb309ed8d6da53057370ed546ab31259086013c3096ab9103f649145c3fce56ae4ccb1a63b8c81db
AUX cinnamon-2.2.6-optional-networkmanager.patch 3527 SHA256 46d38bb5e6d6219be3d738bc1362431e633ba8369887b9f6983149a7db9aba11 SHA512 f5f046a518d365b69bb3fc22417406b11a4795d1cfc5ae2e7cb101f0f0514f81d104ae42f79e3b00d5b702050626e2b141164208e7ba22811d25090d985c12f1 WHIRLPOOL db506981950455c08ba5412a6968cc92d436b5013a316c19c9f57989fbc0f6c2a95b1dcd983cb53a874e63f00e5be2f993f5a6d7cac3a3e71845bb61ecf2a9ed
+AUX cinnamon-2.4.5-background.patch 1084 SHA256 d13d14917cd5372f1078963c33f3e32d68574fb68109ec2eed64ad3926d6033d SHA512 123b882db366e5f069887d293d96994c39f3b3974477c20f6587d5a6a8019198e1498889eee9e983a5273262695fa27c7dd7b61f2381f5084c0469d150dbebf1 WHIRLPOOL 0eefef6f165025c09587dbef148b924aaee60c1aa32cdaa462aacd63ca5170bc7d542210f5097c96433f98ec81fb170874eaec215dbb8f5d929ad2ca35bc8b2a
+AUX cinnamon-2.4.5-gnome-3.14.patch 1761 SHA256 a26e0b876c49abf9bb610bdb7766e689d2a5a3459de31c1a1f86c7cf4041c321 SHA512 bd0b8f19c628c634c9e8ca939d4a6e0d16da1dd12d2ef3e0ffcc1b7605fbf103847a6d0d2e41e2143033fc8a50b222515e8638fe7807ad595ac34d4975835c10 WHIRLPOOL 101a5b4c3e735e376cb063f0b30573adde6f79bca47501bd376820443f3105013de81b5560a26adf56c88cac8261ecda39e7debbc863890c66068d121c2f7fc2
+AUX cinnamon-2.4.5-optional-networkmanager.patch 3579 SHA256 6bd12e4fc844457399f004a30371c34774016a3f6ee3e6203393edb781488c8b SHA512 47bac1d6e52ee7fca305e5ee910229d84142eda40826281f6773a62125604609c4ac8df1f4274f09f1e9a99118b9c12cf3f1889b80a4b7a566b528606cfac207 WHIRLPOOL 79757d88f07e928c3f45a5b97399c67c555a63367a2e8294c2210fbe774f139062011f9d448b0f4cd97495e318ea25cacec161ca7fa133daf1d6e7d9d49ef8f3
+AUX cinnamon-2.4.5-set-wheel.patch 3141 SHA256 d7c38162bc0c8bf56f8fc6f58c04397638675816da23a93ba2de829967c0a7ee SHA512 729e389580658db0e124ea74dd9c0e3033592e13a90e1d1baa880107adcdb97c61ec5f122c6663f98232117ec3448dd6fad34baa7ebae23fdb0cd4cb26e4c402 WHIRLPOOL 92f5ae780220060b7dc227bc43117fda2a8cb50e98c059bcc226b55d081f83ce768342712a4716666820749694d52456bda7cab54c6b8a1a7e58b61fffb75410
AUX cinnamon-screensaver.desktop 451 SHA256 19ca21fbe12ef393176c2dfa75c7c1b248c6e1560005e0c19a07349f25101323 SHA512 8e1f7b5524494336da3f469f446c45adfefee0ff55f04d069612234cc27ca39b6bf1c87bdcdb18078ddffad4b46a8750bd5b41d35ab9180b4ed1417cc82e5552 WHIRLPOOL 29a1a430f7d7aa73bd8ff5d0877772fe092c3c39b9bc1adb35b32f5432f357204b7367edd00616adc5a15f3059cd16da14db5047ddc09795ce761e53f2fec626
AUX cinnamon2d-screensaver.desktop 455 SHA256 ce9172af04758a4078079e6bcb7b1117bfce02e3a9a7f794f32d7359612a3aa0 SHA512 2dffcbc2dba76597176ea645974208b58aca9c5809e46426e55f655a4f05a2fafffb9f024d25ec6bbe7fb05a3e8bfbfdfed055051895838db8816edfaea57791 WHIRLPOOL a4bec3d1c85b47691b2ddd337c480889a51a3140ff17ecb7fd11e3326788b9b20044a540851b3bcfae3a106e143363369d47c03310b315a78faff5201c66e215
AUX polkit-cinnamon-authentication-agent-1.desktop 252 SHA256 bfdbdc3e2ab360100bf85007f8762ae055611f4071535a6b207cd34437f2ec83 SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360 WHIRLPOOL 7fcc04c4bc28fe08ed8b3a6b5574f55392c0fcc13902e0b9f311279e1ac4f282fa999cd5d804a0f41d684ac03a3f9706745df7cdf6a98ab3ddd4b3200d3c080a
DIST cinnamon-2.2.14.tar.gz 2656809 SHA256 ffccc44c8b4675ba76510172d8252c3c07a131a9ad7b5ba062740b686a3cb0f9 SHA512 fab14dd7ba7ec0ed0ae8e9eb57befdd9d85239dc0215900192475fb7b256bb7c54df068ccedaa01c97651ce97f6bb2837bf1b2f56189d34eaf5a1d5f2ffad227 WHIRLPOOL 4f19e3bd44fcb63d650d3a8c8748605f55e5e3c8a1796bb88968addcefd277d9572a8192aead9c5e3ceae7f1132ad6d060e56060e6780dc836312f7281c0f655
DIST cinnamon-2.2.16.tar.gz 2656994 SHA256 1fc0bc1b6dbd071ca61f90c5cac5e41abfddbfa77577bdf3407afd1c1ca04793 SHA512 1e671c02393bb42ffcf20766a4bda005199115f9686784b3baa85828182d630cedce392a589689e639005aaf4ae05a2fb5c9b852cd94691f62ef55ab415a53fa WHIRLPOOL a8f86eb71449fd8281ff85b0e93e92d53fde43c7cf617621d2093b8222b8061ed278a7fe13413fc4f896dfbbdd12f67cb5b20536637ac53d6b06564b76dd918f
+DIST cinnamon-2.4.5.tar.gz 2734142 SHA256 118a42fe9c6450fd345ea98e48fb855e02b4cee017d171f9d08d6396a20e844c SHA512 fe252a7d5d784a4228c5cba2129d33228bfb3cbd0c8db2dd064d94b53b9f3bd54b49d52095abd3a0f2ca104aac7945b39c55ad26f8527d6a17945e7ef590dffc WHIRLPOOL b22d2ae55a002c8215f6f5520277409a15be733141c649a69bfe1ef20e853f4014db7b512b93623685f3b4f85d493448beeff5f8b4d2883040d022765f587b1a
EBUILD cinnamon-2.2.14.ebuild 8086 SHA256 21d6337ca37c0bb716a6fce83489f23477e2371e49b7d6296ecb17768c3fc06c SHA512 99ba24b0f9404d5aaec93ccded5fb101e234f31f00c5dfeb621be0e623b645975b43c48be470930ac53bcf2180461d00058246251c55ec45adcfed7201b14a83 WHIRLPOOL ab8b8af2da5230390b5498b1122c3bf073b7a1e0a182b2802fbaec853c51be1c9b9af143042edd012205d2ba3531cf172de0724b047aa2b4adb2740b18e2b7a8
EBUILD cinnamon-2.2.16-r2.ebuild 9328 SHA256 6893dc734d355fcbcc913cbc9b9db9bfdfe95619af2267fc2a9131647665490a SHA512 7a5b5b9de285f670040585b62dce6be4150bbcc7d6877c9f0989f7bd984cd082bed7f1ce3b49fdb5b748542a9d6a1645a569b2686f59e9bbddc9b0da5918d698 WHIRLPOOL 802dffa3cb025948c10d3a004717d7bee2d1bfbf65ec3d5b7ff847afa999e0be7ed438f6547ef6cfcd7937766c1e7f8f2d90ba5aa05d1af5dc69a2521da15ce8
-MISC ChangeLog 12110 SHA256 6dad26aba64389720b65a520c82180e5640c12ad7df7fed517839321d625a2f5 SHA512 a0e25bd2d0fadedea7a33228fb3bdab02a69c131a0aae1342231d9bb743c8f9b59606619f9278cef224deac8b3a5f2a7bf637b0b2ef27727b123736ad706938f WHIRLPOOL 326293772aafc1a4c209d3e861b1938e1b51d4168f38a4c8a319acc4d246ee5b069f3946100fda3b0def60cf5a5c82cab0023f30e2432007bd1c42678cbe8834
+EBUILD cinnamon-2.4.5.ebuild 8221 SHA256 077723b112f20b1266b4aa81d9c3ebeabc736e816ce104931041e3c256c52e16 SHA512 aa7970e6db1732d7ceb181c14021ba683c6256ca8776f3c3a80c650327ed6ce61dadfdde61a11907ace00676c59062255fc791b80c60e4d1121f0f94475abb6b WHIRLPOOL cb98c354eee0988d0e5150b5f2f4703a0bfaed2626f21e2ee29264af7842b202d765c842db5325cc91825aa6cce7ba67158e4bff83635c414d15de8fea19f243
+MISC ChangeLog 12444 SHA256 0c03184668d0eeb65b46fda4403fd7098040c6eec3b1330eba60b1371a1711ea SHA512 0d97f173e2b221cc4ffb97cbedb9dfcc9eddae9e98d164ea358639e8232bb39634d2abda3a4042c09abfb5bf55ba624766e525f7bb75d0f51a10dd0c18dbd5d4 WHIRLPOOL 39dee8fa0085ecb4dd8626acbb1a6fa2604e58cadf5f9cb1f46c5a885756a86b34563ab867ab64bdffcd0b55ede262dc41c37b511061c8995a04b51be4fb6944
MISC metadata.xml 277 SHA256 6786a8b1c9403816c51e1d0148d688b84c4af397d5e9d1339c6b744145599b05 SHA512 57f61828a2c1bc24fa0ee0d83fac6e8aa1c6bf6baae9f291e649dac3a08bb8d49ab299f3b64a384f0dbb436ce210ac74cd1fc230079416d894ffb49717cd401a WHIRLPOOL f6d039a872e0b23097060a856262638e4d092dd407a0b332ce419216663b7d08269c8291fcf493300b4d55d0ac6f2cd8a771ed7bfcca2a329ffcba8f6ad4ab75
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlSUKjsACgkQCaWpQKGI+9SDngCcDTRBtPShBhn8VgFslNg4SD74
-RTcAnRIYGWmqDMncfklDQTlrVlNyWf3L
-=lGMd
+iEYEAREIAAYFAlSy/TgACgkQ1fmVwcYIWAb+fACg2YD6YQ5corCUAXToSIFc3aIu
+QGcAn0nqLjvyqXgXLMfjoOcsx6Hx9D1w
+=xHd/
-----END PGP SIGNATURE-----
--- /dev/null
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.4.5.ebuild,v 1.1 2015/01/11 22:46:15 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils gnome2 multilib pax-utils python-single-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.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"
+# bluetooth support dropped due bug #511648
+IUSE="+l10n +networkmanager" #+bluetooth
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+ app-misc/ca-certificates
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.29.10:2
+ >=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-2.4:0=[introspection]
+ gnome-extra/cinnamon-menus[introspection]
+ >=gnome-extra/cjs-2.4
+ >=media-libs/clutter-1.7.5: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
+ media-sound/pulseaudio:0=[glib]
+ net-libs/libsoup:2.4[introspection]
+ >=sys-auth/polkit-0.100[introspection]
+ x11-libs/gdk-pixbuf:2[introspection]
+ >=x11-libs/gtk+-3.0.0:3[introspection]
+ x11-libs/pango[introspection]
+ >=x11-libs/startup-notification-0.11
+ x11-libs/libX11
+ >=x11-libs/libXfixes-5.0
+ >=x11-wm/muffin-2.4[introspection]
+ ${PYTHON_DEPS}
+ networkmanager? (
+ gnome-base/libgnome-keyring
+ >=net-misc/networkmanager-0.8.999[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[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
+# 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] sys-power/upower-pm-utils[introspection] )
+
+ >=gnome-extra/cinnamon-session-2.4
+ >=gnome-extra/cinnamon-settings-daemon-2.4
+
+ >=sys-apps/accountsservice-0.6.14[introspection]
+
+ >=app-accessibility/caribou-0.3
+
+ x11-misc/xdg-utils
+
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/gconf-python:2[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/pypam[${PYTHON_USEDEP}]
+ virtual/python-imaging[${PYTHON_USEDEP}]
+
+ x11-themes/gnome-themes-standard[gtk]
+ x11-themes/gnome-icon-theme-symbolic
+
+ >=gnome-extra/nemo-2.4
+ >=gnome-extra/cinnamon-control-center-2.4
+ >=gnome-extra/cinnamon-screensaver-2.4
+
+ l10n? ( >=gnome-extra/cinnamon-translations-2.4 )
+ networkmanager? (
+ gnome-extra/nm-applet
+ net-misc/mobile-broadband-provider-info
+ sys-libs/timezone-data )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+ dev-python/polib[${PYTHON_USEDEP}]
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40
+ 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-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Fix backgrounds path as cinnamon doesn't provide them
+ # https://github.com/linuxmint/Cinnamon/issues/3575
+ epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
+
+ # Fix automagic gnome-bluetooth dep, bug #398145
+ epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+ # Optional NetworkManager, bug #488684
+ epatch "${FILESDIR}"/${PN}-2.4.5-optional-networkmanager.patch
+
+ # Use wheel group instead of sudo (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3576
+ epatch "${FILESDIR}"/${PN}-2.4.5-set-wheel.patch
+
+ # Fix GNOME 3.14 support (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3577
+ epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.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
+
+ # Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
+ sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+ -e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
+ -i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
+ -i files/usr/lib/*/*.py \
+ -i files/usr/bin/* || die "sed failed"
+ if [[ "$(get_libdir)" != lib ]]; then
+ mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
+ fi
+
+ if ! use networkmanager; then
+ rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+ fi
+
+ epatch_user
+
+ python_fix_shebang .
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-jhbuild-wrapper-script \
+ $(use_enable networkmanager) \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+ BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+ --without-bluetooth
+}
+
+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
+
+ if has_version "media-libs/mesa[video_cards_radeon]" ||
+ has_version "media-libs/mesa[video_cards_r300]" ||
+ has_version "media-libs/mesa[video_cards_r600]"; then
+ elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
+ elog "Make sure that gallium architecture for r300 and r600 drivers is"
+ elog "selected using 'eselect mesa'."
+ if ! has_version "media-libs/mesa[gallium]"; then
+ ewarn "You will need to emerge media-libs/mesa with USE=gallium."
+ fi
+ fi
+}
--- /dev/null
+From 19b9e5392a0b1530861d306ee962ac85c108ba1a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 11 Jan 2015 20:33:37 +0100
+Subject: [PATCH 1/5] Use gnome backgrounds since Cinnamon isn't providing any
+
+https://github.com/linuxmint/Cinnamon/issues/3575
+---
+ files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+index bf6dc39..83a8b04 100644
+--- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
++++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+@@ -198,7 +198,7 @@ class Module:
+ def get_system_backgrounds(self):
+ picture_list = []
+ folder_list = []
+- properties_dir = "/usr/share/cinnamon-background-properties"
++ properties_dir = "/usr/share/gnome-background-properties"
+ backgrounds = []
+ if os.path.exists(properties_dir):
+ for i in os.listdir(properties_dir):
+--
+2.2.1
+
--- /dev/null
+From b048ad4144607cad258e4193235abeb3930ffcab Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 11 Jan 2015 20:51:55 +0100
+Subject: [PATCH 5/5] Fix theme compatibility with Gnome 3.14
+
+from Fedora/Arch
+
+https://github.com/linuxmint/Cinnamon/issues/3577
+---
+ data/theme/cinnamon.css | 3 ++-
+ files/usr/lib/cinnamon-settings/modules/cs_themes.py | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/data/theme/cinnamon.css b/data/theme/cinnamon.css
+index 9539586..d931b86 100644
+--- a/data/theme/cinnamon.css
++++ b/data/theme/cinnamon.css
+@@ -1444,7 +1444,8 @@ StScrollBar StButton#vhandle:hover {
+ }
+ .applet-box:hover .applet-icon {
+ color: #fff;
+- icon-shadow: white 0px 0px 3px;
++/* Broken with GNOME 3.14 (icon-size is not honoured)
++ * icon-shadow: white 0px 0px 3px;*/
+ }
+
+ /* ===================================================================
+diff --git a/files/usr/lib/cinnamon-settings/modules/cs_themes.py b/files/usr/lib/cinnamon-settings/modules/cs_themes.py
+index 3002499..ab8b0b3 100644
+--- a/files/usr/lib/cinnamon-settings/modules/cs_themes.py
++++ b/files/usr/lib/cinnamon-settings/modules/cs_themes.py
+@@ -244,7 +244,7 @@ class Module:
+
+ def _load_icon_themes(self):
+ dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons"))
+- valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme")))
++ valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme")))
+ valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
+ res = []
+ for i in valid:
+--
+2.2.1
+
--- /dev/null
+From e89cbae294685195de51aca1e8e6cd400dc0822b Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 10 May 2014 15:14:05 -0400
+Subject: [PATCH 3/5] Make networkmanager dependency optional for Gentoo
+
+---
+ configure.ac | 36 ++++++++++++++++++++++++++++++++++--
+ js/misc/config.js.in | 2 ++
+ src/Makefile.am | 5 ++++-
+ 3 files changed, 40 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1977da8..920d256 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,8 +81,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
+ clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
+ libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
+ gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+- polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+- libnm-glib libnm-util gnome-keyring-1)
++ polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
++
++##########################
++# Check for NetworkManager
++##########################
++NM_MIN_VERSION=0.9
++AC_ARG_ENABLE(networkmanager,
++ AS_HELP_STRING([--disable-networkmanager],
++ [disable NetworkManager support @<:@default=auto@:>@]),,
++ [enable_networkmanager=auto])
++
++if test "x$enable_networkmanager" != "xno"; then
++ PKG_CHECK_MODULES(NETWORKMANAGER,
++ [libnm-glib libnm-util gnome-keyring-1],
++ [have_networkmanager=yes],
++ [have_networkmanager=no])
++
++ CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
++ CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
++else
++ have_networkmanager="no (disabled)"
++fi
++
++if test "x$have_networkmanager" = "xyes"; then
++ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
++ AC_SUBST([HAVE_NETWORKMANAGER], [1])
++else
++ if test "x$enable_networkmanager" = "xyes"; then
++ AC_MSG_ERROR([Couldn't find NetworkManager.])
++ fi
++ AC_SUBST([HAVE_NETWORKMANAGER], [0])
++fi
++
++AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
+
+ PKG_CHECK_MODULES(CINNAMON_JS, gio-2.0 cjs-internals-1.0 >= $GJS_MIN_VERSION)
+
+diff --git a/js/misc/config.js.in b/js/misc/config.js.in
+index 704989b..df7e014 100644
+--- a/js/misc/config.js.in
++++ b/js/misc/config.js.in
+@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+ const GJS_VERSION = '@GJS_VERSION@';
+ /* 1 if gnome-bluetooth is available, 0 otherwise */
+ const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
++/* 1 if networkmanager is available, 0 otherwise */
++const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
+ /* The system TLS CA list */
+ const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c0c6e7e..fc2dd14 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -286,7 +286,10 @@ libcinnamon_la_LIBADD = \
+ libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
+
+ Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
+-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0
++if HAVE_NETWORKMANAGER
++Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
++endif
+ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
+ Cinnamon_0_1_gir_LIBS = libcinnamon.la
+ Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
+--
+2.2.1
+
--- /dev/null
+From 916b13aa2b86eb7e14f539293a0059a95c936393 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 11 Jan 2015 20:50:13 +0100
+Subject: [PATCH 4/5] Use wheel group instead of sudo
+
+from Fedora/Arch
+
+https://github.com/linuxmint/Cinnamon/issues/3576
+---
+ .../cinnamon-settings-users/cinnamon-settings-users.py | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+index c4de658..d9062dc 100755
+--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
++++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -145,12 +145,11 @@ class EditableEntry (Gtk.Notebook):
+
+ class PasswordDialog(Gtk.Dialog):
+
+- def __init__ (self, user, password_mask, group_mask):
++ def __init__ (self, user, password_mask):
+ super(PasswordDialog, self).__init__()
+
+ self.user = user
+ self.password_mask = password_mask
+- self.group_mask = group_mask
+
+ self.set_modal(True)
+ self.set_skip_taskbar_hint(True)
+@@ -216,12 +215,6 @@ class PasswordDialog(Gtk.Dialog):
+ def change_password(self):
+ newpass = self.new_password.get_text()
+ self.user.set_password(newpass, "")
+- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
+- mask = self.group_mask.get_text()
+- mask = mask.split(", ")
+- mask.remove("nopasswdlogin")
+- mask = ", ".join(mask)
+- self.group_mask.set_text(mask)
+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.destroy()
+
+@@ -516,7 +509,7 @@ class Module:
+ model, treeiter = self.users_treeview.get_selection().get_selected()
+ if treeiter != None:
+ user = model[treeiter][INDEX_USER_OBJECT]
+- dialog = PasswordDialog(user, self.password_mask, self.groups_label)
++ dialog = PasswordDialog(user, self.password_mask)
+ response = dialog.run()
+
+ def _on_groups_button_clicked(self, widget):
+@@ -753,11 +746,11 @@ class Module:
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
+ description = "<b>%s</b>\n%s" % (fullname, username)
+ piter = self.users.append(None, [new_user, pixbuf, description])
+- # Add the user to his/her own group and sudo if Administrator was selected
++ # Add the user to his/her own group and wheel if Administrator was selected
+ if dialog.account_type_combo.get_active() == 1:
+- os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username))
++ os.system("usermod %s -G %s,wheel" % (username, username))
+ else:
+- os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
++ os.system("usermod %s -G %s" % (username, username))
+ self.load_groups()
+ dialog.destroy()
+
+--
+2.2.1
+
projects / gentoo.git / commitdiff