X-Original-To: alpine-aports@lists.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 92178DC0098 for ; Sat, 27 Dec 2014 15:55:21 +0000 (UTC) Received: by mail-wg0-f51.google.com with SMTP id x12so15840292wgg.24 for ; Sat, 27 Dec 2014 07:55:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=WYlPQ9gV0V5GSVobbViowm3obAEdDJP5jkiw9KAfYH8=; b=iVzLJVRl3Ep41a/+qx5iBzVzuThe7gxO7/oPVJZY9BLWiKbU7Al9BMYKxh4iJaTTKv Gft6VNLFyk/t+3YkfadlGJwBsxrU6BuuRrjqQjQMQ/2Qxj89lX6QjEZOkwn/oFHYJc/I EMozUkxxe2OiKxxyXTGziOI6eczWCEY+Bj/sSA42oS8qUZkubjRg0HbuH01Esh3fAJRj yAkSIAh9ua+Zr7wzsSKPA89+Hcah8h2OieHXzuPbyqKyuHVXID6zJdC+TfnV6F+hKphB Xkprhd4uxZypxJN/aPWDOydPElmSluJS/R1oBx7qvthojGzCkJqLeQCEPfklGbCHD75c dA1w== X-Received: by 10.194.6.199 with SMTP id d7mr92052699wja.124.1419695720264; Sat, 27 Dec 2014 07:55:20 -0800 (PST) Received: from alpine.my.domain (84.127.141.73.dyn.user.ono.com. [84.127.141.73]) by mx.google.com with ESMTPSA id i3sm31508817wie.23.2014.12.27.07.55.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 Dec 2014 07:55:19 -0800 (PST) From: AmatCoder To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/gtk+3.0: use gtk-update-icon-cache package from gtk+2 Date: Sat, 27 Dec 2014 15:50:26 +0000 Message-Id: <1419695426-31459-1-git-send-email-amatcoder@gmail.com> X-Mailer: git-send-email 2.2.1 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/gtk+3.0/APKBUILD | 15 +++------------ main/gtk+3.0/gtk+3.0.trigger | 6 ------ 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 main/gtk+3.0/gtk+3.0.trigger diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD index 2aa445d..0c99665 100644 --- a/main/gtk+3.0/APKBUILD +++ b/main/gtk+3.0/APKBUILD @@ -1,23 +1,19 @@ # Maintainer: Natanael Copa 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 adaf66b..0000000 --- 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 - -- 2.2.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---