packages: emerald/emerald.spec, emerald/emerald-gtk+2_2_20.patch (NEW) - ad...

[jareq]

Author: jareq                        Date: Wed Sep  8 16:28:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added emerald-gtk+2_2_20.patch (fix build with gtk+2 2.20)
- rel 2

---- Files affected:
packages/emerald:
   emerald.spec (1.40 -> 1.41) , emerald-gtk+2_2_20.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/emerald/emerald.spec
diff -u packages/emerald/emerald.spec:1.40 packages/emerald/emerald.spec:1.41
--- packages/emerald/emerald.spec:1.40	Mon Nov 16 19:23:46 2009
+++ packages/emerald/emerald.spec	Wed Sep  8 18:28:22 2010
@@ -3,13 +3,14 @@
 Summary(pl.UTF-8):	Alternatywny dekorator okien z obsługą motywów
 Name:		emerald
 Version:	0.8.4
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5:	e92fbe8252ea393206d98ed6ae9af4ec
 Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-gtk+2_2_20.patch
 URL:		http://www.compiz.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1:1.9
@@ -72,6 +73,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__glib_gettextize}
@@ -147,6 +149,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2010/09/08 16:28:22  jareq
+- added emerald-gtk+2_2_20.patch (fix build with gtk+2 2.20)
+- rel 2
+
 Revision 1.40  2009/11/16 18:23:46  sparky
 - up to 0.8.4
 

================================================================
Index: packages/emerald/emerald-gtk+2_2_20.patch
diff -u /dev/null packages/emerald/emerald-gtk+2_2_20.patch:1.1
--- /dev/null	Wed Sep  8 18:28:27 2010
+++ packages/emerald/emerald-gtk+2_2_20.patch	Wed Sep  8 18:28:22 2010
@@ -0,0 +1,33 @@
+--- emerald-0.8.4/src/main.c.old	2010-03-29 19:49:30.420710030 -0700
++++ emerald-0.8.4/src/main.c	2010-03-29 19:52:33.654024944 -0700
+@@ -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);
+
+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 {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emerald/emerald.spec?r1=1.40&r2=1.41&f=u