[arch-commits] Commit in gtk2/gnome-unstable (PKGBUILD gtk2-fix-install.patch)

[Jan de Groot]

    Date: Sunday, September 6, 2009 @ 07:12:05
  Author: jgc
Revision: 51230

Update to 2.17.11
Disable C++ tests, somehow this is broken with new automake
add patch to fix locale installation

Added:
  gtk2/gnome-unstable/gtk2-fix-install.patch
Modified:
  gtk2/gnome-unstable/PKGBUILD

------------------------+
 PKGBUILD               |   20 ++++++++++++--------
 gtk2-fix-install.patch |   24 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-06 11:01:47 UTC (rev 51229)
+++ PKGBUILD	2009-09-06 11:12:05 UTC (rev 51230)
@@ -2,14 +2,14 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.17.9
+pkgver=2.17.11
 pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 install=gtk2.install
-depends=('atk>=1.27.90' 'pango>=1.25.5' 'libxcursor' 'libxinerama' 'libxrandr>=1.3.0' 'libxi>=1.2.1' 'libcups>=1.3.11' 'libxcomposite' 'libxdamage' 'heimdal>=1.2.1' 'gnutls>=2.8.1' 'shared-mime-info')
-makedepends=('pkgconfig')
+depends=('atk>=1.27.90' 'pango>=1.25.5' 'libxcursor' 'libxinerama' 'libxrandr>=1.3.0' 'libxi>=1.2.1' 'libcups>=1.4.0' 'libxcomposite' 'libxdamage' 'heimdal>=1.2.1' 'gnutls>=2.8.3' 'shared-mime-info')
+makedepends=('pkgconfig' 'gtk-doc')
 replaces=('gtkprint-cups' 'gail')
 conflicts=('gtkprint-cups' 'gail')
 provides=('gail=1.22.3')
@@ -17,15 +17,19 @@
 backup=(etc/gtk-2.0/gtkrc)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.17/gtk+-${pkgver}.tar.bz2
-        libjpeg-7.patch)
-sha256sums=('6c922a637b264dd98caa64fc3c70dc50bffc4b3cad2626862729eb0e9eecc266'
-            '977ba13f3e2778cb82aadfd5e27fc4a8b715346e30e1cd1e6e76bec30079bf99')
+        libjpeg-7.patch
+        gtk2-fix-install.patch)
+sha256sums=('dbbb13462ec385ba6803f08b5c6d15342b74282828b2fe699e75723aa0e89c70'
+            '977ba13f3e2778cb82aadfd5e27fc4a8b715346e30e1cd1e6e76bec30079bf99'
+            '08cb92a62ce3318efa3a0cf0fcb25cc6dadfec3699d715476570946d062c28fa')
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
   patch -Np1 -i "${srcdir}/libjpeg-7.patch" || return 1
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
+  patch -Np1 -i "${srcdir}/gtk2-fix-install.patch" || return 1
+
+  autoreconf || return 1
+  CXX=/bin/false ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --with-xinput=yes \
       --without-libjasper \
       --with-included-loaders=png || return 1

Added: gtk2-fix-install.patch
===================================================================
--- gtk2-fix-install.patch	                        (rev 0)
+++ gtk2-fix-install.patch	2009-09-06 11:12:05 UTC (rev 51230)
@@ -0,0 +1,24 @@
+diff -up gtk+-2.17.11/po/Makefile.in.in.fix-install gtk+-2.17.11/po/Makefile.in.in
+--- gtk+-2.17.11/po/Makefile.in.in.fix-install	2009-09-05 01:19:45.303824009 -0400
++++ gtk+-2.17.11/po/Makefile.in.in	2009-09-05 01:19:14.632573806 -0400
+@@ -126,7 +126,7 @@ install-data: install-data- at USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+ 	$(mkdir_p) $(DESTDIR)$(datadir); \
+-	@catalogs='$(CATALOGS)'; \
++	catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+diff -up gtk+-2.17.11/po-properties/Makefile.in.in.fix-install gtk+-2.17.11/po-properties/Makefile.in.in
+--- gtk+-2.17.11/po-properties/Makefile.in.in.fix-install	2009-09-05 01:19:54.543583934 -0400
++++ gtk+-2.17.11/po-properties/Makefile.in.in	2009-09-05 01:20:16.427830666 -0400
+@@ -107,7 +107,7 @@ install-data: install-data- at USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+ 	$(mkdir_p) $(DESTDIR)$(datadir); \
+-	@catalogs='$(CATALOGS)'; \
++	catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \