[arch-commits] Commit in lib32-gtk2/trunk (PKGBUILD gtk-modules-32.patch gtk2.install)
Florian Pritz
bluewind at nymeria.archlinux.org
Sun Jul 7 16:05:36 UTC 2013
Date: Sunday, July 7, 2013 @ 18:05:35
Author: bluewind
Revision: 93622
upgpkg: lib32-gtk2 2.24.20-1
upstream update
Modified:
lib32-gtk2/trunk/PKGBUILD
lib32-gtk2/trunk/gtk2.install
Deleted:
lib32-gtk2/trunk/gtk-modules-32.patch
----------------------+
PKGBUILD | 12 +++++-------
gtk-modules-32.patch | 12 ------------
gtk2.install | 11 ++++++-----
3 files changed, 11 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-07 15:50:25 UTC (rev 93621)
+++ PKGBUILD 2013-07-07 16:05:35 UTC (rev 93622)
@@ -5,7 +5,7 @@
_pkgbasename=gtk2
pkgname=lib32-$_pkgbasename
-pkgver=2.24.19
+pkgver=2.24.20
pkgrel=1
pkgdesc="The GTK+ Toolkit (v2) (32-bit)"
arch=('x86_64')
@@ -18,17 +18,15 @@
options=('!libtool' '!docs')
license=('LGPL')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
- xid-collision-debug.patch
- gtk-modules-32.patch)
-sha256sums=('15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8'
- 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
- '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0')
+ xid-collision-debug.patch)
+sha256sums=('cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3'
+'d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
prepare() {
cd "${srcdir}/gtk+-${pkgver}"
patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
- patch -p1 -i ${srcdir}/gtk-modules-32.patch
+ sed -i 's#"immomodules.cache"#"immomodules.cache-32"#' gtk/gtkrc.c
}
build() {
Deleted: gtk-modules-32.patch
===================================================================
--- gtk-modules-32.patch 2013-07-07 15:50:25 UTC (rev 93621)
+++ gtk-modules-32.patch 2013-07-07 16:05:35 UTC (rev 93622)
@@ -1,12 +0,0 @@
-diff -ur gtk+-2.20.1/gtk/gtkrc.c gtk+-2.20.1-32/gtk/gtkrc.c
---- gtk+-2.20.1/gtk/gtkrc.c 2010-05-03 01:28:21.000000000 +0200
-+++ gtk+-2.20.1-32/gtk/gtkrc.c 2010-08-26 07:22:42.316920033 +0200
-@@ -450,7 +450,7 @@
- if (im_module_file)
- result = g_strdup (im_module_file);
- else
-- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-32", NULL);
- }
-
- return result;
Modified: gtk2.install
===================================================================
--- gtk2.install 2013-07-07 15:50:25 UTC (rev 93621)
+++ gtk2.install 2013-07-07 16:05:35 UTC (rev 93622)
@@ -1,16 +1,17 @@
post_install() {
- GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 > etc/gtk-2.0/gtk.immodules-32
+ GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 --update-cache
}
pre_upgrade() {
- pre_remove
+if (( $(vercmp $2 2.24.20) < 0 )); then
+ rm -f /etc/gtk-2.0/gtk.immodules-32
+fi
}
post_upgrade() {
- post_install
+ post_install
}
pre_remove() {
- rm -f etc/gtk-2.0/gtk.immodules-32 &>/dev/null
- rm -f etc/gtk-2.0/gdk-pixbuf.loaders-32 &>/dev/null
+ rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache-32
}
More information about the arch-commits
mailing list