summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra/cinnamon/files/cinnamon-1.8.8.1-mozjs17.patch')
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-1.8.8.1-mozjs17.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.8.8.1-mozjs17.patch b/gnome-extra/cinnamon/files/cinnamon-1.8.8.1-mozjs17.patch
new file mode 100644
index 000000000000..cd29462ef784
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-1.8.8.1-mozjs17.patch
@@ -0,0 +1,36 @@
+From 914d7da8baea24b1b31e2bcf982d12996f86694a Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux@fedoraproject.org>
+Date: Tue, 4 Jun 2013 14:02:15 +0200
+Subject: [PATCH] Fix build error so cinnamon compiles with mozjs-17
+
+https://mail.gnome.org/archives/desktop-devel-list/2013-March/msg00135.html
+
+Fixes #2113
+---
+ src/cinnamon-global.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/cinnamon-global.c b/src/cinnamon-global.c
+index ab5d5d4..69958d3 100644
+--- a/src/cinnamon-global.c
++++ b/src/cinnamon-global.c
+@@ -1237,14 +1237,11 @@ enum
+ 0,
+ &target_object))
+ {
+- char *message;
+- gjs_log_exception(context,
+- &message);
++ gjs_log_exception(context);
+ g_set_error(error,
+ G_IO_ERROR,
+ G_IO_ERROR_FAILED,
+- "%s", message ? message : "(unknown)");
+- g_free(message);
++ "Unable to import %s", target_object_script);
+ goto out_error;
+ }
+
+--
+1.8.5.5
+