From 7229503102a520e62b2209f8001dc2451fdf995d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 5 Mar 2013 14:49:26 +0000
Subject: main/xscreensaver: upgrade to 5.21

---
 main/xscreensaver/APKBUILD        | 23 +++++++++++++++++------
 main/xscreensaver/intl-libs.patch | 11 +++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 main/xscreensaver/intl-libs.patch

(limited to 'main/xscreensaver')

diff --git a/main/xscreensaver/APKBUILD b/main/xscreensaver/APKBUILD
index b4636b7b3b..11c982b61c 100644
--- a/main/xscreensaver/APKBUILD
+++ b/main/xscreensaver/APKBUILD
@@ -1,29 +1,35 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xscreensaver
-pkgver=5.20
-pkgrel=1
+pkgver=5.21
+pkgrel=0
 pkgdesc="screensavers for X11 environment"
 url="http://www.jwz.org/xscreensaver/"
 license="GPL"
 depends="bc"
 makedepends="gtk+-dev libjpeg-turbo-dev mesa-dev gettext-dev libxmu-dev perl-dev
-	libxml2-dev libglade-dev libxinerama-dev libxrandr-dev"
+	libxml2-dev libglade-dev libxinerama-dev libxrandr-dev glu-dev"
 install=
 subpackages="$pkgname-doc $pkgname-gl-extras:gl $pkgname-extras $pkgname-lang"
-source="http://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz"
+source="http://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz
+	intl-libs.patch"
 arch="all"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 _libexecdir=/usr/lib/xscreensaver
 _confdir=/usr/share/xscreensaver/config
+
 prepare() {
 	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
 }
 
 build() {
 	cd "$_builddir"
-	[ "$ALPINE_LIBC" != "eglibc"] && export LIBS="-lintl"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -66,4 +72,9 @@ extras() {
 	mv "$pkgdir"/$_confdir/* "$subpkgdir"/$_confdir
 }
 
-md5sums="1faec61c61e29dc11f6ec9e4750ab877  xscreensaver-5.20.tar.gz"
+md5sums="1e9828ab7146d443c9d109cf2a1a4ed2  xscreensaver-5.21.tar.gz
+7ab63bb0d5b5d043c94128dbd98cf311  intl-libs.patch"
+sha256sums="90f9a4574880c6e6d24796b5c386405a4bbf27a7d764a00f858d43ce07788868  xscreensaver-5.21.tar.gz
+d13e51b406e84f02901bd16f401c9ae897400b0567182f4b8092df1fcd51e754  intl-libs.patch"
+sha512sums="3e74f786df8374d96969493094934a478a7023107efadc84ec58ebd9def6993ea069512f7850e0a2ffe65ff43dc5e251b0057246fc39a67846085d2d0990cba7  xscreensaver-5.21.tar.gz
+3a4d750350bb1e5248fb03ea094001797e0628fb38c0ef854b9d30efd5d7a7f5a5b31fbac73816ae26a221201119be954c74fddbb863216ced4a5a63609720a2  intl-libs.patch"
diff --git a/main/xscreensaver/intl-libs.patch b/main/xscreensaver/intl-libs.patch
new file mode 100644
index 0000000000..c1fb71675e
--- /dev/null
+++ b/main/xscreensaver/intl-libs.patch
@@ -0,0 +1,11 @@
+--- ./driver/Makefile.in.orig	2013-03-05 14:39:59.352107702 +0000
++++ ./driver/Makefile.in	2013-03-05 14:41:18.676188601 +0000
+@@ -207,7 +207,7 @@
+ SAVER_LIBS	= $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
+ 		  $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
+ 		  -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
+-		  $(PASSWD_LIBS)
++		  $(PASSWD_LIBS) $(INTL_LIBS)
+ 
+ CMD_LIBS	= $(LIBS) $(X_LIBS) \
+ 		  $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
-- 
cgit v1.2.3