Date: Wednesday, January 25, 2012 @ 10:45:40 Author: ibiru Revision: 147271
archrelease: copy trunk to extra-i686, extra-x86_64 Added: gtk2/repos/extra-i686/PKGBUILD (from rev 147270, gtk2/trunk/PKGBUILD) gtk2/repos/extra-i686/gtk2.install (from rev 147270, gtk2/trunk/gtk2.install) gtk2/repos/extra-i686/xid-collision-debug.patch (from rev 147270, gtk2/trunk/xid-collision-debug.patch) gtk2/repos/extra-x86_64/PKGBUILD (from rev 147270, gtk2/trunk/PKGBUILD) gtk2/repos/extra-x86_64/gtk2.install (from rev 147270, gtk2/trunk/gtk2.install) gtk2/repos/extra-x86_64/xid-collision-debug.patch (from rev 147270, gtk2/trunk/xid-collision-debug.patch) Deleted: gtk2/repos/extra-i686/PKGBUILD gtk2/repos/extra-i686/gtk2.install gtk2/repos/extra-i686/revert-iconview.patch gtk2/repos/extra-i686/xid-collision-debug.patch gtk2/repos/extra-x86_64/PKGBUILD gtk2/repos/extra-x86_64/gtk2.install gtk2/repos/extra-x86_64/revert-iconview.patch gtk2/repos/extra-x86_64/xid-collision-debug.patch ----------------------------------------+ extra-i686/PKGBUILD | 113 +++++++++++++++---------------- extra-i686/gtk2.install | 32 ++++---- extra-i686/revert-iconview.patch | 30 -------- extra-i686/xid-collision-debug.patch | 30 ++++---- extra-x86_64/PKGBUILD | 113 +++++++++++++++---------------- extra-x86_64/gtk2.install | 32 ++++---- extra-x86_64/revert-iconview.patch | 30 -------- extra-x86_64/xid-collision-debug.patch | 30 ++++---- 8 files changed, 172 insertions(+), 238 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-01-25 15:42:18 UTC (rev 147270) +++ extra-i686/PKGBUILD 2012-01-25 15:45:40 UTC (rev 147271) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgbase=gtk2 -pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.8 -pkgrel=2 -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 - revert-iconview.patch) -sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '517b3d0797b27324b8fa042ce4b653334ff3b55e48b921de3485505b9ca99fba') - -build() { - cd "$srcdir/gtk+-$pkgver" - patch -Np1 -i "$srcdir/xid-collision-debug.patch" - patch -Np1 -i "$srcdir/revert-iconview.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/extra-i686/PKGBUILD (from rev 147270, gtk2/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-01-25 15:45:40 UTC (rev 147271) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=gtk2 +pkgname=('gtk2' 'gtk-update-icon-cache') +pkgver=2.24.9 +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=('84204bf24cac739fd979943127e7b29cb46b1017684aa24dce630faa01bcb61d' + '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 +} Deleted: extra-i686/gtk2.install =================================================================== --- extra-i686/gtk2.install 2012-01-25 15:42:18 UTC (rev 147270) +++ extra-i686/gtk2.install 2012-01-25 15:45:40 UTC (rev 147271) @@ -1,16 +0,0 @@ -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/extra-i686/gtk2.install (from rev 147270, gtk2/trunk/gtk2.install) =================================================================== --- extra-i686/gtk2.install (rev 0) +++ extra-i686/gtk2.install 2012-01-25 15:45:40 UTC (rev 147271) @@ -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 +} Deleted: extra-i686/revert-iconview.patch =================================================================== --- extra-i686/revert-iconview.patch 2012-01-25 15:42:18 UTC (rev 147270) +++ extra-i686/revert-iconview.patch 2012-01-25 15:45:40 UTC (rev 147271) @@ -1,30 +0,0 @@ -From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cosi...@gnome.org> -Date: Wed, 16 Nov 2011 22:38:45 +0000 -Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel" - -It makes GtkIconView segfault on GTK 2.24. - -gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if -there's a layout queued anyway, so we wouldn't end up in the same -situation causing the crash the original patch is supposed to fix. - -This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1. - -https://bugzilla.gnome.org/show_bug.cgi?id=663138 ---- -diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c -index 62877fa..54b3f3b 100644 ---- a/gtk/gtkiconview.c -+++ b/gtk/gtkiconview.c -@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view, - - gtk_icon_view_build_items (icon_view); - -- gtk_icon_view_layout (icon_view); -+ gtk_icon_view_queue_layout (icon_view); - } - - g_object_notify (G_OBJECT (icon_view), "model"); --- -cgit v0.9.0.2 Deleted: extra-i686/xid-collision-debug.patch =================================================================== --- extra-i686/xid-collision-debug.patch 2012-01-25 15:42:18 UTC (rev 147270) +++ extra-i686/xid-collision-debug.patch 2012-01-25 15:45:40 UTC (rev 147271) @@ -1,15 +0,0 @@ ---- 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/extra-i686/xid-collision-debug.patch (from rev 147270, gtk2/trunk/xid-collision-debug.patch) =================================================================== --- extra-i686/xid-collision-debug.patch (rev 0) +++ extra-i686/xid-collision-debug.patch 2012-01-25 15:45:40 UTC (rev 147271) @@ -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); + } + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-01-25 15:42:18 UTC (rev 147270) +++ extra-x86_64/PKGBUILD 2012-01-25 15:45:40 UTC (rev 147271) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgbase=gtk2 -pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.8 -pkgrel=2 -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 - revert-iconview.patch) -sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '517b3d0797b27324b8fa042ce4b653334ff3b55e48b921de3485505b9ca99fba') - -build() { - cd "$srcdir/gtk+-$pkgver" - patch -Np1 -i "$srcdir/xid-collision-debug.patch" - patch -Np1 -i "$srcdir/revert-iconview.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/extra-x86_64/PKGBUILD (from rev 147270, gtk2/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-01-25 15:45:40 UTC (rev 147271) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgbase=gtk2 +pkgname=('gtk2' 'gtk-update-icon-cache') +pkgver=2.24.9 +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=('84204bf24cac739fd979943127e7b29cb46b1017684aa24dce630faa01bcb61d' + '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 +} Deleted: extra-x86_64/gtk2.install =================================================================== --- extra-x86_64/gtk2.install 2012-01-25 15:42:18 UTC (rev 147270) +++ extra-x86_64/gtk2.install 2012-01-25 15:45:40 UTC (rev 147271) @@ -1,16 +0,0 @@ -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/extra-x86_64/gtk2.install (from rev 147270, gtk2/trunk/gtk2.install) =================================================================== --- extra-x86_64/gtk2.install (rev 0) +++ extra-x86_64/gtk2.install 2012-01-25 15:45:40 UTC (rev 147271) @@ -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 +} Deleted: extra-x86_64/revert-iconview.patch =================================================================== --- extra-x86_64/revert-iconview.patch 2012-01-25 15:42:18 UTC (rev 147270) +++ extra-x86_64/revert-iconview.patch 2012-01-25 15:45:40 UTC (rev 147271) @@ -1,30 +0,0 @@ -From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cosi...@gnome.org> -Date: Wed, 16 Nov 2011 22:38:45 +0000 -Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel" - -It makes GtkIconView segfault on GTK 2.24. - -gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if -there's a layout queued anyway, so we wouldn't end up in the same -situation causing the crash the original patch is supposed to fix. - -This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1. - -https://bugzilla.gnome.org/show_bug.cgi?id=663138 ---- -diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c -index 62877fa..54b3f3b 100644 ---- a/gtk/gtkiconview.c -+++ b/gtk/gtkiconview.c -@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view, - - gtk_icon_view_build_items (icon_view); - -- gtk_icon_view_layout (icon_view); -+ gtk_icon_view_queue_layout (icon_view); - } - - g_object_notify (G_OBJECT (icon_view), "model"); --- -cgit v0.9.0.2 Deleted: extra-x86_64/xid-collision-debug.patch =================================================================== --- extra-x86_64/xid-collision-debug.patch 2012-01-25 15:42:18 UTC (rev 147270) +++ extra-x86_64/xid-collision-debug.patch 2012-01-25 15:45:40 UTC (rev 147271) @@ -1,15 +0,0 @@ ---- 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/extra-x86_64/xid-collision-debug.patch (from rev 147270, gtk2/trunk/xid-collision-debug.patch) =================================================================== --- extra-x86_64/xid-collision-debug.patch (rev 0) +++ extra-x86_64/xid-collision-debug.patch 2012-01-25 15:45:40 UTC (rev 147271) @@ -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); + } +