Remove GDK_DISABLE_DEPRECATED define in emerald.h which totaly broke

gdk_draw_drawable() and friends. Also include some gtk+ patches.

Submitted by:	jkim@
Approved by:	fixing gnome 2.32 update fallout
Obtained from:	emerald git

5 files changed, 105 insertions, 10 deletions

diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index ff089eea5f10..8df5e2abf553 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emerald
 PORTVERSION=	0.8.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
@@ -37,6 +37,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 # XXX - might want to change that
 post-patch:
 	@${REINPLACE_CMD} 's|icons/gnome|icons/hicolor|' ${WRKSRC}/misc/Makefile.in
-	@${REINPLACE_CMD} 's|#define GTK_DISABLE_DEPRECATED||g' ${WRKSRC}/include/emerald.h
+	@${REINPLACE_CMD} -e 's|#define GDK_DISABLE_DEPRECATED||g' \
+	    -e 's|#define GTK_DISABLE_DEPRECATED||g' ${WRKSRC}/include/emerald.h
 
 .include <bsd.port.mk>
diff --git a/x11-wm/emerald/files/patch-libengine_themer.c b/x11-wm/emerald/files/patch-libengine_themer.c
new file mode 100644
index 000000000000..6657eb9035df
--- /dev/null
+++ b/x11-wm/emerald/files/patch-libengine_themer.c
@@ -0,0 +1,47 @@
+--- libengine/themer.c.orig	2009-10-13 20:56:23.000000000 -0400
++++ libengine/themer.c	2010-11-24 15:34:34.000000000 -0500
+@@ -461,7 +461,7 @@ gboolean get_bool(SettingItem * item)
+ }
+ 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_bool(SettingItem * item, gboole
+ }
+ 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 {
+@@ -874,7 +874,7 @@ static void append_engine(gchar * dlname
+     err = dlerror();
+     if (!hand || err)
+     {
+-        g_warning(err);
++        g_warning("%s", err);
+         if (hand)
+             dlclose(hand);
+         return;
+@@ -885,7 +885,7 @@ static void append_engine(gchar * dlname
+         layout_settings_proc lay;
+         lay = dlsym(hand,"layout_engine_settings");
+         if ((err=dlerror()))
+-            g_warning(err);
++            g_warning("%s", err);
+         if (lay)
+         {
+             get_meta_info_proc meta;
+@@ -896,7 +896,7 @@ static void append_engine(gchar * dlname
+                 "<i><small>%s</small></i>";
+             meta = dlsym(hand,"get_meta_info");
+             if ((err=dlerror()))
+-                g_warning(err);
++                g_warning("%s", err);
+                 d->meta.description=g_strdup("No Description");
+                 d->meta.version=g_strdup("0.0");
+                 d->meta.last_compat=g_strdup("0.0");
diff --git a/x11-wm/emerald/files/patch-src_engine_loader.c b/x11-wm/emerald/files/patch-src_engine_loader.c
new file mode 100644
index 000000000000..11ea7adb3973
--- /dev/null
+++ b/x11-wm/emerald/files/patch-src_engine_loader.c
@@ -0,0 +1,11 @@
+--- src/engine_loader.c.orig	2009-10-13 20:56:23.000000000 -0400
++++ src/engine_loader.c	2010-11-24 15:34:33.000000000 -0500
+@@ -54,7 +54,7 @@ gboolean load_engine(gchar * engine_name
+         newengine = dlopen(path,RTLD_NOW);
+         if (!newengine)
+         {
+-            g_warning(dlerror());
++            g_warning("%s", dlerror());
+             //here's where we should bail out somehow
+         }
+     }
diff --git a/x11-wm/emerald/files/patch-src_main.c b/x11-wm/emerald/files/patch-src_main.c
index adff2eccea31..286cdd522882 100644
--- a/x11-wm/emerald/files/patch-src_main.c
+++ b/x11-wm/emerald/files/patch-src_main.c
@@ -1,6 +1,17 @@
---- src/main.c.orig	2010-11-02 16:54:19.000000000 +0100
-+++ src/main.c	2010-11-02 16:56:04.000000000 +0100
-@@ -2457,7 +2457,7 @@
+--- src/main.c.orig	2009-10-13 20:56:23.000000000 -0400
++++ src/main.c	2010-11-24 15:34:35.000000000 -0500
+@@ -27,8 +27,8 @@
+ #include <emerald.h>
+ #include <engine.h>
+ 
+-#define BASE_PROP_SIZE 12
+-#define QUAD_PROP_SIZE 9
++//#define BASE_PROP_SIZE 12
++//#define QUAD_PROP_SIZE 9
+ 
+ #ifndef DECOR_INTERFACE_VERSION
+ #define DECOR_INTERFACE_VERSION 0
+@@ -2457,7 +2457,7 @@ static gboolean get_window_prop(Window x
      gdk_error_trap_push();
  
      type = None;
@@ -9,6 +20,15 @@
  				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;
  
@@ -22,7 +42,7 @@
      gdk_error_trap_pop();
  }
  
-@@ -4262,11 +4262,11 @@
+@@ -4262,11 +4262,11 @@ static char *get_client_machine(Window x
      int format, result;
      char *retval;
  
@@ -36,7 +56,7 @@
  				xwindow, atom,
  				0, G_MAXLONG,
  				FALSE, XA_STRING, &type, &format, &nitems,
-@@ -4318,8 +4318,8 @@
+@@ -4318,8 +4318,8 @@ static void kill_window(WnckWindow * win
      }
  
      gdk_error_trap_push();
@@ -47,7 +67,7 @@
      gdk_error_trap_pop();
  }
  
-@@ -4739,7 +4739,7 @@
+@@ -4739,7 +4739,7 @@ static XFixed *create_gaussian_kernel(do
  
  static int update_shadow(frame_settings * fs)
  {
diff --git a/x11-wm/emerald/files/patch-themer_main.c b/x11-wm/emerald/files/patch-themer_main.c
index 3a434eb47adc..952634316618 100644
--- a/x11-wm/emerald/files/patch-themer_main.c
+++ b/x11-wm/emerald/files/patch-themer_main.c
@@ -1,5 +1,5 @@
---- themer/main.c.orig	Sun Oct 29 18:57:14 2006
-+++ themer/main.c	Sun Oct 29 23:09:37 2006
+--- themer/main.c.orig	2009-10-13 20:56:23.000000000 -0400
++++ themer/main.c	2010-11-24 15:45:57.000000000 -0500
 @@ -7,6 +7,103 @@
  #include <emerald.h>
  #include <engine.h>
@@ -104,3 +104,19 @@
  #define LAST_COMPAT_VER "0.1.0"
  
  typedef struct _FetcherInfo
+@@ -264,6 +361,7 @@ static void info_dialog(gchar * val)
+             GTK_DIALOG_DESTROY_WITH_PARENT,
+             GTK_MESSAGE_INFO,
+             GTK_BUTTONS_CLOSE,
++            "%s",
+             val);
+     gtk_dialog_run(GTK_DIALOG(w));
+     gtk_widget_destroy(w);
+@@ -275,6 +373,7 @@ static void error_dialog(gchar * val)
+             GTK_DIALOG_DESTROY_WITH_PARENT,
+             GTK_MESSAGE_ERROR,
+             GTK_BUTTONS_CLOSE,
++            "%s",
+             val);
+     gtk_dialog_run(GTK_DIALOG(w));
+     gtk_widget_destroy(w);