[arch-commits] Commit in gtkglext/trunk (PKGBUILD gtkglext-1.0.6-pangox.patch)

[Jan de Groot]

    Date: Tuesday, August 2, 2011 @ 13:13:55
  Author: jgc
Revision: 134243

Remove old patch
Get rid of AC_PATH_XTRA

Modified:
  gtkglext/trunk/PKGBUILD
Deleted:
  gtkglext/trunk/gtkglext-1.0.6-pangox.patch

-----------------------------+
 PKGBUILD                    |   16 ++++++++--------
 gtkglext-1.0.6-pangox.patch |   30 ------------------------------
 2 files changed, 8 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-02 17:13:29 UTC (rev 134242)
+++ PKGBUILD	2011-08-02 17:13:55 UTC (rev 134243)
@@ -4,13 +4,12 @@
 
 pkgname=gtkglext
 pkgver=1.2.0
-pkgrel=5
+pkgrel=6
 pkgdesc="opengl extensions for gtk2"
 arch=('i686' 'x86_64')
 url="http://gtkglext.sourceforge.net/"
 license=('LGPL')
 depends=('gtk2' 'mesa' 'libxmu')
-makedepends=('gcc')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
 	gtk2.20.patch)
@@ -18,10 +17,11 @@
          'e5a87ec3f2d0e616c6f32f90c3f7237f')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/gtk2.20.patch || return 1
-  autoconf --force || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gtk2.20.patch"
+  sed '/AC_PATH_XTRA/d' -i configure.in
+  autoreconf --force --install
+  ./configure --prefix=/usr --disable-static
+  make
+  make DESTDIR="${pkgdir}" install
 }

Deleted: gtkglext-1.0.6-pangox.patch
===================================================================
--- gtkglext-1.0.6-pangox.patch	2011-08-02 17:13:29 UTC (rev 134242)
+++ gtkglext-1.0.6-pangox.patch	2011-08-02 17:13:55 UTC (rev 134243)
@@ -1,30 +0,0 @@
---- 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`"