..

5 files changed, 108 insertions, 4 deletions

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 605ec0f..63d2c26 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,6 @@
+AUX cinnamon-1.1.3-automagic-gnome-bluetooth.patch 1841 RMD160 4b57dfeb42f299ef74799409132778b60ddc7a09 SHA1 4acf93b0bda58660b6c7ed5c8fdb6b06df86c035 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2
+AUX cinnamon-1.1.3-extensionjs_path.patch 1136 RMD160 8fea3328501f749dcd9e1459b948b2f88350d13c SHA1 18def1c34675a5f4eecc51cd90d08cb7311cc101 SHA256 a937cfd70a6c5e63cc74d0b72387fd6b3d9f4286e42b2c9615b7f8f458cab19c
+AUX cinnamon-1.1.3-xdg-open.patch 944 RMD160 68cc5eda9affdd83b49b25e09c8bf25ba0ef1621 SHA1 772a75130d50acc66d7bd252e857dc3ffce724ae SHA256 87ec3b57829107e1d3cb56cd75bf3d1125c71193a14087296bfce3f18780b7d5
 DIST cinnamon-1.2.tar.gz 2375269 RMD160 66844177f0b9a331c2bf59434ffbfa39504f4854 SHA1 bdf91cef0e01ccbdf4d1b4e35c0f51ad04adacbd SHA256 caa83d0536bc08e2446277bb744efdf141b40cf705f4cf86ffbb91dea5d6d488
 DIST cinnamon-session_1.0.0_all.deb 1634 RMD160 3420dd6144fe184cd0b049f9a7dc0b033b3cdb5a SHA1 f963e4473dbdb28964357f742119cf1c87c3361f SHA256 720e07da6f3163346db9d01fff1b8771aaf145c2d406a4e88435826a38de0134
