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

Jan de Groot jgc at archlinux.org
Wed Jul 2 14:15:18 EDT 2008


    Date: Wednesday, July 2, 2008 @ 14:15:06
  Author: jgc
Revision: 4026

upgpkg: gtk2 2.12.11-1
    Remove upstream patches

Modified:
  gtk2/trunk/PKGBUILD
Deleted:
  gtk2/trunk/bgo508751.patch
  gtk2/trunk/gtk2-windowpos.patch
  gtk2/trunk/printbackendcups.patch

------------------------+
 PKGBUILD               |   21 ++++++---------------
 bgo508751.patch        |   11 -----------
 gtk2-windowpos.patch   |   31 -------------------------------
 printbackendcups.patch |   39 ---------------------------------------
 4 files changed, 6 insertions(+), 96 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-02 18:01:45 UTC (rev 4025)
+++ PKGBUILD	2008-07-02 18:15:06 UTC (rev 4026)
@@ -2,13 +2,13 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.12.10
-pkgrel=3
+pkgver=2.12.11
+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.3' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.7' 'libxcomposite' 'libxdamage')
+depends=('atk>=1.22.0' 'pango>=1.20.5' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.7' 'libxcomposite' 'libxdamage')
 makedepends=('pkgconfig')
 replaces=('gtkprint-cups')
 conflicts=('gtkprint-cups')
@@ -16,24 +16,15 @@
 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
-	gtk2-windowpos.patch
-	printbackendcups.patch
-	bgo508751.patch)
-md5sums=('5fcbdd2254eedb6b9ae828afc01d9eaa'
-         '4025d3c15d6c6f73a032f403ffd4ff1c'
-	 'bbff943e597f0000b9d47cde0ffba289')
+	gtkclipboard-check.patch)
+md5sums=('f7aab88e856a813386f797aade5867ad'
+         '4025d3c15d6c6f73a032f403ffd4ff1c')
 
 build() {
   cd ${startdir}/src/gtk+-${pkgver}
   # Workaround patch for flash
   patch -Np1 -i ${startdir}/src/gtkclipboard-check.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

Deleted: bgo508751.patch
===================================================================
--- bgo508751.patch	2008-07-02 18:01:45 UTC (rev 4025)
+++ bgo508751.patch	2008-07-02 18:15:06 UTC (rev 4026)
@@ -1,11 +0,0 @@
---- 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

Deleted: gtk2-windowpos.patch
===================================================================
--- gtk2-windowpos.patch	2008-07-02 18:01:45 UTC (rev 4025)
+++ gtk2-windowpos.patch	2008-07-02 18:15:06 UTC (rev 4026)
@@ -1,31 +0,0 @@
-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: printbackendcups.patch
===================================================================
--- printbackendcups.patch	2008-07-02 18:01:45 UTC (rev 4025)
+++ printbackendcups.patch	2008-07-02 18:15:06 UTC (rev 4026)
@@ -1,39 +0,0 @@
---- 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