[arch-commits] CVS update of extra/lib/gtk2 (2 files)
Jan de Groot
jgc at archlinux.org
Thu Jan 10 18:36:43 UTC 2008
Date: Thursday, January 10, 2008 @ 13:36:43
Author: jgc
Path: /home/cvs-extra/extra/lib/gtk2
Modified: PKGBUILD (1.104 -> 1.105)
Removed: 071_fix_gdk_window_null_crasher.patch (1.1)
upgpkg: gtk2 2.12.5-1
Remove old patch
---------------------------------------+
071_fix_gdk_window_null_crasher.patch | 68 --------------------------------
PKGBUILD | 8 +--
2 files changed, 4 insertions(+), 72 deletions(-)
Index: extra/lib/gtk2/071_fix_gdk_window_null_crasher.patch
diff -u extra/lib/gtk2/071_fix_gdk_window_null_crasher.patch:1.1 extra/lib/gtk2/071_fix_gdk_window_null_crasher.patch:removed
--- extra/lib/gtk2/071_fix_gdk_window_null_crasher.patch:1.1 Sat Oct 13 13:55:05 2007
+++ extra/lib/gtk2/071_fix_gdk_window_null_crasher.patch Thu Jan 10 13:36:43 2008
@@ -1,68 +0,0 @@
---- gdk/gdkwindow.c.orig 2007-10-02 11:22:11.000000000 +0200
-+++ gtk+2.0-2.12.0/gdk/gdkwindow.c 2007-10-02 11:22:20.000000000 +0200
-@@ -609,18 +609,21 @@ gdk_window_get_parent (GdkWindow *window
- GdkWindow*
- gdk_window_get_toplevel (GdkWindow *window)
- {
- GdkWindowObject *obj;
-
- g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
-
- obj = (GdkWindowObject *)window;
-- while (GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD)
-+ while (obj && GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD) {
- obj = (GdkWindowObject *)obj->parent;
-+ }
-+
-+ g_return_val_if_fail (obj != NULL, NULL);
-
- return GDK_WINDOW (obj);
- }
-
- /**
- * gdk_window_get_children:
- * @window: a #GdkWindow
- *
-@@ -2290,19 +2293,21 @@ gdk_window_update_idle (gpointer data)
- return FALSE;
- }
-
- static gboolean
- gdk_window_is_toplevel_frozen (GdkWindow *window)
- {
- GdkWindowObject *toplevel;
-
-+ g_return_val_if_fail (window != NULL, FALSE);
-+
- toplevel = (GdkWindowObject *)gdk_window_get_toplevel (window);
-
-- return toplevel->update_and_descendants_freeze_count > 0;
-+ return toplevel ? toplevel->update_and_descendants_freeze_count > 0 : FALSE;
- }
-
- static void
- gdk_window_schedule_update (GdkWindow *window)
- {
- if (window &&
- (GDK_WINDOW_OBJECT (window)->update_freeze_count ||
- gdk_window_is_toplevel_frozen (window)))
-@@ -2428,16 +2433,19 @@ gdk_window_process_all_updates (void)
-
- update_windows = NULL;
- update_idle = 0;
-
- g_slist_foreach (old_update_windows, (GFunc)g_object_ref, NULL);
-
- while (tmp_list)
- {
-+ if(!tmp_list->data)
-+ continue;
-+
- GdkWindowObject *private = (GdkWindowObject *)tmp_list->data;
-
- if (private->update_freeze_count ||
- gdk_window_is_toplevel_frozen (tmp_list->data))
- update_windows = g_slist_prepend (update_windows, private);
- else
- gdk_window_process_updates_internal (tmp_list->data);
-
Index: extra/lib/gtk2/PKGBUILD
diff -u extra/lib/gtk2/PKGBUILD:1.104 extra/lib/gtk2/PKGBUILD:1.105
--- extra/lib/gtk2/PKGBUILD:1.104 Tue Dec 11 10:32:06 2007
+++ extra/lib/gtk2/PKGBUILD Thu Jan 10 13:36:43 2008
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD,v 1.104 2007/12/11 15:32:06 jgc Exp $
+# $Id: PKGBUILD,v 1.105 2008/01/10 18:36:43 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gtk2
-pkgver=2.12.3
+pkgver=2.12.5
pkgrel=1
pkgdesc="The GTK+ Toolkit (v2)"
arch=(i686 x86_64)
url="http://www.gtk.org/"
install=gtk2.install
-depends=('atk>=1.20.0' 'pango>=1.18.3' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.3' 'libxcomposite' 'libxdamage')
+depends=('atk>=1.20.0' 'pango>=1.18.4' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.5' 'libxcomposite' 'libxdamage')
makedepends=('pkgconfig')
replaces=('gtkprint-cups')
conflicts=('gtkprint-cups')
@@ -17,7 +17,7 @@
license=('LGPL')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.12/gtk+-${pkgver}.tar.bz2
gtkclipboard-check.patch)
-md5sums=('dc8455144f27945f2fcbe91e75acd118'
+md5sums=('588c7fb3d9ebadf4f5a1ab4c534e4db5'
'4025d3c15d6c6f73a032f403ffd4ff1c')
build() {
More information about the arch-commits
mailing list