[emerald/f13/master] - add upstream patch to hopefully fix crash

leigh123linux leigh123linux at fedoraproject.org
Fri Sep 10 09:24:26 UTC 2010


commit 3a034add0fcdd8bdc4f5dbf796e7228b424d943e
Author: leigh scott <leigh123linux at googlemail.com>
Date:   Fri Sep 10 10:24:29 2010 +0100

    - add upstream patch to hopefully fix crash

 ...-81775d407f775bad1e6f6ba3345b891b66bb5faf.patch |   20 ++------------------
 emerald.spec                                       |    2 +-
 2 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/emerald-81775d407f775bad1e6f6ba3345b891b66bb5faf.patch b/emerald-81775d407f775bad1e6f6ba3345b891b66bb5faf.patch
index 2ea7ef8..0ece993 100644
--- a/emerald-81775d407f775bad1e6f6ba3345b891b66bb5faf.patch
+++ b/emerald-81775d407f775bad1e6f6ba3345b891b66bb5faf.patch
@@ -1,21 +1,5 @@
-From: Sam Spilsbury <smspillaz at gmail.com>
-Date: Fri, 12 Feb 2010 04:08:44 +0000 (+0800)
-Subject: Adjust for libdecoration changes
-X-Git-Url: http://gitweb.compiz.org/?p=fusion%2Fdecorators%2Femerald;a=commitdiff_plain;h=81775d407f775bad1e6f6ba3345b891b66bb5faf
-
-Adjust for libdecoration changes
-
-This works, however it is LEGACY and is NOT SUPPORTED. The code is approaching FOUR YEARS OLD and it HASNT BEEN TOUCHED.
-
-This will be available for those who want it however it is NOT part of the official 0.9 development.
-
-FIXME: Replace this kerbungle entirely
----
-
-diff --git a/src/main.c b/src/main.c
-index 5acfe03..4ca64c1 100644
---- a/src/main.c
-+++ b/src/main.c
+--- emerald-0.8.4.orig/src/main.c
++++ emerald-0.8.4/src/main.c
 @@ -5512,7 +5512,7 @@ int main(int argc, char *argv[])
      gdkdisplay = gdk_display_get_default();
      xdisplay = gdk_x11_display_get_xdisplay(gdkdisplay);
diff --git a/emerald.spec b/emerald.spec
index 327fe10..99504a8 100644
--- a/emerald.spec
+++ b/emerald.spec
@@ -48,7 +48,7 @@ for emerald, the themeable window decorator for Compiz.
 %setup -q
 %patch0 -p1 -b .DSO
 %patch1 -p1 -b .gtk
-%patch2 -p0 -b .emerald-81775d407f775bad1e6f6ba3345b891b66bb5faf
+%patch2 -p1 -b .emerald-81775d407f775bad1e6f6ba3345b891b66bb5faf
 
 %build
 %configure --enable-librsvg --disable-mime-update


More information about the scm-commits mailing list