Date: Tuesday, October 18, 2011 @ 02:32:41 Author: ibiru Revision: 140694
archrelease: copy trunk to testing-i686, testing-x86_64 Added: gtk2/repos/testing-i686/ gtk2/repos/testing-i686/PKGBUILD (from rev 140693, gtk2/trunk/PKGBUILD) gtk2/repos/testing-i686/gtk2.install (from rev 140693, gtk2/trunk/gtk2.install) gtk2/repos/testing-i686/xid-collision-debug.patch (from rev 140693, gtk2/trunk/xid-collision-debug.patch) gtk2/repos/testing-x86_64/ gtk2/repos/testing-x86_64/PKGBUILD (from rev 140693, gtk2/trunk/PKGBUILD) gtk2/repos/testing-x86_64/gtk2.install (from rev 140693, gtk2/trunk/gtk2.install) gtk2/repos/testing-x86_64/xid-collision-debug.patch (from rev 140693, gtk2/trunk/xid-collision-debug.patch) ------------------------------------------+ testing-i686/PKGBUILD | 55 +++++++++++++++++++++++++++++ testing-i686/gtk2.install | 16 ++++++++ testing-i686/xid-collision-debug.patch | 15 +++++++ testing-x86_64/PKGBUILD | 55 +++++++++++++++++++++++++++++ testing-x86_64/gtk2.install | 16 ++++++++ testing-x86_64/xid-collision-debug.patch | 15 +++++++ 6 files changed, 172 insertions(+) Copied: gtk2/repos/testing-i686/PKGBUILD (from rev 140693, gtk2/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2011-10-18 06:32:41 UTC (rev 140694) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=gtk2 +pkgname=('gtk2' 'gtk-update-icon-cache') +pkgver=2.24.7 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' + 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') +options=('!libtool' '!docs') +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz + xid-collision-debug.patch) +sha256sums=('1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') + +build() { + cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/xid-collision-debug.patch" + + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-xinput=yes + + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package_gtk2() { + pkgdesc="GTK+ is a multi-platform toolkit (v2)" + install=gtk2.install + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') + backup=(etc/gtk-2.0/gtkrc) + + cd "${srcdir}/gtk+-${pkgver}" + + make DESTDIR="${pkgdir}" install + sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert + echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" + #split this out to use with gtk3 too + rm ${pkgdir}/usr/bin/gtk-update-icon-cache +} +package_gtk-update-icon-cache() { + pkgdesc="The GTK+ update icon cache tool" + depends=('gdk-pixbuf2') + + cd "${srcdir}/gtk+-${pkgver}/gtk" + + install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache +} Copied: gtk2/repos/testing-i686/gtk2.install (from rev 140693, gtk2/trunk/gtk2.install) =================================================================== --- testing-i686/gtk2.install (rev 0) +++ testing-i686/gtk2.install 2011-10-18 06:32:41 UTC (rev 140694) @@ -0,0 +1,16 @@ +post_install() { + usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f etc/gtk-2.0/gtk.immodules &>/dev/null + rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null +} Copied: gtk2/repos/testing-i686/xid-collision-debug.patch (from rev 140693, gtk2/trunk/xid-collision-debug.patch) =================================================================== --- testing-i686/xid-collision-debug.patch (rev 0) +++ testing-i686/xid-collision-debug.patch 2011-10-18 06:32:41 UTC (rev 140694) @@ -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 140693, gtk2/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2011-10-18 06:32:41 UTC (rev 140694) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=gtk2 +pkgname=('gtk2' 'gtk-update-icon-cache') +pkgver=2.24.7 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' + 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') +options=('!libtool' '!docs') +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz + xid-collision-debug.patch) +sha256sums=('1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') + +build() { + cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/xid-collision-debug.patch" + + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-xinput=yes + + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package_gtk2() { + pkgdesc="GTK+ is a multi-platform toolkit (v2)" + install=gtk2.install + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') + backup=(etc/gtk-2.0/gtkrc) + + cd "${srcdir}/gtk+-${pkgver}" + + make DESTDIR="${pkgdir}" install + sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert + echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" + #split this out to use with gtk3 too + rm ${pkgdir}/usr/bin/gtk-update-icon-cache +} +package_gtk-update-icon-cache() { + pkgdesc="The GTK+ update icon cache tool" + depends=('gdk-pixbuf2') + + cd "${srcdir}/gtk+-${pkgver}/gtk" + + install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache +} Copied: gtk2/repos/testing-x86_64/gtk2.install (from rev 140693, gtk2/trunk/gtk2.install) =================================================================== --- testing-x86_64/gtk2.install (rev 0) +++ testing-x86_64/gtk2.install 2011-10-18 06:32:41 UTC (rev 140694) @@ -0,0 +1,16 @@ +post_install() { + usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f etc/gtk-2.0/gtk.immodules &>/dev/null + rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null +} Copied: gtk2/repos/testing-x86_64/xid-collision-debug.patch (from rev 140693, gtk2/trunk/xid-collision-debug.patch) =================================================================== --- testing-x86_64/xid-collision-debug.patch (rev 0) +++ testing-x86_64/xid-collision-debug.patch 2011-10-18 06:32:41 UTC (rev 140694) @@ -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); + } +