[arch-commits] Commit in gtk2/repos (10 files)
Jan Steffens
heftig at nymeria.archlinux.org
Tue Sep 24 11:03:14 UTC 2013
Date: Tuesday, September 24, 2013 @ 13:03:13
Author: heftig
Revision: 194968
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
gtk2/repos/gnome-unstable-i686/
gtk2/repos/gnome-unstable-i686/PKGBUILD
(from rev 194967, gtk2/trunk/PKGBUILD)
gtk2/repos/gnome-unstable-i686/gtk-update-icon-cache.install
(from rev 194967, gtk2/trunk/gtk-update-icon-cache.install)
gtk2/repos/gnome-unstable-i686/gtk2.install
(from rev 194967, gtk2/trunk/gtk2.install)
gtk2/repos/gnome-unstable-i686/xid-collision-debug.patch
(from rev 194967, gtk2/trunk/xid-collision-debug.patch)
gtk2/repos/gnome-unstable-x86_64/
gtk2/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 194967, gtk2/trunk/PKGBUILD)
gtk2/repos/gnome-unstable-x86_64/gtk-update-icon-cache.install
(from rev 194967, gtk2/trunk/gtk-update-icon-cache.install)
gtk2/repos/gnome-unstable-x86_64/gtk2.install
(from rev 194967, gtk2/trunk/gtk2.install)
gtk2/repos/gnome-unstable-x86_64/xid-collision-debug.patch
(from rev 194967, gtk2/trunk/xid-collision-debug.patch)
-----------------------------------------------------+
gnome-unstable-i686/PKGBUILD | 57 ++++++++++++++++++
gnome-unstable-i686/gtk-update-icon-cache.install | 3
gnome-unstable-i686/gtk2.install | 17 +++++
gnome-unstable-i686/xid-collision-debug.patch | 15 ++++
gnome-unstable-x86_64/PKGBUILD | 57 ++++++++++++++++++
gnome-unstable-x86_64/gtk-update-icon-cache.install | 3
gnome-unstable-x86_64/gtk2.install | 17 +++++
gnome-unstable-x86_64/xid-collision-debug.patch | 15 ++++
8 files changed, 184 insertions(+)
Copied: gtk2/repos/gnome-unstable-i686/PKGBUILD (from rev 194967, gtk2/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2013-09-24 11:03:13 UTC (rev 194968)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.21
+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')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+ xid-collision-debug.patch)
+sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3'
+ 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+build() {
+ cd gtk+-$pkgver
+ patch -Np1 -i ../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')
+ replaces=('gtk2-docs')
+
+ cd gtk+-$pkgver
+
+ make DESTDIR="$pkgdir" install
+ sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+ mkdir -p "$pkgdir/usr/share/gtk-2.0"
+ echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/usr/share/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>=2.24.1-3' 'hicolor-icon-theme')
+ install=gtk-update-icon-cache.install
+
+ cd gtk+-$pkgver/gtk
+
+ install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
+}
Copied: gtk2/repos/gnome-unstable-i686/gtk-update-icon-cache.install (from rev 194967, gtk2/trunk/gtk-update-icon-cache.install)
===================================================================
--- gnome-unstable-i686/gtk-update-icon-cache.install (rev 0)
+++ gnome-unstable-i686/gtk-update-icon-cache.install 2013-09-24 11:03:13 UTC (rev 194968)
@@ -0,0 +1,3 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Copied: gtk2/repos/gnome-unstable-i686/gtk2.install (from rev 194967, gtk2/trunk/gtk2.install)
===================================================================
--- gnome-unstable-i686/gtk2.install (rev 0)
+++ gnome-unstable-i686/gtk2.install 2013-09-24 11:03:13 UTC (rev 194968)
@@ -0,0 +1,17 @@
+post_install() {
+ /usr/bin/gtk-query-immodules-2.0 --update-cache
+}
+
+pre_upgrade() {
+ if (( $(vercmp $2 2.24.20) < 0 )); then
+ rm -f /etc/gtk-2.0/gtk.immodules
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
+}
Copied: gtk2/repos/gnome-unstable-i686/xid-collision-debug.patch (from rev 194967, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- gnome-unstable-i686/xid-collision-debug.patch (rev 0)
+++ gnome-unstable-i686/xid-collision-debug.patch 2013-09-24 11:03:13 UTC (rev 194968)
@@ -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/gnome-unstable-x86_64/PKGBUILD (from rev 194967, gtk2/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2013-09-24 11:03:13 UTC (rev 194968)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.21
+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')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+ xid-collision-debug.patch)
+sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3'
+ 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+build() {
+ cd gtk+-$pkgver
+ patch -Np1 -i ../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')
+ replaces=('gtk2-docs')
+
+ cd gtk+-$pkgver
+
+ make DESTDIR="$pkgdir" install
+ sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+ mkdir -p "$pkgdir/usr/share/gtk-2.0"
+ echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/usr/share/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>=2.24.1-3' 'hicolor-icon-theme')
+ install=gtk-update-icon-cache.install
+
+ cd gtk+-$pkgver/gtk
+
+ install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
+}
Copied: gtk2/repos/gnome-unstable-x86_64/gtk-update-icon-cache.install (from rev 194967, gtk2/trunk/gtk-update-icon-cache.install)
===================================================================
--- gnome-unstable-x86_64/gtk-update-icon-cache.install (rev 0)
+++ gnome-unstable-x86_64/gtk-update-icon-cache.install 2013-09-24 11:03:13 UTC (rev 194968)
@@ -0,0 +1,3 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Copied: gtk2/repos/gnome-unstable-x86_64/gtk2.install (from rev 194967, gtk2/trunk/gtk2.install)
===================================================================
--- gnome-unstable-x86_64/gtk2.install (rev 0)
+++ gnome-unstable-x86_64/gtk2.install 2013-09-24 11:03:13 UTC (rev 194968)
@@ -0,0 +1,17 @@
+post_install() {
+ /usr/bin/gtk-query-immodules-2.0 --update-cache
+}
+
+pre_upgrade() {
+ if (( $(vercmp $2 2.24.20) < 0 )); then
+ rm -f /etc/gtk-2.0/gtk.immodules
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
+}
Copied: gtk2/repos/gnome-unstable-x86_64/xid-collision-debug.patch (from rev 194967, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- gnome-unstable-x86_64/xid-collision-debug.patch (rev 0)
+++ gnome-unstable-x86_64/xid-collision-debug.patch 2013-09-24 11:03:13 UTC (rev 194968)
@@ -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