[arch-commits] Commit in gtk3/trunk (3 files)

[Ionut Biru]

    Date: Monday, December 19, 2011 @ 11:28:04
  Author: ibiru
Revision: 145198

update to 3.2.3

Modified:
  gtk3/trunk/PKGBUILD
Deleted:
  gtk3/trunk/filechooserdefault_do_not_unref_value_twice.patch
  gtk3/trunk/moveresize.patch

---------------------------------------------------+
 PKGBUILD                                          |   16 ++----
 filechooserdefault_do_not_unref_value_twice.patch |   24 ----------
 moveresize.patch                                  |   47 --------------------
 3 files changed, 5 insertions(+), 82 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-19 14:11:19 UTC (rev 145197)
+++ PKGBUILD	2011-12-19 16:28:04 UTC (rev 145198)
@@ -2,8 +2,8 @@
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=gtk3
-pkgver=3.2.2
-pkgrel=4
+pkgver=3.2.3
+pkgrel=1
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -14,18 +14,12 @@
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
-        settings.ini
-        filechooserdefault_do_not_unref_value_twice.patch
-        moveresize.patch)
-sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            '0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6'
-            '627f430ccecc95ec61d9a83607469e71e95568c077f7bda849a7fe1c02d0bea7')
+        settings.ini)
+sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d'
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/filechooserdefault_do_not_unref_value_twice.patch"
-    patch -Np1 -i "$srcdir/moveresize.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \

Deleted: filechooserdefault_do_not_unref_value_twice.patch
===================================================================
--- filechooserdefault_do_not_unref_value_twice.patch	2011-12-19 14:11:19 UTC (rev 145197)
+++ filechooserdefault_do_not_unref_value_twice.patch	2011-12-19 16:28:04 UTC (rev 145198)
@@ -1,24 +0,0 @@
-From aca43f43be3886f1a0befda0178ebb94ea2cf7b1 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte at redhat.com>
-Date: Tue, 29 Nov 2011 19:39:21 +0000
-Subject: filechooserdefault: Don't unref value twice
-
-Double unref was introduced in eb02dacb370e8b4e6ef62328d0c09673b1234b32
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646461
-https://bugzilla.gnome.org/show_bug.cgi?id=664137
----
-diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
-index e33b91e..a74aacc 100644
---- a/gtk/gtkfilechooserdefault.c
-+++ b/gtk/gtkfilechooserdefault.c
-@@ -10127,7 +10127,6 @@ list_row_activated (GtkTreeView           *tree_view,
-   if (is_folder && file)
-     {
-       change_folder_and_display_error (impl, file, FALSE);
--      g_object_unref (file);
-       goto out;
-     }
- 
---
-cgit v0.9.0.2

Deleted: moveresize.patch
===================================================================
--- moveresize.patch	2011-12-19 14:11:19 UTC (rev 145197)
+++ moveresize.patch	2011-12-19 16:28:04 UTC (rev 145198)
@@ -1,47 +0,0 @@
-From 89c90ed193331d2ee96f323e10aaafd4366f4b0e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at redhat.com>
-Date: Sat, 10 Dec 2011 02:21:09 +0000
-Subject: Fix move-resize emulation with XI2
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650943
----
-diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
-index 1ff816e..d48927f 100644
---- a/gdk/x11/gdkwindow-x11.c
-+++ b/gdk/x11/gdkwindow-x11.c
-@@ -4296,6 +4296,33 @@ _gdk_x11_moveresize_handle_event (XEvent *event)
-       if (event->xbutton.button == mv_resize->moveresize_button)
-         finish_drag (mv_resize);
-       break;
-+
-+#ifdef HAVE_XGENERICEVENTS
-+    case GenericEvent:
-+      {
-+        /* we just assume this is an XI2 event */
-+        XIEvent *ev = (XIEvent *) event->xcookie.data;
-+        XIDeviceEvent *xev = (XIDeviceEvent *)ev;
-+        gint state;
-+        switch (ev->evtype)
-+          {
-+          case XI_Motion:
-+            update_pos (mv_resize, xev->root_x, xev->root_y);
-+            state = _gdk_x11_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group);
-+            if ((state & button_mask) == 0)
-+            finish_drag (mv_resize);
-+            break;
-+
-+          case XI_ButtonRelease:
-+            update_pos (mv_resize, xev->root_x, xev->root_y);
-+            if (xev->detail == mv_resize->moveresize_button)
-+              finish_drag (mv_resize);
-+            break;
-+          }
-+      }
-+      break;
-+#endif
-+
-     }
-   return TRUE;
- }
---
-cgit v0.9.0.2