[arch-commits] Commit in gtk3/repos (18 files)

Ionut Biru ibiru at archlinux.org
Sun Dec 11 21:22:28 UTC 2011


    Date: Sunday, December 11, 2011 @ 16:22:27
  Author: ibiru
Revision: 144950

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gtk3/repos/extra-i686/PKGBUILD
    (from rev 144949, gtk3/trunk/PKGBUILD)
  gtk3/repos/extra-i686/filechooserdefault_do_not_unref_value_twice.patch
    (from rev 144949, gtk3/trunk/filechooserdefault_do_not_unref_value_twice.patch)
  gtk3/repos/extra-i686/gtk3.install
    (from rev 144949, gtk3/trunk/gtk3.install)
  gtk3/repos/extra-i686/moveresize.patch
    (from rev 144949, gtk3/trunk/moveresize.patch)
  gtk3/repos/extra-i686/settings.ini
    (from rev 144949, gtk3/trunk/settings.ini)
  gtk3/repos/extra-x86_64/PKGBUILD
    (from rev 144949, gtk3/trunk/PKGBUILD)
  gtk3/repos/extra-x86_64/filechooserdefault_do_not_unref_value_twice.patch
    (from rev 144949, gtk3/trunk/filechooserdefault_do_not_unref_value_twice.patch)
  gtk3/repos/extra-x86_64/gtk3.install
    (from rev 144949, gtk3/trunk/gtk3.install)
  gtk3/repos/extra-x86_64/moveresize.patch
    (from rev 144949, gtk3/trunk/moveresize.patch)
  gtk3/repos/extra-x86_64/settings.ini
    (from rev 144949, gtk3/trunk/settings.ini)
Deleted:
  gtk3/repos/extra-i686/PKGBUILD
  gtk3/repos/extra-i686/filechooserdefault_do_not_unref_value_twice.patch
  gtk3/repos/extra-i686/gtk3.install
  gtk3/repos/extra-i686/settings.ini
  gtk3/repos/extra-x86_64/PKGBUILD
  gtk3/repos/extra-x86_64/filechooserdefault_do_not_unref_value_twice.patch
  gtk3/repos/extra-x86_64/gtk3.install
  gtk3/repos/extra-x86_64/settings.ini

----------------------------------------------------------------+
 extra-i686/PKGBUILD                                            |   85 +++++-----
 extra-i686/filechooserdefault_do_not_unref_value_twice.patch   |   48 ++---
 extra-i686/gtk3.install                                        |   30 +--
 extra-i686/moveresize.patch                                    |   47 +++++
 extra-i686/settings.ini                                        |    4 
 extra-x86_64/PKGBUILD                                          |   85 +++++-----
 extra-x86_64/filechooserdefault_do_not_unref_value_twice.patch |   48 ++---
 extra-x86_64/gtk3.install                                      |   30 +--
 extra-x86_64/moveresize.patch                                  |   47 +++++
 extra-x86_64/settings.ini                                      |    4 
 10 files changed, 264 insertions(+), 164 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-12-11 21:20:45 UTC (rev 144949)
+++ extra-i686/PKGBUILD	2011-12-11 21:22:27 UTC (rev 144950)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=gtk3
-pkgver=3.2.2
-pkgrel=3
-pkgdesc="GTK+ is a multi-platform toolkit (v3)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
-makedepends=('gobject-introspection')
-options=('!libtool' '!docs')
-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)
-sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            '0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6')
-
-build() {
-    cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/filechooserdefault_do_not_unref_value_twice.patch"
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --enable-gtk2-dependency \
-        --disable-schemas-compile
-    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-    make
-}
-
-package() {
-    cd "$srcdir/gtk+-$pkgver"
-    make DESTDIR="$pkgdir" install
-
-    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
-}

Copied: gtk3/repos/extra-i686/PKGBUILD (from rev 144949, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-12-11 21:22:27 UTC (rev 144950)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=gtk3
+pkgver=3.2.2
+pkgrel=4
+pkgdesc="GTK+ is a multi-platform toolkit (v3)"
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+install=gtk3.install
+depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
+makedepends=('gobject-introspection')
+options=('!libtool' '!docs')
+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')
+
+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 \
+        --enable-gtk2-dependency \
+        --disable-schemas-compile
+    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+    make
+}
+
+package() {
+    cd "$srcdir/gtk+-$pkgver"
+    make DESTDIR="$pkgdir" install
+
+    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
+}

Deleted: extra-i686/filechooserdefault_do_not_unref_value_twice.patch
===================================================================
--- extra-i686/filechooserdefault_do_not_unref_value_twice.patch	2011-12-11 21:20:45 UTC (rev 144949)
+++ extra-i686/filechooserdefault_do_not_unref_value_twice.patch	2011-12-11 21:22:27 UTC (rev 144950)
@@ -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

Copied: gtk3/repos/extra-i686/filechooserdefault_do_not_unref_value_twice.patch (from rev 144949, gtk3/trunk/filechooserdefault_do_not_unref_value_twice.patch)
===================================================================
--- extra-i686/filechooserdefault_do_not_unref_value_twice.patch	                        (rev 0)
+++ extra-i686/filechooserdefault_do_not_unref_value_twice.patch	2011-12-11 21:22:27 UTC (rev 144950)
@@ -0,0 +1,24 @@
+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: extra-i686/gtk3.install
===================================================================
--- extra-i686/gtk3.install	2011-12-11 21:20:45 UTC (rev 144949)
+++ extra-i686/gtk3.install	2011-12-11 21:22:27 UTC (rev 144950)
@@ -1,15 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-3.0 --update-cache
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-post_remove() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}

