Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/emerald/files: emerald-0.8.4-gtk+-2.20-build.patch
Date: Sat, 03 Apr 2010 05:45:54
Message-Id: E1NxwB3-0000MI-9a@stork.gentoo.org
1 jmbsvicetto 10/04/03 05:45:49
2
3 Added: emerald-0.8.4-gtk+-2.20-build.patch
4 Log:
5 Replaced compiz ~ deps with >= deps to support the new compiz-0.8.6 release and to avoid future dep issues.
6 Did a revbump to avoid issues with installed packages.
7 Added a patch to enable emerald to build with gtk+-2.20. Fixes bug 308791 - thanks to Leif Walsh <adlaiff6@×××××.com>.
8 (Portage version: 2.2_rc67/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 x11-wm/emerald/files/emerald-0.8.4-gtk+-2.20-build.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/emerald/files/emerald-0.8.4-gtk+-2.20-build.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/emerald/files/emerald-0.8.4-gtk+-2.20-build.patch?rev=1.1&content-type=text/plain
15
16 Index: emerald-0.8.4-gtk+-2.20-build.patch
17 ===================================================================
18 diff -urN emerald-0.8.4/libengine/themer.c emerald-0.8.4.new/libengine/themer.c
19 --- emerald-0.8.4/libengine/themer.c 2009-10-13 20:56:23.000000000 -0400
20 +++ emerald-0.8.4.new/libengine/themer.c 2010-03-10 01:20:03.046827674 -0500
21 @@ -461,7 +461,7 @@
22 }
23 gdouble get_float(SettingItem * item)
24 {
25 - if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
26 + if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
27 return gtk_spin_button_get_value((GtkSpinButton *)item->widget);
28 }
29 else {
30 @@ -647,7 +647,7 @@
31 }
32 void set_float(SettingItem * item, gdouble f)
33 {
34 - if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
35 + if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
36 gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
37 }
38 else {
39 --- emerald-0.8.4/src/main.c.old 2010-03-29 19:49:30.420710030 -0700
40 +++ emerald-0.8.4/src/main.c 2010-03-29 19:52:33.654024944 -0700
41 @@ -3757,7 +3757,7 @@
42
43 static void hide_tooltip(void)
44 {
45 - if (GTK_WIDGET_VISIBLE(tip_window))
46 + if (gtk_widget_get_visible(tip_window))
47 g_get_current_time(&tooltip_last_popdown);
48
49 gtk_widget_hide(tip_window);