-EBUILD cinnamon-1.2.ebuild 6849 RMD160 5630a2eba14f3c086ac757db382a3023800736a1 SHA1 19fe6248255a36754775b41183d3d311cfcb52f0 SHA256 0b03e65edc9e254ae41482ba5d39a0232a061096fe68d18d30ae4273fed6ec47
+EBUILD cinnamon-1.2.ebuild 6846 RMD160 89434cf2474b7d342508a1b624198b66106a390e SHA1 4fc421f0d4dba33ee9bcd31199b577c55da57d82 SHA256 3732073edc6ea290b63fb35e9d2e0c3bb0957e459d44e3cbe2d8faa4d9799c59
diff --git a/gnome-extra/cinnamon/cinnamon-1.2.ebuild b/gnome-extra/cinnamon/cinnamon-1.2.ebuild
index 3757ee3..9a2f7c6 100644
--- a/gnome-extra/cinnamon/cinnamon-1.2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.2.ebuild
@@ -123,11 +123,11 @@ src_unpack() {
 
 src_prepare() {
 	# Fix automagic gnome-bluetooth dep, bug #398145
-	#epatch "${FILESDIR}/${PN}-1.1.3-automagic-gnome-bluetooth.patch"
+	epatch "${FILESDIR}/${PN}-1.1.3-automagic-gnome-bluetooth.patch"
 
 	# Do not depend on libgnome (patch from gnome-shell 3.3.x)
-	#epatch "${FILESDIR}/${PN}-1.1.3-extensionjs_path.patch"
-	#epatch "${FILESDIR}/${PN}-1.1.3-xdg-open.patch"
+	epatch "${FILESDIR}/${PN}-1.1.3-extensionjs_path.patch"
+	epatch "${FILESDIR}/${PN}-1.1.3-xdg-open.patch"
 
 	# Gentoo uses /usr/libexec
 	sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.1.3-automagic-gnome-bluetooth.patch b/gnome-extra/cinnamon/files/cinnamon-1.1.3-automagic-gnome-bluetooth.patch
new file mode 100644
index 0000000..ae23a6c
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-1.1.3-automagic-gnome-bluetooth.patch
@@ -0,0 +1,44 @@
+From 84568fa9454f279ff519a2a11174e112786e46db Mon Sep 17 00:00:00 2001
+From: root <admin@catmur.co.uk>
+Date: Sun, 8 Jan 2012 13:55:05 +0000
+Subject: [PATCH] Fix automagic gnome-bluetooth dependency
+
+https://bugs.gentoo.org/show_bug.cgi?id=398145
+
+Ed Catmur 2012-01-08 13:46:22 UTC
+libgnome-bluetooth-applet is a private library so they shouldn't be linking
+against it anyway.  I tried to work out how to tell libtool to add it to rpath
+but got totally lost.
+
+I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
+so I can at least merge USE=-bluetooth.
+---
+ configure.ac |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1c64122..a699838 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -127,6 +127,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
+ 
+ AC_MSG_CHECKING([for bluetooth support])
++AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
++AS_IF([test "x$with_bluetooth" != "xno"], [
+ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
+ 	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
+@@ -138,6 +140,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+ 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
+ 	 AC_SUBST([HAVE_BLUETOOTH],[0])
+ 	 AC_MSG_RESULT([no])])
++], [AC_DEFINE([HAVE_BLUETOOTH],[0])
++	 AC_SUBST([HAVE_BLUETOOTH],[0])
++	 AC_MSG_RESULT([no])])
+ 
+ PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
+ AC_SUBST(CALENDAR_SERVER_CFLAGS)
+-- 
+1.7.8.2
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.1.3-extensionjs_path.patch b/gnome-extra/cinnamon/files/cinnamon-1.1.3-extensionjs_path.patch
new file mode 100644
index 0000000..ff42f22
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-1.1.3-extensionjs_path.patch
@@ -0,0 +1,31 @@
+From b64739844de4d84032b69ecd04f0fbe1d452f311 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Thu, 13 Oct 2011 00:46:46 -0400
+Subject: [PATCH 03/28] gnome-shell-extension-tool: Fix error after creating
+ extension
+
+Commit 7a8a00c7057d56350d4b5509cefd812a67d4b7d7 cleaned up the code to move all
+files to a dictionary, which accidentally left an undefined "extensionjs_path"
+error. Fix that error.
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: port to cinnamon]
+
+https://bugzilla.gnome.org/show_bug.cgi?id=661623
+---
+ src/cinnamon-extension-tool.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/cinnamon-extension-tool.in b/src/cinnamon-extension-tool.in
+index e610b46..8ec24fb 100644
+--- a/src/cinnamon-extension-tool.in
++++ b/src/cinnamon-extension-tool.in
+@@ -148,5 +148,6 @@ use an extension title clicktofocus@janedoe.example.com.'''
+         f.close()
+ 
+     print "Created extension in %r" % (extension_path, )
++    extensionjs_path = os.path.join(extension_path, 'extension.js')
+     subprocess.Popen(['gnome-open', extensionjs_path])
+     sys.exit(0)
+-- 
+1.7.8.3
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.1.3-xdg-open.patch b/gnome-extra/cinnamon/files/cinnamon-1.1.3-xdg-open.patch
new file mode 100644
index 0000000..f4e355b
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-1.1.3-xdg-open.patch
@@ -0,0 +1,26 @@
+From 9db2c12d23daaeab0d69bc8b58cec610689cc4dc Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Thu, 20 Oct 2011 12:48:40 -0400
+Subject: [PATCH 04/28] gnome-shell-extension-tool: Use xdg-open
+
+gnome-open is deprecated
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: port to cinnamon]
+---
+ src/gnome-shell-extension-tool.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/cinnamon-extension-tool.in b/src/cinnamon-extension-tool.in
+index 8ec24fb..2f942d8 100644
+--- a/src/cinnamon-extension-tool.in
++++ b/src/cinnamon-extension-tool.in
+@@ -149,5 +149,5 @@ use an extension title clicktofocus@janedoe.example.com.'''
+ 
+     print "Created extension in %r" % (extension_path, )
+     extensionjs_path = os.path.join(extension_path, 'extension.js')
+-    subprocess.Popen(['gnome-open', extensionjs_path])
++    subprocess.Popen(['xdg-open', extensionjs_path])
+     sys.exit(0)
+-- 
+1.7.8.3
+