From 0b942ccfb70896949669608584d7df09517f7afd 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 01/10] sc: fix build after auto-create_wrksrc --- srcpkgs/sc/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/sc/template b/srcpkgs/sc/template index 2f827708d669..0abe03d72101 100644 --- a/srcpkgs/sc/template +++ b/srcpkgs/sc/template @@ -14,9 +14,11 @@ distfiles="http://ibiblio.org/pub/linux/apps/financial/spreadsheet/sc-${version} checksum="1997a00b6d82d189b65f6fd2a856a34992abc99e50d9ec463bbf1afb750d1765 37116b9619790564650c4090b4a6264c08aa59fa1e24c63ca073011cd70507cb" CFLAGS='-DSYSV3' +skip_extraction="sc_${version}-2.diff.gz" post_extract() { - patch -Np1 <../${pkgname}_${version}-2.diff + zcat $XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction | + patch -Np1 } do_install() { From f8e122481195edde62084dd29b79eb72b194909d 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:16 +0700 Subject: [PATCH 02/10] tcpflow: fix build --- srcpkgs/tcpflow/template | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template index decc27a0a27c..6eaf1addccb5 100644 --- a/srcpkgs/tcpflow/template +++ b/srcpkgs/tcpflow/template @@ -2,7 +2,7 @@ pkgname=tcpflow version=1.5.2 revision=3 -wrksrc="$pkgname-$pkgname-$version" +create_wrksrc=yes build_style=gnu-configure hostmakedepends="automake" makedepends="libpcap-devel zlib-devel openssl-devel boost-devel" @@ -10,22 +10,26 @@ short_desc="Captures data transmitted as part of TCP connections" maintainer="Orphaned " license="GPL-3.0-only" homepage="https://github.com/simsong/tcpflow" -_be13_commit=c81521d768bb78499c069fcd7c47adc8eee0350c +_be20_commit=c81521d768bb78499c069fcd7c47adc8eee0350c _dfxml_commit=c31224626cf5f6678d42cbcfbfcd4e6191c9a864 _httpparser_commit=6b05cce82da5c4d407e5576ab892bc20a17b0394 distfiles="https://github.com/simsong/tcpflow/archive/${pkgname}-${version}.tar.gz https://github.com/nodejs/http-parser/archive/$_httpparser_commit.tar.gz - https://github.com/simsong/be13_api/archive/$_be13_commit.tar.gz + https://github.com/simsong/be20_api/archive/$_be20_commit.tar.gz https://github.com/simsong/dfxml/archive/$_dfxml_commit.tar.gz" checksum="c4138dbf2ed9915aed92e8f5cd6d19db2c7d1caeb02191939d0bfa15e52fe600 b947bd185511fd28a12a30436bcbe8f765473a667cdb6f8f55888274d44f550f - a682edf8469b7130b52e6f12dc7beea4bb60d4834d6de42904a3c0a1425cd5fe + c98cface83e074be790293bb1041df8968ef385a196e0990f5174883d2e1d8f4 358e4d3599c6e26f1dff85066e15e86025fc537466e8f4e35924922886eed86b" -pre_configure() { +post_extract() { + mv tcpflow-*/* . rmdir src/{dfxml,be13_api,http-parser} - ln -fsr ../be13_api-$_be13_commit src/be13_api - ln -fsr ../dfxml-$_dfxml_commit src/dfxml - ln -fsr ../http-parser-$_httpparser_commit src/http-parser + mv be??_api-$_be20_commit src/be13_api + mv dfxml-$_dfxml_commit src/dfxml + mv http-parser-$_httpparser_commit src/http-parser +} + +pre_configure() { autoreconf -fi } From dd365aac91676e4baee4f12b62c6c226566dd4cd 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:02 +0700 Subject: [PATCH 03/10] maturin: use create_wrksrc --- srcpkgs/maturin/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index 8270694bc1b9..79aa1f62d9b8 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -2,6 +2,7 @@ pkgname=maturin version=0.13.6 revision=1 +create_wrksrc=yes build_style=python3-module build_helper="qemu rust" hostmakedepends="python3-setuptools-rust python3-tomli python3-wheel cargo" @@ -31,7 +32,8 @@ case "$XBPS_TARGET_MACHINE" in esac post_extract() { - mv ../target-lexicon* target-lexicon + mv maturin-${version}/* . + mv target-lexicon-* target-lexicon echo "[patch.crates-io]" >> Cargo.toml echo "target-lexicon = { path = './target-lexicon' }" >> Cargo.toml } From eaf58098468c8108b021411d179083c6569ad40c 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 04/10] ppsspp: use create_wrksrc --- srcpkgs/ppsspp/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index 38308424f58b..19dbeb7f7b25 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -7,6 +7,7 @@ _SPIRV_Cross_commit=9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1 _armips_commit=7885552b208493a6a0f21663770c446c3ba65576 _discord_rpc_commit=963aa9f3e5ce81a4682c6ca3d136cddda614db33 _miniupnp_commit=3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e +create_wrksrc=yes build_style=cmake configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON -DUSING_QT_UI=$(vopt_if qt ON OFF) -DUSE_SYSTEM_ZSTD=ON" @@ -47,16 +48,17 @@ build_options="wayland qt sdl2" build_options_default="sdl2" post_extract() { + mv ppsspp-${version}/* . rmdir -v ${wrksrc}/ext/armips - mv ${wrksrc}/../armips-${_armips_commit} ${wrksrc}/ext/armips + mv ${wrksrc}/armips-${_armips_commit} ${wrksrc}/ext/armips rmdir -v ${wrksrc}/ext/glslang - mv ${wrksrc}/../glslang-${_glslang_commit} ${wrksrc}/ext/glslang + mv ${wrksrc}/glslang-${_glslang_commit} ${wrksrc}/ext/glslang rmdir -v ${wrksrc}/ext/SPIRV-Cross - mv ${wrksrc}/../SPIRV-Cross-${_SPIRV_Cross_commit} ${wrksrc}/ext/SPIRV-Cross + mv ${wrksrc}/SPIRV-Cross-${_SPIRV_Cross_commit} ${wrksrc}/ext/SPIRV-Cross rmdir -v ${wrksrc}/ext/discord-rpc - mv ${wrksrc}/../discord-rpc-${_discord_rpc_commit} ${wrksrc}/ext/discord-rpc + mv ${wrksrc}/discord-rpc-${_discord_rpc_commit} ${wrksrc}/ext/discord-rpc rmdir -v ${wrksrc}/ext/miniupnp - mv ${wrksrc}/../miniupnp-${_miniupnp_commit} ${wrksrc}/ext/miniupnp + mv ${wrksrc}/miniupnp-${_miniupnp_commit} ${wrksrc}/ext/miniupnp } post_patch(){ From abd6af0b383c39c14f446e40cb09b6b73f2ea9ce 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 05/10] sc3-plugins: use create_wrksrc --- srcpkgs/sc3-plugins/patches/cstdio.patch | 4 ++-- srcpkgs/sc3-plugins/template | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/srcpkgs/sc3-plugins/patches/cstdio.patch b/srcpkgs/sc3-plugins/patches/cstdio.patch index 9ffb2d2bac0e..ae5880b68f76 100644 --- a/srcpkgs/sc3-plugins/patches/cstdio.patch +++ b/srcpkgs/sc3-plugins/patches/cstdio.patch @@ -1,5 +1,5 @@ ---- a/source/NHUGens/NHHall.cpp 2018-11-18 23:18:46.000000000 +0100 -+++ b/source/NHUGens/NHHall.cpp 2020-09-13 07:57:48.084435095 +0200 +--- a/sc3-plugins/source/NHUGens/NHHall.cpp 2018-11-18 23:18:46.000000000 +0100 ++++ b/sc3-plugins/source/NHUGens/NHHall.cpp 2020-09-13 07:57:48.084435095 +0200 @@ -25,6 +25,7 @@ For more information, please refer to */ diff --git a/srcpkgs/sc3-plugins/template b/srcpkgs/sc3-plugins/template index 45f54453e414..cdd0064b8ee9 100644 --- a/srcpkgs/sc3-plugins/template +++ b/srcpkgs/sc3-plugins/template @@ -2,10 +2,11 @@ pkgname=sc3-plugins version=3.10.0 revision=2 -wrksrc="${pkgname}-Version-${version}" _nova_simd_hash=2bdc68bc5704a42578300a4c18411df2405cb307 +create_wrksrc=yes +build_wrksrc=sc3-plugins build_style=cmake -configure_args="-DSC_PATH=${XBPS_BUILDDIR}/SuperCollider-Source -DSUPERNOVA=ON -DSYSTEM_STK=ON" +configure_args="-DSUPERNOVA=ON -DSYSTEM_STK=ON" hostmakedepends="pkg-config" makedepends="fftw-devel libstk-devel" depends="supercollider" @@ -21,12 +22,16 @@ checksum="b8144231ea1bfc1c9d8aa6780c7e963dfb642868794abbfd8ccab418ffbbdfbe df9f280daaad56fdadb5fa75d492ee6a06762a41d7346aa473aa49c1ac9ec9c8" post_extract() { - rm -rf external_libraries/nova-simd - mv ${XBPS_BUILDDIR}/nova-simd-${_nova_simd_hash} external_libraries/nova-simd + mv sc3-plugins-* sc3-plugins + rm -rf sc3-plugins/external_libraries/nova-simd + mv nova-simd-${_nova_simd_hash} sc3-plugins/external_libraries/nova-simd +} + +pre_configure() { + configure_args+=" -DSC_PATH=${wrksrc}/SuperCollider-Source " } post_install() { vmkdir usr/lib/SuperCollider/Extensions/SC3plugins/LadspaUGen mv -v ${DESTDIR}/usr/{share,lib}/SuperCollider/Extensions/SC3plugins/LadspaUGen/ladspalist - rm -rf ${XBPS_BUILDDIR}/SuperCollider-Source } From d00ca4241630f936bf441b734c57bd4373f6748e 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:15 +0700 Subject: [PATCH 06/10] stremio-shell: use create_wrksrc --- srcpkgs/stremio-shell/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template index 5e498162abdf..ac133f6c3729 100644 --- a/srcpkgs/stremio-shell/template +++ b/srcpkgs/stremio-shell/template @@ -4,6 +4,7 @@ version=4.4.159 revision=1 _singleapplication_hash=f1e15081dc57a9c03f7f4f165677f18802e1437a _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef +create_wrksrc=yes build_style=qmake hostmakedepends="qt5-host-tools qt5-qmake" makedepends="mpv-devel qt5-webview-devel qt5-webengine-devel @@ -28,10 +29,11 @@ checksum="aca0e5bf026e31399571f5cdc1485cbb2540e7ad7b981f10adb0e87ee47b9af5 skip_extraction="server.js stremio.asar" post_extract() { + mv stremio-shell-$version/* . rmdir deps/singleapplication - mv ../SingleApplication-${_singleapplication_hash} deps/singleapplication + mv SingleApplication-${_singleapplication_hash} deps/singleapplication rmdir deps/libmpv - mv ../libmpv-${_libmpv_hash} deps/libmpv + mv libmpv-${_libmpv_hash} deps/libmpv } post_install() { From 4681fbbc14a10f2ee89c3e95f18af4be1bb755ad 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:15 +0700 Subject: [PATCH 07/10] steam-fonts: broken distfiles --- srcpkgs/steam-fonts/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/steam-fonts/template b/srcpkgs/steam-fonts/template index 3b9de3c61c8b..33de3614c2d0 100644 --- a/srcpkgs/steam-fonts/template +++ b/srcpkgs/steam-fonts/template @@ -12,6 +12,7 @@ distfiles="https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts. checksum=a03bcc9581f2896cac39967633fc43546af5ed9d73d505a10cae4016797dfeb1 font_dirs="/usr/share/fonts/steam-fonts" restricted=yes +broken=dead-url do_install() { vmkdir usr/share/fonts/steam-fonts From 7808b446da0f350e2f839499a7f80d4da6153ad7 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:17 +0700 Subject: [PATCH 08/10] tg_owt: fix build --- srcpkgs/tg_owt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template index 1b81a7475ac0..d712ac678ec1 100644 --- a/srcpkgs/tg_owt/template +++ b/srcpkgs/tg_owt/template @@ -25,7 +25,7 @@ distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz checksum="@b8a4b1a9e4f8936c02b4a31c19d6282a914df976b9cbdfadb3ae40ca1a185ac6 @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3 @b359ed4f5fd0321d807fd7301e66399c311c1fe6ab4c6a0f5538587d97ba4a8d" -skip_extraction="${_libyuv_commit}.tar.gz ${_crc32c_commit}" +skip_extraction="${_libyuv_commit}.tar.gz ${_crc32c_commit}.tar.gz" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" From a32ef028246dae88c66804b078dd7e1991ac2ba3 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:16 +0700 Subject: [PATCH 09/10] textadept: update checksum --- srcpkgs/textadept/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/textadept/template b/srcpkgs/textadept/template index e49056c0cb54..76fa8b663e70 100644 --- a/srcpkgs/textadept/template +++ b/srcpkgs/textadept/template @@ -24,7 +24,7 @@ distfiles="https://github.com/orbitalquark/textadept/archive/textadept_${version https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip https://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz" -checksum="87d67975b22952344e1bdcb330301b88cdfe8242e7710526cd344ab252499c2a +checksum="55d153fba03aa2e12c2865f38f378154bbc7d2d3e3448a3682b46ee17056fb4c 4f2168684b4024dc3d6b267320fff1d729192047f4a1b79aeab9ec7c64f733ec 3b1e3cc3ee48bb158d1d666c7c86d190905c973918914876f6ab3712f8dd7d20 ccd5b3d615116b8c4376086cf1d03b6ef1f67a565e57446b15eba3f39ef0c180 From 0b94e636c785a2fafdb8e6aba8e390cf35f7ae41 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 10/10] 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 }