[patch] diff file for cinnamon-2.2.16-r2 to cinnamon-2.4.3

cinnamon-2.2.16-r2-to-cinnamon-2.4.3.diff (text/plain), 3.93 KB, created by Allen Holl on 2014-11-20 16:01:26 UTC

--- a/gnome-extra/cinnamon/cinnamon-2.2.16-r2.ebuild	2014-10-07 07:38:11.000000000 -0400
+++ b/gnome-extra/cinnamon/cinnamon-2.4.3.ebuild	2014-11-18 18:03:08.372790000 -0500
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.16-r2.ebuild,v 1.1 2014/10/07 11:38:11 pacho Exp $
+# $Header:
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -36,9 +36,9 @@
 	dev-libs/libxml2:2
 	gnome-base/gconf:2[introspection]
 	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-1.0:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-1.9.0
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	>=gnome-extra/cinnamon-menus-2.4[introspection]
+	>=gnome-extra/cjs-2.3.1
 	>=media-libs/clutter-1.7.5:1.0[introspection]
 	media-libs/cogl:1.0=[introspection]
 	>=gnome-base/gsettings-desktop-schemas-2.91.91
@@ -47,14 +47,14 @@
 	media-libs/libcanberra
 	media-sound/pulseaudio:0=[glib]
 	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
+	>=sys-auth/polkit-0.100[introspection,gtk]
 	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-1.9.1[introspection]
+	>=x11-wm/muffin-2.4[introspection]
 	${PYTHON_DEPS}
 	networkmanager? (
 		gnome-base/libgnome-keyring
@@ -81,9 +81,9 @@
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
 	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
 
-	gnome-extra/cinnamon-session
+	>=gnome-extra/cinnamon-session-2.4
 
-	gnome-extra/cinnamon-settings-daemon
+	>=gnome-extra/cinnamon-settings-daemon-2.4
 
 	>=sys-apps/accountsservice-0.6.14[introspection]
 
@@ -104,11 +104,11 @@
 	x11-themes/gnome-themes-standard[gtk]
 	x11-themes/gnome-icon-theme-symbolic
 
-	gnome-extra/nemo
-	gnome-extra/cinnamon-control-center
-	gnome-extra/cinnamon-screensaver
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
 
-	l10n? ( >=gnome-extra/cinnamon-translations-2.2 )
+	l10n? ( >=gnome-extra/cinnamon-translations-2.4 )
 	networkmanager? (
 		gnome-extra/nm-applet
 		net-misc/mobile-broadband-provider-info
@@ -139,25 +139,19 @@
 	epatch "${FILESDIR}/background.patch"
 
 	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-2.2.6-automagic-gnome-bluetooth.patch"
+	epatch "${FILESDIR}/${PN}-2.4.3-automagic-gnome-bluetooth.patch"
 
 	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}/${PN}-2.2.6-optional-networkmanager.patch"
-
-	# Fix lspci path, https://github.com/linuxmint/Cinnamon/issues/3548
-	epatch "${FILESDIR}/${PN}-2.2.16-sbin-lspci.patch"
-
-	# Fix calendar with latest upower, https://github.com/linuxmint/Cinnamon/issues/2913
-	epatch "${FILESDIR}/${PN}-2.2.16-calendar-upower.patch"
+	epatch "${FILESDIR}/${PN}-2.4.3-optional-networkmanager.patch"
 
 	# Use wheel group instead of sudo (from Fedora/Arch)
 	# https://github.com/linuxmint/Cinnamon/issues/3576
-	epatch "${FILESDIR}/${PN}-2.2.16-set-wheel.patch"
+	epatch "${FILESDIR}/${PN}-2.4.3-set-wheel.patch"
 
 	# Fix GNOME 3.14 support (from Fedora/Arch)
 	# https://github.com/linuxmint/Cinnamon/issues/3577
-	epatch "${FILESDIR}/${PN}-2.2.16-gnome-3.14.patch"
-
+	epatch "${FILESDIR}/${PN}-2.4.3-gnome-3.14.patch"
+    
 	# Check for the cc-panel path, not for the unneeded binary (from Arch)
 	# https://github.com/linuxmint/Cinnamon/issues/3578
 	sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' \
@@ -204,6 +198,7 @@
 	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