[arch-commits] CVS update of arch/build/lib/gtk2 (3 files)

[Jan de Groot]

    Date: Sunday, August 19, 2007 @ 06:43:12
  Author: jgc
    Path: /home/cvs-arch/arch/build/lib/gtk2

   Added: gdkscreen-check.patch (1.1) gtkclipboard-check.patch (1.1)
Modified: PKGBUILD (1.98 -> 1.99)

upgpkg: gtk2 2.10.14-3
Add two patches to fix critical assertions with OpenOffice.org and Flashplayer. The first one can be fixed, but requires a 100MB package update, the 2nd cannot be fixed without help from Adobe. These extra checks should be done in the offended packages, but checking it inside GTK does no harm to other applications


--------------------------+
 PKGBUILD                 |   16 +++++++++++-----
 gdkscreen-check.patch    |   11 +++++++++++
 gtkclipboard-check.patch |   11 +++++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)


Index: arch/build/lib/gtk2/PKGBUILD
diff -u arch/build/lib/gtk2/PKGBUILD:1.98 arch/build/lib/gtk2/PKGBUILD:1.99
--- arch/build/lib/gtk2/PKGBUILD:1.98	Sun Aug  5 17:53:50 2007
+++ arch/build/lib/gtk2/PKGBUILD	Sun Aug 19 06:43:11 2007
@@ -1,25 +1,31 @@
-# $Id: PKGBUILD,v 1.98 2007/08/05 21:53:50 jgc Exp $
+# $Id: PKGBUILD,v 1.99 2007/08/19 10:43:11 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
 pkgver=2.10.14
-pkgrel=2
+pkgrel=3
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 install=gtk2.install
-depends=('atk>=1.18.0-2' 'pango>=1.16.5' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups')
+depends=('atk>=1.18.0-2' 'pango>=1.16.5' 'glib2>=2.14.0-3' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups')
 makedepends=('pkgconfig')
 replaces=('gtkprint-cups')
 conflicts=('gtkprint-cups')
 options=('!libtool')
 backup=(etc/gtk-2.0/gtkrc)
 license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-${pkgver}.tar.bz2)
-md5sums=('018d7dd0fa7de01cfdb77c7c55e7ba26')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-${pkgver}.tar.bz2
+	gdkscreen-check.patch
+	gtkclipboard-check.patch)
+md5sums=('018d7dd0fa7de01cfdb77c7c55e7ba26'
+         'e223e58ffde3706b0d82641aaf1db273'
+         '4025d3c15d6c6f73a032f403ffd4ff1c')
 
 build() {
   cd ${startdir}/src/gtk+-${pkgver}
+  patch -Np1 -i ${startdir}/src/gdkscreen-check.patch || return 1
+  patch -Np1 -i ${startdir}/src/gtkclipboard-check.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --with-xinput=xfree \
 	      --with-included-loaders=png
Index: arch/build/lib/gtk2/gdkscreen-check.patch
diff -u /dev/null arch/build/lib/gtk2/gdkscreen-check.patch:1.1
--- /dev/null	Sun Aug 19 06:43:11 2007
+++ arch/build/lib/gtk2/gdkscreen-check.patch	Sun Aug 19 06:43:11 2007
@@ -0,0 +1,11 @@
+--- gtk+-2.11.6/gdk/gdkscreen.c.orig	2007-08-19 12:26:37.000000000 +0200
++++ gtk+-2.11.6/gdk/gdkscreen.c	2007-08-19 12:27:08.000000000 +0200
+@@ -417,6 +417,8 @@
+ const cairo_font_options_t *
+ gdk_screen_get_font_options (GdkScreen *screen)
+ {
++    if (screen == NULL)
++        return NULL;
+     g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+ 
+     return screen->font_options;
Index: arch/build/lib/gtk2/gtkclipboard-check.patch
diff -u /dev/null arch/build/lib/gtk2/gtkclipboard-check.patch:1.1
--- /dev/null	Sun Aug 19 06:43:11 2007
+++ arch/build/lib/gtk2/gtkclipboard-check.patch	Sun Aug 19 06:43:12 2007
@@ -0,0 +1,11 @@
+--- gtk+-2.11.6/gtk/gtkclipboard.c.orig	2007-08-18 13:48:22.000000000 +0000
++++ gtk+-2.11.6/gtk/gtkclipboard.c	2007-08-18 13:49:08.000000000 +0000
+@@ -287,6 +287,8 @@
+ gtk_clipboard_get_for_display (GdkDisplay *display, 
+ 			       GdkAtom     selection)
+ {
++  if (display == NULL)
++	  return NULL;
+   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+   g_return_val_if_fail (!display->closed, NULL);
+