Added a patch to correctly link libgtkglext against pangox. Please see bug #105493...

Package-Manager: portage-2.0.52-r1

diff --git a/x11-libs/gtkglext/ChangeLog b/x11-libs/gtkglext/ChangeLog
index 0081802e4e42f0213b333fbc22d2e6d89f9ba013..b406400918f7fe243e967946a5b2d238d9844885 100644 (file)
--- a/x11-libs/gtkglext/ChangeLog
+++ b/x11-libs/gtkglext/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtkglext
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.39 2005/06/17 20:37:32 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.40 2005/09/18 09:34:39 obz Exp $
+
+*gtkglext-1.0.6-r3 (18 Sep 2005)
+
+  18 Sep 2005; Mike Gardiner <obz@gentoo.org>
+  +files/gtkglext-1.0.6-pangox.patch, +gtkglext-1.0.6-r3.ebuild:
+  Added a patch to correctly link libgtkglext against pangox. Please see bug
+  #105493 for more information, thanks to Martin <azarah@gentoo.org> for the
+  patch.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   gtkglext-1.0.6-r2.ebuild:

diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index 5c1c8de4bab44ac8c846910846649bf37012b50c..f2579e5007d1a7a731ef58c1f8739dabd4146907 100644 (file)
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fae39d865777382cf9237afa59f07935 ChangeLog 4924
-MD5 6ea907d4bcb5ddbb40fb762c6113ebee files/digest-gtkglext-1.0.3 67
-MD5 70192bf7a64990c43b9c1b3f6c95c2a5 files/digest-gtkglext-1.0.4 67
-MD5 a7c68f59946312c5054bd66ddeaa8cd1 files/digest-gtkglext-1.0.5 67
-MD5 526fbcdd193a45e6d4bd2af6bfca4952 files/digest-gtkglext-1.0.6 67
-MD5 526fbcdd193a45e6d4bd2af6bfca4952 files/digest-gtkglext-1.0.6-r2 67
+MD5 1f34e213329bde8acb2813a87a4263d2 ChangeLog 5230
 MD5 7664edfd39d853d33fb89d4193555c01 gtkglext-1.0.3.ebuild 1053
 MD5 17706763adce6fc344a42a7116c4c124 gtkglext-1.0.4.ebuild 1059
 MD5 c65695e82964775d599c29d26554788f gtkglext-1.0.5.ebuild 1456
 MD5 5eccfce46c45a14ff1493b21f73341b9 gtkglext-1.0.6-r2.ebuild 1225
 MD5 9e9e44a03d95d435554cce51d126f7c5 gtkglext-1.0.6.ebuild 1464
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1SbPI1lqEGTUzyQRAn32AJ9CS9mroz43g3YZnQm49rtqRLotDwCeOA7L
-BPa1S8YR+rSuIpRHE7QIi7Y=
-=KbB5
------END PGP SIGNATURE-----
+MD5 fe946a74cf1217fc1b68111b4ea92214 gtkglext-1.0.6-r3.ebuild 1422
+MD5 6ea907d4bcb5ddbb40fb762c6113ebee files/digest-gtkglext-1.0.3 67
+MD5 70192bf7a64990c43b9c1b3f6c95c2a5 files/digest-gtkglext-1.0.4 67
+MD5 a7c68f59946312c5054bd66ddeaa8cd1 files/digest-gtkglext-1.0.5 67
+MD5 526fbcdd193a45e6d4bd2af6bfca4952 files/digest-gtkglext-1.0.6 67
+MD5 526fbcdd193a45e6d4bd2af6bfca4952 files/digest-gtkglext-1.0.6-r2 67
+MD5 a04cbfbcf497c93eaa78998d0a27c402 files/gtkglext-1.0.6-pangox.patch 1053
+MD5 526fbcdd193a45e6d4bd2af6bfca4952 files/digest-gtkglext-1.0.6-r3 67

diff --git a/x11-libs/gtkglext/files/digest-gtkglext-1.0.6-r3 b/x11-libs/gtkglext/files/digest-gtkglext-1.0.6-r3
new file mode 100644 (file)
index 0000000..6219481
--- /dev/null
+++ b/x11-libs/gtkglext/files/digest-gtkglext-1.0.6-r3
@@ -0,0 +1 @@
+MD5 e347e028dfe98d69c5995f547108db77 gtkglext-1.0.6.tar.bz2 681751

diff --git a/x11-libs/gtkglext/files/gtkglext-1.0.6-pangox.patch b/x11-libs/gtkglext/files/gtkglext-1.0.6-pangox.patch
new file mode 100644 (file)
index 0000000..8cd589e
--- /dev/null
+++ b/x11-libs/gtkglext/files/gtkglext-1.0.6-pangox.patch
@@ -0,0 +1,30 @@
+--- gtkglext-1.0.6/configure.in        2005-09-10 16:45:06.000000000 +0200
++++ gtkglext-1.0.6.az/configure.in     2005-09-10 16:46:01.000000000 +0200
+@@ -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`"

diff --git a/x11-libs/gtkglext/gtkglext-1.0.6-r3.ebuild b/x11-libs/gtkglext/gtkglext-1.0.6-r3.ebuild
new file mode 100644 (file)
index 0000000..34c5c0b
--- /dev/null
+++ b/x11-libs/gtkglext/gtkglext-1.0.6-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.0.6-r3.ebuild,v 1.1 2005/09/18 09:34:40 obz Exp $
+
+inherit gnome2 autotools
+
+DESCRIPTION="GL extensions for Gtk+ 2.0"
+HOMEPAGE="http://gtkglext.sourceforge.net/"
+LICENSE="GPL-2 LGPL-2.1"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SLOT="0"
+IUSE="doc"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=dev-libs/glib-2
+       >=x11-libs/gtk+-2
+       >=x11-libs/pango-1
+       virtual/glu
+       virtual/opengl"
+
+DEPEND="${RDEPEND}
+       doc? ( >=dev-util/gtk-doc-0.10 )
+       >=x11-base/opengl-update-1.5
+       dev-util/pkgconfig"
+
+DOCS="AUTHORS COPYING* ChangeLog* INSTALL NEWS README* TODO"
+
+# gtkglext doesn't build with some (faulty) nvidia drivers headers
+# this makes it always switch to x11 headers during install
+# foser <foser@gentoo.org>
+
+pkg_setup () {
+
+       # Set up X11 implementation
+       X11_IMPLEM_P="$(best_version virtual/x11)"
+       X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+       X11_IMPLEM="${X11_IMPLEM##*\/}"
+       einfo "X11 implementation is ${X11_IMPLEM}."
+
+       GL_IMPLEM=$(opengl-update --get-implementation)
+       opengl-update ${X11_IMPLEM}
+
+}
+
+src_unpack() {
+
+       unpack ${A}
+       cd ${S}
+       # Apply a patch to correctly link gtkglext against
+       # pangox, (bug #105493). <obz@gentoo.org>
+       epatch ${FILESDIR}/${P}-pangox.patch
+       eautoconf
+
+}
+
+pkg_postinst () {
+
+       opengl-update ${GL_IMPLEM}
+
+}