Copied: gtk3/repos/extra-i686/gtk3.install (from rev 144949, gtk3/trunk/gtk3.install)
===================================================================
--- extra-i686/gtk3.install	                        (rev 0)
+++ extra-i686/gtk3.install	2011-12-11 21:22:27 UTC (rev 144950)
@@ -0,0 +1,15 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
+post_remove() {
+    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}

Copied: gtk3/repos/extra-i686/moveresize.patch (from rev 144949, gtk3/trunk/moveresize.patch)
===================================================================
--- extra-i686/moveresize.patch	                        (rev 0)
+++ extra-i686/moveresize.patch	2011-12-11 21:22:27 UTC (rev 144950)
@@ -0,0 +1,47 @@
+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

Deleted: extra-i686/settings.ini
===================================================================
--- extra-i686/settings.ini	2011-12-11 21:20:45 UTC (rev 144949)
+++ extra-i686/settings.ini	2011-12-11 21:22:27 UTC (rev 144950)
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome

Copied: gtk3/repos/extra-i686/settings.ini (from rev 144949, gtk3/trunk/settings.ini)
===================================================================
--- extra-i686/settings.ini	                        (rev 0)
+++ extra-i686/settings.ini	2011-12-11 21:22:27 UTC (rev 144950)
@@ -0,0 +1,2 @@
+[Settings]
+gtk-fallback-icon-theme = gnome

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-12-11 21:20:45 UTC (rev 144949)
+++ extra-x86_64/PKGBUILD	2011-12-11 21:22:27 UTC (rev 144950)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=gtk3
-pkgver=3.2.2
-pkgrel=3
-pkgdesc="GTK+ is a multi-platform toolkit (v3)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
-makedepends=('gobject-introspection')
-options=('!libtool' '!docs')
-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)
-sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            '0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6')
-
-build() {
-    cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/filechooserdefault_do_not_unref_value_twice.patch"
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --enable-gtk2-dependency \
-        --disable-schemas-compile
-    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-    make
-}
-
-package() {
-    cd "$srcdir/gtk+-$pkgver"
-    make DESTDIR="$pkgdir" install
-
-    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
-}

Copied: gtk3/repos/extra-x86_64/PKGBUILD (from rev 144949, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-12-11 21:22:27 UTC (rev 144950)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=gtk3
+pkgver=3.2.2
+pkgrel=4
+pkgdesc="GTK+ is a multi-platform toolkit (v3)"
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+install=gtk3.install
+depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
+makedepends=('gobject-introspection')
+options=('!libtool' '!docs')
+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')
+
+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 \
+        --enable-gtk2-dependency \
+        --disable-schemas-compile
+    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+    make
+}
+
+package() {
+    cd "$srcdir/gtk+-$pkgver"
+    make DESTDIR="$pkgdir" install
+
+    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
+}

Deleted: extra-x86_64/filechooserdefault_do_not_unref_value_twice.patch
===================================================================
--- extra-x86_64/filechooserdefault_do_not_unref_value_twice.patch	2011-12-11 21:20:45 UTC (rev 144949)
+++ extra-x86_64/filechooserdefault_do_not_unref_value_twice.patch	2011-12-11 21:22:27 UTC (rev 144950)
@@ -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

Copied: gtk3/repos/extra-x86_64/filechooserdefault_do_not_unref_value_twice.patch (from rev 144949, gtk3/trunk/filechooserdefault_do_not_unref_value_twice.patch)
===================================================================
--- extra-x86_64/filechooserdefault_do_not_unref_value_twice.patch	                        (rev 0)
+++ extra-x86_64/filechooserdefault_do_not_unref_value_twice.patch	2011-12-11 21:22:27 UTC (rev 144950)
@@ -0,0 +1,24 @@
+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: extra-x86_64/gtk3.install
===================================================================
--- extra-x86_64/gtk3.install	2011-12-11 21:20:45 UTC (rev 144949)
+++ extra-x86_64/gtk3.install	2011-12-11 21:22:27 UTC (rev 144950)
@@ -1,15 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-3.0 --update-cache
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-post_remove() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}

Copied: gtk3/repos/extra-x86_64/gtk3.install (from rev 144949, gtk3/trunk/gtk3.install)
===================================================================
--- extra-x86_64/gtk3.install	                        (rev 0)
+++ extra-x86_64/gtk3.install	2011-12-11 21:22:27 UTC (rev 144950)
@@ -0,0 +1,15 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
+post_remove() {
+    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}

Copied: gtk3/repos/extra-x86_64/moveresize.patch (from rev 144949, gtk3/trunk/moveresize.patch)
===================================================================
--- extra-x86_64/moveresize.patch	                        (rev 0)
+++ extra-x86_64/moveresize.patch	2011-12-11 21:22:27 UTC (rev 144950)
@@ -0,0 +1,47 @@
+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

Deleted: extra-x86_64/settings.ini
===================================================================
--- extra-x86_64/settings.ini	2011-12-11 21:20:45 UTC (rev 144949)
+++ extra-x86_64/settings.ini	2011-12-11 21:22:27 UTC (rev 144950)
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome

Copied: gtk3/repos/extra-x86_64/settings.ini (from rev 144949, gtk3/trunk/settings.ini)
===================================================================
--- extra-x86_64/settings.ini	                        (rev 0)
+++ extra-x86_64/settings.ini	2011-12-11 21:22:27 UTC (rev 144950)
@@ -0,0 +1,2 @@
+[Settings]
+gtk-fallback-icon-theme = gnome




More information about the arch-commits mailing list