compiz-fusion/emerald: version 0.8.8, removed gtk2.20.patch

6 files changed, 6 insertions, 93 deletions

diff --git a/compiz-fusion/emerald/DETAILS b/compiz-fusion/emerald/DETAILS
index ceb286ce4d..dcfe55016c 100755
--- a/compiz-fusion/emerald/DETAILS
+++ b/compiz-fusion/emerald/DETAILS
@@ -13,9 +13,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
   FORCE_DOWNLOAD=1
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.8.4
+         VERSION=0.8.8
           SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=http://releases.compiz.org/components/$SPELL/$SOURCE
+   SOURCE_URL[0]=http://releases.compiz.org/$VERSION/$SOURCE
 #     SOURCE_HASH=sha512:ed764d385bed7d348dd31840e0485b69f796422f9b60ac5e046034e11683bd19eb9ea36ab84820e1f3d9a4c0d70aba69baf768a9e0d96829094ef4ebc5014eb1
       SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/compiz-fusion/emerald/HISTORY b/compiz-fusion/emerald/HISTORY
index 469381baa8..19ef21fdd1 100644
--- a/compiz-fusion/emerald/HISTORY
+++ b/compiz-fusion/emerald/HISTORY
@@ -1,3 +1,7 @@
+2012-02-24 Pol Vinogradov <vin.public@gmail.com>
+	* DETAILS: version 0.8.8
+	* PRE_BUILD, gtk2.20.patch: removed patch, no need anymore
+
 2010-12-23 Pol Vinogradov <vin.public@gmail.com>
 	* gtk2.20.patch: more fixes for compiling with gtk
 
diff --git a/compiz-fusion/emerald/PRE_BUILD b/compiz-fusion/emerald/PRE_BUILD
index 8e287c1df5..bf046d7c05 100755
--- a/compiz-fusion/emerald/PRE_BUILD
+++ b/compiz-fusion/emerald/PRE_BUILD
@@ -1,8 +1,6 @@
 default_pre_build        &&
 cd  "$SOURCE_DIRECTORY"  &&
 
-patch -p1 < $SCRIPT_DIRECTORY/gtk2.20.patch &&
-
 if [[ $EMERALD_TRUNK == y ]]
 then
   NOCONFIGURE=Y  ./autogen.sh
diff --git a/compiz-fusion/emerald/emerald-0.8.4.tar.bz2.sig b/compiz-fusion/emerald/emerald-0.8.4.tar.bz2.sig
deleted file mode 100644
index 79f33c82a9..0000000000
--- a/compiz-fusion/emerald/emerald-0.8.4.tar.bz2.sig
+++ /dev/null
diff --git a/compiz-fusion/emerald/emerald-0.8.8.tar.bz2.sig b/compiz-fusion/emerald/emerald-0.8.8.tar.bz2.sig
new file mode 100644
index 0000000000..e41ac59f6c
--- /dev/null
+++ b/compiz-fusion/emerald/emerald-0.8.8.tar.bz2.sig
diff --git a/compiz-fusion/emerald/gtk2.20.patch b/compiz-fusion/emerald/gtk2.20.patch
deleted file mode 100644
index 07ecf6ed7f..0000000000
--- a/compiz-fusion/emerald/gtk2.20.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-# From http://bugs.gentoo.org/show_bug.cgi?id=308791
-diff -urN emerald-0.8.4/libengine/themer.c emerald-0.8.4.new/libengine/themer.c
---- emerald-0.8.4/libengine/themer.c	2009-10-13 20:56:23.000000000 -0400
-+++ emerald-0.8.4.new/libengine/themer.c	2010-03-10 01:20:03.046827674 -0500
-@@ -461,7 +461,7 @@
- }
- gdouble get_float(SettingItem * item)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          return gtk_spin_button_get_value((GtkSpinButton *)item->widget);
-     }
-     else {
-@@ -647,7 +647,7 @@
- }
- void set_float(SettingItem * item, gdouble f)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
-     } 
-     else {
---- emerald-0.8.4/src/main.c.old	2010-12-23 20:03:51.083703858 -0500
-+++ emerald-0.8.4/src/main.c	2010-12-23 19:56:19.657703857 -0500
-@@ -2457,7 +2457,7 @@
-     gdk_error_trap_push();
- 
-     type = None;
--    result = XGetWindowProperty(gdk_display,
-+    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				xwindow,
- 				atom,
- 				0, G_MAXLONG,
-@@ -3757,7 +3757,7 @@
- 
- static void hide_tooltip(void)
- {
--    if (GTK_WIDGET_VISIBLE(tip_window))
-+    if (gtk_widget_get_visible(tip_window))
- 	g_get_current_time(&tooltip_last_popdown);
- 
-     gtk_widget_hide(tip_window);
-@@ -4246,10 +4246,10 @@
-     WnckWindow *win = data;
- 
-     gdk_error_trap_push();
--    XSetTransientForHint(gdk_display,
-+    XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 			 GDK_WINDOW_XID(dialog->window),
- 			 wnck_window_get_xid(win));
--    XSync(gdk_display, FALSE);
-+    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-     gdk_error_trap_pop();
- }
- 
-@@ -4262,11 +4262,11 @@
-     int format, result;
-     char *retval;
- 
--    atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
-+    atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
- 
-     gdk_error_trap_push();
- 
--    result = XGetWindowProperty(gdk_display,
-+    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				xwindow, atom,
- 				0, G_MAXLONG,
- 				FALSE, XA_STRING, &type, &format, &nitems,
-@@ -4318,8 +4318,8 @@
-     }
- 
-     gdk_error_trap_push();
--    XKillClient(gdk_display, wnck_window_get_xid(win));
--    XSync(gdk_display, FALSE);
-+    XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win));
-+    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-     gdk_error_trap_pop();
- }
- 
-@@ -4739,7 +4739,7 @@
- 
- static int update_shadow(frame_settings * fs)
- {
--    Display *xdisplay = gdk_display;
-+    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-     XRenderPictFormat *format;
-     GdkPixmap *pixmap;
-     Picture src, dst, tmp;