[arch-commits] Commit in gtk2/repos (12 files)
Jan de Groot
jgc at archlinux.org
Thu Jul 14 11:13:07 UTC 2016
Date: Thursday, July 14, 2016 @ 11:13:07
Author: jgc
Revision: 271855
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gtk2/repos/testing-i686/
gtk2/repos/testing-i686/PKGBUILD
(from rev 271854, gtk2/trunk/PKGBUILD)
gtk2/repos/testing-i686/gtk-query-immodules-2.0.hook
(from rev 271854, gtk2/trunk/gtk-query-immodules-2.0.hook)
gtk2/repos/testing-i686/gtk2.install
(from rev 271854, gtk2/trunk/gtk2.install)
gtk2/repos/testing-i686/gtkrc
(from rev 271854, gtk2/trunk/gtkrc)
gtk2/repos/testing-i686/xid-collision-debug.patch
(from rev 271854, gtk2/trunk/xid-collision-debug.patch)
gtk2/repos/testing-x86_64/
gtk2/repos/testing-x86_64/PKGBUILD
(from rev 271854, gtk2/trunk/PKGBUILD)
gtk2/repos/testing-x86_64/gtk-query-immodules-2.0.hook
(from rev 271854, gtk2/trunk/gtk-query-immodules-2.0.hook)
gtk2/repos/testing-x86_64/gtk2.install
(from rev 271854, gtk2/trunk/gtk2.install)
gtk2/repos/testing-x86_64/gtkrc
(from rev 271854, gtk2/trunk/gtkrc)
gtk2/repos/testing-x86_64/xid-collision-debug.patch
(from rev 271854, gtk2/trunk/xid-collision-debug.patch)
---------------------------------------------+
testing-i686/PKGBUILD | 65 ++++++++++++++++++++++++++
testing-i686/gtk-query-immodules-2.0.hook | 11 ++++
testing-i686/gtk2.install | 3 +
testing-i686/gtkrc | 3 +
testing-i686/xid-collision-debug.patch | 15 ++++++
testing-x86_64/PKGBUILD | 65 ++++++++++++++++++++++++++
testing-x86_64/gtk-query-immodules-2.0.hook | 11 ++++
testing-x86_64/gtk2.install | 3 +
testing-x86_64/gtkrc | 3 +
testing-x86_64/xid-collision-debug.patch | 15 ++++++
10 files changed, 194 insertions(+)
Copied: gtk2/repos/testing-i686/PKGBUILD (from rev 271854, gtk2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-07-14 11:13:07 UTC (rev 271855)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gtk2
+pkgver=2.24.30+95+g876b5f7
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
+ shared-mime-info cairo libcups gtk-update-icon-cache librsvg desktop-file-utils)
+makedepends=(gobject-introspection python2 git gtk-doc)
+optdepends=('gnome-themes-standard: Default widget theme'
+ 'adwaita-icon-theme: Default icon theme')
+license=(LGPL)
+install=gtk2.install
+_commit=876b5f75faab5d8f3c60c3ec035b2ecd4ac5b67e
+source=("git://git.gnome.org/gtk+#commit=$_commit"
+ gtkrc
+ gtk-query-immodules-2.0.hook
+ xid-collision-debug.patch)
+sha256sums=('SKIP'
+ 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
+ '9656a1efc798da1ac2dae94e921ed0f72719bd52d4d0138f305b993f778f7758'
+ 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+pkgver() {
+ cd gtk+
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd gtk+
+ patch -Np1 -i ../xid-collision-debug.patch
+ sed -i '1s/python$/&2/' gtk/gtk-builder-convert
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd gtk+
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-xinput=yes \
+ --enable-gtk-doc
+
+ # 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+
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 ../gtkrc "$pkgdir/usr/share/gtk-2.0/gtkrc"
+ install -Dm644 ../gtk-query-immodules-2.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-2.0.hook"
+
+ rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+ rm -r "$pkgdir/usr/share/gtk-doc"
+}
+
+# vim:set et sw=4:
Copied: gtk2/repos/testing-i686/gtk-query-immodules-2.0.hook (from rev 271854, gtk2/trunk/gtk-query-immodules-2.0.hook)
===================================================================
--- testing-i686/gtk-query-immodules-2.0.hook (rev 0)
+++ testing-i686/gtk-query-immodules-2.0.hook 2016-07-14 11:13:07 UTC (rev 271855)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-2.0/2.10.0/immodules/*.so
+
+[Action]
+Description = Probing GTK2 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-2.0 --update-cache
Copied: gtk2/repos/testing-i686/gtk2.install (from rev 271854, gtk2/trunk/gtk2.install)
===================================================================
--- testing-i686/gtk2.install (rev 0)
+++ testing-i686/gtk2.install 2016-07-14 11:13:07 UTC (rev 271855)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
+}
Copied: gtk2/repos/testing-i686/gtkrc (from rev 271854, gtk2/trunk/gtkrc)
===================================================================
--- testing-i686/gtkrc (rev 0)
+++ testing-i686/gtkrc 2016-07-14 11:13:07 UTC (rev 271855)
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "Adwaita"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"
Copied: gtk2/repos/testing-i686/xid-collision-debug.patch (from rev 271854, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- testing-i686/xid-collision-debug.patch (rev 0)
+++ testing-i686/xid-collision-debug.patch 2016-07-14 11:13:07 UTC (rev 271855)
@@ -0,0 +1,15 @@
+--- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200
++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200
+@@ -56,10 +56,10 @@
+ if (!display_x11->xid_ht)
+ display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+ (GEqualFunc) gdk_xid_equal);
+-
++/*
+ if (g_hash_table_lookup (display_x11->xid_ht, xid))
+ g_warning ("XID collision, trouble ahead");
+-
++*/
+ g_hash_table_insert (display_x11->xid_ht, xid, data);
+ }
+
Copied: gtk2/repos/testing-x86_64/PKGBUILD (from rev 271854, gtk2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-07-14 11:13:07 UTC (rev 271855)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gtk2
+pkgver=2.24.30+95+g876b5f7
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
+ shared-mime-info cairo libcups gtk-update-icon-cache librsvg desktop-file-utils)
+makedepends=(gobject-introspection python2 git gtk-doc)
+optdepends=('gnome-themes-standard: Default widget theme'
+ 'adwaita-icon-theme: Default icon theme')
+license=(LGPL)
+install=gtk2.install
+_commit=876b5f75faab5d8f3c60c3ec035b2ecd4ac5b67e
+source=("git://git.gnome.org/gtk+#commit=$_commit"
+ gtkrc
+ gtk-query-immodules-2.0.hook
+ xid-collision-debug.patch)
+sha256sums=('SKIP'
+ 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
+ '9656a1efc798da1ac2dae94e921ed0f72719bd52d4d0138f305b993f778f7758'
+ 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+pkgver() {
+ cd gtk+
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd gtk+
+ patch -Np1 -i ../xid-collision-debug.patch
+ sed -i '1s/python$/&2/' gtk/gtk-builder-convert
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd gtk+
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-xinput=yes \
+ --enable-gtk-doc
+
+ # 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+
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 ../gtkrc "$pkgdir/usr/share/gtk-2.0/gtkrc"
+ install -Dm644 ../gtk-query-immodules-2.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-2.0.hook"
+
+ rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+ rm -r "$pkgdir/usr/share/gtk-doc"
+}
+
+# vim:set et sw=4:
Copied: gtk2/repos/testing-x86_64/gtk-query-immodules-2.0.hook (from rev 271854, gtk2/trunk/gtk-query-immodules-2.0.hook)
===================================================================
--- testing-x86_64/gtk-query-immodules-2.0.hook (rev 0)
+++ testing-x86_64/gtk-query-immodules-2.0.hook 2016-07-14 11:13:07 UTC (rev 271855)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-2.0/2.10.0/immodules/*.so
+
+[Action]
+Description = Probing GTK2 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-2.0 --update-cache
Copied: gtk2/repos/testing-x86_64/gtk2.install (from rev 271854, gtk2/trunk/gtk2.install)
===================================================================
--- testing-x86_64/gtk2.install (rev 0)
+++ testing-x86_64/gtk2.install 2016-07-14 11:13:07 UTC (rev 271855)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
+}
Copied: gtk2/repos/testing-x86_64/gtkrc (from rev 271854, gtk2/trunk/gtkrc)
===================================================================
--- testing-x86_64/gtkrc (rev 0)
+++ testing-x86_64/gtkrc 2016-07-14 11:13:07 UTC (rev 271855)
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "Adwaita"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"
Copied: gtk2/repos/testing-x86_64/xid-collision-debug.patch (from rev 271854, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- testing-x86_64/xid-collision-debug.patch (rev 0)
+++ testing-x86_64/xid-collision-debug.patch 2016-07-14 11:13:07 UTC (rev 271855)
@@ -0,0 +1,15 @@
+--- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200
++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200
+@@ -56,10 +56,10 @@
+ if (!display_x11->xid_ht)
+ display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+ (GEqualFunc) gdk_xid_equal);
+-
++/*
+ if (g_hash_table_lookup (display_x11->xid_ht, xid))
+ g_warning ("XID collision, trouble ahead");
+-
++*/
+ g_hash_table_insert (display_x11->xid_ht, xid, data);
+ }
+
More information about the arch-commits
mailing list