From 0d433529954c1a67382b644738d3ce7fd5f47b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 28 Oct 2022 11:34:54 +0700 Subject: [PATCH 1/8] google-earth-pro: proper cleanup --- srcpkgs/google-earth-pro/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template index a8dd0d7996be..6bb98082cb63 100644 --- a/srcpkgs/google-earth-pro/template +++ b/srcpkgs/google-earth-pro/template @@ -16,6 +16,8 @@ restricted=yes nostrip=yes post_fetch() { + mkdir -p "$wrksrc" + cd "$wrksrc" $XBPS_FETCH_CMD https://www.google.com/intl/ALL/policies/terms/index.html>Google-Terms-of-Service.html \ https://www.google.com/help/terms_maps.html>Google-Earth-Additional-Terms-of-Service.html \ https://www.google.com/help/legalnotices_maps.html>Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \ @@ -42,10 +44,10 @@ do_install() { usr/share/icons/hicolor/${i}x${i}/apps ${pkgname}.png done - for i in ${XBPS_BUILDDIR}/Google-Terms-of-Service.html \ - ${XBPS_BUILDDIR}/Google-Earth-Additional-Terms-of-Service.html \ - ${XBPS_BUILDDIR}/Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \ - ${XBPS_BUILDDIR}/Google-Privacy-Policy.html; do + for i in Google-Terms-of-Service.html \ + Google-Earth-Additional-Terms-of-Service.html \ + Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \ + Google-Privacy-Policy.html; do vlicense ${i} done From 621987ec2f66cd53b26c118d79f7960addbb08b6 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 19:05:42 +0700 Subject: [PATCH 2/8] plume-creator: update to 0.66+dfsg1pl3.2. --- srcpkgs/plume-creator/patches/qt5.13.patch | 9 ------- srcpkgs/plume-creator/template | 30 ++++++++++------------ 2 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/plume-creator/patches/qt5.13.patch diff --git a/srcpkgs/plume-creator/patches/qt5.13.patch b/srcpkgs/plume-creator/patches/qt5.13.patch deleted file mode 100644 index 644a7f52adc7..000000000000 --- a/srcpkgs/plume-creator/patches/qt5.13.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100 -+++ b/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100 -@@ -1,5 +1,6 @@ - #include "selectpage.h" - #include "ui_selectpage.h" -+#include - - SelectPage::SelectPage(QWidget *parent) : - QWizardPage(parent), diff --git a/srcpkgs/plume-creator/template b/srcpkgs/plume-creator/template index 3c415a06cdd8..8368fd0480d3 100644 --- a/srcpkgs/plume-creator/template +++ b/srcpkgs/plume-creator/template @@ -1,9 +1,8 @@ # Template file for 'plume-creator' pkgname=plume-creator -version=0.66.1 -revision=3 -_debianversion=0.66+dfsg1 -_debianbuild=3.1build2 +version=0.66+dfsg1pl3.2 +revision=1 +wrksrc="$pkgname-${version%+*}.1" build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools pkg-config" makedepends="qt5-devel qt5-declarative-devel qt5-tools-devel @@ -15,22 +14,21 @@ license="GPL-3.0-or-later" homepage="http://plume-creator.eu/" configure_args="plume-creator-all.pro" distfiles=" - ${UBUNTU_SITE}/universe/p/plume-creator/${pkgname}_${_debianversion}.orig.tar.xz - ${UBUNTU_SITE}/universe/p/plume-creator/${pkgname}_${_debianversion}-${_debianbuild}.debian.tar.bz2" + ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version%pl*}.orig.tar.xz + ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version/pl/-}.debian.tar.bz2" checksum=" f88f9524184bcf60dae855d6ad37899aefa39de0edd56098e93ce3b97b679e0c - 7d473ee7283bc311c7d4dd3311d1e7726df7d45fa0123894265f355b436298e1" + e3c5421ca91bf823843bcb6c08be32cec7ddd9b6f069a4ebbe2085fcc5aeea00" + +skip_extraction="${pkgname}_${version/pl/-}.debian.tar.bz2" post_extract() { - mv -f ${wrksrc}/../debian ${wrksrc}/ - mv -f ${wrksrc}/../resources/themes ${wrksrc}/ - mv -f ${wrksrc}/../src/pics/* ${wrksrc}/src/pics/ - patch -p1 <${wrksrc}/debian/patches/git.2014-01-09.patch - patch -p1 <${wrksrc}/debian/patches/remove-external.patch - patch -p1 <${wrksrc}/debian/patches/remove-SlimUpdater.patch - patch -p1 <${wrksrc}/debian/patches/translations-es.patch - patch -p1 <${wrksrc}/debian/patches/built-in-Qt5.patch - patch -p1 <${wrksrc}/debian/patches/desktop.patch + local p + TAR=$(command -v bsdtar || command -v tar) + $TAR -xf $XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction + for p in $(cat debian/patches/series); do + patch -Np1 -F0 -i debian/patches/$p || return 1 + done sed -i 's|quazip/JlCompress|quazip5/JlCompress|g' src/fileupdater.cpp src/hub.h \ src/themes.cpp src/importuserdictdialog.cpp src/zipper/zipper.cpp \ src/common/utils.h From 545fe24dd5b480d4d55ce7a0f670ce395a557c12 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:19 +0700 Subject: [PATCH 3/8] wasmtime: use create_wrksrc --- srcpkgs/wasmtime/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/wasmtime/template b/srcpkgs/wasmtime/template index 888af785f36c..836ed5513c81 100644 --- a/srcpkgs/wasmtime/template +++ b/srcpkgs/wasmtime/template @@ -2,6 +2,7 @@ pkgname=wasmtime version=0.25.0 revision=1 +create_wrksrc=yes archs="x86_64* i686* aarch64*" build_style=cargo short_desc="Standalone JIT-style runtime for WebAssembly, using Cranelift" @@ -33,15 +34,16 @@ do_check() { : } -pre_configure() { +post_extract() { + mv wasmtime-${version}/* . # move submodules to the proper location rmdir tests/spec_testsuite rmdir crates/c-api/wasm-c-api rmdir crates/wasi-common/WASI rmdir crates/wasi-crypto/spec - mv -v ../testsuite-${_spec_testsuite_commit} tests/spec_testsuite - mv -v ../wasm-c-api-${_wasm_c_api_commit} crates/c-api/wasm-c-api - mv -v ../WASI-${_WASI_commit} crates/wasi-common/WASI - mv -v ../wasi-crypto-${_wasi_crypto_commit} crates/wasi-crypto/spec + mv -v testsuite-${_spec_testsuite_commit} tests/spec_testsuite + mv -v wasm-c-api-${_wasm_c_api_commit} crates/c-api/wasm-c-api + mv -v WASI-${_WASI_commit} crates/wasi-common/WASI + mv -v wasi-crypto-${_wasi_crypto_commit} crates/wasi-crypto/spec } From ddf96d1e521fcfbcf7692210bbd1c6ffa2485095 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:19 +0700 Subject: [PATCH 4/8] wabt: use create-wrksrc --- srcpkgs/wabt/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wabt/template b/srcpkgs/wabt/template index 0a025a820edc..f8cb3d18bb67 100644 --- a/srcpkgs/wabt/template +++ b/srcpkgs/wabt/template @@ -2,6 +2,7 @@ pkgname=wabt version=1.0.23 revision=1 +create_wrksrc=yes build_style=cmake make_check_target=check checkdepends="python3-ply" @@ -22,12 +23,13 @@ checksum="925f47020705cd2cc00a4ff6a36ab08f8adf6d08c7eac5057db0db38b6b2f16d aea8cd095e9937f1e14f2c93e026317b197eb2345e7a817fe3932062eb7b792c" post_extract() { + mv wabt-${version}/* . # move submodule to proper location rmdir third_party/gtest rmdir third_party/testsuite rmdir third_party/wasm-c-api - mv -v ../googletest-${_gtest_commit} third_party/gtest - mv -v ../testsuite-${_testsuite_commit} third_party/testsuite - mv -v ../wasm-c-api-${_wasm_c_api_commit} third_party/wasm-c-api + mv -v googletest-${_gtest_commit} third_party/gtest + mv -v testsuite-${_testsuite_commit} third_party/testsuite + mv -v wasm-c-api-${_wasm_c_api_commit} third_party/wasm-c-api } From bf95df052cbe84ec19ec58722ad0b37dc01c580f 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:18 +0700 Subject: [PATCH 5/8] volk: use create_wrksrc --- srcpkgs/volk/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template index dff042f32d1e..3de82331071b 100644 --- a/srcpkgs/volk/template +++ b/srcpkgs/volk/template @@ -3,6 +3,7 @@ pkgname=volk version=2.5.2 revision=1 _cpu_features_gitrev="188d0d3c383689cdb6bb70dc6da2469faec84f61" +create_wrksrc=yes build_style=cmake hostmakedepends="pkg-config python3-cheetah3 git python3-Mako python3-six" makedepends="python3-cheetah3 python3-devel python3-Mako python3-six" @@ -21,8 +22,9 @@ case "$XBPS_TARGET_MACHINE" in esac post_extract() { + mv volk-$version/* . rm -rf cpu_features - mv ../cpu_features-${_cpu_features_gitrev} cpu_features + mv cpu_features-${_cpu_features_gitrev} cpu_features } volk-devel_package() { From 4f58eb17f6ebcbc8b4df47dffefa960eaf9fec6a 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:18 +0700 Subject: [PATCH 6/8] tracebox: use create-wrksrc --- srcpkgs/tracebox/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template index 5cf656b50641..ca5713072262 100644 --- a/srcpkgs/tracebox/template +++ b/srcpkgs/tracebox/template @@ -5,6 +5,7 @@ revision=5 _click_ver=2.0.1 _crafter_git=3db70ab6fd62ade25de7328aaf8e9ba92696c92e _crafter_ver=0.3.3git +create_wrksrc=yes archs="i686 x86_64" build_style=gnu-configure hostmakedepends="automake pkg-config libtool unzip" @@ -26,11 +27,12 @@ nocross=yes CXXFLAGS="-DHAVE_LUA_PUSHGLOBALTABLE=1" pre_configure() { + mv tracebox-${version}/* . # Do what ./bootstrap.sh would have done but without using git to pull submodules mkdir -p ${wrksrc}/test/tools ${wrksrc}/noinst/libcrafter - mv -v ../click-${_click_ver} test/tools/click - mv -v ../libcrafter-${_crafter_git}/{.gitignore,README,libcrafter} noinst/libcrafter - rmdir -v ../libcrafter-${_crafter_git} + mv -v click-${_click_ver} test/tools/click + mv -v libcrafter-${_crafter_git}/{.gitignore,README,libcrafter} noinst/libcrafter + rmdir -v libcrafter-${_crafter_git} # Set missing AM_PROG_AR sed -e "/AC_PROG_CXX/iAM_PROG_AR=${AR}" -i noinst/libcrafter/libcrafter/configure.ac autoreconf --force --install --verbose From e62ef1291fc9f6e7d1707ca3e96235be65808725 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 7/8] tigervnc: fix build after auto create-wrksrc --- srcpkgs/tigervnc/template | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template index 8c1c1d360db3..4add2881ac25 100644 --- a/srcpkgs/tigervnc/template +++ b/srcpkgs/tigervnc/template @@ -3,6 +3,7 @@ pkgname=tigervnc version=1.10.1 revision=3 _xorg_version=1.20.0 +create_wrksrc=yes build_style=cmake hostmakedepends="automake gettext xorg-util-macros font-util pkg-config libtool xtrans" makedepends="fltk-devel zlib-devel libXtst-devel libjpeg-turbo-devel pixman-devel @@ -13,18 +14,29 @@ short_desc="High performance, multi-platform VNC client and server" maintainer="Evan Deaubl " license="GPL-2.0-or-later" homepage="https://www.tigervnc.org" -distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz>tigervnc-${version}.tar.gz +distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz ${XORG_SITE}/xserver/xorg-server-${_xorg_version}.tar.bz2" checksum="19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4 9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6" conflicts="turbovnc>=0" +skip_extraction="xorg-server-${_xorg_version}.tar.gz" -post_configure() { - cd ${wrksrc}/unix/xserver - cp -R ${XBPS_BUILDDIR}/xorg-server-${_xorg_version}/* . - patch -p1 <../xserver120.patch +post_extract() { + mv tigervnc-${version}/* . + cp -R xorg-server-${_xorg_version}/* unix/xserver +} + +post_patch() { + cd unix/xserver + _xorg_version=${_xorg_version%.*} + _xorg_version=${_xorg_version/./} + patch -p1 <../xserver${_xorg_version}.patch # glvnd changed versioning vsed -i configure.ac -e '/LIBGL/s/[79]\..\.0/1.2/' +} + +post_configure() { + cd unix/xserver autoreconf -fi ./configure --host=${XBPS_CROSS_TRIPLET} --prefix=/usr \ --with-pic --without-dtrace --disable-static \ From 2ff05a763f8606fb4dea3fbd32fbc618835e002d 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 8/8] 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 }