aboutsummaryrefslogtreecommitdiffstats
path: root/main/gtk+2.0
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-11-28 10:26:49 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-11-28 10:26:49 +0000
commit14c21425abbcc63a35fc29432ddb22c66330ae09 (patch)
tree68b7daa22daf70f51f5f24c40693d6b80f6451c5 /main/gtk+2.0
parenta198cedeeee8a8770bf2edb63d313ed9dae1df2c (diff)
downloadaports-14c21425abbcc63a35fc29432ddb22c66330ae09.tar.bz2
aports-14c21425abbcc63a35fc29432ddb22c66330ae09.tar.xz
main/gtk+2.0: fix post-deinstall. remove unneeded jpeg and tiff deps
Diffstat (limited to 'main/gtk+2.0')
-rw-r--r--main/gtk+2.0/APKBUILD4
-rw-r--r--main/gtk+2.0/gtk+2.0.post-deinstall6
2 files changed, 5 insertions, 5 deletions
diff --git a/main/gtk+2.0/APKBUILD b/main/gtk+2.0/APKBUILD
index 269e8ed66e..737b9ad5c3 100644
--- a/main/gtk+2.0/APKBUILD
+++ b/main/gtk+2.0/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk+2.0
pkgver=2.24.13
-pkgrel=1
+pkgrel=2
pkgdesc="The GTK+ Toolkit (v2)"
url="http://www.gtk.org/"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
@@ -35,7 +35,6 @@ makedepends="pkgconfig
gtk-doc
libice-dev
libiconv-dev
- jpeg-dev>=8
libx11-dev
libxcomposite-dev
libxcursor-dev
@@ -43,7 +42,6 @@ makedepends="pkgconfig
libxfixes-dev
libxrandr-dev
libxi-dev
- tiff-dev
zlib-dev"
source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
xid-collision-debug.patch
diff --git a/main/gtk+2.0/gtk+2.0.post-deinstall b/main/gtk+2.0/gtk+2.0.post-deinstall
index e7ee2a1517..ea39aa8bf8 100644
--- a/main/gtk+2.0/gtk+2.0.post-deinstall
+++ b/main/gtk+2.0/gtk+2.0.post-deinstall
@@ -1,5 +1,7 @@
#!/bin/sh
-rm -f etc/gtk-2.0/gtk.immodules
-rm -f etc/gtk-2.0/gdk-pixbuf.loaders
+# since we depend on coreutils and busybox trigger has not yet run, we
+# use busybox directly as workaround
+/bin/busybox rm -f etc/gtk-2.0/gtk.immodules
+/bin/busybox rm -f etc/gtk-2.0/gdk-pixbuf.loaders