diff options
Diffstat (limited to 'gnome-extra/cinnamon/files')
3 files changed, 101 insertions, 0 deletions
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 + |