~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
1

[alpine-aports] [PATCH] main/gtk+3.0: use gtk-update-icon-cache package from gtk+2

Details
Message ID
<1419695426-31459-1-git-send-email-amatcoder@gmail.com>
Sender timestamp
1419695426
DKIM signature
missing
Download raw message
Patch: +3 -18
---
 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 <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 adaf66b..0000000
--- a/main/gtk+3.0/gtk+3.0.trigger
@@ -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
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20141229172948.276eeddf@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1419695426-31459-1-git-send-email-amatcoder@gmail.com> (view parent)
Sender timestamp
1419870588
DKIM signature
missing
Download raw message
On Sat, 27 Dec 2014 15:50:26 +0000
AmatCoder <amatcoder@gmail.com> wrote:

> ---
>  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

applied. thanks!

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)