- Update to 0.5.8

- Fix GNOME panel support

PR:		ports/79980
Submitted by:	David Thiel <lx@redundancy.redundancy.org>
Approved by:	adamw (mentor)

4 files changed, 38 insertions, 20 deletions

diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index 619d6f76e885..29052c03af46 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -7,13 +7,12 @@
 #
 
 PORTNAME=	gai
-PORTVERSION=	0.5.4
-PORTREVISION=	2
+PORTVERSION=	0.5.8
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	General Applet Interface Library
 
 LIB_DEPENDS=	gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext
@@ -22,12 +21,12 @@ USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_GL=		yes
 USE_SDL=	sdl
-USE_GNOME=	gnomehack gdkpixbuf gtk20 pango gnomepanel
+USE_GNOME=	gnomehack gnomepanel
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDLCONF=${SDL_CONFIG}
 
-PLIST_FILES=	include/gai/gai.h lib/libgai.so.0.5.4 lib/libgai.so.0 \
-		lib/libgai.so libdata/pkgconfig/gai.pc
+PLIST_FILES=	include/gai/gai.h lib/libgai.so.${PORTVERSION} \
+		lib/libgai.so.0 lib/libgai.so libdata/pkgconfig/gai.pc
 PLIST_DIRS=	include/gai
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gai/distinfo b/x11-toolkits/gai/distinfo
index cf8a9c4a10ed..c53c3924b929 100644
--- a/x11-toolkits/gai/distinfo
+++ b/x11-toolkits/gai/distinfo
@@ -1,2 +1,2 @@
-MD5 (gai-0.5.4.tar.bz2) = 06b67eb1466bc94459ee6fce88d446d0
-SIZE (gai-0.5.4.tar.bz2) = 234954
+MD5 (gai-0.5.8.tar.bz2) = 29d90cb37fe5341009b27ffd09f871cb
+SIZE (gai-0.5.8.tar.bz2) = 255375
diff --git a/x11-toolkits/gai/files/patch-gai:gai-gnome.c b/x11-toolkits/gai/files/patch-gai:gai-gnome.c
deleted file mode 100644
index 93ba6607b681..000000000000
--- a/x11-toolkits/gai/files/patch-gai:gai-gnome.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gai/gai-gnome.c.orig	Mon May 10 09:16:17 2004
-+++ gai/gai-gnome.c	Mon May 10 09:16:26 2004
-@@ -345,8 +345,8 @@
- static int
- gai_gnome_expose(GtkWidget *widget, GdkEventExpose *event, gpointer d)
- {
--    GAI_ENTER;
-     static gboolean expose_lock = FALSE;
-+    GAI_ENTER;
-     if(expose_lock){
- 	GAI_NOTE("Expose lock");
- 	return FALSE;
diff --git a/x11-toolkits/gai/files/patch-gai_gai-gnome.c b/x11-toolkits/gai/files/patch-gai_gai-gnome.c
new file mode 100644
index 000000000000..f6848e3c1e61
--- /dev/null
+++ b/x11-toolkits/gai/files/patch-gai_gai-gnome.c
@@ -0,0 +1,31 @@
+--- gai/gai-gnome.c.orig	Sat Aug 14 13:58:24 2004
++++ gai/gai-gnome.c	Fri Apr 15 22:52:09 2005
+@@ -181,7 +181,7 @@
+ static void gai_gnome_create_menu(void)
+ {
+     int i,ptr,j=0;
+-    gnome_menu_verb = g_malloc0(sizeof(BonoboUIVerb)*GAI.menu_entries);
++    gnome_menu_verb = g_new0(BonoboUIVerb, GAI.menu_entries + 1);
+ 
+     /* It will be freed anyway pretty soon */
+     gnome_menu_xml = g_malloc0(81920);
+@@ -225,6 +225,9 @@
+ 	ptr = strlen(gnome_menu_xml);
+ 
+     }
++    gnome_menu_verb[j].cname = NULL;
++    gnome_menu_verb[j].cb = NULL;
++    gnome_menu_verb[j].user_data = NULL;
+     sprintf(gnome_menu_xml+ptr,"</popup>\n");
+ 
+ 
+@@ -345,8 +348,8 @@
+ static int
+ gai_gnome_expose(GtkWidget *widget, GdkEventExpose *event, gpointer d)
+ {
+-    static gboolean expose_lock = FALSE;
+     GAI_ENTER;
++    static gboolean expose_lock = FALSE;
+ 
+     if(expose_lock){
+ 	GAI_NOTE("Expose lock");