diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
| commit | 61b68fb9fca39dda7e4b48c5af9567dc60ea3dd2 (patch) | |
| tree | 6b8b6fb14ede5aae651e92f593252dba143cee74 /extra/gtk3 | |
| parent | ca998b4c054452abed4e01be1d2b28fee0ca904f (diff) | |
| parent | 5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/coq/PKGBUILD
community/ldns/PKGBUILD
community/luxrays/PKGBUILD
community/luxrender/PKGBUILD
community/nut/PKGBUILD
community/root/PKGBUILD
community/swi-prolog/PKGBUILD
community/vtk/PKGBUILD
community/wings3d/wings3d.sh
core/sqlite3/PKGBUILD
core/tzdata/PKGBUILD
extra/cmus/PKGBUILD
extra/dcron/PKGBUILD
extra/farsight2/PKGBUILD
extra/foomatic/PKGBUILD
extra/fwbuilder/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/ivtv-utils/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/koffice/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/openmpi/PKGBUILD
extra/telepathy-butterfly/PKGBUILD
extra/telepathy-farsight/PKGBUILD
extra/telepathy-kde-presence-dataengine/PKGBUILD
extra/telepathy-qt4/PKGBUILD
extra/xfce-utils/PKGBUILD
extra/xulrunner/PKGBUILD
multilib/lib32-zlib/PKGBUILD
staging/gimp-devel/gimp-devel.install
testing/gtk3/PKGBUILD
testing/php/PKGBUILD
~xihh/couchdb-git/couchdb.install
~xihh/couchdb-git/rc-script.patch
~xihh/gmime24/PKGBUILD
Diffstat (limited to 'extra/gtk3')
| -rw-r--r-- | extra/gtk3/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/gtk3/empty_grid.patch | 29 | ||||
| -rw-r--r-- | extra/gtk3/wacom.patch | 12 |
3 files changed, 23 insertions, 35 deletions
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index aaed4e8d5..af3455eb8 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156874 2012-04-23 09:08:04Z ibiru $ +# $Id: PKGBUILD 158335 2012-05-03 17:45:08Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.4.1 -pkgrel=1 +pkgver=3.4.2 +pkgrel=2 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -14,11 +14,16 @@ options=('!libtool') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz - settings.ini) -sha256sums=('0716b533de0ff2ffdec1076bb85c7a95e2b7b6ac9ece71e84625043ae3eb25f7' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + settings.ini wacom.patch) +sha256sums=('b1ab72bc61434418160ff0c7edfd93c74758ed8a35e2ed3d07e3e218c2705480' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') build() { cd "gtk+-$pkgver" + + # Partially revert BGO#673440 in order to fix BGO#674157 + patch -Np1 -i ../wacom.patch + CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtk3/empty_grid.patch b/extra/gtk3/empty_grid.patch deleted file mode 100644 index 45aefde47..000000000 --- a/extra/gtk3/empty_grid.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 97c1df4bb05966a4ce53b07271eff2f53284e235 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Fri, 21 Oct 2011 20:23:03 +0000 -Subject: Fix natural/min widht calculations for empty grids - -https://bugzilla.gnome.org/show_bug.cgi?id=660139 ---- -diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c -index a122ad4..78ae2ff 100644 ---- a/gtk/gtkgrid.c -+++ b/gtk/gtkgrid.c -@@ -927,8 +927,13 @@ gtk_grid_request_sum (GtkGridRequest *request, - linedata = &priv->linedata[orientation]; - lines = &request->lines[orientation]; - -- min = (nonempty - 1) * linedata->spacing; -- nat = (nonempty - 1) * linedata->spacing; -+ min = 0; -+ nat = 0; -+ if (nonempty > 0) -+ { -+ min = (nonempty - 1) * linedata->spacing; -+ nat = (nonempty - 1) * linedata->spacing; -+ } - - for (i = 0; i < lines->max - lines->min; i++) - { --- -cgit v0.9.0.2 diff --git a/extra/gtk3/wacom.patch b/extra/gtk3/wacom.patch new file mode 100644 index 000000000..79ad84fc6 --- /dev/null +++ b/extra/gtk3/wacom.patch @@ -0,0 +1,12 @@ +diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c +--- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c 2012-05-02 14:45:04.000000000 +0200 ++++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c 2012-05-03 18:34:18.034807644 +0200 +@@ -331,6 +331,8 @@ + input_source = GDK_SOURCE_ERASER; + else if (strstr (tmp_name, "cursor")) + input_source = GDK_SOURCE_CURSOR; ++ else if (strstr (tmp_name, "finger")) ++ input_source = GDK_SOURCE_TOUCHSCREEN; + else if (strstr (tmp_name, "wacom") || + strstr (tmp_name, "pen")) + input_source = GDK_SOURCE_PEN; |