Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc

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

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

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

https://github.com/sgn/void-packages prepare-hooks-extract
https://github.com/void-linux/void-packages/pull/40244

DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (only build to confirm xbps-src still works)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prepare-hooks-extract-40244.patch --]
[-- Type: text/x-diff, Size: 11105 bytes --]

From 691409d76aa9f2549232d073f5fdc3c5a811b805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:06 +0700
Subject: [PATCH 1/9] grafx2: use create_wrksrc

---
 srcpkgs/grafx2/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grafx2/template b/srcpkgs/grafx2/template
index 724f8fa65765..d9ae5509e634 100644
--- a/srcpkgs/grafx2/template
+++ b/srcpkgs/grafx2/template
@@ -3,7 +3,7 @@ pkgname=grafx2
 version=2.6
 revision=2
 _recoil_version=4.3.1
-wrksrc="grafX2-v${version}"
+create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="API=sdl2"
@@ -21,7 +21,8 @@ checksum="1d679216e481b0c22d1d160eb1f66ed6ef2c1ec4eda6f5c0f2ec406d16045534
  8f64fd21bafa180e6cbac5853ef65453f080385b3c53600af8360e938668e574"
 
 post_extract() {
-	mv ../recoil-${_recoil_version} 3rdparty/
+	mv grafX2-v$version/* .
+	mv recoil-${_recoil_version} 3rdparty/
 	touch 3rdparty/recoil-${_recoil_version}/.ok
 }
 

From 133fc935657fb305308d8e0508508f7fda947149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:05 +0700
Subject: [PATCH 2/9] gitflow: use create_wrksrc

---
 srcpkgs/gitflow/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gitflow/template b/srcpkgs/gitflow/template
index 1ff82a670696..cb869243d20e 100644
--- a/srcpkgs/gitflow/template
+++ b/srcpkgs/gitflow/template
@@ -5,21 +5,24 @@ version=20120925
 revision=3
 _commit=15aab26490facf285acef56cb5d61025eacb3a69
 _shflags_commit=2fb06af13de884e9680f14a00c82e52a67c867f1
+create_wrksrc=yes
 hostmakedepends="perl"
 depends="git"
 short_desc="Git extensions to provide high-level repository operations"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/nvie/gitflow"
-distfiles="${homepage}/archive/${_commit}.tar.gz https://github.com/nvie/shFlags/archive/${_shflags_commit}.tar.gz"
-checksum="277ecb102afd45c3137d630de11ceac4b267a73d6a5f2ac41ccbd3d96b609ce7 a1c5782a78e106d0c6289a9412fffa376f4cd78f4f86af441eb7bf06cf664594"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/nvie/shFlags/archive/${_shflags_commit}.tar.gz"
+checksum="277ecb102afd45c3137d630de11ceac4b267a73d6a5f2ac41ccbd3d96b609ce7
+ a1c5782a78e106d0c6289a9412fffa376f4cd78f4f86af441eb7bf06cf664594"
 
 wrksrc="$pkgname-$_commit"
 
 post_extract() {
-	cd $wrksrc
-	rm -r shFlags
-	cp -r ../shFlags-$_shflags_commit $wrksrc/shFlags
+	mv gitflow-${_commit}/* .
+	rmdir shFlags
+	mv shFlags-$_shflags_commit $wrksrc/shFlags
 }
 
 do_build() {

From 4f02302b1b27ad750bbddb5f609923cb7bbae089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:04 +0700
Subject: [PATCH 3/9] flightgear: use create_wrksrc

---
 srcpkgs/flightgear/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 595b8021b527..45404e778ed4 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -3,10 +3,12 @@ pkgname=flightgear
 version=2020.3.13
 revision=1
 # XXX: always keep in sync with simgear version!
+create_wrksrc=yes
 build_style=cmake
 build_helper="qemu"
 configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
- -DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${XBPS_BUILDDIR}/fgdata/Translations
+ -DOpenGL_GL_PREFERENCE=GLVND
+ -DTRANSLATIONS_SRC_DIR=${XBPS_BUILDDIR}/$pkgname-$version/fgdata/Translations
  -DSYSTEM_SQLITE=ON -DSYSTEM_FLITE=ON"
 hostmakedepends="gettext pkg-config qt5-tools"
 makedepends="MesaLib-devel boost-devel freealut-devel libevent-devel
@@ -37,10 +39,14 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo"
 fi
 
+post_extract() {
+	mv flightgear-$version/* .
+}
+
 flightgear-data_package() {
 	short_desc+=" - data files"
 	pkg_install() {
 		vmkdir usr/share/flightgear
-		mv ${XBPS_BUILDDIR}/fgdata ${PKGDESTDIR}/usr/share/flightgear
+		mv fgdata ${PKGDESTDIR}/usr/share/flightgear
 	}
 }

From 8e67d012788f1179cc025483308672baea48f23d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:00 +0700
Subject: [PATCH 4/9] nsjail: use create_wrksrc

---
 srcpkgs/nsjail/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index d115bcc43792..346348fdf17b 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -2,6 +2,7 @@
 pkgname=nsjail
 version=3.0
 revision=9
+create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="bison flex pkg-config protobuf which"
 makedepends="libnl3-devel protobuf-devel"
@@ -21,8 +22,9 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 fi
 
 post_extract() {
+	mv nsjail-$version/* .
 	rmdir kafel
-	mv ../kafel-* kafel
+	mv kafel-* kafel
 }
 
 post_patch() {

From f49ade8821b01d7dba3f110f559d46d099093e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:00 +0700
Subject: [PATCH 5/9] leocad: use create_wrksrc

---
 srcpkgs/leocad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/leocad/template b/srcpkgs/leocad/template
index cd81c17b1e21..4010c69a2be1 100644
--- a/srcpkgs/leocad/template
+++ b/srcpkgs/leocad/template
@@ -3,6 +3,7 @@ pkgname=leocad
 version=21.06
 revision=1
 _lib_version=20.03
+create_wrksrc=yes
 build_style=qmake
 configure_args="DISABLE_UPDATE_CHECK=1"
 hostmakedepends="qt5-host-tools qt5-qmake unzip"
@@ -17,7 +18,7 @@ checksum="bd28c47f920fa1bc458b6e5f476b93ccc1aa40e30158a3dd2397368cc3d79099
  88d6d28b3a494a15ae63e984c1e732e28362fabc2e145ffab828fed2eb5e3632"
 
 post_extract() {
-	mv ../library.bin .
+	mv leocad-${version}/* .
 }
 
 leocad-data_package() {

From 4cb6a3408282366099eecd20ddab783f792eb649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:00 +0700
Subject: [PATCH 6/9] arena: no check permissions

---
 srcpkgs/arena/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/arena/template b/srcpkgs/arena/template
index 0a82fcea57b9..d53f52265798 100644
--- a/srcpkgs/arena/template
+++ b/srcpkgs/arena/template
@@ -8,6 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:freeware"
 homepage="http://www.playwitharena.de"
 restricted=yes
+nocheckperms="database"
 
 case "$XBPS_TARGET_MACHINE" in
 	armv7l)
@@ -33,7 +34,7 @@ nostrip=yes
 do_install() {
 	vmkdir opt/arena
 	vcopy ${wrksrc}/* opt/arena
-	chmod -R a+rw ${DESTDIR}/opt/arena
+	chmod -R a+rw ${DESTDIR}/opt/arena/Databases
 
 	case "$XBPS_TARGET_MACHINE" in
 		armv7l)

From 8ac5b919cb5bc80a511743bdf046ff1ee202fa68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:02 +0700
Subject: [PATCH 7/9] cavestory: use create_wrksrc

---
 srcpkgs/cavestory/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/cavestory/template b/srcpkgs/cavestory/template
index b08211e1419a..3a165e9f2c26 100644
--- a/srcpkgs/cavestory/template
+++ b/srcpkgs/cavestory/template
@@ -3,7 +3,7 @@ pkgname=cavestory
 version=1.2
 revision=2
 archs="x86_64 i686"
-wrksrc=linuxDoukutsu-1.01
+create_wrksrc=yes
 short_desc="Japanese side-scrolling platformer game"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom: proprietary"
@@ -17,12 +17,12 @@ nopie=yes
 
 do_install() {
 	vmkdir usr/libexec/cavestory
-	vcopy Config.dat usr/libexec/cavestory
-	vcopy data usr/libexec/cavestory
-	vdoc doc/readme.txt
-	vdoc doc/configfileformat.txt
-	mv ../linuxDoukutsu-${version}/doukutsu_${XBPS_TARGET_WORDSIZE}bits doukutsu.bin
-	vinstall doukutsu.bin 755 usr/libexec/cavestory
+	vcopy linuxDoukutsu-1.01/Config.dat usr/libexec/cavestory
+	vcopy linuxDoukutsu-1.01/data usr/libexec/cavestory
+	vdoc linuxDoukutsu-1.01/doc/readme.txt
+	vdoc linuxDoukutsu-1.01/doc/configfileformat.txt
+	vinstall linuxDoukutsu-${version}/doukutsu_${XBPS_TARGET_WORDSIZE}bits \
+		755 usr/libexec/cavestory doukutsu.bin
 	vbin ${FILESDIR}/cavestory
 	vinstall ${FILESDIR}/cavestory.desktop 644 usr/share/applications/
 	vinstall ${FILESDIR}/cavestory.png 644 usr/share/pixmaps/

From 8356d464c144a516eb759309c47ef89ad637d43e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:06 +0700
Subject: [PATCH 8/9] hunspell-el_GR: fix after auto-create_wrksrc

---
 srcpkgs/hunspell-el_GR/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hunspell-el_GR/template b/srcpkgs/hunspell-el_GR/template
index 4702ce1733b2..ee3d39b031d0 100644
--- a/srcpkgs/hunspell-el_GR/template
+++ b/srcpkgs/hunspell-el_GR/template
@@ -2,7 +2,6 @@
 pkgname=hunspell-el_GR
 version=0.4.0
 revision=2
-create_wrksrc=yes
 short_desc="Greek el_GR dictionary for hunspell"
 maintainer="Nicholas Christopoulos <nereus@freemail.gr>"
 license="GPL-2.0-only"
@@ -11,6 +10,6 @@ distfiles="${SOURCEFORGE_SITE}/orthos-spell/v.${version}./orthos-${version}.tar.
 checksum=63d355ddb7b6c6f7a5221b33d7d7646c49bfa08f61e3e6fb31416a315bdfc217
 
 do_install() {
-	vinstall v.${version}/dicts/el_GR/el_GR.aff 644 /usr/share/hunspell
-	vinstall v.${version}/dicts/el_GR/el_GR.dic 644 /usr/share/hunspell
+	vinstall dicts/el_GR/el_GR.aff 644 /usr/share/hunspell
+	vinstall dicts/el_GR/el_GR.dic 644 /usr/share/hunspell
 }

From 7c41df096ff013a82f31f1b7c5394da38905cf03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 1 Nov 2022 11:38:36 +0700
Subject: [PATCH 9/9] temporary disable check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 95f1cd88e338..f39948c6216e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -54,11 +54,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }