From b72d6e68ffe2d40ac154abebc28391c619d56bdf Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 19 Jun 2022 19:59:28 -0500
Subject: user/xscreensaver: Update to 6.04

* New elogind integration which is kinda cool for those who use it.

* Remove -lang package because jwz is 100% right with the expletives he
  used regarding GNU gettext.

Fixes: #629
---
 user/xscreensaver/APKBUILD | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'user')

diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD
index 214437813..f1217bcf1 100644
--- a/user/xscreensaver/APKBUILD
+++ b/user/xscreensaver/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=xscreensaver
-pkgver=5.45
+pkgver=6.04
 pkgrel=0
 pkgdesc="X Screensaver suite"
 url="https://www.jwz.org/xscreensaver/"
@@ -9,10 +9,11 @@ arch="all"
 options="!check suid"  # No test suite.
 license="MIT"
 depends=""
-makedepends="bc gtk+2.0-dev intltool libglade-dev libice-dev libjpeg-turbo-dev
-	libx11-dev libxft-dev libxinerama-dev libxml2-dev libxml2-utils
-	libxrandr-dev libxt-dev linux-pam-dev mesa-dev mesa-glapi"
-subpackages="$pkgname-doc $pkgname-lang"
+makedepends="bc gtk+2.0-dev intltool libice-dev libjpeg-turbo-dev libx11-dev
+	libxft-dev libxi-dev libxinerama-dev libxml2-dev libxml2-utils glu-dev
+	libxrandr-dev libxt-dev linux-pam-dev mesa-dev mesa-glapi xorgproto-dev
+	desktop-file-utils elogind-dev xdg-utils"
+subpackages="$pkgname-doc $pkgname-elogind"
 source="https://www.jwz.org/xscreensaver/xscreensaver-$pkgver.tar.gz"
 
 build() {
@@ -22,12 +23,24 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--with-pam \
+		--with-shadow \
+		--with-elogind
 	make
 }
 
 package() {
+	mkdir -p "$pkgdir"/etc/pam.d
 	make install_prefix="$pkgdir" install
 }
 
-sha512sums="1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14  xscreensaver-5.45.tar.gz"
+elogind() {
+	pkgdesc="$pkgdesc (elogind integration)"
+	install_if="$pkgname=$pkgver-r$pkgrel elogind"
+	mkdir -p "$subpkgdir"/usr/libexec/$pkgname
+	mv "$pkgdir"/usr/libexec/$pkgname/xscreensaver-systemd \
+		"$subpkgdir"/usr/libexec/$pkgname/
+}
+
+sha512sums="7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071  xscreensaver-6.04.tar.gz"
-- 
cgit v1.2.3-60-g2f50