Re: [PR PATCH] [Updated] xtrlock, trollock: remove

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 535 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages lock
https://github.com/void-linux/void-packages/pull/46512

xtrlock, trollock: remove
- python 2 in hostmakedepends for configure script
- claims to be compatible with python 3 but is not compatible with modern python 3.x argparse
- upstreams untouched for 8+ years

cc @thypon @leahneukirchen


A patch file from https://github.com/void-linux/void-packages/pull/46512.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lock-46512.patch --]
[-- Type: text/x-diff, Size: 2504 bytes --]

From 6692884c8be7057a63f532e3d6377df5e623b147 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 7 Oct 2023 18:22:57 -0400
Subject: [PATCH 1/2] xtrlock: work around ancient python configure script

---
 srcpkgs/xtrlock/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xtrlock/template b/srcpkgs/xtrlock/template
index 92f320b607ca9..df5b5dfadbe24 100644
--- a/srcpkgs/xtrlock/template
+++ b/srcpkgs/xtrlock/template
@@ -2,8 +2,7 @@
 pkgname=xtrlock
 version=3.4
 revision=2
-build_style=configure
-hostmakedepends="pkg-config python"
+build_wrksrc="src"
 makedepends="libX11-devel pam-devel"
 short_desc="PAM based X11 screen locker"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,6 +11,14 @@ homepage="https://github.com/aanatoly/xtrlock-pam"
 distfiles="https://github.com/aanatoly/xtrlock-pam/archive/${version}.tar.gz"
 checksum=dcc4b37a1ec303a99c9ef96412f6ba875f0c06355cdfdf4605a2a0a9e144c5d2
 
-post_install() {
+do_build() {
+	touch config.h
+	$CC $CFLAGS -DPROJECT_NAME="\"${pkgname}-${version}\"" \
+		-DPROJECT_VERSION="\"${version}\"" \
+		-o xtrlock-pam *.c $LDFLAGS -lX11 -lpam
+}
+
+do_install() {
+	vbin xtrlock-pam
 	ln -s xtrlock-pam ${DESTDIR}/usr/bin/xtrlock
 }

From cf8ae024156e3750a01075db7a7e95fe52762728 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 7 Oct 2023 18:23:47 -0400
Subject: [PATCH 2/2] trollock: work around ancient python configure script

---
 srcpkgs/trollock/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/trollock/template b/srcpkgs/trollock/template
index 72b3508755aec..2902adfa29464 100644
--- a/srcpkgs/trollock/template
+++ b/srcpkgs/trollock/template
@@ -2,8 +2,7 @@
 pkgname=trollock
 version=4.1
 revision=2
-build_style=gnu-configure
-hostmakedepends="python pkg-config"
+build_wrksrc="src"
 makedepends="libX11-devel pam-devel"
 short_desc="Xtrlock fork with PAM support"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -12,6 +11,13 @@ homepage="https://github.com/thypon/trollock"
 distfiles="https://github.com/thypon/trollock/archive/v${version}.tar.gz"
 checksum=3e48ef9d129e91206e79b73df03757375c785296b3193d9148d044a9f9e84229
 
-do_configure() {
-	./configure
+do_build() {
+	touch config.h
+	$CC $CFLAGS -DPROJECT_NAME="\"${pkgname}-${version}\"" \
+		-DPROJECT_VERSION="\"${version}\"" \
+		-o trollock *.c $LDFLAGS -lX11 -lpam
+}
+
+do_install() {
+	vbin trollock
 }