| 1 |
mgorny 14/02/26 10:52:07 |
| 2 |
|
| 3 |
Added: cinnamon-1.8.8.1-mozjs17.patch |
| 4 |
Log: |
| 5 |
Fix build failure with mozjs17, bug #499980. |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 gnome-extra/cinnamon/files/cinnamon-1.8.8.1-mozjs17.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-1.8.8.1-mozjs17.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-1.8.8.1-mozjs17.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: cinnamon-1.8.8.1-mozjs17.patch |
| 16 |
=================================================================== |
| 17 |
From 914d7da8baea24b1b31e2bcf982d12996f86694a Mon Sep 17 00:00:00 2001 |
| 18 |
From: leigh123linux <leigh123linux@×××××××××××××.org> |
| 19 |
Date: Tue, 4 Jun 2013 14:02:15 +0200 |
| 20 |
Subject: [PATCH] Fix build error so cinnamon compiles with mozjs-17 |
| 21 |
|
| 22 |
https://mail.gnome.org/archives/desktop-devel-list/2013-March/msg00135.html |
| 23 |
|
| 24 |
Fixes #2113 |
| 25 |
--- |
| 26 |
src/cinnamon-global.c | 7 ++----- |
| 27 |
1 file changed, 2 insertions(+), 5 deletions(-) |
| 28 |
|
| 29 |
diff --git a/src/cinnamon-global.c b/src/cinnamon-global.c |
| 30 |
index ab5d5d4..69958d3 100644 |
| 31 |
--- a/src/cinnamon-global.c |
| 32 |
+++ b/src/cinnamon-global.c |
| 33 |
@@ -1237,14 +1237,11 @@ enum |
| 34 |
0, |
| 35 |
&target_object)) |
| 36 |
{ |
| 37 |
- char *message; |
| 38 |
- gjs_log_exception(context, |
| 39 |
- &message); |
| 40 |
+ gjs_log_exception(context); |
| 41 |
g_set_error(error, |
| 42 |
G_IO_ERROR, |
| 43 |
G_IO_ERROR_FAILED, |
| 44 |
- "%s", message ? message : "(unknown)"); |
| 45 |
- g_free(message); |
| 46 |
+ "Unable to import %s", target_object_script); |
| 47 |
goto out_error; |
| 48 |
} |
| 49 |
|
| 50 |
-- |
| 51 |
1.8.5.5 |
Archives