[arch-commits] Commit in gtk3/repos (14 files)
Jan Steffens
heftig at archlinux.org
Thu May 3 17:45:08 UTC 2012
Date: Thursday, May 3, 2012 @ 13:45:08
Author: heftig
Revision: 158335
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gtk3/repos/extra-i686/PKGBUILD
(from rev 158334, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-i686/gtk3.install
(from rev 158334, gtk3/trunk/gtk3.install)
gtk3/repos/extra-i686/settings.ini
(from rev 158334, gtk3/trunk/settings.ini)
gtk3/repos/extra-i686/wacom.patch
(from rev 158334, gtk3/trunk/wacom.patch)
gtk3/repos/extra-x86_64/PKGBUILD
(from rev 158334, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-x86_64/gtk3.install
(from rev 158334, gtk3/trunk/gtk3.install)
gtk3/repos/extra-x86_64/settings.ini
(from rev 158334, gtk3/trunk/settings.ini)
gtk3/repos/extra-x86_64/wacom.patch
(from rev 158334, gtk3/trunk/wacom.patch)
Deleted:
gtk3/repos/extra-i686/PKGBUILD
gtk3/repos/extra-i686/gtk3.install
gtk3/repos/extra-i686/settings.ini
gtk3/repos/extra-x86_64/PKGBUILD
gtk3/repos/extra-x86_64/gtk3.install
gtk3/repos/extra-x86_64/settings.ini
---------------------------+
extra-i686/PKGBUILD | 79 +++++++++++++++++++++++---------------------
extra-i686/gtk3.install | 32 ++++++++---------
extra-i686/settings.ini | 4 +-
extra-i686/wacom.patch | 12 ++++++
extra-x86_64/PKGBUILD | 79 +++++++++++++++++++++++---------------------
extra-x86_64/gtk3.install | 32 ++++++++---------
extra-x86_64/settings.ini | 4 +-
extra-x86_64/wacom.patch | 12 ++++++
8 files changed, 144 insertions(+), 110 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-05-03 17:43:41 UTC (rev 158334)
+++ extra-i686/PKGBUILD 2012-05-03 17:45:08 UTC (rev 158335)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=gtk3
-pkgver=3.4.1
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI 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')
-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')
-build() {
- cd "gtk+-$pkgver"
- 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 "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 158334, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-05-03 17:45:08 UTC (rev 158335)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=gtk3
+pkgver=3.4.2
+pkgrel=2
+pkgdesc="GObject-based multi-platform GUI 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')
+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 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 \
+ --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 "gtk+-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
+}
Deleted: extra-i686/gtk3.install
===================================================================
--- extra-i686/gtk3.install 2012-05-03 17:43:41 UTC (rev 158334)
+++ extra-i686/gtk3.install 2012-05-03 17:45:08 UTC (rev 158335)
@@ -1,16 +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 158334, gtk3/trunk/gtk3.install)
===================================================================
--- extra-i686/gtk3.install (rev 0)
+++ extra-i686/gtk3.install 2012-05-03 17:45:08 UTC (rev 158335)
@@ -0,0 +1,16 @@
+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
+}
Deleted: extra-i686/settings.ini
===================================================================
--- extra-i686/settings.ini 2012-05-03 17:43:41 UTC (rev 158334)
+++ extra-i686/settings.ini 2012-05-03 17:45:08 UTC (rev 158335)
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome
Copied: gtk3/repos/extra-i686/settings.ini (from rev 158334, gtk3/trunk/settings.ini)
===================================================================
--- extra-i686/settings.ini (rev 0)
+++ extra-i686/settings.ini 2012-05-03 17:45:08 UTC (rev 158335)
@@ -0,0 +1,2 @@
+[Settings]
+gtk-fallback-icon-theme = gnome
Copied: gtk3/repos/extra-i686/wacom.patch (from rev 158334, gtk3/trunk/wacom.patch)
===================================================================
--- extra-i686/wacom.patch (rev 0)
+++ extra-i686/wacom.patch 2012-05-03 17:45:08 UTC (rev 158335)
@@ -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;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-05-03 17:43:41 UTC (rev 158334)
+++ extra-x86_64/PKGBUILD 2012-05-03 17:45:08 UTC (rev 158335)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=gtk3
-pkgver=3.4.1
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI 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')
-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')
-build() {
- cd "gtk+-$pkgver"
- 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 "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 158334, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-05-03 17:45:08 UTC (rev 158335)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=gtk3
+pkgver=3.4.2
+pkgrel=2
+pkgdesc="GObject-based multi-platform GUI 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')
+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 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 \
+ --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 "gtk+-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
+}
Deleted: extra-x86_64/gtk3.install
===================================================================
--- extra-x86_64/gtk3.install 2012-05-03 17:43:41 UTC (rev 158334)
+++ extra-x86_64/gtk3.install 2012-05-03 17:45:08 UTC (rev 158335)
@@ -1,16 +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 158334, gtk3/trunk/gtk3.install)
===================================================================
--- extra-x86_64/gtk3.install (rev 0)
+++ extra-x86_64/gtk3.install 2012-05-03 17:45:08 UTC (rev 158335)
@@ -0,0 +1,16 @@
+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
+}
Deleted: extra-x86_64/settings.ini
===================================================================
--- extra-x86_64/settings.ini 2012-05-03 17:43:41 UTC (rev 158334)
+++ extra-x86_64/settings.ini 2012-05-03 17:45:08 UTC (rev 158335)
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome
Copied: gtk3/repos/extra-x86_64/settings.ini (from rev 158334, gtk3/trunk/settings.ini)
===================================================================
--- extra-x86_64/settings.ini (rev 0)
+++ extra-x86_64/settings.ini 2012-05-03 17:45:08 UTC (rev 158335)
@@ -0,0 +1,2 @@
+[Settings]
+gtk-fallback-icon-theme = gnome
Copied: gtk3/repos/extra-x86_64/wacom.patch (from rev 158334, gtk3/trunk/wacom.patch)
===================================================================
--- extra-x86_64/wacom.patch (rev 0)
+++ extra-x86_64/wacom.patch 2012-05-03 17:45:08 UTC (rev 158335)
@@ -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;
More information about the arch-commits
mailing list