Link against pangox, because gtkglxext uses the deprecated X11 font

interface.  This should fix all the programs that link against this pkg.
Will be testing those soon and removing failure markers if they work.
(devel/coconut games/genecys-client graphics/gliv misc/celestia-gnome
 misc/celestia-gtk)
Bumped pkgrevision to nb1

2 files changed, 103 insertions, 0 deletions

diff --git a/graphics/gtkglext/patches/patch-aa b/graphics/gtkglext/patches/patch-aa
new file mode 100644
index 00000000000..8316a661efe
--- /dev/null
+++ b/graphics/gtkglext/patches/patch-aa
@@ -0,0 +1,73 @@
+--- configure.orig	2005-12-27 23:48:46.000000000 -0700
++++ configure	2005-12-27 23:49:33.000000000 -0700
+@@ -20131,12 +20131,14 @@
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
++pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ " >&5
+ echo $ECHO_N "checking for \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
++pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ... $ECHO_C" >&6
+ 
+@@ -20144,6 +20146,7 @@
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
++pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ " ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+@@ -20156,6 +20159,7 @@
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
++pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ "`
+             echo "$as_me:$LINENO: result: $BASE_DEPENDENCIES_CFLAGS" >&5
+@@ -20167,6 +20171,7 @@
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
++pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ "`
+             echo "$as_me:$LINENO: result: $BASE_DEPENDENCIES_LIBS" >&5
+@@ -20180,6 +20185,7 @@
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
++pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ "`
+             echo $BASE_DEPENDENCIES_PKG_ERRORS
+@@ -20200,12 +20206,14 @@
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
++pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+ echo "$as_me: error: Library requirements (\
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
++pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+    { (exit 1); exit 1; }; }
+@@ -25591,7 +25599,7 @@
+ # CFLAGS and LIBS
+ ##################################################
+ 
+-GDKGLEXT_PACKAGES="gdk-2.0 pango gmodule-2.0"
++GDKGLEXT_PACKAGES="gdk-2.0 pango pangox gmodule-2.0"
+ GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
+ GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
diff --git a/graphics/gtkglext/patches/patch-ab b/graphics/gtkglext/patches/patch-ab
new file mode 100644
index 00000000000..acbc8c27633
--- /dev/null
+++ b/graphics/gtkglext/patches/patch-ab
@@ -0,0 +1,30 @@
+--- configure.in.orig	2005-12-27 23:47:45.000000000 -0700
++++ configure.in	2005-12-27 23:48:38.000000000 -0700
+@@ -59,6 +59,10 @@
+ m4_define([pango_pkg], [pango])
+ m4_define([pango_required_version], [1.0.0])
+ 
++# Pangox
++m4_define([pangox_pkg], [pangox])
++m4_define([pangox_required_version], [1.0.0])
++
+ # PangoFT2
+ m4_define([pangoft2_pkg], [pangoft2])
+ m4_define([pangoft2_required_version], [1.0.0])
+@@ -345,6 +349,7 @@
+ gtk_pkg >= gtk_required_version \
+ gdk_pkg >= gdk_required_version \
+ pango_pkg >= pango_required_version \
++pangox_pkg >= pango_required_version \
+ gmodule_pkg >= gmodule_required_version \
+ ])
+ 
+@@ -789,7 +794,7 @@
+ # CFLAGS and LIBS
+ ##################################################
+ 
+-GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
++GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
+ GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
+ GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"