X-Original-To: alpine-aports@lists.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 9D3F9DC0098 for ; Sat, 27 Dec 2014 15:51:02 +0000 (UTC) Received: by mail-wi0-f171.google.com with SMTP id bs8so18797514wib.16 for ; Sat, 27 Dec 2014 07:51:01 -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=P4rYkFizGJK4jA0PpadIJQNXS3dNiJydV/gO+3zqGcI=; b=pa7fTUyFH7KX2du9Hz/qT2In6aRq8zyXqvjTC2D0Ztc37ZJP9+jX0H3M2+5dnKQNvW x4PQeXacMbRhX5rx2i8d+YoaZqFeDshefSyDbh+3FOpgHrRUctCrUx+T8z+ElTBnzW5Q /jW+duTmIpvPSzIjsbxt6XGT0srDdH5vHy9zP0m96CANVR5OxD2id9u4LcFqNFgmELN+ 2deitYvh2eBhSnwXBh2zZWja5YlSp8MZCun7Ab3YNQDegQTpUsdW+T9amyGalzd4cvyW zevciBR4r3L36JYE4ziBduYQ+BikbXUeBYEgN9xWYe6Tn034WLRKRyKGVefSEOVKZxVS 26YQ== X-Received: by 10.194.2.178 with SMTP id 18mr92216652wjv.67.1419695461182; Sat, 27 Dec 2014 07:51:01 -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 e7sm42646408wjx.31.2014.12.27.07.50.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 Dec 2014 07:51:00 -0800 (PST) From: AmatCoder To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/gtk+2.0: split gtk-update-icon-cache Date: Sat, 27 Dec 2014 15:46:05 +0000 Message-Id: <1419695165-31338-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: Changes: - Split 'gtk-update-icon-cache' to a new package. This avoid the gtk2 dependency in gtk3 package and two triggers being fired. - Fix trigger to not exit with error on uninstall. - Update to 2.24.25 --- main/gtk+2.0/APKBUILD | 22 +++++++++++++++------- main/gtk+2.0/gtk+2.0.trigger | 6 ------ main/gtk+2.0/gtk-update-icon-cache.trigger | 9 +++++++++ 3 files changed, 24 insertions(+), 13 deletions(-) delete mode 100644 main/gtk+2.0/gtk+2.0.trigger create mode 100644 main/gtk+2.0/gtk-update-icon-cache.trigger diff --git a/main/gtk+2.0/APKBUILD b/main/gtk+2.0/APKBUILD index 09d8dae..103700e 100644 --- a/main/gtk+2.0/APKBUILD +++ b/main/gtk+2.0/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: Natanael Copa pkgname=gtk+2.0 -pkgver=2.24.23 +pkgver=2.24.25 pkgrel=0 +subpkg=gtk-update-icon-cache pkgdesc="The GTK+ Toolkit (v2)" 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" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $subpkg:icon_cache" +depends="shared-mime-info gtk-update-icon-cache" replaces="gtk+" replaces_dev="gtk+-dev" @@ -97,12 +97,20 @@ dev() { "$subpkgdir"/usr/bin || return 1 } -md5sums="0be39fbed4ca125645175cd6e22f2548 gtk+-2.24.23.tar.xz +icon_cache() { + triggers="$subpkg.trigger=/usr/share/icons/*" + depends="hicolor-icon-theme" + + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/"$subpkg" "$subpkgdir"/usr/bin || return 1 +} + +md5sums="612350704dd3aacb95355a4981930c6f gtk+-2.24.25.tar.xz 22355df723f6ca358e30e6b8f0baace5 xid-collision-debug.patch b1f61a42b2fa3c54eb2e0d6c130a0f0a gtk2-fixdso.patch" -sha256sums="a0a406e27e9b5e7d6b2c4334212706ed5cdcd41e713e66c9ae950655dd61517c gtk+-2.24.23.tar.xz +sha256sums="38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3 gtk+-2.24.25.tar.xz d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558 xid-collision-debug.patch 609c20a1a3ca09ad3a3aa5186743d858e930edd9d775a3bf59c9716b54771b5d gtk2-fixdso.patch" -sha512sums="e6db7d61d753f5d8ce0f41e99b461decda364d04314ff58838d2f98f29aab22313c0b5898f2cf56ddd3a18e0544f47ad796e673390d464ee2160b2542c5f558b gtk+-2.24.23.tar.xz +sha512sums="e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d gtk+-2.24.25.tar.xz 89e3223c86731a76b12d39245f1ec4cf8b4860ab1d11d74a10e5deb0db302f20b4bb5d9034da1d8aeb96369dbdeddcdd2f28943270dc501476c694562b960159 xid-collision-debug.patch 95f28633a5164a2a9fec45ee1aa80bd1c07e0c5a7ac8d770b9c74af0909b7286b823eb634aa384cad609dc8799d2e6c9e8392c2732b9093076fdf94b4f6878b7 gtk2-fixdso.patch" diff --git a/main/gtk+2.0/gtk+2.0.trigger b/main/gtk+2.0/gtk+2.0.trigger deleted file mode 100644 index adaf66b..0000000 --- a/main/gtk+2.0/gtk+2.0.trigger +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -for i in "$@"; do - gtk-update-icon-cache -q -t -f $i -done - diff --git a/main/gtk+2.0/gtk-update-icon-cache.trigger b/main/gtk+2.0/gtk-update-icon-cache.trigger new file mode 100644 index 0000000..f247335 --- /dev/null +++ b/main/gtk+2.0/gtk-update-icon-cache.trigger @@ -0,0 +1,9 @@ +#!/bin/sh + +for i in "$@"; do + if ! [ -e "$i" ]; then + continue + fi + 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 ---