From 9b4fe1b9085b7ec3117b5c21decb106a7d685a00 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 27 Mar 2018 08:38:20 +0000
Subject: main/xscreensaver: upgrade to 5.38

---
 main/xscreensaver/APKBUILD        | 33 ++++++++-------------------------
 main/xscreensaver/intl-libs.patch | 11 -----------
 2 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 main/xscreensaver/intl-libs.patch

(limited to 'main')

diff --git a/main/xscreensaver/APKBUILD b/main/xscreensaver/APKBUILD
index 92d05369e4..eed3e76797 100644
--- a/main/xscreensaver/APKBUILD
+++ b/main/xscreensaver/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xscreensaver
-pkgver=5.36
+pkgver=5.38
 pkgrel=0
 pkgdesc="screensavers for X11 environment"
 url="https://www.jwz.org/xscreensaver/"
@@ -11,27 +11,16 @@ makedepends="gtk+-dev libjpeg-turbo-dev mesa-dev gettext-dev libxmu-dev perl
 	libxml2-dev libglade-dev libxinerama-dev libxrandr-dev glu-dev sed"
 install=
 subpackages="$pkgname-doc $pkgname-gl-extras:gl $pkgname-extras $pkgname-lang"
-source="http://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz
-	intl-libs.patch"
+source="http://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz"
 arch="all"
 options="suid"
 
-_builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir"/$pkgname-$pkgver
 _libexecdir=/usr/lib/xscreensaver
 _confdir=/usr/share/xscreensaver/config
 
-prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -43,13 +32,12 @@ build() {
 		--libexecdir=$_libexecdir \
 		--with-xinerama-ext \
 		--with-xf86vmode-ext \
-		--with-randr-ext \
-		|| return 1
-	make || return 1
+		--with-randr-ext
+	make
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make install_prefix="$pkgdir" install
 }
 
@@ -77,9 +65,4 @@ extras() {
 	mv "$pkgdir"/$_confdir/* "$subpkgdir"/$_confdir
 }
 
-md5sums="79dc3349df1fe978825991ce71a4a220  xscreensaver-5.36.tar.gz
-7ab63bb0d5b5d043c94128dbd98cf311  intl-libs.patch"
-sha256sums="6b8b5238047f1613d99149bb02d5ed3384675f3ce74a0a8ba25290bd61abc06c  xscreensaver-5.36.tar.gz
-d13e51b406e84f02901bd16f401c9ae897400b0567182f4b8092df1fcd51e754  intl-libs.patch"
-sha512sums="4f476135bbfdce0593bb6e5a6a48dd474fcce6031214ffbb3d43dc91bb8e1a28b3e59fc960d5f1a9ac0bdd3dc4531da26679bffbe47b7fb00b67ad74295b40f7  xscreensaver-5.36.tar.gz
-3a4d750350bb1e5248fb03ea094001797e0628fb38c0ef854b9d30efd5d7a7f5a5b31fbac73816ae26a221201119be954c74fddbb863216ced4a5a63609720a2  intl-libs.patch"
+sha512sums="9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561  xscreensaver-5.38.tar.gz"
diff --git a/main/xscreensaver/intl-libs.patch b/main/xscreensaver/intl-libs.patch
deleted file mode 100644
index c1fb71675e..0000000000
--- a/main/xscreensaver/intl-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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