Subject: [alpine-devel] [PATCH 1/4] main/rxvt-unicode: fix makedepends

From: Dubiousjim <[email-masked]>
Date: Thu, 27 Jun 2013 02:12:47 -0400

ncurses is needed for its /usr/bin/tic.

The Changes file says in the entry for v9.10 that fontconfig and xrender are
needed for Xft support; we compile with --enable-xft and required libxft-dev
and libxrender-dev, but omitted fontconfig-dev.
---
 main/rxvt-unicode/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/rxvt-unicode/APKBUILD b/main/rxvt-unicode/APKBUILD
index ad307f5..2ceed66 100644
--- a/main/rxvt-unicode/APKBUILD
+++ b/main/rxvt-unicode/APKBUILD
@@ -8,7 +8,7 @@ arch=all
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
 license='GPL'
 depends=
-makedepends="libx11-dev libxft-dev gdk-pixbuf-dev libxrender-dev perl-dev"
+makedepends="libx11-dev libxft-dev ncurses fontconfig-dev gdk-pixbuf-dev libxrender-dev perl-dev"
 source="http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2
 	rxvt-unicode-kerning.patch"
 
-- 
1.8.3.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Dubiousjim <[email-masked]>
Date: Thu, 27 Jun 2013 02:12:48 -0400

---
 main/rxvt-unicode/APKBUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/rxvt-unicode/APKBUILD b/main/rxvt-unicode/APKBUILD
index 2ceed66..e3b851b 100644
--- a/main/rxvt-unicode/APKBUILD
+++ b/main/rxvt-unicode/APKBUILD
@@ -16,6 +16,7 @@ _builddir="${srcdir}/${pkgname}-${pkgver}"
 
 prepare() {
 	cd "$_builddir"
+	local i
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-- 
1.8.3.1

---

---

From: Dubiousjim <[email-masked]>
Date: Thu, 27 Jun 2013 02:12:49 -0400

---

diff --git a/main/rxvt-unicode/APKBUILD b/main/rxvt-unicode/APKBUILD
index e3b851b..19133b6 100644
--- a/main/rxvt-unicode/APKBUILD
+++ b/main/rxvt-unicode/APKBUILD
@@ -50,8 +50,8 @@ build() {
 
 package() {
 	cd "$_builddir"
-	install -d "$pkgdir/usr/share/terminfo"
 	export TERMINFO="$pkgdir/usr/share/terminfo"
+	install -d "$TERMINFO"
 	make DESTDIR="$pkgdir" install
 }
 
-- 
1.8.3.1

---

---

From: Dubiousjim <[email-masked]>
Date: Thu, 27 Jun 2013 02:12:50 -0400

---
 main/rxvt-unicode/APKBUILD        | 4 ++++
 main/rxvt-unicode/gentables.patch | 8 ++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 main/rxvt-unicode/gentables.patch

diff --git a/main/rxvt-unicode/APKBUILD b/main/rxvt-unicode/APKBUILD
index 19133b6..8281953 100644
--- a/main/rxvt-unicode/APKBUILD
+++ b/main/rxvt-unicode/APKBUILD
@@ -10,6 +10,7 @@ license='GPL'
 depends=
 makedepends="libx11-dev libxft-dev ncurses fontconfig-dev gdk-pixbuf-dev libxrender-dev perl-dev"
 source="http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2
+	gentables.patch
 	rxvt-unicode-kerning.patch"
 
 _builddir="${srcdir}/${pkgname}-${pkgver}"
@@ -56,8 +57,11 @@ package() {
 }
 
 md5sums="963ccc748fe5bca925e7b92c0404d68b  rxvt-unicode-9.18.tar.bz2
+105d79e77f2aedc2520791177c74feda  gentables.patch
 585157318cb78733804eed507b77c37c  rxvt-unicode-kerning.patch"
 sha256sums="87b72a43cac7c9362a984094c661a632ce1a829ad90f149142ab1953854b433f  rxvt-unicode-9.18.tar.bz2
+d89c34b9a36d67cde0d3a4e934e499d668a4d712c355847956a284fa2899b576  gentables.patch
 fc241d7c11b86f589f41a0f488e8f04875ca6ca937e57bc2347c19dff423a38a  rxvt-unicode-kerning.patch"
 sha512sums="8d1abf38c6ad47129fafc22c3996a7e2cd0f0cf4982d441ee30076d64d191637942307efd12cc05dfef6b65136530973be9da89e6769c5967d4e523f33309237  rxvt-unicode-9.18.tar.bz2
+2a973e001dacf900895d0c1045dfffd5a1ca7650669853bd5fdf09819b19a750bb59d913f8bdc83b103e5e0e7cce7f0d2b6184f36a29c1bac86e90c08ae6a475  gentables.patch
 d2fb68b3e11a78328ded4d2d646ffbaae657e9f23f3b4b81e11bc4350dd3e1e7585eeaeee47a70246bdfb7e12fbb667e40a7766989154235064f56ed4ad0a987  rxvt-unicode-kerning.patch"
diff --git a/main/rxvt-unicode/gentables.patch b/main/rxvt-unicode/gentables.patch
new file mode 100644
index 0000000..8e3d82b
--- /dev/null
+++ b/main/rxvt-unicode/gentables.patch
@@ -0,0 +1,8 @@
+--- ./src/gentables.orig	Wed Aug  4 04:59:09 2004
++++ ./src/gentables	Tue Aug 10 00:03:21 2004
+@@ -1,4 +1,4 @@
+-#!/opt/bin/perl
++#!/usr/bin/perl
+ 
+ # the generated tables mostly have NOT been checked so far!
+ 
-- 
1.8.3.1

---