[arch-commits] CVS update of extra/lib/gtk2 (PKGBUILD)

[Jan de Groot]

    Date: Sunday, December 2, 2007 @ 09:00:15
  Author: jgc
    Path: /home/cvs-extra/extra/lib/gtk2

Modified: PKGBUILD (1.102 -> 1.103)

upgpkg: gtk2 2.12.2-1
Change fallback icon theme to gnome again
Remove ubuntu patch, there is a better solution applied upstream


----------+
 PKGBUILD |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)


Index: extra/lib/gtk2/PKGBUILD
diff -u extra/lib/gtk2/PKGBUILD:1.102 extra/lib/gtk2/PKGBUILD:1.103
--- extra/lib/gtk2/PKGBUILD:1.102	Wed Oct 17 13:51:37 2007
+++ extra/lib/gtk2/PKGBUILD	Sun Dec  2 09:00:15 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.102 2007/10/17 17:51:37 jgc Exp $
+# $Id: PKGBUILD,v 1.103 2007/12/02 14:00:15 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.12.1
+pkgver=2.12.2
 pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
@@ -16,25 +16,20 @@
 backup=(etc/gtk-2.0/gtkrc)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.12/gtk+-${pkgver}.tar.bz2
-	gtkclipboard-check.patch
-	071_fix_gdk_window_null_crasher.patch)
-md5sums=('c46f34addc2fe3ea6756055d59fb8856'
-         '4025d3c15d6c6f73a032f403ffd4ff1c'
-         '7ee249f879a20384d53c6ff4e091e102')
+	gtkclipboard-check.patch)
+md5sums=('a789a8a333d418f47cda1dba106d9aac'
+         '4025d3c15d6c6f73a032f403ffd4ff1c')
 
 build() {
   cd ${startdir}/src/gtk+-${pkgver}
   # Workaround patch for flash
   patch -Np1 -i ${startdir}/src/gtkclipboard-check.patch || return 1
 
-  #Patch from Ubuntu
-  patch -Np1 -i ${startdir}/src/071_fix_gdk_window_null_crasher.patch || return 1
-
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --with-xinput=xfree \
 	      --with-included-loaders=png
   make || return 1
   make DESTDIR=${startdir}/pkg install
 
-  echo 'gtk-fallback-icon-theme = "hicolor"' > ${startdir}/pkg/etc/gtk-2.0/gtkrc
+  echo 'gtk-fallback-icon-theme = "gnome"' > ${startdir}/pkg/etc/gtk-2.0/gtkrc
 }