[PR PATCH] xtrlock, trollock: remove

[PR PATCH] xtrlock, trollock: remove

[classabbyamp]

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

There is a new 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
- 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: 3329 bytes --]

From 1b8563a525ac3a8d5b365db884ca8b5ec1f1b205 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 7 Oct 2023 15:31:10 -0400
Subject: [PATCH 1/2] xtrlock: remove

- python 2 in hostmakedepends
- claims to be compatible with python 3 but is not compatible with
  modern python 3.x argparse
- upstream untouched for 9 years
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xtrlock/template          | 17 -----------------
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 srcpkgs/xtrlock/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 669234714539b..b8e0a5eec6571 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -685,6 +685,7 @@ replaces="
  xnp2<=0.86_2
  xsetmode<=1.0.0_5
  xsetpointer<=1.0.1_4
+ xtrlock<=3.4_2
  yabause-gtk<=0.9.15_2
  yt-play<=20140117_2
  ytop<=0.6.2_1
diff --git a/srcpkgs/xtrlock/template b/srcpkgs/xtrlock/template
deleted file mode 100644
index 92f320b607ca9..0000000000000
--- a/srcpkgs/xtrlock/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'xtrlock'
-pkgname=xtrlock
-version=3.4
-revision=2
-build_style=configure
-hostmakedepends="pkg-config python"
-makedepends="libX11-devel pam-devel"
-short_desc="PAM based X11 screen locker"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/aanatoly/xtrlock-pam"
-distfiles="https://github.com/aanatoly/xtrlock-pam/archive/${version}.tar.gz"
-checksum=dcc4b37a1ec303a99c9ef96412f6ba875f0c06355cdfdf4605a2a0a9e144c5d2
-
-post_install() {
-	ln -s xtrlock-pam ${DESTDIR}/usr/bin/xtrlock
-}

From 04d7335646993abb1a17c5b47e7db2b2fa96bb5a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 7 Oct 2023 15:32:24 -0400
Subject: [PATCH 2/2] trollock: remove

- python 2 in hostmakedepends
- claims to be compatible with python 3 but is not compatible with
  modern python 3.x argparse
- upstream untouched for 8 years
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/trollock/template         | 17 -----------------
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 srcpkgs/trollock/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index b8e0a5eec6571..50633fcc2793e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -654,6 +654,7 @@ replaces="
  tlsdate<=0.0.13_16
  transcode<=1.1.7_4
  traverso<=0.49.6_2
+ trollock<=4.1_2
  ttyload-git<=20141117_4
  tuxc<=1.1_3
  unicorn-python<=1.0.2_2
diff --git a/srcpkgs/trollock/template b/srcpkgs/trollock/template
deleted file mode 100644
index 72b3508755aec..0000000000000
--- a/srcpkgs/trollock/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'trollock'
-pkgname=trollock
-version=4.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="python pkg-config"
-makedepends="libX11-devel pam-devel"
-short_desc="Xtrlock fork with PAM support"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/thypon/trollock"
-distfiles="https://github.com/thypon/trollock/archive/v${version}.tar.gz"
-checksum=3e48ef9d129e91206e79b73df03757375c785296b3193d9148d044a9f9e84229
-
-do_configure() {
-	./configure
-}

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

[classabbyamp]

[-- 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
 }

Re: xtrlock, trollock: work around ancient python configure script

[thypon]

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

New comment by thypon on void-packages repository

https://github.com/void-linux/void-packages/pull/46512#issuecomment-1751843689

Comment:
Seems fine. I might port the fixes on trollock

Re: [PR PATCH] [Updated] xtrlock, trollock: work around ancient python configure script

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 405 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: work around ancient python configure script
cc @thypon @leahneukirchen

tested: builds


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 991711a862c237ce7b55f69cfe50caf688281d51 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 931ffc4c768c143a0db32d0dea16607e3e3bba7b 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
 }

Re: [PR PATCH] [Merged]: xtrlock, trollock: work around ancient python configure script

[classabbyamp]

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

There's a merged pull request on the void-packages repository

xtrlock, trollock: work around ancient python configure script
https://github.com/void-linux/void-packages/pull/46512

Description:
cc @thypon @leahneukirchen

tested: builds