From a919c59442cc22908f52d9d9da0f9e635d27c95f Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Thu, 28 Sep 2017 13:12:35 +0200
Subject: main/slim: new alpinelinux theme

---
 main/slim/APKBUILD | 44 ++++++++++----------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

(limited to 'main')

diff --git a/main/slim/APKBUILD b/main/slim/APKBUILD
index e589ce2602..aac999ec4d 100644
--- a/main/slim/APKBUILD
+++ b/main/slim/APKBUILD
@@ -2,18 +2,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=slim
 pkgver=1.3.6
-pkgrel=7
+pkgrel=8
 pkgdesc="Desktop-independent graphical login manager for X11"
 url="https://sourceforge.net/projects/slim.berlios/files/"
 arch="all"
 license="GPL2"
+options="!check"
 subpackages="$pkgname-doc"
 makedepends="libxmu-dev libpng-dev libjpeg-turbo-dev libxft-dev
 	cmake libxrandr-dev consolekit2-dev"
 depends="dbus"
 install=
 source="http://downloads.sourceforge.net/project/slim.berlios/${pkgname}-${pkgver}.tar.gz
-	http://dev.alpinelinux.org/~ncopa/alpine/slim-alpinelinux.tar.gz
+	https://dev.alpinelinux.org/~clandmeter/sources/slim-alpinelinux-0.2.0.tar.gz
 	no-slimlock.patch
 	libslim-underlinking.patch
 	slim-freetype-dirs.patch
@@ -24,13 +25,7 @@ source="http://downloads.sourceforge.net/project/slim.berlios/${pkgname}-${pkgve
 	"
 
 prepare() {
-	cd "$srcdir/slim-$pkgver"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-
+	default_prepare
 	sed -i -e 's|#xserver_arguments.*|xserver_arguments   -nolisten tcp vt07|'\
 		-e 's|/var/run/slim.lock|/var/lock/slim.lock|' \
 		-e 's|halt_cmd.*|halt_cmd            /sbin/poweroff|'\
@@ -40,7 +35,7 @@ prepare() {
 		-e 's|screenshot_cmd.*|screenshot_cmd      scrot /slim.png|' \
 		-e 's|imagemagick|scrot|' \
 		-e 's|current_theme.*|current_theme       alpinelinux|' \
-		slim.conf || return 1
+		slim.conf
 }
 
 build() {
@@ -50,18 +45,17 @@ build() {
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DUSE_PAM=no \
-		-DUSE_CONSOLEKIT=yes \
-		|| return 1
+		-DUSE_CONSOLEKIT=yes 
 
 
-	make CXX="${CXX:-g++}" CC="${CC:-gcc}" || return 1
+	make CXX="${CXX:-g++}" CC="${CC:-gcc}"
 }
 
 package() {
 	cd "$srcdir/slim-$pkgver"
-	make DESTDIR="$pkgdir" MANDIR=/usr/share/man install || return 1
+	make DESTDIR="$pkgdir" MANDIR=/usr/share/man install
 
-	install -D -m755 ../slim.initd "$pkgdir"/etc/init.d/slim || return 1
+	install -D -m755 ../slim.initd "$pkgdir"/etc/init.d/slim
 	install -D -m644 ../slim.logrotate "$pkgdir"/etc/logrotate.d/slim
 
 	# remove unused systemd service
@@ -75,26 +69,8 @@ package() {
 	rm -rf "$pkgdir"/usr/share/slim/themes/default
 }
 
-md5sums="d40d256394f9ef34cef34d2aa9cb52e6  slim-1.3.6.tar.gz
-cd63232c7770b0e67a009a94c2a46b82  slim-alpinelinux.tar.gz
-b443d1a03f767fcb1fe33a10a532cef0  no-slimlock.patch
-348be5e6570881f601b68c3ba2f7bbed  libslim-underlinking.patch
-da8a6a6320dfb9bc7dad46e165c68d60  slim-freetype-dirs.patch
-111e3a5f1e5e3d71f2c75f20a285932b  snprintf.patch
-f39b25e4191afaa91f7d415905de8932  musl-includes.patch
-43da096480bf72c3ccec8ad8400f34f0  slim.logrotate
-74ae39e1f37922074b75d9610979e49c  slim.initd"
-sha256sums="21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df  slim-1.3.6.tar.gz
-dfa910e8d8c1cd3b687d7b0b49d1cb36ba4148de8862667c4ca03da194e42e64  slim-alpinelinux.tar.gz
-7658a24019bec1de41de037525731a9ccdb9d05867a99efaeb49af2fb8e7a9a5  no-slimlock.patch
-cf506b6a42c86c45c2614e3e36b3e6b280efba93be53bb30a280c2b0c2dc2196  libslim-underlinking.patch
-f808e0fd22c0a31ec3b8bb4493aa131a73118a5da419bbc5cc33e43635652bd6  slim-freetype-dirs.patch
-ef1fac57a57dfb696db110c8741c0902dd84bac50f516f52d0ee0c8bd4133d5d  snprintf.patch
-fdccc8f2cfc225db1b7b57aa4e9ab00784d79f906d4b61043a724e164c4faa98  musl-includes.patch
-5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def  slim.logrotate
-09a4045ed620b2fd28f2a0c986459e17d3fb029142423834887fb7736e83a31b  slim.initd"
 sha512sums="345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c  slim-1.3.6.tar.gz
-45e080bd5cc49e5c380d851fee7622ffe6ce9b11fdabe3b3b971618b0d140c39cead5e2a9f6ac5272eed885649b1903c9a4d3c6ce45dcf3026a91198f4d790c5  slim-alpinelinux.tar.gz
+3cd3de67e5b1e122da05e02e0e6e8fe2c5a1ae07487e51068aa56ddf05d17854562350ef47c914a2c9fb2534b8f757a326cfed64f4b5ddbbeb18e48af43b46c6  slim-alpinelinux-0.2.0.tar.gz
 3df74cf3c8b2e313b7f394a624c094ec144844003cdd264867a7bd9f46d6a10d9f5e818078340eef76cd52c38bc9ec11989f9dac2f5c693b674c2ec627f447a2  no-slimlock.patch
 c66c3908147ec28b68577958bdd7bd4bc7c42b00fc4a7ce30162202a4d0ae18ef7c0c81ca60c661609e479b370ad30261494fe84bb4ffad48232536aec483729  libslim-underlinking.patch
 1f957eadb586b8f0523a2cf6ea550280a542500de925383a06d658424c524a4ef5b148aa9150a9f045529c896fe69c013417b9883583acc12a7a656b7202eded  slim-freetype-dirs.patch
-- 
cgit v1.2.3