[arch-commits] Commit in gtk2/repos (3 files)

[Jan de Groot]

    Date: Sunday, June 8, 2008 @ 06:46:05
  Author: jgc
Revision: 2559

Merged revisions 494-2558 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gtk2/trunk

........
  r2558 | jgc | 2008-06-08 10:45:53 +0000 (Sun, 08 Jun 2008) | 1 line
  
  upgpkg: gtk2 2.12.10-1
........

Modified:
  gtk2/repos/extra-i686/	(properties)
  gtk2/repos/extra-i686/PKGBUILD
Deleted:
  gtk2/repos/extra-i686/printbackendcups-include-gstdio.patch

---------------------------------------+
 PKGBUILD                              |   12 +++++-------
 printbackendcups-include-gstdio.patch |   11 -----------
 2 files changed, 5 insertions(+), 18 deletions(-)


Property changes on: gtk2/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gtk2/trunk:1-493
   + /gtk2/trunk:1-2558

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-08 10:45:53 UTC (rev 2558)
+++ extra-i686/PKGBUILD	2008-06-08 10:46:05 UTC (rev 2559)
@@ -2,13 +2,13 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.12.9
-pkgrel=2
+pkgver=2.12.10
+pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 install=gtk2.install
-depends=('atk>=1.22.0' 'pango>=1.20.2-2' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.6' 'libxcomposite' 'libxdamage')
+depends=('atk>=1.22.0' 'pango>=1.20.3' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.7' 'libxcomposite' 'libxdamage')
 makedepends=('pkgconfig')
 replaces=('gtkprint-cups')
 conflicts=('gtkprint-cups')
@@ -16,16 +16,14 @@
 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
-	printbackendcups-include-gstdio.patch)
-md5sums=('33499772fdc3bea569c6d5673e5831b4'
+	gtkclipboard-check.patch)
+md5sums=('5fcbdd2254eedb6b9ae828afc01d9eaa'
          '4025d3c15d6c6f73a032f403ffd4ff1c')
 
 build() {
   cd ${startdir}/src/gtk+-${pkgver}
   # Workaround patch for flash
   patch -Np1 -i ${startdir}/src/gtkclipboard-check.patch || return 1
-  patch -Np1 -i ${startdir}/src/printbackendcups-include-gstdio.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --with-xinput=xfree \

Deleted: extra-i686/printbackendcups-include-gstdio.patch
===================================================================
--- extra-i686/printbackendcups-include-gstdio.patch	2008-06-08 10:45:53 UTC (rev 2558)
+++ extra-i686/printbackendcups-include-gstdio.patch	2008-06-08 10:46:05 UTC (rev 2559)
@@ -1,11 +0,0 @@
-diff -p -up gtk+-2.12.9/modules/printbackends/cups/gtkprintbackendcups.c~ gtk+-2.12.9/modules/printbackends/cups/gtkprintbackendcups.c
---- gtk+-2.12.9/modules/printbackends/cups/gtkprintbackendcups.c~	2008-03-12 05:17:03.000000000 +0100
-+++ gtk+-2.12.9/modules/printbackends/cups/gtkprintbackendcups.c	2008-04-02 11:30:12.000000000 +0200
-@@ -36,6 +36,7 @@
- #include <cairo-ps.h>
- 
- #include <glib/gi18n-lib.h>
-+#include <glib/gstdio.h>
- #include <gmodule.h>
- 
- #include <gtk/gtkprintoperation.h>