[arch-commits] Commit in gtk2/repos (20 files)
Jan Steffens
heftig at nymeria.archlinux.org
Mon Sep 30 17:31:11 UTC 2013
Date: Monday, September 30, 2013 @ 19:31:09
Author: heftig
Revision: 195470
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gtk2/repos/testing-i686/PKGBUILD
(from rev 195469, gtk2/trunk/PKGBUILD)
gtk2/repos/testing-i686/gtk-update-icon-cache.install
(from rev 195469, gtk2/trunk/gtk-update-icon-cache.install)
gtk2/repos/testing-i686/gtk2.install
(from rev 195469, gtk2/trunk/gtk2.install)
gtk2/repos/testing-i686/gtkrc
(from rev 195469, gtk2/trunk/gtkrc)
gtk2/repos/testing-i686/gtkrc-fix.patch
(from rev 195469, gtk2/trunk/gtkrc-fix.patch)
gtk2/repos/testing-i686/xid-collision-debug.patch
(from rev 195469, gtk2/trunk/xid-collision-debug.patch)
gtk2/repos/testing-x86_64/PKGBUILD
(from rev 195469, gtk2/trunk/PKGBUILD)
gtk2/repos/testing-x86_64/gtk-update-icon-cache.install
(from rev 195469, gtk2/trunk/gtk-update-icon-cache.install)
gtk2/repos/testing-x86_64/gtk2.install
(from rev 195469, gtk2/trunk/gtk2.install)
gtk2/repos/testing-x86_64/gtkrc
(from rev 195469, gtk2/trunk/gtkrc)
gtk2/repos/testing-x86_64/gtkrc-fix.patch
(from rev 195469, gtk2/trunk/gtkrc-fix.patch)
gtk2/repos/testing-x86_64/xid-collision-debug.patch
(from rev 195469, gtk2/trunk/xid-collision-debug.patch)
Deleted:
gtk2/repos/testing-i686/PKGBUILD
gtk2/repos/testing-i686/gtk-update-icon-cache.install
gtk2/repos/testing-i686/gtk2.install
gtk2/repos/testing-i686/xid-collision-debug.patch
gtk2/repos/testing-x86_64/PKGBUILD
gtk2/repos/testing-x86_64/gtk-update-icon-cache.install
gtk2/repos/testing-x86_64/gtk2.install
gtk2/repos/testing-x86_64/xid-collision-debug.patch
----------------------------------------------+
/PKGBUILD | 134 +++++++++++++++++++++++++
/gtk-update-icon-cache.install | 6 +
/gtk2.install | 34 ++++++
/xid-collision-debug.patch | 30 +++++
testing-i686/PKGBUILD | 57 ----------
testing-i686/gtk-update-icon-cache.install | 3
testing-i686/gtk2.install | 17 ---
testing-i686/gtkrc | 3
testing-i686/gtkrc-fix.patch | 22 ++++
testing-i686/xid-collision-debug.patch | 15 --
testing-x86_64/PKGBUILD | 57 ----------
testing-x86_64/gtk-update-icon-cache.install | 3
testing-x86_64/gtk2.install | 17 ---
testing-x86_64/gtkrc | 3
testing-x86_64/gtkrc-fix.patch | 22 ++++
testing-x86_64/xid-collision-debug.patch | 15 --
16 files changed, 254 insertions(+), 184 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-09-30 17:16:14 UTC (rev 195469)
+++ testing-i686/PKGBUILD 2013-09-30 17:31:09 UTC (rev 195470)
@@ -1,57 +0,0 @@
-# $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/testing-i686/PKGBUILD (from rev 195469, gtk2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-09-30 17:31:09 UTC (rev 195470)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.21
+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')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+ gtkrc xid-collision-debug.patch gtkrc-fix.patch)
+sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3'
+ 'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
+ 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+ '4038c0f1ef4cc052e469858abe32eaa8afc8d4f540760f18ad132986e396604d')
+
+prepare() {
+ cd gtk+-$pkgver
+ patch -Np1 -i ../xid-collision-debug.patch
+ patch -Np1 -i ../gtkrc-fix.patch
+}
+
+build() {
+ cd gtk+-$pkgver
+
+ 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')
+ optdepends=('gnome-themes-standard: Default widget theme'
+ 'gnome-icon-theme: Default icon theme')
+ replaces=('gtk2-docs')
+
+ cd gtk+-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+
+ install -Dm644 "$srcdir/gtkrc" "$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"
+}
Deleted: testing-i686/gtk-update-icon-cache.install
===================================================================
--- testing-i686/gtk-update-icon-cache.install 2013-09-30 17:16:14 UTC (rev 195469)
+++ testing-i686/gtk-update-icon-cache.install 2013-09-30 17:31:09 UTC (rev 195470)
@@ -1,3 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
Copied: gtk2/repos/testing-i686/gtk-update-icon-cache.install (from rev 195469, gtk2/trunk/gtk-update-icon-cache.install)
===================================================================
--- testing-i686/gtk-update-icon-cache.install (rev 0)
+++ testing-i686/gtk-update-icon-cache.install 2013-09-30 17:31:09 UTC (rev 195470)
@@ -0,0 +1,3 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Deleted: testing-i686/gtk2.install
===================================================================
--- testing-i686/gtk2.install 2013-09-30 17:16:14 UTC (rev 195469)
+++ testing-i686/gtk2.install 2013-09-30 17:31:09 UTC (rev 195470)
@@ -1,17 +0,0 @@
-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/testing-i686/gtk2.install (from rev 195469, gtk2/trunk/gtk2.install)
===================================================================
--- testing-i686/gtk2.install (rev 0)
+++ testing-i686/gtk2.install 2013-09-30 17:31:09 UTC (rev 195470)
@@ -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/testing-i686/gtkrc (from rev 195469, gtk2/trunk/gtkrc)
===================================================================
--- testing-i686/gtkrc (rev 0)
+++ testing-i686/gtkrc 2013-09-30 17:31:09 UTC (rev 195470)
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "gnome"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"
Copied: gtk2/repos/testing-i686/gtkrc-fix.patch (from rev 195469, gtk2/trunk/gtkrc-fix.patch)
===================================================================
--- testing-i686/gtkrc-fix.patch (rev 0)
+++ testing-i686/gtkrc-fix.patch 2013-09-30 17:31:09 UTC (rev 195470)
@@ -0,0 +1,22 @@
+From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Mon, 30 Sep 2013 16:50:34 +0000
+Subject: Actually look in /usr/share/gtk-2.0 for default rc files
+
+I managed to forget the 'share' component of the path.
+---
+diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
+index b1f68e2..50b2563 100644
+--- a/gtk/gtkrc.c
++++ b/gtk/gtkrc.c
+@@ -525,7 +525,7 @@ gtk_rc_add_initial_default_files (void)
+ const gchar * const *config_dirs;
+ const gchar *config_dir;
+
+- str = g_build_filename (GTK_DATA_PREFIX, "gtk-2.0", "gtkrc", NULL);
++ str = g_build_filename (GTK_DATA_PREFIX, "share", "gtk-2.0", "gtkrc", NULL);
+ gtk_rc_add_default_file (str);
+ g_free (str);
+
+--
+cgit v0.9.2
Deleted: testing-i686/xid-collision-debug.patch
===================================================================
--- testing-i686/xid-collision-debug.patch 2013-09-30 17:16:14 UTC (rev 195469)
+++ testing-i686/xid-collision-debug.patch 2013-09-30 17:31:09 UTC (rev 195470)
@@ -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/testing-i686/xid-collision-debug.patch (from rev 195469, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- testing-i686/xid-collision-debug.patch (rev 0)
+++ testing-i686/xid-collision-debug.patch 2013-09-30 17:31:09 UTC (rev 195470)
@@ -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: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-09-30 17:16:14 UTC (rev 195469)
+++ testing-x86_64/PKGBUILD 2013-09-30 17:31:09 UTC (rev 195470)
@@ -1,57 +0,0 @@
-# $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/testing-x86_64/PKGBUILD (from rev 195469, gtk2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-09-30 17:31:09 UTC (rev 195470)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.21
+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')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+ gtkrc xid-collision-debug.patch gtkrc-fix.patch)
+sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3'
+ 'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
+ 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+ '4038c0f1ef4cc052e469858abe32eaa8afc8d4f540760f18ad132986e396604d')
+
+prepare() {
+ cd gtk+-$pkgver
+ patch -Np1 -i ../xid-collision-debug.patch
+ patch -Np1 -i ../gtkrc-fix.patch
+}
+
+build() {
+ cd gtk+-$pkgver
+
+ 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')
+ optdepends=('gnome-themes-standard: Default widget theme'
+ 'gnome-icon-theme: Default icon theme')
+ replaces=('gtk2-docs')
+
+ cd gtk+-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+
+ install -Dm644 "$srcdir/gtkrc" "$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"
+}
Deleted: testing-x86_64/gtk-update-icon-cache.install
===================================================================
--- testing-x86_64/gtk-update-icon-cache.install 2013-09-30 17:16:14 UTC (rev 195469)
+++ testing-x86_64/gtk-update-icon-cache.install 2013-09-30 17:31:09 UTC (rev 195470)
@@ -1,3 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
Copied: gtk2/repos/testing-x86_64/gtk-update-icon-cache.install (from rev 195469, gtk2/trunk/gtk-update-icon-cache.install)
===================================================================
--- testing-x86_64/gtk-update-icon-cache.install (rev 0)
+++ testing-x86_64/gtk-update-icon-cache.install 2013-09-30 17:31:09 UTC (rev 195470)
@@ -0,0 +1,3 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Deleted: testing-x86_64/gtk2.install
===================================================================
--- testing-x86_64/gtk2.install 2013-09-30 17:16:14 UTC (rev 195469)
+++ testing-x86_64/gtk2.install 2013-09-30 17:31:09 UTC (rev 195470)
@@ -1,17 +0,0 @@
-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/testing-x86_64/gtk2.install (from rev 195469, gtk2/trunk/gtk2.install)
===================================================================
--- testing-x86_64/gtk2.install (rev 0)
+++ testing-x86_64/gtk2.install 2013-09-30 17:31:09 UTC (rev 195470)
@@ -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/testing-x86_64/gtkrc (from rev 195469, gtk2/trunk/gtkrc)
===================================================================
--- testing-x86_64/gtkrc (rev 0)
+++ testing-x86_64/gtkrc 2013-09-30 17:31:09 UTC (rev 195470)
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "gnome"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"
Copied: gtk2/repos/testing-x86_64/gtkrc-fix.patch (from rev 195469, gtk2/trunk/gtkrc-fix.patch)
===================================================================
--- testing-x86_64/gtkrc-fix.patch (rev 0)
+++ testing-x86_64/gtkrc-fix.patch 2013-09-30 17:31:09 UTC (rev 195470)
@@ -0,0 +1,22 @@
+From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Mon, 30 Sep 2013 16:50:34 +0000
+Subject: Actually look in /usr/share/gtk-2.0 for default rc files
+
+I managed to forget the 'share' component of the path.
+---
+diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
+index b1f68e2..50b2563 100644
+--- a/gtk/gtkrc.c
++++ b/gtk/gtkrc.c
+@@ -525,7 +525,7 @@ gtk_rc_add_initial_default_files (void)
+ const gchar * const *config_dirs;
+ const gchar *config_dir;
+
+- str = g_build_filename (GTK_DATA_PREFIX, "gtk-2.0", "gtkrc", NULL);
++ str = g_build_filename (GTK_DATA_PREFIX, "share", "gtk-2.0", "gtkrc", NULL);
+ gtk_rc_add_default_file (str);
+ g_free (str);
+
+--
+cgit v0.9.2
Deleted: testing-x86_64/xid-collision-debug.patch
===================================================================
--- testing-x86_64/xid-collision-debug.patch 2013-09-30 17:16:14 UTC (rev 195469)
+++ testing-x86_64/xid-collision-debug.patch 2013-09-30 17:31:09 UTC (rev 195470)
@@ -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/testing-x86_64/xid-collision-debug.patch (from rev 195469, gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- testing-x86_64/xid-collision-debug.patch (rev 0)
+++ testing-x86_64/xid-collision-debug.patch 2013-09-30 17:31:09 UTC (rev 195470)
@@ -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