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

[Jan de Groot]

    Date: Sunday, April 20, 2008 @ 07:50:00
  Author: jgc
Revision: 494

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

........
  r157 | jgc | 2008-04-12 13:14:49 +0000 (Sat, 12 Apr 2008) | 2 lines
  
  upgpkg: gtk2 2.12.9-2
      Depend on latest pango/cairo, add patch to fix eclipse crashes with cups printing backend
........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

Added:
  gtk2/repos/extra-i686/printbackendcups-include-gstdio.patch
    (from rev 356, gtk2/trunk/printbackendcups-include-gstdio.patch)
Modified:
  gtk2/repos/extra-i686/	(properties)
  gtk2/repos/extra-i686/PKGBUILD

---------------------------------------+
 PKGBUILD                              |    8 +++++---
 printbackendcups-include-gstdio.patch |   11 +++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-20 11:42:09 UTC (rev 493)
+++ extra-i686/PKGBUILD	2008-04-20 11:50:00 UTC (rev 494)
@@ -3,12 +3,12 @@
 
 pkgname=gtk2
 pkgver=2.12.9
-pkgrel=1
+pkgrel=2
 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.0' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.6' 'libxcomposite' 'libxdamage' 'glib2>=2.16.1')
+depends=('atk>=1.22.0' 'pango>=1.20.2-2' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.6' 'libxcomposite' 'libxdamage')
 makedepends=('pkgconfig')
 replaces=('gtkprint-cups')
 conflicts=('gtkprint-cups')
@@ -16,7 +16,8 @@
 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)
+	gtkclipboard-check.patch
+	printbackendcups-include-gstdio.patch)
 md5sums=('33499772fdc3bea569c6d5673e5831b4'
          '4025d3c15d6c6f73a032f403ffd4ff1c')
 
@@ -24,6 +25,7 @@
   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 \

Copied: gtk2/repos/extra-i686/printbackendcups-include-gstdio.patch (from rev 356, gtk2/trunk/printbackendcups-include-gstdio.patch)
===================================================================
--- extra-i686/printbackendcups-include-gstdio.patch	                        (rev 0)
+++ extra-i686/printbackendcups-include-gstdio.patch	2008-04-20 11:50:00 UTC (rev 494)
@@ -0,0 +1,11 @@
+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>