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

[Jan de Groot]

    Date: Saturday, June 21, 2008 @ 14:27:23
  Author: jgc
Revision: 3253

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

........
  r3209 | jgc | 2008-06-21 14:35:48 +0000 (Sat, 21 Jun 2008) | 2 lines
  
  upgpkg: gtk2 2.12.10-3
      Fix possible crash with XKB errors, fix printing to IPP printers
........

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

------------------------+
 PKGBUILD               |   10 +++++++---
 bgo508751.patch        |   11 +++++++++++
 printbackendcups.patch |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 3 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-21 18:27:19 UTC (rev 3252)
+++ extra-i686/PKGBUILD	2008-06-21 18:27:23 UTC (rev 3253)
@@ -3,7 +3,7 @@
 
 pkgname=gtk2
 pkgver=2.12.10
-pkgrel=2
+pkgrel=3
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
@@ -17,7 +17,9 @@
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.12/gtk+-${pkgver}.tar.bz2
 	gtkclipboard-check.patch
-	gtk2-windowpos.patch)
+	gtk2-windowpos.patch
+	printbackendcups.patch
+	bgo508751.patch)
 md5sums=('5fcbdd2254eedb6b9ae828afc01d9eaa'
          '4025d3c15d6c6f73a032f403ffd4ff1c'
 	 'bbff943e597f0000b9d47cde0ffba289')
@@ -27,8 +29,10 @@
   # Workaround patch for flash
   patch -Np1 -i ${startdir}/src/gtkclipboard-check.patch || return 1
 
-  # bgo 536757 / FS#10613
+  # Upstream patches from gtk-2-12 branch, remove for 2.12.11
   patch -Np0 -i ${startdir}/src/gtk2-windowpos.patch || return 1
+  patch -Np2 -i ${startdir}/src/printbackendcups.patch || return 1
+  patch -Np2 -i ${startdir}/src/bgo508751.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --with-xinput=xfree \

Copied: gtk2/repos/extra-i686/bgo508751.patch (from rev 3209, gtk2/trunk/bgo508751.patch)
===================================================================
--- extra-i686/bgo508751.patch	                        (rev 0)
+++ extra-i686/bgo508751.patch	2008-06-21 18:27:23 UTC (rev 3253)
@@ -0,0 +1,11 @@
+--- branches/gtk-2-12/gdk/x11/gdkkeys-x11.c	2007/11/19 09:24:00	19002
++++ branches/gtk-2-12/gdk/x11/gdkkeys-x11.c	2008/06/17 02:13:46	20414
+@@ -1661,7 +1661,7 @@
+     {
+       XkbDescRec *xkb = get_xkb (keymap_x11);
+       
+-      if (xkb->map->modmap[keycode] != 0)
++      if (xkb->map->modmap && xkb->map->modmap[keycode] != 0)
+ 	return TRUE;
+     }
+   else

Copied: gtk2/repos/extra-i686/printbackendcups.patch (from rev 3209, gtk2/trunk/printbackendcups.patch)
===================================================================
--- extra-i686/printbackendcups.patch	                        (rev 0)
+++ extra-i686/printbackendcups.patch	2008-06-21 18:27:23 UTC (rev 3253)
@@ -0,0 +1,39 @@
+--- branches/gtk-2-12/modules/printbackends/cups/gtkprintbackendcups.c	2008/05/01 00:39:29	20059
++++ branches/gtk-2-12/modules/printbackends/cups/gtkprintbackendcups.c	2008/06/12 13:07:43	20361
+@@ -414,6 +414,7 @@
+   GtkCupsRequest *request;
+   GtkPrintSettings *settings;
+   const gchar *title;
++  char  printer_absolute_uri[HTTP_MAX_URI];
+ 
+   GTK_NOTE (PRINTING,
+             g_print ("CUPS Backend: %s\n", G_STRFUNC));   
+@@ -428,9 +429,27 @@
+ 				  NULL,
+ 				  cups_printer->device_uri);
+ 
++#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) || CUPS_VERSION_MAJOR > 1
++  httpAssembleURIf (HTTP_URI_CODING_ALL,
++                    printer_absolute_uri,
++                    sizeof (printer_absolute_uri),
++                    "ipp",
++                    NULL,
++                    "localhost",
++                    ippPort (),
++                    "/printers/%s",
++                    gtk_printer_get_name (gtk_print_job_get_printer (job)));
++#else
++  g_snprintf (printer_absolute_uri,
++              sizeof (printer_absolute_uri),
++              "ipp://localhost:%d/printers/%s",
++              ippPort (),
++              gtk_printer_get_name (gtk_print_job_get_printer (job)));
++#endif
++
+   gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, 
+                                    IPP_TAG_URI, "printer-uri",
+-                                   NULL, cups_printer->printer_uri);
++                                   NULL, printer_absolute_uri);
+ 
+   title = gtk_print_job_get_title (job);
+   if (title)