[arch-commits] Commit in gtk2/trunk (3 files)
Jan Steffens
heftig at archlinux.org
Fri Apr 29 22:30:46 UTC 2016
Date: Saturday, April 30, 2016 @ 00:30:46
Author: heftig
Revision: 266656
2.24.30-2
Added:
gtk2/trunk/gtk-query-immodules-2.0.hook
Modified:
gtk2/trunk/PKGBUILD
gtk2/trunk/gtk2.install
------------------------------+
PKGBUILD | 19 +++++++++++--------
gtk-query-immodules-2.0.hook | 11 +++++++++++
gtk2.install | 14 --------------
3 files changed, 22 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-04-29 22:30:12 UTC (rev 266655)
+++ PKGBUILD 2016-04-29 22:30:46 UTC (rev 266656)
@@ -3,12 +3,12 @@
pkgname=gtk2
pkgver=2.24.30
-pkgrel=1
+pkgrel=2
pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
arch=(i686 x86_64)
url="http://www.gtk.org/"
-depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
- shared-mime-info cairo libcups gtk-update-icon-cache librsvg)
+depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
+ shared-mime-info cairo libcups gtk-update-icon-cache librsvg desktop-file-utils)
makedepends=(gobject-introspection python2)
optdepends=('gnome-themes-standard: Default widget theme'
'adwaita-icon-theme: Default icon theme')
@@ -15,14 +15,18 @@
license=(LGPL)
install=gtk2.install
source=(https://download.gnome.org/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
- gtkrc xid-collision-debug.patch)
+ gtkrc
+ gtk-query-immodules-2.0.hook
+ xid-collision-debug.patch)
sha256sums=('0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50'
'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
+ '9656a1efc798da1ac2dae94e921ed0f72719bd52d4d0138f305b993f778f7758'
'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
prepare() {
cd gtk+-$pkgver
patch -Np1 -i ../xid-collision-debug.patch
+ sed -i '1s/python$/&2/' gtk/gtk-builder-convert
}
build() {
@@ -43,12 +47,11 @@
cd gtk+-$pkgver
make DESTDIR="$pkgdir" install
- sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+ install -Dm644 ../gtkrc "$pkgdir/usr/share/gtk-2.0/gtkrc"
+ install -Dm644 ../gtk-query-immodules-2.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-2.0.hook"
- install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/gtk-2.0/gtkrc"
-
rm "$pkgdir/usr/bin/gtk-update-icon-cache"
rm -r "$pkgdir/usr/share/gtk-doc"
}
-# vim:set noet sw=4:
+# vim:set et sw=4:
Added: gtk-query-immodules-2.0.hook
===================================================================
--- gtk-query-immodules-2.0.hook (rev 0)
+++ gtk-query-immodules-2.0.hook 2016-04-29 22:30:46 UTC (rev 266656)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-2.0/2.10.0/immodules/*.so
+
+[Action]
+Description = Probing GTK2 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-2.0 --update-cache
Modified: gtk2.install
===================================================================
--- gtk2.install 2016-04-29 22:30:12 UTC (rev 266655)
+++ gtk2.install 2016-04-29 22:30:46 UTC (rev 266656)
@@ -1,17 +1,3 @@
-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
}
More information about the arch-commits
mailing list