[arch-commits] Commit in gtk2/repos (6 files)
Jan de Groot
jgc at archlinux.org
Sat Jun 21 14:36:09 UTC 2008
Date: Saturday, June 21, 2008 @ 10:36:07
Author: jgc
Revision: 3210
Merged revisions 158-3209 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/gtk2/trunk
........
r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
Added svn:keywords to all PKGBUILDs
........
r2558 | jgc | 2008-06-08 10:45:53 +0000 (Sun, 08 Jun 2008) | 1 line
upgpkg: gtk2 2.12.10-1
........
r2655 | jgc | 2008-06-10 17:27:38 +0000 (Tue, 10 Jun 2008) | 2 lines
upgpkg: gtk2 2.12.10-2
Fix FS#10613
........
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-x86_64/bgo508751.patch
(from rev 3209, gtk2/trunk/bgo508751.patch)
gtk2/repos/extra-x86_64/gtk2-windowpos.patch
(from rev 3209, gtk2/trunk/gtk2-windowpos.patch)
gtk2/repos/extra-x86_64/printbackendcups.patch
(from rev 3209, gtk2/trunk/printbackendcups.patch)
Modified:
gtk2/repos/extra-x86_64/ (properties)
gtk2/repos/extra-x86_64/PKGBUILD
Deleted:
gtk2/repos/extra-x86_64/printbackendcups-include-gstdio.patch
---------------------------------------+
PKGBUILD | 21 +++++++++++------
bgo508751.patch | 11 +++++++++
gtk2-windowpos.patch | 31 +++++++++++++++++++++++++
printbackendcups-include-gstdio.patch | 11 ---------
printbackendcups.patch | 39 ++++++++++++++++++++++++++++++++
5 files changed, 95 insertions(+), 18 deletions(-)
Property changes on: gtk2/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /gtk2/trunk:1-157
+ /gtk2/trunk:1-3209
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-06-21 14:35:48 UTC (rev 3209)
+++ extra-x86_64/PKGBUILD 2008-06-21 14:36:07 UTC (rev 3210)
@@ -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=3
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')
@@ -17,16 +17,23 @@
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'
- '4025d3c15d6c6f73a032f403ffd4ff1c')
+ gtk2-windowpos.patch
+ printbackendcups.patch
+ bgo508751.patch)
+md5sums=('5fcbdd2254eedb6b9ae828afc01d9eaa'
+ '4025d3c15d6c6f73a032f403ffd4ff1c'
+ 'bbff943e597f0000b9d47cde0ffba289')
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
+ # 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 \
--with-included-loaders=png || return 1
Copied: gtk2/repos/extra-x86_64/bgo508751.patch (from rev 3209, gtk2/trunk/bgo508751.patch)
===================================================================
--- extra-x86_64/bgo508751.patch (rev 0)
+++ extra-x86_64/bgo508751.patch 2008-06-21 14:36:07 UTC (rev 3210)
@@ -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-x86_64/gtk2-windowpos.patch (from rev 3209, gtk2/trunk/gtk2-windowpos.patch)
===================================================================
--- extra-x86_64/gtk2-windowpos.patch (rev 0)
+++ extra-x86_64/gtk2-windowpos.patch 2008-06-21 14:36:07 UTC (rev 3210)
@@ -0,0 +1,31 @@
+Index: gdk/x11/gdkwindow-x11.c
+===================================================================
+--- gdk/x11/gdkwindow-x11.c (revision 20280)
++++ gdk/x11/gdkwindow-x11.c (working copy)
+@@ -3412,6 +3412,7 @@
+ Window xwindow;
+ Window xparent;
+ Window root;
++ Window child;
+ Window *children;
+ guchar *data;
+ Window *vroots;
+@@ -3470,13 +3471,15 @@
+ if ((type_return == XA_CARDINAL) && (format_return == 32) &&
+ (nitems_return == 4) && (data))
+ {
+- guint32 *ldata = (guint32 *) data;
++ gulong *ldata = (gulong *) data;
+ got_frame_extents = TRUE;
+
+ /* try to get the real client window geometry */
+ if (XGetGeometry (GDK_DISPLAY_XDISPLAY (display), xwindow,
+- &root, &wx, &wy, &ww, &wh, &wb, &wd))
+- {
++ &root, &wx, &wy, &ww, &wh, &wb, &wd) &&
++ XTranslateCoordinates (GDK_DISPLAY_XDISPLAY (display),
++ xwindow, root, 0, 0, &wx, &wy, &child))
++ {
+ rect->x = wx;
+ rect->y = wy;
+ rect->width = ww;
Deleted: extra-x86_64/printbackendcups-include-gstdio.patch
===================================================================
--- extra-x86_64/printbackendcups-include-gstdio.patch 2008-06-21 14:35:48 UTC (rev 3209)
+++ extra-x86_64/printbackendcups-include-gstdio.patch 2008-06-21 14:36:07 UTC (rev 3210)
@@ -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>
Copied: gtk2/repos/extra-x86_64/printbackendcups.patch (from rev 3209, gtk2/trunk/printbackendcups.patch)
===================================================================
--- extra-x86_64/printbackendcups.patch (rev 0)
+++ extra-x86_64/printbackendcups.patch 2008-06-21 14:36:07 UTC (rev 3210)
@@ -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)
More information about the arch-commits
mailing list