aboutsummaryrefslogtreecommitdiffstats
path: root/main/gtk+3.0
diff options
context:
space:
mode:
authorAmatCoder <amatcoder@gmail.com>2014-12-27 15:50:26 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-12-29 16:20:39 +0000
commitbeea7418ac9442e6b5d94a047ebc6e1770e597d6 (patch)
tree84dbf20adc74af347e49e2f6a7d489431d08de69 /main/gtk+3.0
parent52c3cd0153a87c05d8d6f9631ddeabe1188d3fae (diff)
downloadaports-beea7418ac9442e6b5d94a047ebc6e1770e597d6.tar.bz2
aports-beea7418ac9442e6b5d94a047ebc6e1770e597d6.tar.xz
main/gtk+3.0: use gtk-update-icon-cache package from gtk+2
Diffstat (limited to 'main/gtk+3.0')
-rw-r--r--main/gtk+3.0/APKBUILD15
-rw-r--r--main/gtk+3.0/gtk+3.0.trigger6
2 files changed, 3 insertions, 18 deletions
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index 2aa445d90..0c996657b 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -1,23 +1,19 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk+3.0
pkgver=3.14.6
-pkgrel=0
+pkgrel=1
pkgdesc="The GTK+ Toolkit (v3)"
url="http://www.gtk.org/"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-triggers="$pkgname.trigger=/usr/share/icons/*"
arch="all"
license="LGPL"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-depends="shared-mime-info"
+depends="shared-mime-info gtk-update-icon-cache"
replaces="gtk+"
replaces_dev="gtk+-dev"
replaces_doc="gtk+-doc"
-# depend on gtk+2.0 for update-icon-cache
-depends="gtk+2.0"
-
depends_dev="
at-spi2-atk-dev
atk-dev
@@ -69,11 +65,6 @@ build() {
--enable-xdamage \
--enable-x11-backend \
|| return 1
- # the configure script checks if isnan is a function. In uclibc
- # isnan is there, but as a macro
- # https://bugzilla.gnome.org/show_bug.cgi?id=676087
- echo "#define HAVE_ISNAN 1" >> config.h
- echo "#define HAVE_ISINF 1" >> config.h
# https://bugzilla.gnome.org/show_bug.cgi?id=655517
sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool || return 1
@@ -85,7 +76,7 @@ package() {
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
- # use gtk+2.0's for now
+ # use gtk-update-icon-cache from gtk+2.0 for now
rm "$pkgdir"/usr/bin/gtk-update-icon-cache
find "$pkgdir" -name *.la -delete
}
diff --git a/main/gtk+3.0/gtk+3.0.trigger b/main/gtk+3.0/gtk+3.0.trigger
deleted file mode 100644
index adaf66bf6..000000000
--- a/main/gtk+3.0/gtk+3.0.trigger
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-for i in "$@"; do
- gtk-update-icon-cache -q -t -f $i
-done
-