diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-09 21:04:53 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-09 21:04:53 -0300 |
commit | fd5ff7e53a5b8dbabc85ab6e2ff1342b85e155b1 (patch) | |
tree | d2b16d75c64d947545149f37bda7cdb8873a4770 /extra/gtk2 | |
parent | 7823c9009a845174746fd0da09af46a138481851 (diff) | |
parent | 10aa61ef39e662453e1d817046e359372fe3b326 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aspell-pl/PKGBUILD
community/gloox/PKGBUILD
community/libircclient/PKGBUILD
community/mashup/PKGBUILD
community/omniorb/PKGBUILD
community/openbox/PKGBUILD
community/patchutils/PKGBUILD
community/rxvt-unicode/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt5/PKGBUILD
extra/samba/PKGBUILD
extra/tdb/PKGBUILD
extra/transmission/PKGBUILD
extra/vim/PKGBUILD
pcr/python-sfml2/PKGBUILD
pcr/python2-sfml2/PKGBUILD
Diffstat (limited to 'extra/gtk2')
-rw-r--r-- | extra/gtk2/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/gtk2/gtk2.install | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 48928df3a..1be842221 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188597 2013-06-16 18:27:06Z heftig $ +# $Id: PKGBUILD 189695 2013-07-04 21:16:18Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.19 +pkgver=2.24.20 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8' +sha256sums=('cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/gtk2/gtk2.install b/extra/gtk2/gtk2.install index a988c645b..f14e648d3 100644 --- a/extra/gtk2/gtk2.install +++ b/extra/gtk2/gtk2.install @@ -1,16 +1,17 @@ post_install() { - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + /usr/bin/gtk-query-immodules-2.0 --update-cache } pre_upgrade() { - pre_remove + if (( $(vercmp $2 2.24.20) < 0 )); then + rm -f /etc/gtk-2.0/gtk.immodules + fi } post_upgrade() { - post_install + 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 + rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache } |