[arch-commits] Commit in gtk2/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Sunday, December 21, 2008 @ 10:10:58
  Author: jgc
Revision: 22060

Merged revisions 20958,22044 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gtk2/trunk

........
  r20958 | allan | 2008-12-08 07:58:43 +0000 (Mon, 08 Dec 2008) | 1 line
  
  add missing patch
........
  r22044 | jgc | 2008-12-21 13:00:02 +0000 (Sun, 21 Dec 2008) | 1 line
  
  upgpkg: gtk2 2.14.6-1
........

Modified:
  gtk2/repos/extra-x86_64/	(properties)
  gtk2/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


Property changes on: gtk2/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gtk2/trunk:1-20913
   + /gtk2/trunk:1-22059
Deleted: svn:mergeinfo
   - 

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-21 15:10:43 UTC (rev 22059)
+++ extra-x86_64/PKGBUILD	2008-12-21 15:10:58 UTC (rev 22060)
@@ -2,13 +2,13 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.14.5
-pkgrel=2
+pkgver=2.14.6
+pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 install=gtk2.install
-depends=('atk>=1.24.0' 'pango>=1.22.3' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.9' 'libxcomposite' 'libxdamage' 'heimdal>=1.2' 'gnutls>=2.4.1')
+depends=('atk>=1.24.0' 'pango>=1.22.4' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.9' 'libxcomposite' 'libxdamage' 'heimdal>=1.2.1' 'gnutls>=2.4.2')
 makedepends=('pkgconfig')
 replaces=('gtkprint-cups' 'gail')
 conflicts=('gtkprint-cups' 'gail')
@@ -19,23 +19,23 @@
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.14/gtk+-${pkgver}.tar.bz2
 	gtkclipboard-check.patch
 	gtk2-emit-size-change.patch)
-md5sums=('1b1b5d7ab5a25e84682cb27ee4808a40'
+md5sums=('69c2d2842203d7b627bc6ec34cb4a4f8'
          '4025d3c15d6c6f73a032f403ffd4ff1c'
          '942981cbba5057d9f02f4393e552f101')
 
 build() {
-  cd ${startdir}/src/gtk+-${pkgver}
+  cd "${srcdir}/gtk+-${pkgver}"
   # Workaround patch for flash
-  patch -Np1 -i ${startdir}/src/gtkclipboard-check.patch || return 1
+  patch -Np1 -i "${srcdir}/gtkclipboard-check.patch" || return 1
   # gdk does not let xfwm know about screen size changes
-  patch -Np1 -i ${srcdir}/gtk2-emit-size-change.patch
+  patch -Np1 -i "${srcdir}/gtk2-emit-size-change.patch" || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --with-xinput=yes \
 	      --without-libjasper \
 	      --with-included-loaders=png || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
-  echo 'gtk-fallback-icon-theme = "gnome"' > ${startdir}/pkg/etc/gtk-2.0/gtkrc || return 1
+  echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" || return 1
 }