From 662f29352e7a9afe18b4656fdb498f27e6134ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 27 Oct 2022 18:59:06 +0700 Subject: [PATCH 1/9] hddtemp: fix after auto-create_wrksrc --- srcpkgs/hddtemp/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hddtemp/template b/srcpkgs/hddtemp/template index 787193f86e79..2402b9ca74a3 100644 --- a/srcpkgs/hddtemp/template +++ b/srcpkgs/hddtemp/template @@ -16,10 +16,14 @@ distfiles=" checksum=" 618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b 6f1ddaa9fbc90ea5c00b949e0981b78c5014e109de88804ae2512209091eae56" +skip_extraction="hddtemp_${version/.b/-b}-53.diff.gz" + +post_extract() { + zcat ${XBPS_SRCDISTDIR}/${pkgname}-${version}/$skip_extraction | + patch -Np1 -F0 +} pre_configure() { - patch -p1 -i ../hddtemp_${version/.b/-b}-53.diff - rm ../hddtemp_${version/.b/-b}-53.diff sed -i 's|/etc/hddtemp.db|/usr/share/hddtemp/hddtemp.db|' doc/hddtemp.8 } post_install() { From cd05348170df1750f841546aa284168264a31948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 27 Oct 2022 18:59:08 +0700 Subject: [PATCH 2/9] mons: use create_wrksrc --- srcpkgs/mons/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/mons/template b/srcpkgs/mons/template index 447c81881bb5..f3a119991c27 100644 --- a/srcpkgs/mons/template +++ b/srcpkgs/mons/template @@ -2,6 +2,7 @@ pkgname=mons version=0.8.2 revision=2 +create_wrksrc=yes build_style=gnu-makefile hostmakedepends="help2man" depends="libXrandr" @@ -15,8 +16,9 @@ checksum="73cf0e21c32206acec128c050c5905ee48412234f77c72fc4c1640cb53861160 4f9ea887751765e0cba26397a3534b5a254e2d93ea41606e39db402ce25826d9" post_extract() { + mv mons-$version/* . rm -r libshlist - mv "../libshlist-1.1" libshlist + mv libshlist-1.1 libshlist } post_install() { From 443a5debd56de8e742ee20cd737d2975a79a6d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 27 Oct 2022 18:59:11 +0700 Subject: [PATCH 3/9] poppler: use create_wrksrc --- srcpkgs/poppler/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index c34698d6bd75..1bb3ff0720f3 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -6,6 +6,7 @@ pkgname=poppler version=22.07.0 revision=2 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435 +create_wrksrc=yes build_style=cmake build_helper="gir" configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON @@ -30,7 +31,8 @@ build_options="gir boost" build_options_default="gir boost" post_extract() { - mv ../test-${_testVersion} testdatadir + mv poppler-*/* . + mv test-${_testVersion} testdatadir } libpoppler_package() { From ac704110fc88ea2f417d3b12ab1753c0ce09e2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 27 Oct 2022 18:59:11 +0700 Subject: [PATCH 4/9] pijul: use create_wrksrc --- srcpkgs/pijul/patches/bindgen.patch | 2 +- srcpkgs/pijul/template | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch index 04ccc8381aae..f76431e4e333 100644 --- a/srcpkgs/pijul/patches/bindgen.patch +++ b/srcpkgs/pijul/patches/bindgen.patch @@ -6,4 +6,4 @@ version = "0.2" + +[patch.crates-io] -+"sequoia-rfc2822" = {path = '/builddir/sequoia-v0.9.0/rfc2822'} ++"sequoia-rfc2822" = {path = './sequoia/rfc2822'} diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index 53fb1c83ebe5..a6a6d048b1ec 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -2,6 +2,7 @@ pkgname=pijul version=0.12.2 revision=5 +create_wrksrc=yes build_style=cargo _sequoia_ver=0.9.0 hostmakedepends="pkg-config clang" @@ -15,6 +16,11 @@ distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${ver checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889 71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b" +post_extract() { + mv pijul-*/* . + mv sequoia-* sequoia +} + # We only want to install the binary, so don't run cargo install do_install() { vbin target/${RUST_TARGET}/release/pijul From 5bd10eee9dfaab9b075d3c8710a99c473f7e9942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 27 Oct 2022 18:59:13 +0700 Subject: [PATCH 5/9] sbcl: use create_wrksrc --- srcpkgs/sbcl/patches/ppc-musl.patch | 12 ++++++------ srcpkgs/sbcl/template | 7 ++++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/srcpkgs/sbcl/patches/ppc-musl.patch b/srcpkgs/sbcl/patches/ppc-musl.patch index 91a347f21f33..ad0e0bc08467 100644 --- a/srcpkgs/sbcl/patches/ppc-musl.patch +++ b/srcpkgs/sbcl/patches/ppc-musl.patch @@ -1,5 +1,5 @@ ---- a/src/runtime/ppc-linux-os.c -+++ b/src/runtime/ppc-linux-os.c +--- a/sbcl/src/runtime/ppc-linux-os.c ++++ b/sbcl/src/runtime/ppc-linux-os.c @@ -33,6 +33,7 @@ #include #include @@ -8,8 +8,8 @@ #include "validate.h" #include "ppc-linux-mcontext.h" ---- a/src/runtime/os-common.c -+++ b/src/runtime/os-common.c +--- a/sbcl/src/runtime/os-common.c ++++ b/sbcl/src/runtime/os-common.c @@ -31,6 +31,9 @@ #if defined(LISP_FEATURE_OS_PROVIDES_DLOPEN) && !defined(LISP_FEATURE_WIN32) # include @@ -20,8 +20,8 @@ /* * historically, this used sysconf to select the runtime page size ---- a/src/runtime/ppc-arch.c -+++ b/src/runtime/ppc-arch.c +--- a/sbcl/src/runtime/ppc-arch.c ++++ b/sbcl/src/runtime/ppc-arch.c @@ -10,6 +10,7 @@ */ diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index 7d401b5e166c..fafab7d36d29 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -2,6 +2,8 @@ pkgname=sbcl version=2.2.9 revision=1 +create_wrksrc="required" +build_wrksrc=sbcl # make sure the sbcl option in maxima is enabled for the same archs archs="i686 x86_64* armv7l aarch64 ppc64le*" hostmakedepends="iana-etc texinfo" @@ -39,6 +41,10 @@ i686*|ppc*|*-musl) ;; esac +post_extract() { + mv sbcl-${version} sbcl +} + do_build() { printf '"%s.void.%s"\n' "$version" "$revision" >version.lisp-expr export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl" @@ -59,7 +65,6 @@ sbcl-source_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" -- source files" pkg_install() { - cd $wrksrc ./clean.sh vmkdir usr/lib/sbcl vcopy src usr/lib/sbcl From 250c159cc99262226c20d872cc92a281e1810212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 27 Oct 2022 18:59:14 +0700 Subject: [PATCH 6/9] schroot: fix build after create_wrksrc --- srcpkgs/schroot/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template index 1a6dfe8ef1a0..cd011b5043bc 100644 --- a/srcpkgs/schroot/template +++ b/srcpkgs/schroot/template @@ -55,10 +55,12 @@ checksum=" 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b 7bd4e0c2709979362c86a86c10d2b23d290d26e1a2d301a602e829327f483ec1" nocross=yes +skip_extraction="schroot_${version}-${_debian_version}.debian.tar.xz" -pre_configure() { - cat ../debian/patches/series | while read p; do - patch -p1 -i ../debian/patches/$p +post_extract() { + bsdtar -xf $XBPS_SRCDISTDIR/schroot-${version}/$skip_extraction + cat debian/patches/series | while read p; do + patch -Np1 -F0 -i debian/patches/$p done } From 1c4973ed2009a75a2c5b012f436eaa867878f373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 27 Oct 2022 18:59:03 +0700 Subject: [PATCH 7/9] openbsd-netcat: use create_wrksrc --- srcpkgs/openbsd-netcat/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template index 9c458b8e23cf..4b09dfe9a28b 100644 --- a/srcpkgs/openbsd-netcat/template +++ b/srcpkgs/openbsd-netcat/template @@ -2,7 +2,7 @@ pkgname=openbsd-netcat version=1.219 revision=1 -wrksrc="netcat-openbsd-${version%p*}" +create_wrksrc=yes hostmakedepends="pkg-config" makedepends="libbsd-devel" short_desc="TCP/IP swiss army knife (OpenBSD/Debian variant)" @@ -19,8 +19,12 @@ alternatives=" nc:nc:/usr/bin/openbsd-nc nc:nc.1:/usr/share/man/man1/openbsd-nc.1" +post_extract() { + mv netcat-openbsd-${version}/* . + ( cd debian/patches; xargs cat Date: Thu, 27 Oct 2022 18:59:09 +0700 Subject: [PATCH 8/9] ocs-url: use create_wrksrc --- srcpkgs/ocs-url/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ocs-url/template b/srcpkgs/ocs-url/template index 29c0d304f730..fd76eee398b7 100644 --- a/srcpkgs/ocs-url/template +++ b/srcpkgs/ocs-url/template @@ -2,7 +2,7 @@ pkgname=ocs-url version=3.1.0 revision=2 -wrksrc="ocs-url-release-${version}" +create_wrksrc=yes build_style="qmake" hostmakedepends="qt5-qmake kdeclarative-devel qt5-svg-devel qt5-declarative-devel" makedepends="qt5-svg-devel kdeclarative-devel qt5-declarative-devel" @@ -15,7 +15,8 @@ distfiles="${homepage}/-/archive/release-${version}/ocs-url-release-${version}.t https://github.com/akiraohgaki/qtil/archive/v0.4.0.tar.gz" checksum="d8c67920359c36eb0004221e5b5695fd04cbc9e93811c372837bdb2a8c9cbcc8 c1548d3f2ca5a2fc63fce60bea2c350dfcc656b03a4e00d86a9fdc0b43f22ec8" + post_extract() { - mkdir ${wrksrc}/lib/qtil - mv ${wrksrc}/../qtil-0.4.0/* ${wrksrc}/lib/qtil/ + mv ocs-url-*/* . + mv qtil-0.4.0 lib/qtil } From c752c69dff99c590e7e1d39ba051ffa1a9b676de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= 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 }