Fix the build with new gtk20.

Reported by:	pointyhat-exp


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9756 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 92 insertions, 0 deletions

diff --git a/deskutils/superswitcher/Makefile b/deskutils/superswitcher/Makefile
new file mode 100644
index 000000000..1a154519c
--- /dev/null
+++ b/deskutils/superswitcher/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:	superswitcher
+# Date Created:				02 Jan 2006
+# Whom:					Remington Lang <MrL0Lz@gmail.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	superswitcher
+PORTVERSION=	0.3
+PORTREVISION=	1
+CATEGORIES=	deskutils gnome
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	browserbookapp
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	MrL0Lz@gmail.com
+COMMENT=	Alt-Tab replacement
+
+BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
+RUN_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
+
+USE_GMAKE=	yes
+USE_GNOME=	gtk20 libwnck pango
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+post-extract:
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${RM} -f
+
+post-patch:
+	@${REINPLACE_CMD} -e 's/x11//g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+
+.include <bsd.port.mk>
diff --git a/deskutils/superswitcher/distinfo b/deskutils/superswitcher/distinfo
new file mode 100644
index 000000000..711087129
--- /dev/null
+++ b/deskutils/superswitcher/distinfo
@@ -0,0 +1,3 @@
+MD5 (superswitcher-0.3.tgz) = 8b301d2e240f7aad6281a2db53aeaf38
+SHA256 (superswitcher-0.3.tgz) = 00ba1446551be7bf9f232a2690d045ca0f801a65d613d306488214959d67e45d
+SIZE (superswitcher-0.3.tgz) = 197624
diff --git a/deskutils/superswitcher/files/patch-src__xinerama.c b/deskutils/superswitcher/files/patch-src__xinerama.c
new file mode 100644
index 000000000..16580ff97
--- /dev/null
+++ b/deskutils/superswitcher/files/patch-src__xinerama.c
@@ -0,0 +1,46 @@
+#
+# Fix build on 4.x
+#
+--- ./src/xinerama.c.orig	Sat May 20 18:36:30 2006
++++ ./src/xinerama.c	Sat May 20 18:38:45 2006
+@@ -22,24 +22,26 @@
+   int minimum_width;
+   SSXineramaScreen *screens;
+   SSXinerama *xinerama;
+-
+-  minimum_width = 0;
++  int x_screen;
+ 
+ #ifdef HAVE_XINERAMA
+   gboolean xinerama_is_active = XineramaIsActive (x_display);
++  XineramaScreenInfo *xsi_array;
++  XineramaScreenInfo *xsi;
+ #else
+   gboolean xinerama_is_active = FALSE;
+ #endif
+ 
++  minimum_width = 0;
++
+   if (xinerama_is_active) {
+ #ifdef HAVE_XINERAMA
+-    XineramaScreenInfo *xsi_array =
+-      XineramaQueryScreens(x_display, &num_screens);
++    xsi_array = XineramaQueryScreens(x_display, &num_screens);
+     screens = g_new (SSXineramaScreen, num_screens);
+ 
+     int i;
+     for (i = 0; i < num_screens; i++) {
+-      XineramaScreenInfo *xsi = &xsi_array[i];
++      xsi = &xsi_array[i];
+       screens[i].x = xsi->x_org;
+       screens[i].y = xsi->y_org;
+       screens[i].width  = xsi->width;
+@@ -54,7 +56,7 @@
+ #endif
+   } else {
+     num_screens = 1;
+-    int x_screen = DefaultScreen (x_display);
++    x_screen = DefaultScreen (x_display);
+     screens = g_new (SSXineramaScreen, num_screens);
+     screens[0].x = 0;
+     screens[0].y = 0;
diff --git a/deskutils/superswitcher/pkg-descr b/deskutils/superswitcher/pkg-descr
new file mode 100644
index 000000000..931cfe71a
--- /dev/null
+++ b/deskutils/superswitcher/pkg-descr
@@ -0,0 +1,6 @@
+A more feature-full replacement of thr Alt-Tab window switching behavior.
+
+Superswitcher uses the "Super" key, also known as the Windows key to switch
+between windows and workspaces.
+
+WWW: http://www.gnomefiles.com/app.php?soft_id=1231
diff --git a/deskutils/superswitcher/pkg-plist b/deskutils/superswitcher/pkg-plist
new file mode 100644
index 000000000..ee9126a25
--- /dev/null
+++ b/deskutils/superswitcher/pkg-plist
@@ -0,0 +1 @@
+bin/superswitcher