From eb0ab4d136836072b74c0b715f3872a58b191fb8 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 09:57:33 -0400 Subject: [PATCH 01/45] backports/calibre: upgrade to 7.20.0 --- backports/calibre/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backports/calibre/APKBUILD b/backports/calibre/APKBUILD index 79582ee..74af5a9 100644 --- a/backports/calibre/APKBUILD +++ b/backports/calibre/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Cowington Post pkgname=calibre -pkgver=7.12.0 +pkgver=7.20.0 pkgrel=0 pkgdesc="Ebook management application" # qt6-webengine @@ -59,6 +59,7 @@ makedepends=" qt6-qtbase-dev uchardet-dev xdg-utils + ffmpeg-dev " subpackages=" $pkgname-pyc @@ -100,7 +101,6 @@ package() { python3 setup.py install \ --staging-root="$pkgdir"/usr \ - --no-compile \ --system-plugins-location=/usr/share/calibre/system-plugins cp -a man-pages/ "$pkgdir"/usr/share/man @@ -111,6 +111,6 @@ package() { } sha512sums=" -ee654260d7047f0579a659b8907439a407fb561affcef84141126840452e7b98d10bb5e0a69e0cc809d9ba68729570900a0e7251f18b2056a94b0213880f1363 calibre-7.12.0.tar.xz +3b6e2d4ed8d0755096b466f4bdcc8b6ca4810398caa2322c1efc30280680ff8b10dc5fb8cb763bed8fee82746e7c51c6f31f56e5d9689d5f43c671442004c532 calibre-7.20.0.tar.xz eb8e7ce40ff8b8daf6e7e55a5dff8ec4dff06c45744266bb48b3194e92ab1196bc91468203e3c2ca1e5144166a7d6be90e6cf0253513e761b56a4c85be4c2c76 0001-calibre-no-update.patch " -- 2.45.2 From 3d07334f691343e18fa7cff54191c4d99c55dc6f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 09:57:51 -0400 Subject: [PATCH 02/45] backports/caprine: bump pkgrel --- backports/caprine/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backports/caprine/APKBUILD b/backports/caprine/APKBUILD index c77c50e..9a73d39 100644 --- a/backports/caprine/APKBUILD +++ b/backports/caprine/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) pkgname=caprine pkgver=2.60.1 -pkgrel=1 +pkgrel=2 pkgdesc="Elegant Facebook Messenger desktop app" arch="x86_64 aarch64" # blocked by electron url="https://github.com/sindresorhus/caprine" -- 2.45.2 From e24a2df16406adb30176a66968533677d03b1744 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 09:58:25 -0400 Subject: [PATCH 03/45] backports/coin: bump pkgrel --- backports/coin/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backports/coin/APKBUILD b/backports/coin/APKBUILD index 7881fd9..723ea30 100644 --- a/backports/coin/APKBUILD +++ b/backports/coin/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman -# Maintainer: Aiden Grossman +# Maintainer: pkgname=coin pkgver=4.0.0 -pkgrel=6 +pkgrel=7 pkgdesc="OpenGL OpenInventor compatible graphics library" url="https://github.com/coin3d/coin" license="BSD-3-Clause" -- 2.45.2 From 0e6979a5e26a06614d0cd9f1db85404db2ae38dd Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 09:58:57 -0400 Subject: [PATCH 04/45] backports/cura: bump pkgrel --- backports/cura/APKBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backports/cura/APKBUILD b/backports/cura/APKBUILD index c6964f8..7c669be 100644 --- a/backports/cura/APKBUILD +++ b/backports/cura/APKBUILD @@ -7,12 +7,13 @@ pkgver=5.2.2 pkgrel=1 pkgdesc="3D printer / slicing GUI built on top of the Uranium framework" url="https://ultimaker.com/software/ultimaker-cura" -arch="noarch !ppc64le !x86 !armhf !riscv64 !s390x !armv7" # ppc64le: no py3-keyring +# ppc64le: no py3-keyring # x86: no curaengine # armhf: no uranium, qt5-qtquickcontrols, qt5-qtquickcontrols2, qt5-qtgraphicaleffects # riscv64: no uranium # s390x: no py3-trimesh, no py3-numpy-stl # armv7: no py3-trimesh +arch="noarch !ppc64le !x86 !armhf !riscv64 !s390x !armv7" license="LGPL-3.0-or-later" # add cura-binary-data to depends when packaged depends=" -- 2.45.2 From 5f2a6598f3b0a5dcf6991f4b8175883d95bc78b4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 09:59:14 -0400 Subject: [PATCH 05/45] backports/electron: upgrade to 33.0.2 --- backports/electron/APKBUILD | 153 +++++----- backports/electron/compiler.patch | 23 +- .../electron/disable-failing-tests.patch | 18 -- .../{icon.patch => electron_icon.patch} | 0 ...patch => electron_python-jinja-3.10.patch} | 0 .../electron_system-zlib-headers.patch | 10 + ...ode.patch => electron_unbundle-node.patch} | 13 +- ...hash.patch => electron_webpack-hash.patch} | 0 .../fix-missing-cstdint-include-musl.patch | 13 - backports/electron/import-version.patch | 15 - backports/electron/libstdc++13.patch | 269 ------------------ backports/electron/mman.patch | 13 - backports/electron/musl-sandbox.patch | 10 +- backports/electron/no-execinfo.patch | 14 +- backports/electron/no-mallinfo.patch | 18 +- .../electron/partalloc-no-tagging-arm64.patch | 11 + backports/electron/perfetto-libstdc++.patch | 20 -- backports/electron/pvalloc.patch | 14 +- backports/electron/quiche-array.patch | 12 - backports/electron/random-fixes.patch | 94 ------ backports/electron/system-zstd.patch | 46 --- 21 files changed, 142 insertions(+), 624 deletions(-) rename backports/electron/{icon.patch => electron_icon.patch} (100%) rename backports/electron/{python-jinja-3.10.patch => electron_python-jinja-3.10.patch} (100%) create mode 100644 backports/electron/electron_system-zlib-headers.patch rename backports/electron/{unbundle-node.patch => electron_unbundle-node.patch} (78%) rename backports/electron/{webpack-hash.patch => electron_webpack-hash.patch} (100%) delete mode 100644 backports/electron/fix-missing-cstdint-include-musl.patch delete mode 100644 backports/electron/import-version.patch delete mode 100644 backports/electron/libstdc++13.patch delete mode 100644 backports/electron/mman.patch delete mode 100644 backports/electron/perfetto-libstdc++.patch delete mode 100644 backports/electron/quiche-array.patch delete mode 100644 backports/electron/random-fixes.patch delete mode 100644 backports/electron/system-zstd.patch diff --git a/backports/electron/APKBUILD b/backports/electron/APKBUILD index a35cba1..12d58f4 100644 --- a/backports/electron/APKBUILD +++ b/backports/electron/APKBUILD @@ -1,16 +1,18 @@ -# Maintainer: lauren n. liberda +# Contributor: lauren n. liberda +# Maintainer: Antoine Martin (ayakael) pkgname=electron -pkgver=30.0.9 -_semver="${pkgver/_beta/-beta.}" +pkgver=33.0.2 +_gittag=v"${pkgver/_beta/-beta.}" pkgrel=0 -_chromium=124.0.6367.233 -_copium_tag=124.5 +_chromium=130.0.6723.59 +_copium_tag=129.1 _depot_tools=495b23b39aaba2ca3b55dd27cadc523f1cb17ee6 pkgdesc="Electron cross-platform desktop toolkit" url="https://github.com/electron/electron" arch="aarch64 x86_64" # same as chromium license="MIT" depends="gtk+3.0 so:libudev.so.1 xdg-utils" +_llvmver=19 makedepends=" ada-dev alsa-lib-dev @@ -22,7 +24,7 @@ makedepends=" bzip2-dev c-ares-dev cairo-dev - clang-dev + clang$_llvmver-dev clang-extra-tools compiler-rt crc32c-dev @@ -44,12 +46,12 @@ makedepends=" gzip harfbuzz-dev hdrhistogram-c-dev - highway-dev hunspell-dev http-parser-dev hwdata-dev java-jdk jpeg-dev + jsoncpp-dev krb5-dev lcms2-dev libarchive-tools @@ -75,7 +77,7 @@ makedepends=" libxslt-dev linux-headers lld - llvm + llvm$_llvmver mesa-dev minizip-dev nghttp2-dev @@ -95,11 +97,16 @@ makedepends=" py3-six python3 qt5-qtbase-dev + re2-dev rsync rust + rust-bindgen samurai + snappy-dev speex-dev + spirv-tools-dev sqlite-dev + woff2-dev xcb-proto yarn zlib-dev @@ -107,21 +114,18 @@ makedepends=" " subpackages="$pkgname-lang $pkgname-dev" # the lower patches are specific to electron, the top ones are from the equivalent chromium version -source="https://ab-sn.lnl.gay/electron-$_semver-$_chromium.tar.zst +source=" + https://ayakael.net/api/packages/mirrors/generic/electron/$_gittag/electron-$_gittag-$_chromium.tar.zst copium-$_copium_tag.tar.gz::https://codeberg.org/selfisekai/copium/archive/$_copium_tag.tar.gz chromium-revert-drop-of-system-java.patch compiler.patch disable-dns_config_service.patch disable-failing-tests.patch fc-cache-version.patch - fix-missing-cstdint-include-musl.patch fix-opus.patch fstatat-32bit.patch gdbinit.patch generic-sensor-include.patch - import-version.patch - libstdc++13.patch - mman.patch musl-auxv.patch musl-sandbox.patch musl-tid-caching.patch @@ -131,18 +135,15 @@ source="https://ab-sn.lnl.gay/electron-$_semver-$_chromium.tar.zst no-res-ninit-nclose.patch no-sandbox-settls.patch partalloc-no-tagging-arm64.patch - perfetto-libstdc++.patch pvalloc.patch - random-fixes.patch - quiche-array.patch - system-zstd.patch temp-failure-retry.patch yes-musl.patch - icon.patch - python-jinja-3.10.patch - webpack-hash.patch - unbundle-node.patch + electron_icon.patch + electron_python-jinja-3.10.patch + electron_webpack-hash.patch + electron_unbundle-node.patch + electron_system-zlib-headers.patch default.conf electron.desktop @@ -150,21 +151,23 @@ source="https://ab-sn.lnl.gay/electron-$_semver-$_chromium.tar.zst " _copium_patches=" cr124-iwyu-sys-select-dawn-terminal.patch - cr124-libwebp-shim-sharpyuv.patch + cr126-aarch64-musl-unsupported-relocation.patch + cr129-ffmpeg-no-noh264parse.patch + cr129-musl-metricts-imports.patch " # tests are todo for some base checks options="!check net suid" -builddir="$srcdir/electron-$_semver-$_chromium" +builddir="$srcdir/electron-$_gittag-$_chromium" export PATH="$PATH:/usr/lib/qt5/bin" -export CC=clang -export CXX=clang++ +export CC=clang-$_llvmver +export CXX=clang++-$_llvmver # required to find the tools export AR=llvm-ar export NM=llvm-nm -export LD=clang++ +export LD=clang++-$_llvmver # less log spam, reproducible export CFLAGS="${CFLAGS/-g/} -O2 -Wno-builtin-macro-redefined -Wno-deprecated-declarations -Wno-shift-count-overflow -Wno-ignored-attributes" @@ -188,6 +191,7 @@ snapshot() { # vpython3 execs system python3 with this set export VPYTHON_BYPASS="manually managed python not supported by chrome operations" export CHROMIUM_BUILDTOOLS_PATH="$srcdir/src/buildtools" + export DEPOT_TOOLS_UPDATE=0 mkdir -p "$srcdir" cd "$srcdir" @@ -205,7 +209,7 @@ snapshot() { echo "solutions = [ { \"name\": \"src/electron\", - \"url\": \"https://github.com/electron/electron.git@v$_semver\", + \"url\": \"https://github.com/electron/electron.git@$_gittag\", \"deps_file\": \"DEPS\", \"managed\": False, \"custom_deps\": { @@ -220,8 +224,7 @@ snapshot() { --nohooks python3 src/build/landmines.py - python3 src/build/util/lastchange.py -o src/build/util/LASTCHANGE - python3 src/build/util/lastchange.py -s src/third_party/dawn \ + python3 src/build/util/lastchange.py -o src/build/util/LASTCHANGE \ --revision src/gpu/webgpu/DAWN_VERSION python3 src/build/util/lastchange.py -m GPU_LISTS_VERSION \ --revision-id-only --header src/gpu/config/gpu_lists_version.h @@ -234,26 +237,27 @@ snapshot() { python3 src/electron/script/apply_all_patches.py \ src/electron/patches/config.json - mv src $pkgname-$_semver-$_chromium + mv src $pkgname-$_gittag-$_chromium # extra binaries are most likely things we don't want, so nuke them all - for elf in $(scanelf -RA -F "%F" $pkgname-$_semver-$_chromium); do + for elf in $(scanelf -RA -F "%F" $pkgname-$_gittag-$_chromium); do rm -f "$elf" done msg "generating tarball.. (this takes a while)" - tar -cf $pkgname-$_semver-$_chromium.tar \ + tar -cf $pkgname-$_gittag-$_chromium.tar \ --exclude="ChangeLog*" \ --exclude="testdata/*" \ --exclude="test_data/*" \ --exclude="android_rust_toolchain/*" \ + --exclude="third_party/instrumented_libs/binaries" \ --exclude-backups \ --exclude-caches-all \ --exclude-vcs \ - $pkgname-$_semver-$_chromium + $pkgname-$_gittag-$_chromium - zstd --auto-threads=logical --ultra --long -22 -T"${ZSTD_LIMIT:-0}" -vv $pkgname-$_semver-$_chromium.tar -o "$SRCDEST"/$pkgname-$_semver-$_chromium.tar.zst - mcli cp "$SRCDEST"/$pkgname-$_semver-$_chromium.tar.zst "$_distbucket" + zstd --auto-threads=logical --ultra --long -22 -T"${ZSTD_LIMIT:-0}" -vv $pkgname-$_gittag-$_chromium.tar -o "$SRCDEST"/$pkgname-$_gittag-$_chromium.tar.zst + mcli cp "$SRCDEST"/$pkgname-$_gittag-$_chromium.tar.zst "$_distbucket" } prepare() { @@ -267,7 +271,7 @@ prepare() { ;; esac done - if [ ! -z "$failed" ]; then + if [ -n "$failed" ]; then error "The following patches failed to apply:" for i in $failed; do printf " %s\n" "$i" >&2 @@ -291,9 +295,9 @@ prepare() { git config commit.gpgsign false git add LICENSE git commit -m "init" - git tag "v$_semver" + git tag "$_gittag" git pack-refs - yarn install --frozen-lockfile --no-scripts + yarn install --frozen-lockfile --ignore-scripts ) ( @@ -303,10 +307,11 @@ prepare() { # reusable system library settings # flatbuffers - tensorflow has a few static_asserts for a specific patch version + # highway - requires highway>=1.1.0 (arm failures) # libavif - https://github.com/AOMediaCodec/libavif/commit/50a541469c98009016af8dcc9f83a1be79f3a7d9 # libaom - https://aomedia.googlesource.com/aom/+/706ee36dcc82%5E%21/ # but watch this space: https://aomedia-review.googlesource.com/c/aom/+/188606 - # jsoncpp, re2, snappy, swiftshader, vulkan, woff2 - needs use_custom_libcxx=false + # jsoncpp, re2, snappy, swiftshader-*, woff2 - requires use_custom_libcxx=false local chromium_use_system=" brotli crc32c @@ -317,7 +322,6 @@ prepare() { fontconfig freetype harfbuzz-ng - highway icu libdrm libevent @@ -333,8 +337,9 @@ prepare() { zstd " - for _lib in $chromium_use_system jinja2 libjpeg_turbo; do + for _lib in $chromium_use_system jinja2 libjpeg_turbo unrar; do msg "Removing buildscripts for system provided $_lib" + _lib="${_lib/swiftshader-/swiftshader/third_party/}" find . -type f -path "*third_party/$_lib/*" \ \! -path "*third_party/$_lib/chromium/*" \ \! -path "*third_party/$_lib/google/*" \ @@ -387,6 +392,12 @@ prepare() { $chromium_use_system python3 third_party/libaddressinput/chromium/tools/update-strings.py + # flatc is used in build workflows since https://crrev.com/c/5595037, + # but the pre-generated files are still checked-in. remove to make sure + # they're not used. (if used, they will break builds on version mismatch.) + # https://github.com/tensorflow/tensorflow/issues/62298 + # find third_party/tflite/ -name '*_generated.h' -delete + # prevent annoying errors when regenerating gni sed -i 's,^update_readme$,#update_readme,' \ third_party/libvpx/generate_gni.sh @@ -399,8 +410,7 @@ prepare() { sed -i -e 's/\/malloc/' -e 's/\/free/' \ third_party/blink/renderer/core/xml/*.cc \ third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \ - third_party/libxml/chromium/*.cc \ - third_party/maldoca/src/maldoca/ole/oss_utils.h + third_party/libxml/chromium/*.cc _configure } @@ -409,8 +419,6 @@ _configure() { cd "$builddir" msg "Configuring build" - local clang_ver="$(clang -dumpversion)" - case "$USE_CCACHE" in 1) local cc_wrapper="ccache" @@ -433,7 +441,7 @@ _configure() { chrome_pgo_phase=0 clang_base_path=\"/usr\" clang_use_chrome_plugins=false - clang_version=\"${clang_ver%%.*}\" + clang_version=\"$_llvmver\" custom_toolchain=\"//build/toolchain/linux/unbundle:default\" disable_fieldtrial_testing_config=true enable_hangout_services_extension=true @@ -453,11 +461,12 @@ _configure() { is_official_build=true link_pulseaudio=true proprietary_codecs=true - regenerate_x11_protos=true rtc_link_pipewire=true rtc_use_pipewire=true rustc_version=\"yes\" + rust_bindgen_root=\"/usr\" rust_sysroot_absolute=\"/usr\" + safe_browsing_use_unrar=false symbol_level=$symbol_level treat_warnings_as_errors=false use_custom_libcxx=true @@ -490,15 +499,12 @@ _configure() { build() { export PATH="$PATH:/usr/lib/qt5/bin" - # ~1 GB per concurrent job is not enough with gcc - _njobs="${NJOBS:-"$(python3 -c 'import os; print(max((os.cpu_count() - (10 if os.uname().machine == "aarch64" else 8), 1)))')"}" - - ninja -C out/Release -j$_njobs \ + ninja -C out/Release \ + copy_node_headers \ electron_dist_zip \ node_gypi_headers \ node_version_header - cp -vf out/Release/gen/node_headers/include/node/config.gypi third_party/electron_node/config.gypi } package() { @@ -512,13 +518,7 @@ package() { install -Dm755 "$srcdir"/default.conf "$pkgdir"/etc/electron/default.conf mkdir -p "$pkgdir"/usr/include/electron - - ( - cd third_party/electron_node/ - HEADERS_ONLY=1 python3 ./tools/install.py install "$pkgdir" "/usr/include/electron/node_headers" - ) - # required overrides - install -Dm644 out/Release/gen/node_headers/include/node/* -t "$pkgdir"/usr/include/electron/node_headers/include/node + cp -rv "$builddir"/out/Release/gen/node_headers "$pkgdir"/usr/include/electron ln -sv /usr/include/electron/node_headers/include/node "$pkgdir"/usr/include/electron/node mkdir -p "$pkgdir"/usr/include/electron/node_headers/include/nan @@ -544,41 +544,34 @@ lang() { } sha512sums=" -97024407a16fb41ec56fcc6df5552165ce4eea34fc51b17ecbf30a7e35406baccf8a3001a795a06d1e92d32e134d9d7a18d59fa74eda1b1bc23b59bc4947929b electron-30.0.9-124.0.6367.233.tar.zst -13c647dc2024e27ae8a4d7e8f1202037a342f4a7054477226665c332029e1b6f1d8b99004c2b2809bcf1e6c19b1359ef5e1c971552d7ced59c5b43d5a836af88 copium-124.5.tar.gz +6523db0feb88a742a8c7228481ae25ed9ea4eaf1cbab84d9a91212bf3590f1b87fd244bc6583e90e78ab15e4be28cc70ddaa270d582c68eaa131e3be455c58fe electron-v33.0.2-130.0.6723.59.tar.zst +6138b3dbf3903c78f4ca1ed5a6c3c3c485471ded31976010484ce8893d03953df2b8f066a4fe84bbde5ae7ef9bbff664ef917e247b2e95dd471de40f2774d7d0 copium-129.1.tar.gz 29bb685e03356a77df5fd347cdf55194cc8b3265c421cc76e54d64edefc329dbcb052deb26b22e8f587ce68456876c071de1b7d258dd0fcc6ee66c875ec4a020 chromium-revert-drop-of-system-java.patch -54eb147c0af2ba096d1df375a289b339ee855ab1a9114e7c747753f0274a6bafb7212c1859b7885454c4529d9a5e3bd9559fc14e8e006f23ccd381895fa68d15 compiler.patch +53b7cdee8f7bfb4c9371cb385c473e34ed3d8ac7efaa43c0af061107560be30d8747b07fb0b16c01079b8c770f2c721bb5a8081313b7c126856ea4078a74da2a compiler.patch 4057cc78f10bfd64092bc35a373869abb1d68b880cdbca70422f39ffd78a929c19c7728d4d4c40709aaba25581148a93ae5343e724849fd35323062ed68753fa disable-dns_config_service.patch -111bc22fb704d97759988268a40d6b356c51b0bd7a8119a694e905ffe21850ff64e91566cd0dd0c9d62fcb46dca8acc821436c34eb0ba78be872ee4f7ec88a7b disable-failing-tests.patch +2470904846e3adde2c9506f9e78220daca0932320b628dd3d427bf2b7c17a8f7880cb97e787b046c28de7aca642e1a8d30824d6049905976da77e7473baa64da disable-failing-tests.patch 5fc5c012c1db6cf1ba82f38c6f3f4f5ca3a209e47ac708a74de379b018e0649b7694877c9571ef79002dde875ffc07b458a3355425f1c01867f362c66c2bc1bf fc-cache-version.patch -9200f78bad70e95c648a5e8392d50642190600f655c6baa366ff6467ebad52d3b3f305dad58f3610da67136f4b723557653b174ec5c25be8d8737ee04d9ee09f fix-missing-cstdint-include-musl.patch b24563e9a738c00fce7ff2fbdee3d7c024d9125d7c74d9ab90af6bdb16f7ec8419f2c8aa78c0640f6d5d81c17dc2c673a194401d354f466749672729b48ed068 fix-opus.patch c63dee5044353eb306a39ca1526158c0f003ab310ecb03d1c368dc2a979454590c84b8d3c15484517d5e66bb8add9b231da9abbadf2e50850abd72ac1345c4ab fstatat-32bit.patch 33ee60863cc438ef57ffef92ba4cf67a856a5ffc16138bce241bcf87e47b15154aa86918e793c26f7ec4dc62a445257ad5673ed7001daf22c4043cf6cc57da7f gdbinit.patch 36a764fa73443b47d38050b52dbe6ad2fa8d67201ff4ccdbad13b52308ef165ca046aac6f9609fe35890a6485f0f3e672e78cc41e3e44f3cdc7f145e540524e8 generic-sensor-include.patch -8de65109ece27ea63bd469f2220c56b8c752ba0a50fdf390082a2d5ae74b8e010199126175569f6d5084270dd4e0571e68aec32c0bca8211a6699925b3a09124 import-version.patch -c49a1b06e061faa430d66dd5b404ef6c843e4d8a6e9012e963009a161b4726f8eb92c4da8fa710f8861f6e4daa8be5f68abee41a7d9fc02f2a0eb61ce53b5fdd libstdc++13.patch -e75f57ae34c97ca1caf15fa4b4106c6c1e79c31ed66869cf92ed9ea0c449886c9511e455047c17c1e9ad8b9a46ad4948511a4f2995a4b6030fb4d1c7ae21d038 mman.patch 99bcc7dd485b404a90c606a96addab1d900852128d44fb8cea8acc7303189ef87c89a7b0e749fd0e10c5ef5f6bf1fadeb5c16a34503cab6a59938ce2653d887e musl-auxv.patch -50c274a420bb8a7f14fcb56e40920dac8f708792a4520789b4987facea459bef88113d5a2b60fa8c57bee6e92bff3617d6b73fa305c8c44614c638971cffd440 musl-sandbox.patch +51f1959bd622af26a1c3a1f4b0ad9a5bfa461057aa4cf9960c568dddf8ac47d55989c277f5d5ab5db040a04c54925a531af7a1cc767559218b408eaa6bdd7577 musl-sandbox.patch e7163ac5810ac85366cef2447412287c856e3d67c6b77f219a6e5a418b1965b98e449c409424ad0704a5bded9355dd0aec3dc4585918ce5a2ab36c079707afe2 musl-tid-caching.patch 92eb002718026611f5542362ad69b67f0a398ff71b3fca5c05d55cb5c6f9f29334e5e127bb4860cfaa3fba0f0d4c901e2b98808217e7dc02e254a64a5c9521aa musl-v8-monotonic-pthread-cont_timedwait.patch -73bca6c6f9873f2f11cef04f3f41f71e0ae86e7e2d77e14db4298675fec390744c5081f6fdb14052e5ee2b5885be1198c3aa6068eb2b656d1a665c0c3f36e708 no-execinfo.patch -8e17101d69e23b456a9c03dc2fe95bcd56846389707ba6f4720192a9e9168406d20d9168dbebbb3a47d921ec92e478f0e390f46e6b9bb43a34dda217c6e6448b no-mallinfo.patch +a250cff50d282b02ce0f28880d0a2b4fb8e7df51bc072bfeeddc561c29a7c76453dbcbc7b17b82966a7b30a31409d2555720d1dcf963e1b3fb8a2a06a6abcf46 no-execinfo.patch +0b41aeb6b212f9c3f61aa0a8d3085c9e865a2e68f3270ceec2376aab67f337ac46eaea7da36d3fd7219e2a1cb731b7aa2d3fb619a374d2b7653976b9f4f384bb no-mallinfo.patch e4c4e5bc6f828f9c883dd418c0ba01887949c29c311f76206a1ec29f620b0c0ba0452949dc2778a9c46ea066405857536964a36436a68eecf7da7952736333cf no-res-ninit-nclose.patch 6dc4d8dc92e685dace62265a1ddb3aebc558aed54d20ff6d36b030be0c48d7e84662326c31363612492574d9a03c62653cdc21a60995b97dee1d75cae86a9f9b no-sandbox-settls.patch -d4ac7f350806b4410ccb1df3b0ad7e90a7b6d724a16919761aa2d47a6f21008c7374da528b05b754ee712b85d23adfb113c7f7b9ca2ed5b47644fe3ea0cb9119 partalloc-no-tagging-arm64.patch -8e1aca983890c78d81a6f888b2cf1aa42878d1f8523e87d63b800e1e468cbfd33e5ff6a0975775ca222fe82f30c6497da95505da01b091c8776a44c98ac86f0f perfetto-libstdc++.patch -2eb434b4fc6aee77026492644cd86772a543d9845f112a75cd4c3e1f25c9435cc31f8454c1c73223451fc9be69b86e822ff68821978f67f2fc8bcba50296d8e0 pvalloc.patch -803b8117c65132f76bec42054a4b2257a078b15b07fd08645fec2dfd51aa4e0075a9015300cd579d4ae0d757d9850b9988e080cfc2eea093f6684fdf82c4722c random-fixes.patch -86f612dd2b39602984a75b1b11c2ab8bc8cc6b4e78fae998570a777a6901ae45fdcdb22e46dd006dab703a0674e64c72cf8120af2dc5b9e78004f402c7e65358 quiche-array.patch -b3beb98b539fe160fbc493ba410ae0f68540cc4b6834f1f8ce9a22c3f4f59ef5d583ad48793e10549fd02a701f833a3969791ef4524322cd1e715ca5bf226bc8 system-zstd.patch +f2b08538ff57c50b3772a07ca91845f9d45f4a5112f608b6192d4fb5d7be48f478c0c36194d95ab7bbf933e0278e5c6d578619d8643895cdc40386eebc5b975f partalloc-no-tagging-arm64.patch +03f829a2da633533ef3fd0f287f5ec602d936a97a98b53cd2415553c2537ae9d571f35397ca7c9fb3f4b0806c300e3b189569f8d979ca132e1a2a4dae7206396 pvalloc.patch e48693e6b7aeebf69a5acbf80d9a35defe4c23835121dfeb58b051ac7c527e758a41004f4d193274fe1b01c0bfb1dbc77b09cb6a404a3fdee507a2918afb0edb temp-failure-retry.patch 914ccf649d7771f19f209ab97f99c481aebc6f66174d68e8b539f6ad4a70bc8cb0fae2df6dadbf0415958ffb3574c420fe029079dcce45f5e5add4db2e903566 yes-musl.patch -465107da7818b237e3c144a318ab80c3c9343b51ed38b8971ef204692d13346929becbe94cefad4c153788d3a200642143584d5ca070f6304e768ba2139c19ec icon.patch -e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3 python-jinja-3.10.patch -2aa340854316f1284217c0ca17cbf44953684ad6c7da90815117df30928612eb9fb9ffb734b948dfc309cd25d1a67cd57f77aac2d052a3dd9aca07a3a58cbb30 webpack-hash.patch -ebb18a0e2eba4b4606e900fa82f4b57fe91dcbdc943e17544bccb3c9a011a49b4331cdbee59629e44b80184bad4ea54ec887c0bfcd00cda8d5686060dbf365e3 unbundle-node.patch +465107da7818b237e3c144a318ab80c3c9343b51ed38b8971ef204692d13346929becbe94cefad4c153788d3a200642143584d5ca070f6304e768ba2139c19ec electron_icon.patch +e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3 electron_python-jinja-3.10.patch +2aa340854316f1284217c0ca17cbf44953684ad6c7da90815117df30928612eb9fb9ffb734b948dfc309cd25d1a67cd57f77aac2d052a3dd9aca07a3a58cbb30 electron_webpack-hash.patch +57aa81d46b9cc931092d9d9b3cb4a9859f86c183a236bc5cca6abbaeca86b82bf1b537dd9cb3412114fa4e86087c0022ee3f7e88de974d29b309e9d1714df7a5 electron_unbundle-node.patch +1b35edcf0b41e39e20c4d64dbb978bcaab8036f2fe839930709b269c50cb1321458a15b4d0013246f9e03f58f250a1e3a57ea910db1aa0adbd602a6a11ad33b9 electron_system-zlib-headers.patch e8ea87c547546011c4c8fc2de30e4f443b85cd4cfcff92808e2521d2f9ada03feefb8e1b0cf0f6b460919c146e56ef8d5ad4bb5e2461cc5247c30d92eb4d068e default.conf 191559fc7aa1ea0353c6fb0cc321ee1d5803a0e44848c8be941cfab96277b0de6a59962d373e2a2a1686c8f9be2bcf2d2f33706759a339a959e297d3f7fda463 electron.desktop 5f7ba5ad005f196facec1c0f26108356b64cafb1e5cfa462ff714a33b8a4c757ac00bfcb080da09eb5b65032f8eb245d9676a61ec554515d125ed63912708648 electron-launcher.sh diff --git a/backports/electron/compiler.patch b/backports/electron/compiler.patch index fedc978..cce8a23 100644 --- a/backports/electron/compiler.patch +++ b/backports/electron/compiler.patch @@ -1,12 +1,12 @@ --- ./build/config/compiler/BUILD.gn.orig +++ ./build/config/compiler/BUILD.gn -@@ -613,24 +613,6 @@ +@@ -568,24 +568,6 @@ } } -- # TODO(crbug.com/1488374): This causes binary size growth and potentially +- # TODO(crbug.com/40283598): This causes binary size growth and potentially - # other problems. -- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version. +- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version. - if (default_toolchain != "//build/toolchain/cros:target" && - !llvm_android_mainline) { - cflags += [ @@ -22,10 +22,10 @@ - } - } - - # TODO(crbug.com/1235145): Investigate why/if this should be needed. + # TODO(crbug.com/40192287): Investigate why/if this should be needed. if (is_win) { cflags += [ "/clang:-ffp-contract=off" ] -@@ -1005,17 +987,6 @@ +@@ -998,17 +980,6 @@ # `-nodefaultlibs` from the linker invocation from Rust, which would be used # to compile dylibs on Android, such as for constructing unit test APKs. "-Cdefault-linker-libraries", @@ -43,7 +43,7 @@ ] if (!is_win || force_rustc_color_output) { -@@ -1182,8 +1153,8 @@ +@@ -1175,8 +1146,8 @@ } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl && !(is_chromeos_lacros && is_chromeos_device)) { @@ -54,7 +54,7 @@ } if (!is_nacl) { cflags += [ -@@ -1197,8 +1168,8 @@ +@@ -1190,8 +1161,8 @@ } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia && !(is_chromeos_lacros && is_chromeos_device)) { @@ -65,7 +65,7 @@ } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] -@@ -1983,7 +1954,7 @@ +@@ -1982,7 +1953,7 @@ defines = [ "_HAS_NODISCARD" ] } } else { @@ -76,7 +76,7 @@ cflags += [ "-Wextra" ] --- ./build/config/rust.gni.orig +++ ./build/config/rust.gni -@@ -186,11 +186,11 @@ +@@ -185,11 +185,11 @@ rust_abi_target = "" if (is_linux || is_chromeos) { if (current_cpu == "arm64") { @@ -91,7 +91,7 @@ } else if (current_cpu == "arm") { if (arm_float_abi == "hard") { float_suffix = "hf" -@@ -199,13 +199,13 @@ +@@ -198,15 +198,15 @@ } if (arm_arch == "armv7-a" || arm_arch == "armv7") { # No way to inform Rust about the -a suffix. @@ -101,6 +101,9 @@ - rust_abi_target = "arm-unknown-linux-gnueabi" + float_suffix + rust_abi_target = "armv6-alpine-linux-musleabi" + float_suffix } + } else if (current_cpu == "riscv64") { +- rust_abi_target = "riscv64gc-unknown-linux-gnu" ++ rust_abi_target = "riscv64-alpine-linux-musl" } else { # Best guess for other future platforms. - rust_abi_target = current_cpu + "-unknown-linux-gnu" diff --git a/backports/electron/disable-failing-tests.patch b/backports/electron/disable-failing-tests.patch index 2ee8f2b..84d0027 100644 --- a/backports/electron/disable-failing-tests.patch +++ b/backports/electron/disable-failing-tests.patch @@ -160,24 +160,6 @@ ProcessAlternativeServicesTest.Process*: crashed ? TEST_F(FileUtilTest, FILEToFile) { ScopedFILE stream; ---- a/base/debug/stack_trace_unittest.cc -+++ b/base/debug/stack_trace_unittest.cc -@@ -345,6 +345,7 @@ - // sometimes we read fp / pc from the place that previously held - // uninitialized value. - // TODO(crbug.com/1132511): Enable this test on Fuchsia. -+#if 0 - #if defined(MEMORY_SANITIZER) || BUILDFLAG(IS_FUCHSIA) - #define MAYBE_TraceStackFramePointersFromBuffer \ - DISABLED_TraceStackFramePointersFromBuffer -@@ -357,6 +358,7 @@ - const void* frames[kDepth]; - ExpectStackFramePointers(frames, kDepth, /*copy_stack=*/true); - } -+#endif - - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) - #define MAYBE_StackEnd StackEnd --- a/base/threading/platform_thread_unittest.cc +++ b/base/threading/platform_thread_unittest.cc @@ -416,6 +416,7 @@ diff --git a/backports/electron/icon.patch b/backports/electron/electron_icon.patch similarity index 100% rename from backports/electron/icon.patch rename to backports/electron/electron_icon.patch diff --git a/backports/electron/python-jinja-3.10.patch b/backports/electron/electron_python-jinja-3.10.patch similarity index 100% rename from backports/electron/python-jinja-3.10.patch rename to backports/electron/electron_python-jinja-3.10.patch diff --git a/backports/electron/electron_system-zlib-headers.patch b/backports/electron/electron_system-zlib-headers.patch new file mode 100644 index 0000000..0dc5c8e --- /dev/null +++ b/backports/electron/electron_system-zlib-headers.patch @@ -0,0 +1,10 @@ +--- ./electron/BUILD.gn.orig ++++ ./electron/BUILD.gn +@@ -1565,7 +1565,6 @@ + public_deps = header_groups + [ + ":node_gypi_headers", + ":node_version_header", +- ":zlib_headers", + ] + } + diff --git a/backports/electron/unbundle-node.patch b/backports/electron/electron_unbundle-node.patch similarity index 78% rename from backports/electron/unbundle-node.patch rename to backports/electron/electron_unbundle-node.patch index 08122af..d69f5ae 100644 --- a/backports/electron/unbundle-node.patch +++ b/backports/electron/electron_unbundle-node.patch @@ -52,9 +52,11 @@ if (use_system_cares) { configs += [ ":cares" ] } else { ---- ./electron/script/generate-config-gypi.py.orig -+++ ./electron/script/generate-config-gypi.py -@@ -62,6 +62,11 @@ +diff --git a/./electron/script/generate-config-gypi.py.orig b/./electron/script/generate-config-gypi.py +index b41cd7eb450..bc4098debb5 100755 +--- a/./electron/script/generate-config-gypi.py.orig ++++ b/./electron/script/generate-config-gypi.py +@@ -62,6 +62,11 @@ def main(target_file, target_cpu): # Used by certain versions of node-gyp. v['build_v8_with_gn'] = 'false' @@ -63,6 +65,5 @@ + if v.get(f'node_shared_{dep}') is not None: + v[f'node_shared_{dep}'] = 'true' + - with open(target_file, 'w+') as f: - f.write(pprint.pformat(config, indent=2)) - + with open(target_file, 'w+', encoding='utf-8') as file_out: + file_out.write(pprint.pformat(config, indent=2)) diff --git a/backports/electron/webpack-hash.patch b/backports/electron/electron_webpack-hash.patch similarity index 100% rename from backports/electron/webpack-hash.patch rename to backports/electron/electron_webpack-hash.patch diff --git a/backports/electron/fix-missing-cstdint-include-musl.patch b/backports/electron/fix-missing-cstdint-include-musl.patch deleted file mode 100644 index 00f16af..0000000 --- a/backports/electron/fix-missing-cstdint-include-musl.patch +++ /dev/null @@ -1,13 +0,0 @@ -Patch-Source: https://github.com/void-linux/void-packages/blob/378db3cf5087877588aebaaa8ca3c9d94dfb54e0/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch -fixed in https://github.com/google/quiche/commit/4d4820f0a959be7fa22285d114a5b5b8676f10fe --- ---- a/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h -+++ b/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h -@@ -3,6 +3,7 @@ - - #include - -+#include - #include - - #include "common/platform/api/quiche_export.h" diff --git a/backports/electron/import-version.patch b/backports/electron/import-version.patch deleted file mode 100644 index d275038..0000000 --- a/backports/electron/import-version.patch +++ /dev/null @@ -1,15 +0,0 @@ -they fixed the import to be glibc conditional, but now nothing is imported so -all the string functions are missing. --- ---- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -61,8 +61,7 @@ - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) --#include -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) - - #include "base/linux_util.h" - #include "base/strings/string_split.h" diff --git a/backports/electron/libstdc++13.patch b/backports/electron/libstdc++13.patch deleted file mode 100644 index c49f7e8..0000000 --- a/backports/electron/libstdc++13.patch +++ /dev/null @@ -1,269 +0,0 @@ -missing libstdc++13 includes --- ---- a/third_party/openscreen/src/platform/base/error.h -+++ b/third_party/openscreen/src/platform/base/error.h -@@ -6,6 +6,7 @@ - #define PLATFORM_BASE_ERROR_H_ - - #include -+#include - #include - #include - #include ---- a/ui/base/prediction/kalman_filter.h -+++ b/ui/base/prediction/kalman_filter.h -@@ -8,6 +8,8 @@ - #include "base/component_export.h" - #include "ui/gfx/geometry/matrix3_f.h" - -+#include -+ - namespace ui { - - // This Kalman filter is used to predict state in one axles. ---- a/ui/events/types/scroll_types.h -+++ b/ui/events/types/scroll_types.h -@@ -5,6 +5,8 @@ - #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_ - #define UI_EVENTS_TYPES_SCROLL_TYPES_H_ - -+#include -+ - namespace ui { - - enum class ScrollGranularity : uint8_t { ---- a/third_party/webrtc/rtc_base/system/file_wrapper.h -+++ b/third_party/webrtc/rtc_base/system/file_wrapper.h -@@ -14,6 +14,7 @@ - #include - #include - -+#include - #include - - #include "absl/strings/string_view.h" ---- a/third_party/pdfium/constants/annotation_flags.h -+++ b/third_party/pdfium/constants/annotation_flags.h -@@ -5,6 +5,8 @@ - #ifndef CONSTANTS_ANNOTATION_FLAGS_H_ - #define CONSTANTS_ANNOTATION_FLAGS_H_ - -+#include -+ - namespace pdfium { - namespace annotation_flags { - ---- a/third_party/s2cellid/src/s2/util/math/mathutil.h -+++ b/third_party/s2cellid/src/s2/util/math/mathutil.h -@@ -21,6 +21,7 @@ - #ifndef S2_UTIL_MATH_MATHUTIL_H_ - #define S2_UTIL_MATH_MATHUTIL_H_ - -+#include - #include - - class MathUtil { ---- a/third_party/s2cellid/src/s2/s1angle.h -+++ b/third_party/s2cellid/src/s2/s1angle.h -@@ -24,6 +24,7 @@ - #define S2_S1ANGLE_H_ - - #include -+#include - #include - #include - #include ---- a/third_party/maldoca/src/maldoca/ole/header.h -+++ b/third_party/maldoca/src/maldoca/ole/header.h -@@ -45,6 +45,8 @@ - - #include "absl/strings/string_view.h" - -+#include -+ - namespace maldoca { - - class OLEHeader { ---- a/components/password_manager/core/browser/generation/password_generator.h -+++ b/components/password_manager/core/browser/generation/password_generator.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_ - #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_ - -+#include - #include - - ---- a/base/debug/profiler.h -+++ b/base/debug/profiler.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - - #include "base/base_export.h" ---- a/components/dom_distiller/core/url_utils.h -+++ b/components/dom_distiller/core/url_utils.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_DOM_DISTILLER_CORE_URL_UTILS_H_ - #define COMPONENTS_DOM_DISTILLER_CORE_URL_UTILS_H_ - -+#include - #include - - #include "base/strings/string_piece_forward.h" ---- a/components/feature_engagement/internal/event_storage_validator.h -+++ b/components/feature_engagement/internal/event_storage_validator.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_ - #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_ - -+#include - #include - - namespace feature_engagement { ---- a/chrome/test/chromedriver/chrome/web_view_impl.cc -+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include - ---- a/cc/trees/target_property.cc -+++ b/cc/trees/target_property.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "cc/trees/target_property.h" - - #include "ui/gfx/animation/keyframe/target_property.h" ---- a/gpu/config/gpu_feature_info.h -+++ b/gpu/config/gpu_feature_info.h -@@ -5,6 +5,7 @@ - #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_ - #define GPU_CONFIG_GPU_FEATURE_INFO_H_ - -+#include - #include - #include - ---- a/gpu/config/gpu_driver_bug_workarounds.h -+++ b/gpu/config/gpu_driver_bug_workarounds.h -@@ -5,6 +5,7 @@ - #ifndef GPU_CONFIG_GPU_DRIVER_BUG_WORKAROUNDS_H_ - #define GPU_CONFIG_GPU_DRIVER_BUG_WORKAROUNDS_H_ - -+#include - #include - - #include "build/build_config.h" ---- a/third_party/blink/public/common/page_state/page_state.h -+++ b/third_party/blink/public/common/page_state/page_state.h -@@ -5,6 +5,7 @@ - #ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_PAGE_STATE_PAGE_STATE_H_ - #define THIRD_PARTY_BLINK_PUBLIC_COMMON_PAGE_STATE_PAGE_STATE_H_ - -+#include - #include - #include - ---- a/pdf/document_attachment_info.h -+++ b/pdf/document_attachment_info.h -@@ -5,6 +5,7 @@ - #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_ - #define PDF_DOCUMENT_ATTACHMENT_INFO_H_ - -+#include - #include - - ---- a/components/payments/content/utility/fingerprint_parser.h -+++ b/components/payments/content/utility/fingerprint_parser.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - #include - ---- a/media/base/video_transformation.h -+++ b/media/base/video_transformation.h -@@ -5,6 +5,7 @@ - #ifndef MEDIA_BASE_VIDEO_TRANSFORMATION_H_ - #define MEDIA_BASE_VIDEO_TRANSFORMATION_H_ - -+#include - #include - - #include "base/numerics/math_constants.h" ---- a/components/omnibox/browser/on_device_head_model.h -+++ b/components/omnibox/browser/on_device_head_model.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_ - #define COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_ - -+#include - #include - #include - #include ---- a/components/autofill/core/browser/autofill_ablation_study.h -+++ b/components/autofill/core/browser/autofill_ablation_study.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_ - #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_ - -+#include - #include - - class GURL; ---- a/components/autofill/core/browser/strike_databases/strike_database_base.h -+++ b/components/autofill/core/browser/strike_databases/strike_database_base.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_STRIKE_DATABASES_STRIKE_DATABASE_BASE_H_ - #define COMPONENTS_AUTOFILL_CORE_BROWSER_STRIKE_DATABASES_STRIKE_DATABASE_BASE_H_ - -+#include - #include - #include - #include ---- a/chrome/browser/resource_coordinator/decision_details.h -+++ b/chrome/browser/resource_coordinator/decision_details.h -@@ -5,6 +5,7 @@ - #ifndef CHROME_BROWSER_RESOURCE_COORDINATOR_DECISION_DETAILS_H_ - #define CHROME_BROWSER_RESOURCE_COORDINATOR_DECISION_DETAILS_H_ - -+#include - #include - #include - ---- a/net/third_party/quiche/src/quiche/quic/core/qpack/qpack_stream_sender_delegate.h -+++ b/net/third_party/quiche/src/quiche/quic/core/qpack/qpack_stream_sender_delegate.h -@@ -8,6 +8,8 @@ - #include "absl/strings/string_view.h" - #include "quiche/quic/platform/api/quic_export.h" - -+#include -+ - namespace quic { - - // This interface writes encoder/decoder data to peer. ---- a/third_party/perfetto/include/perfetto/base/export.h -+++ b/third_party/perfetto/include/perfetto/base/export.h -@@ -17,6 +17,8 @@ - #ifndef INCLUDE_PERFETTO_BASE_EXPORT_H_ - #define INCLUDE_PERFETTO_BASE_EXPORT_H_ - -+#include -+ - #include "perfetto/base/build_config.h" - #include "perfetto/public/abi/export.h" - diff --git a/backports/electron/mman.patch b/backports/electron/mman.patch deleted file mode 100644 index d15605a..0000000 --- a/backports/electron/mman.patch +++ /dev/null @@ -1,13 +0,0 @@ -needed for PKEY_DISABLE_WRITE. these are documented as also being from sys/ -mman.h with GNU_SOURCE, but musl doesn't do that, so these are strictly from -kernel headers ---- a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_unittest.cc -+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_unittest.cc -@@ -60,6 +60,7 @@ - #include - #include - #include -+#include - #endif // BUILDFLAG(IS_POSIX) - - #if BUILDFLAG(ENABLE_PARTITION_ALLOC_AS_MALLOC_SUPPORT) && BUILDFLAG(IS_MAC) diff --git a/backports/electron/musl-sandbox.patch b/backports/electron/musl-sandbox.patch index 52c3b21..ccd9423 100644 --- a/backports/electron/musl-sandbox.patch +++ b/backports/electron/musl-sandbox.patch @@ -45,7 +45,7 @@ diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ./sandbox/linux/s index d9d1882..0567557 100644 --- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { +@@ -438,6 +438,7 @@ #if defined(__i386__) case __NR_waitpid: #endif @@ -53,7 +53,7 @@ index d9d1882..0567557 100644 return true; case __NR_clone: // Should be parameter-restricted. case __NR_setns: // Privileged. -@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { +@@ -450,7 +451,6 @@ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) case __NR_set_thread_area: #endif @@ -61,16 +61,16 @@ index d9d1882..0567557 100644 case __NR_unshare: #if !defined(__mips__) && !defined(__aarch64__) case __NR_vfork: -@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { - case __NR_mlock: +@@ -549,6 +549,8 @@ case __NR_munlock: case __NR_munmap: + case __NR_mseal: + case __NR_mremap: + case __NR_membarrier: return true; case __NR_madvise: case __NR_mincore: -@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { +@@ -566,7 +568,6 @@ case __NR_modify_ldt: #endif case __NR_mprotect: diff --git a/backports/electron/no-execinfo.patch b/backports/electron/no-execinfo.patch index b1705f5..12064ba 100644 --- a/backports/electron/no-execinfo.patch +++ b/backports/electron/no-execinfo.patch @@ -37,16 +37,16 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 #define HAVE_FCNTL_H 1 --- a/base/debug/stack_trace.cc +++ b/base/debug/stack_trace.cc -@@ -291,7 +291,7 @@ - } - std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { +@@ -311,7 +311,7 @@ + + std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const { std::stringstream stream; -#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - if (ShouldSuppressOutput()) { - return "Backtrace suppressed."; - } -@@ -301,7 +301,7 @@ + OutputToStreamWithPrefix(&stream, prefix_string); + #endif + return stream.str(); +@@ -335,7 +335,7 @@ } std::ostream& operator<<(std::ostream& os, const StackTrace& s) { diff --git a/backports/electron/no-mallinfo.patch b/backports/electron/no-mallinfo.patch index 37abb3f..1f2d541 100644 --- a/backports/electron/no-mallinfo.patch +++ b/backports/electron/no-mallinfo.patch @@ -102,23 +102,23 @@ musl does not implement mallinfo()/mallinfo2() #define HAVE_MALLOC_H 1 --- a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc +++ b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc -@@ -717,7 +717,7 @@ +@@ -660,7 +660,7 @@ - #endif // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_ANDROID) + #endif // !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) +#if 0 SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW { - base::SimplePartitionStatsDumper allocator_dumper; + partition_alloc::SimplePartitionStatsDumper allocator_dumper; Allocator()->DumpStats("malloc", true, &allocator_dumper); --- a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc +++ b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc -@@ -24,7 +24,7 @@ - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) +@@ -29,7 +29,7 @@ + #if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) // Platforms on which we override weak libc symbols. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if (PA_BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || PA_BUILDFLAG(IS_CHROMEOS) - NOINLINE void FreeForTest(void* data) { + PA_NOINLINE void FreeForTest(void* data) { free(data); diff --git a/backports/electron/partalloc-no-tagging-arm64.patch b/backports/electron/partalloc-no-tagging-arm64.patch index e5c7525..fb33151 100644 --- a/backports/electron/partalloc-no-tagging-arm64.patch +++ b/backports/electron/partalloc-no-tagging-arm64.patch @@ -12,3 +12,14 @@ to make the partalloc support code for it work. declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually, +--- ./base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h.orig ++++ ./base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h +@@ -10,7 +10,7 @@ + #include "partition_alloc/build_config.h" + #include "partition_alloc/partition_alloc_buildflags.h" + +-#if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_LINUX) ++#if PA_BUILDFLAG(IS_ANDROID) || (PA_BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) + #define HAS_HW_CAPS + #endif + diff --git a/backports/electron/perfetto-libstdc++.patch b/backports/electron/perfetto-libstdc++.patch deleted file mode 100644 index 31ff9d9..0000000 --- a/backports/electron/perfetto-libstdc++.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/third_party/perfetto/src/trace_processor/perfetto_sql/engine/created_function.cc -+++ b/third_party/perfetto/src/trace_processor/perfetto_sql/engine/created_function.cc -@@ -107,7 +107,7 @@ - // the destructors run correctly for non-trivial members of the - // union. - using Data = -- std::variant; -+ std::variant; - - StoredSqlValue(SqlValue value) { - switch (value.type) { -@@ -132,7 +132,7 @@ - } - - SqlValue AsSqlValue() { -- if (std::holds_alternative(data)) { -+ if (std::holds_alternative(data)) { - return SqlValue(); - } else if (std::holds_alternative(data)) { - return SqlValue::Long(std::get(data)); diff --git a/backports/electron/pvalloc.patch b/backports/electron/pvalloc.patch index 1d874d6..145e05b 100644 --- a/backports/electron/pvalloc.patch +++ b/backports/electron/pvalloc.patch @@ -2,24 +2,24 @@ the pvalloc/valloc symbols are obsolete and not implemented in musl -- --- a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc +++ b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc -@@ -375,7 +375,7 @@ +@@ -410,7 +410,7 @@ ASSERT_GE(aligned_allocs_intercepted_by_alignment[128], 1u); ASSERT_GE(aligned_allocs_intercepted_by_size[53], 1u); --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && defined(__GLIBC__) +-#if PA_BUILDFLAG(IS_POSIX) && !PA_BUILDFLAG(IS_ANDROID) ++#if (PA_BUILDFLAG(IS_POSIX) && defined(__GLIBC__)) && !PA_BUILDFLAG(IS_ANDROID) void* pvalloc_ptr = pvalloc(67); ASSERT_NE(nullptr, pvalloc_ptr); ASSERT_EQ(0u, reinterpret_cast(pvalloc_ptr) % kPageSize); -@@ -414,7 +414,7 @@ +@@ -449,7 +449,7 @@ free(memalign_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u); --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && defined(__GLIBC__) +-#if PA_BUILDFLAG(IS_POSIX) && !PA_BUILDFLAG(IS_ANDROID) ++#if (PA_BUILDFLAG(IS_POSIX) && defined(__GLIBC__)) && !PA_BUILDFLAG(IS_ANDROID) free(pvalloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u); - #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) + #endif // PA_BUILDFLAG(IS_POSIX) && !PA_BUILDFLAG(IS_ANDROID) --- a/base/process/memory_unittest.cc +++ b/base/process/memory_unittest.cc @@ -359,7 +359,7 @@ diff --git a/backports/electron/quiche-array.patch b/backports/electron/quiche-array.patch deleted file mode 100644 index d016b38..0000000 --- a/backports/electron/quiche-array.patch +++ /dev/null @@ -1,12 +0,0 @@ -needed for push_back on array --- ---- a/net/third_party/quiche/src/quiche/common/quiche_endian.h -+++ b/net/third_party/quiche/src/quiche/common/quiche_endian.h -@@ -6,6 +6,7 @@ - #define QUICHE_COMMON_QUICHE_ENDIAN_H_ - - #include -+#include - #include - #include - diff --git a/backports/electron/random-fixes.patch b/backports/electron/random-fixes.patch deleted file mode 100644 index 5bfdef5..0000000 --- a/backports/electron/random-fixes.patch +++ /dev/null @@ -1,94 +0,0 @@ -Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/chromium/-/blob/c073b0c20935d7eb452732e0f3b2860a96c3db21/random-build-fixes.patch --- -diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc -index 41b647f7b44..8940c6bb7fc 100644 ---- a/chrome/browser/download/bubble/download_bubble_update_service.cc -+++ b/chrome/browser/download/bubble/download_bubble_update_service.cc -@@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item) { - // Helper to get an iterator to the last element in the cache. The cache - // must not be empty. - template --SortedItems::const_iterator GetLastIter(const SortedItems& cache) { -+typename SortedItems::const_iterator GetLastIter(const SortedItems& cache) { - CHECK(!cache.empty()); - auto it = cache.end(); - return std::prev(it); -@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheImpl( - } - - template --SortedItems::iterator -+typename SortedItems::iterator - DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter( -- SortedItems::iterator iter, -+ typename SortedItems::iterator iter, - SortedItems& cache, - IterMap& iter_map) { - CHECK(iter != cache.end()); -diff --git a/chrome/test/chromedriver/capabilities.cc b/chrome/test/chromedriver/capabilities.cc -index c0708681ebd..98b8494d170 100644 ---- a/chrome/test/chromedriver/capabilities.cc -+++ b/chrome/test/chromedriver/capabilities.cc -@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::Value& option, - "'version' field of type string"); - } - -- brands.emplace_back(*brand, *version); -+ brands.emplace_back(BrandVersion{*brand, *version}); - } - - client_hints.brands = std::move(brands); -@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::Value& option, - "a 'version' field of type string"); - } - -- full_version_list.emplace_back(*brand, *version); -+ full_version_list.emplace_back(BrandVersion{*brand, *version}); - } - - client_hints.full_version_list = std::move(full_version_list); -diff --git a/components/optimization_guide/core/tflite_model_executor.h b/components/optimization_guide/core/tflite_model_executor.h -index c4f750f4684..b5635f4108b 100644 ---- a/components/optimization_guide/core/tflite_model_executor.h -+++ b/components/optimization_guide/core/tflite_model_executor.h -@@ -189,7 +189,7 @@ class TFLiteModelExecutor : public ModelExecutor { - void SendForBatchExecution( - BatchExecutionCallback callback_on_complete, - base::TimeTicks start_time, -- ModelExecutor::ConstRefInputVector inputs) -+ typename ModelExecutor::ConstRefInputVector inputs) - override { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc -index 2dc0b304092..a82f255090b 100644 ---- a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc -+++ b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc -@@ -169,7 +169,7 @@ class HTMLFastPathParser { - using Span = base::span; - using USpan = base::span; - // 32 matches that used by HTMLToken::Attribute. -- typedef std::conditional, -+ typedef typename std::conditional, - UCharLiteralBuffer<32>, - LCharLiteralBuffer<32>>::type LiteralBufferType; - typedef UCharLiteralBuffer<32> UCharLiteralBufferType; -diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc -index f0b49139147..a308fb67982 100644 ---- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc -+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc -@@ -91,12 +91,12 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags, - case kGradient: - GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(), - ImageDrawOptions()); -- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); -+ flags.setColor(SkColor4f{0.0f, 0.0f, 0.0f, global_alpha}); - break; - case kImagePattern: - GetCanvasPattern()->GetPattern()->ApplyToFlags( - flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform())); -- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); -+ flags.setColor(SkColor4f{0.0f, 0.0f, 0.0f, global_alpha}); - break; - default: - NOTREACHED(); diff --git a/backports/electron/system-zstd.patch b/backports/electron/system-zstd.patch deleted file mode 100644 index 0fcd3ef..0000000 --- a/backports/electron/system-zstd.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ae3ae3711784865bdc38bf119a6182a7b8dae91c Mon Sep 17 00:00:00 2001 -From: Matt Jolly -Date: Sun, 17 Sep 2023 16:51:42 +1000 -Subject: [PATCH] Add system-zstd - ---- a/build/linux/unbundle/replace_gn_files.py -+++ b/build/linux/unbundle/replace_gn_files.py -@@ -74,6 +74,7 @@ REPLACEMENTS = { - # - 'woff2': 'third_party/woff2/BUILD.gn', - 'zlib': 'third_party/zlib/BUILD.gn', -+ 'zstd': 'third_party/zstd/BUILD.gn', - } - - ---- /dev/null -+++ b/build/linux/unbundle/zstd.gn -@@ -0,0 +1,25 @@ -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") -+ -+pkg_config("system_zstd") { -+ packages = [ "libzstd" ] -+} -+ -+shim_headers("zstd_shim") { -+ root_path = "src/lib" -+ headers = [ -+ "zdict.h", -+ "zstd.h", -+ "zstd_errors.h", -+ ] -+} -+ -+source_set("zstd") { -+ deps = [ ":zstd_shim" ] -+ public_configs = [ ":system_zstd" ] -+} -+ -+source_set("decompress") { -+ deps = [ ":zstd_shim" ] -+ public_configs = [ ":system_zstd" ] -+} --- -2.42.0 - -- 2.45.2 From 89aefc26acff54c95c7f27d88ab18dfb85f5b310 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 09:59:36 -0400 Subject: [PATCH 06/45] backports/electron-tasje: upgrade to 0.7.3 --- backports/electron-tasje/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backports/electron-tasje/APKBUILD b/backports/electron-tasje/APKBUILD index 71648c7..ac8776a 100644 --- a/backports/electron-tasje/APKBUILD +++ b/backports/electron-tasje/APKBUILD @@ -1,7 +1,7 @@ # Contributor: lauren n. liberda # Maintainer: lauren n. liberda pkgname=electron-tasje -pkgver=0.7.1 +pkgver=0.7.3 pkgrel=0 pkgdesc="Tiny replacement for electron-builder" url="https://codeberg.org/selfisekai/electron_tasje/" @@ -31,5 +31,5 @@ package() { } sha512sums=" -665ccbd6cb357c25d55daed4ad3b3ce008da258054951d9d069a5b12e72dd5812d534f906868e6b18e78949f058069a961c394c6f21ab3b3fab5393c330445e5 electron_tasje-0.7.1.tar.gz +251b7eabe74acdb5c7394f9d4d735b736acf555352785a9896ddaeed37632b238e823e1bb639e1f5a44a50455957ec41e1a585a3b2a9919b5818bb40843bd877 electron_tasje-0.7.3.tar.gz " -- 2.45.2 From 50bf56e2f05e61234a3aaabb131fb34f2ab57ba6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:00:10 -0400 Subject: [PATCH 07/45] backports/fdm-materials: bump pkgrel --- backports/fdm-materials/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backports/fdm-materials/APKBUILD b/backports/fdm-materials/APKBUILD index 5bde97d..5780f02 100644 --- a/backports/fdm-materials/APKBUILD +++ b/backports/fdm-materials/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman -# Maintainer: Aiden Grossman +# Maintainer: pkgname=fdm-materials pkgver=5.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="FDM Material Database" url="https://github.com/Ultimaker/fdm_materials" arch="noarch" -- 2.45.2 From c518d603235e9957fae9ecba1913c6b031d79864 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:02:03 -0400 Subject: [PATCH 08/45] user/freecad: move from backports due to aports drop --- {backports => user}/freecad/APKBUILD | 0 {backports => user}/freecad/missing-include-cstdint.patch | 0 {backports => user}/freecad/no-execinfo.patch | 0 {backports => user}/freecad/no-workaround-spnav.patch | 0 {backports => user}/freecad/numpy-1.20.patch | 0 {backports => user}/freecad/opencascade-7.8.0.patch | 0 {backports => user}/freecad/resourceDirectory.patch | 0 {backports => user}/freecad/tests.patch | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename {backports => user}/freecad/APKBUILD (100%) rename {backports => user}/freecad/missing-include-cstdint.patch (100%) rename {backports => user}/freecad/no-execinfo.patch (100%) rename {backports => user}/freecad/no-workaround-spnav.patch (100%) rename {backports => user}/freecad/numpy-1.20.patch (100%) rename {backports => user}/freecad/opencascade-7.8.0.patch (100%) rename {backports => user}/freecad/resourceDirectory.patch (100%) rename {backports => user}/freecad/tests.patch (100%) diff --git a/backports/freecad/APKBUILD b/user/freecad/APKBUILD similarity index 100% rename from backports/freecad/APKBUILD rename to user/freecad/APKBUILD diff --git a/backports/freecad/missing-include-cstdint.patch b/user/freecad/missing-include-cstdint.patch similarity index 100% rename from backports/freecad/missing-include-cstdint.patch rename to user/freecad/missing-include-cstdint.patch diff --git a/backports/freecad/no-execinfo.patch b/user/freecad/no-execinfo.patch similarity index 100% rename from backports/freecad/no-execinfo.patch rename to user/freecad/no-execinfo.patch diff --git a/backports/freecad/no-workaround-spnav.patch b/user/freecad/no-workaround-spnav.patch similarity index 100% rename from backports/freecad/no-workaround-spnav.patch rename to user/freecad/no-workaround-spnav.patch diff --git a/backports/freecad/numpy-1.20.patch b/user/freecad/numpy-1.20.patch similarity index 100% rename from backports/freecad/numpy-1.20.patch rename to user/freecad/numpy-1.20.patch diff --git a/backports/freecad/opencascade-7.8.0.patch b/user/freecad/opencascade-7.8.0.patch similarity index 100% rename from backports/freecad/opencascade-7.8.0.patch rename to user/freecad/opencascade-7.8.0.patch diff --git a/backports/freecad/resourceDirectory.patch b/user/freecad/resourceDirectory.patch similarity index 100% rename from backports/freecad/resourceDirectory.patch rename to user/freecad/resourceDirectory.patch diff --git a/backports/freecad/tests.patch b/user/freecad/tests.patch similarity index 100% rename from backports/freecad/tests.patch rename to user/freecad/tests.patch -- 2.45.2 From 88e8dcecf64147f78c28d43b509e5536100f0a15 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:02:34 -0400 Subject: [PATCH 09/45] backports/freetube: bump pkgrel --- backports/freetube/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backports/freetube/APKBUILD b/backports/freetube/APKBUILD index ecd6add..3d4ac08 100644 --- a/backports/freetube/APKBUILD +++ b/backports/freetube/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Antoine Martin (ayakael) pkgname=freetube pkgver=0.21.3 -pkgrel=0 +pkgrel=2 pkgdesc="An open source desktop YouTube player built with privacy in mind." arch="x86_64 aarch64" # blocked by electron license="AGPL-3.0-only" -- 2.45.2 From 02f9275042b80796bdeb3245f5e41a104b452c4c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:03:05 -0400 Subject: [PATCH 10/45] backports/libmedc: bump pkgrel --- backports/libmedc/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backports/libmedc/APKBUILD b/backports/libmedc/APKBUILD index ffc22e4..8976805 100644 --- a/backports/libmedc/APKBUILD +++ b/backports/libmedc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman -# Maintainer: Aiden Grossman +# Maintainer: pkgname=libmedc pkgver=4.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="Open source library for numerical simulation" url="https://www.salome-platform.org/" arch="all" -- 2.45.2 From a97db3bbe510ee253c7640f0e9285b423e57ce1b Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:03:42 -0400 Subject: [PATCH 11/45] user/looking-glass: move from backports due to custom version --- {backports => user}/looking-glass/APKBUILD | 0 {backports => user}/looking-glass/looking-glass.post-deinstall | 0 {backports => user}/looking-glass/missing-includes.patch | 0 .../looking-glass/module_1075-fix-build-linux64.patch | 0 .../looking-glass/module_1124-fix-build-linux610.patch | 0 {backports => user}/looking-glass/obs-plugins-lib.patch | 0 {backports => user}/looking-glass/werror.patch | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename {backports => user}/looking-glass/APKBUILD (100%) rename {backports => user}/looking-glass/looking-glass.post-deinstall (100%) rename {backports => user}/looking-glass/missing-includes.patch (100%) rename {backports => user}/looking-glass/module_1075-fix-build-linux64.patch (100%) rename {backports => user}/looking-glass/module_1124-fix-build-linux610.patch (100%) rename {backports => user}/looking-glass/obs-plugins-lib.patch (100%) rename {backports => user}/looking-glass/werror.patch (100%) diff --git a/backports/looking-glass/APKBUILD b/user/looking-glass/APKBUILD similarity index 100% rename from backports/looking-glass/APKBUILD rename to user/looking-glass/APKBUILD diff --git a/backports/looking-glass/looking-glass.post-deinstall b/user/looking-glass/looking-glass.post-deinstall similarity index 100% rename from backports/looking-glass/looking-glass.post-deinstall rename to user/looking-glass/looking-glass.post-deinstall diff --git a/backports/looking-glass/missing-includes.patch b/user/looking-glass/missing-includes.patch similarity index 100% rename from backports/looking-glass/missing-includes.patch rename to user/looking-glass/missing-includes.patch diff --git a/backports/looking-glass/module_1075-fix-build-linux64.patch b/user/looking-glass/module_1075-fix-build-linux64.patch similarity index 100% rename from backports/looking-glass/module_1075-fix-build-linux64.patch rename to user/looking-glass/module_1075-fix-build-linux64.patch diff --git a/backports/looking-glass/module_1124-fix-build-linux610.patch b/user/looking-glass/module_1124-fix-build-linux610.patch similarity index 100% rename from backports/looking-glass/module_1124-fix-build-linux610.patch rename to user/looking-glass/module_1124-fix-build-linux610.patch diff --git a/backports/looking-glass/obs-plugins-lib.patch b/user/looking-glass/obs-plugins-lib.patch similarity index 100% rename from backports/looking-glass/obs-plugins-lib.patch rename to user/looking-glass/obs-plugins-lib.patch diff --git a/backports/looking-glass/werror.patch b/user/looking-glass/werror.patch similarity index 100% rename from backports/looking-glass/werror.patch rename to user/looking-glass/werror.patch -- 2.45.2 From 85d1fda80ba98da030b986f3e18a06deb8cadb35 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:04:22 -0400 Subject: [PATCH 12/45] backports/nlopt: upgrade to 2.8.0 --- backports/nlopt/APKBUILD | 59 +++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/backports/nlopt/APKBUILD b/backports/nlopt/APKBUILD index 0be29fe..49b6b8b 100644 --- a/backports/nlopt/APKBUILD +++ b/backports/nlopt/APKBUILD @@ -1,38 +1,71 @@ # Contributor: Anjandev Momi -# Maintainer: Anjandev Momi +# Maintainer: Celeste +maintainer="Celeste " pkgname=nlopt -pkgver=2.7.1 +pkgver=2.8.0 pkgrel=0 -pkgdesc="library for nonlinear optimization, wrapping many algorithms for global and local, constrained or unconstrained, optimization" -url="https://github.com/stevengj/nlopt/" +pkgdesc="Library for nonlinear optimization" +url="https://github.com/stevengj/nlopt" arch="all" license="LGPL-2.1-or-later" -makedepends="samurai cmake" -subpackages="$pkgname-dev $pkgname-doc" +makedepends=" + cmake + guile-dev + python3-dev + samurai + swig + " +subpackages=" + $pkgname-dev + $pkgname-doc + $pkgname-guile + " source="$pkgname-$pkgver.tar.gz::https://github.com/stevengj/nlopt/archive/refs/tags/v$pkgver.tar.gz" +case "$CARCH" in +# octave unavailable on these 3 archs +s390x|riscv64|ppc64le) ;; +*) + makedepends="$makedepends octave-dev" + subpackages="$subpackages $pkgname-octave" + ;; +esac + build() { if [ "$CBUILD" != "$CHOST" ]; then - CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + local crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi cmake -B build -G Ninja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=minsizerel \ - $CMAKE_CROSSOPTS . + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ + $crossopts cmake --build build } check() { - cd build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + ctest --test-dir build --output-on-failure } package() { DESTDIR="$pkgdir" cmake --install build } +guile() { + pkgdesc="$pkgdesc (Guile bindings)" + depends="$pkgname=$pkgver-r$pkgrel guile" + + amove usr/lib/guile usr/share/guile +} + +octave() { + pkgdesc="$pkgdesc (Octave bindings)" + depends="$pkgname=$pkgver-r$pkgrel octave" + + amove usr/lib/octave usr/share/octave +} + sha512sums=" -e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2 nlopt-2.7.1.tar.gz +cb294caa5532e11ae0d22ed849705920bbae79f712144c840a5ca865ef8e6a15c6c9540c81ced0c3c05b9f44c360d50f74e235e69d893be34b7e1c5599f07c71 nlopt-2.8.0.tar.gz " -- 2.45.2 From fe16501d695c7c22e0ed136400c2d603aa0aee5d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:04:45 -0400 Subject: [PATCH 13/45] backports/openssl1.1-compat: bump pkgrel --- backports/openssl1.1-compat/APKBUILD | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/backports/openssl1.1-compat/APKBUILD b/backports/openssl1.1-compat/APKBUILD index 294cbc1..fb31eaa 100644 --- a/backports/openssl1.1-compat/APKBUILD +++ b/backports/openssl1.1-compat/APKBUILD @@ -3,7 +3,7 @@ pkgname=openssl1.1-compat pkgver=1.1.1w _abiver=${pkgver%.*} -pkgrel=0 +pkgrel=1 pkgdesc="toolkit for transport layer security (TLS) - version 1.1" url="https://www.openssl.org/" arch="all" @@ -86,6 +86,7 @@ build() { x86_64) _target="linux-x86_64"; _optflags="enable-ec_nistp_64_gcc_128" ;; s390x) _target="linux64-s390x";; riscv64) _target="linux-generic64";; + loongarch64) _target="linux-generic64";; *) msg "Unable to determine architecture from (CARCH=$CARCH)" ; return 1 ;; esac @@ -103,7 +104,7 @@ build() { perl ./Configure \ $_target \ --prefix=/usr \ - --libdir=lib \ + --libdir=/usr/lib \ --openssldir=/etc/ssl1.1 \ shared \ no-zlib \ @@ -144,23 +145,16 @@ package() { _libcrypto() { pkgdesc="Crypto library from openssl" replaces="libressl2.7-libcrypto" - mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib - mv "$pkgdir"/etc "$subpkgdir"/ - for i in "$pkgdir"/usr/lib/libcrypto*; do - mv $i "$subpkgdir"/lib/ - ln -s ../../lib/${i##*/} "$subpkgdir"/usr/lib/${i##*/} - done - mv "$pkgdir"/usr/lib/engines-$_abiver "$subpkgdir"/usr/lib/ + + amove etc + amove usr/lib/libcrypto* + amove usr/lib/engines-$_abiver } _libssl() { pkgdesc="SSL shared libraries" - mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib - for i in "$pkgdir"/usr/lib/libssl*; do - mv $i "$subpkgdir"/lib/ - ln -s ../../lib/${i##*/} "$subpkgdir"/usr/lib/${i##*/} - done + amove usr/lib/libssl* } _static() { -- 2.45.2 From 94a04377248eefe979c3955f71af5eaca3d4504d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:05:29 -0400 Subject: [PATCH 14/45] backports/perl-math-random-isaac-xs: bump pkgrel --- backports/perl-math-random-isaac-xs/APKBUILD | 50 ++++++++------------ 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/backports/perl-math-random-isaac-xs/APKBUILD b/backports/perl-math-random-isaac-xs/APKBUILD index 4d27426..8cb2f95 100644 --- a/backports/perl-math-random-isaac-xs/APKBUILD +++ b/backports/perl-math-random-isaac-xs/APKBUILD @@ -1,47 +1,39 @@ -# Automatically generated by apkbuild-cpan, template 2 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Timo Teräs -# Maintainer: Timo Teräs +# Maintainer: Celeste +maintainer="Celeste " pkgname=perl-math-random-isaac-xs -_pkgreal=Math-Random-ISAAC-XS pkgver=1.004 -pkgrel=7 +pkgrel=8 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Math-Random-ISAAC-XS pkgdesc="C implementation of the ISAAC PRNG algorithm" url="https://metacpan.org/release/Math-Random-ISAAC-XS/" arch="all" -license="unrestricted" -cpandepends="" -cpanmakedepends="perl-test-nowarnings" -cpancheckdepends="" -depends="$cpandepends" -makedepends="perl-dev perl-module-build $cpanmakedepends" -checkdepends="$cpancheckdepends" +license="Public-Domain" +depends="perl" +makedepends="perl-dev perl-module-build" +checkdepends="perl-test-nowarnings" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/J/JA/JAWNSY/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-XS-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare || return 1 - - cd "$builddir" - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - perl Build.PL installdirs=vendor || return 1 -} - build() { - cd "$builddir" export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') + perl Build.PL \ + --installdirs=vendor \ + --create_packlist=0 ./Build } -package() { - cd "$builddir" - ./Build install destdir="$pkgdir" || return 1 - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete -} - check() { - cd "$builddir" ./Build test } -sha512sums="40c46b5f247f585a407ef9f36b5874d9cf03ec05963a9d92d988ebd63daf1e37b1b51308845d4596f47b5ad7203953bcb7fbb421c905b526dbe99b246ccb4d87 Math-Random-ISAAC-XS-1.004.tar.gz" +package() { + ./Build install --destdir="$pkgdir" +} + +sha512sums=" +40c46b5f247f585a407ef9f36b5874d9cf03ec05963a9d92d988ebd63daf1e37b1b51308845d4596f47b5ad7203953bcb7fbb421c905b526dbe99b246ccb4d87 Math-Random-ISAAC-XS-1.004.tar.gz +" -- 2.45.2 From 8114cc7b68371644193b2031cdc0ffa95f21440e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:06:26 -0400 Subject: [PATCH 15/45] backports/py3-apsw: upgrade at 3.46.1.0 --- backports/py3-apsw/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backports/py3-apsw/APKBUILD b/backports/py3-apsw/APKBUILD index 1259ba3..c0b8c6d 100644 --- a/backports/py3-apsw/APKBUILD +++ b/backports/py3-apsw/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Francesco Colista pkgname=py3-apsw _pkgname=apsw -pkgver=3.45.2.0 -pkgrel=1 +pkgver=3.46.1.0 +pkgrel=0 pkgdesc="Another Python SQLite Wrapper" url="https://github.com/rogerbinns/apsw" arch="all" @@ -41,6 +41,6 @@ package() { } sha512sums=" -0260f6479d5f1188ad172dfc0dd7e4a03c9d809d2f80c2296e587a19286681bb2ce759b0bd19ec6957e2902f18729b7e79410e4db79dff9918089f57dd510828 py3-apsw-3.45.2.0.zip +8d24825c8346b05a99b8959ce1fd45ae5162c95b020ecc63bd3491bfd1579370a0e6b1a962f7f64a7e7e415846007e64d90b28e2065ae047e228d60b12b9cb02 py3-apsw-3.46.1.0.zip 8f3957bd6fecb5660a7cab367043e4ccdacd87d8963bbe41cc3d525265de28f08aa207099658d785be29c5c90b818c1418f766995cd780d02b8e36252a389758 detect-sqlite-config.patch " -- 2.45.2 From d6a69f2445377bd812d4ac9d5fd67b283fae28c8 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:06:51 -0400 Subject: [PATCH 16/45] backports/py3-arcus: bump pkgrel --- backports/py3-arcus/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backports/py3-arcus/APKBUILD b/backports/py3-arcus/APKBUILD index 0a04535..1971b01 100644 --- a/backports/py3-arcus/APKBUILD +++ b/backports/py3-arcus/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Aiden Grossman -# Maintainer: Aiden Grossman +# Maintainer: pkgname=py3-arcus # Needs to be upgraded in sync with libarcus pkgver=5.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Python bindings for libarcus" url="https://github.com/Ultimaker/pyArcus" arch="all" -- 2.45.2 From dc66b1997dbf82a35834233fc42c8cf59d9d01ab Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:07:22 -0400 Subject: [PATCH 17/45] backports/py3-colored: bump pkgrel --- backports/py3-colored/APKBUILD | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/backports/py3-colored/APKBUILD b/backports/py3-colored/APKBUILD index d11a554..deb152a 100644 --- a/backports/py3-colored/APKBUILD +++ b/backports/py3-colored/APKBUILD @@ -2,13 +2,13 @@ pkgname=py3-colored _pyname=${pkgname/py3-/} pkgver=1.4.4 -pkgrel=2 +pkgrel=3 pkgdesc="Simple Python library for color and formatting in terminal" url="https://gitlab.com/dslackw/colored" arch="noarch" license="MIT" depends="python3" -makedepends="py3-setuptools" +makedepends="py3-setuptools py3-gpep517" checkdepends="py3-pytest" subpackages="$pkgname-pyc" source="https://gitlab.com/dslackw/colored/-/archive/$pkgver/colored-$pkgver.tar.gz" @@ -16,11 +16,14 @@ builddir="$srcdir/$_pyname-$pkgver" options="!check" # No testsuite build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } package() { - python3 setup.py install --prefix=/usr --root="$pkgdir" + gpep517 install-wheel --destdir "$pkgdir" \ + .dist/*.whl } sha512sums=" -- 2.45.2 From 35da2f1c0429a147cd36f72e9082d3835f6c8ac2 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:07:47 -0400 Subject: [PATCH 18/45] backports/py3-daemon: drop due to community --- backports/py3-daemon/APKBUILD | 40 ------------------- .../py3-daemon/remove-docutils-depend.patch | 16 -------- 2 files changed, 56 deletions(-) delete mode 100644 backports/py3-daemon/APKBUILD delete mode 100644 backports/py3-daemon/remove-docutils-depend.patch diff --git a/backports/py3-daemon/APKBUILD b/backports/py3-daemon/APKBUILD deleted file mode 100644 index 416cd99..0000000 --- a/backports/py3-daemon/APKBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Contributor: Noel Kuntze -# Maintainer: Noel Kuntze -pkgname=py3-daemon -pkgver=2.3.2 -pkgrel=4 -pkgdesc="Library to implement a well-behaved Unix daemon process" -url="https://pagure.io/python-daemon" -options="!check" # Has lots of dependencies -arch="noarch" -license="Apache-2.0 AND GPL-3.0-or-later" -depends="py3-setuptools py3-lockfile" -makedepends="py3-docutils" -subpackages="$pkgname-pyc" -source=" - https://pypi.io/packages/source/p/python-daemon/python-daemon-$pkgver.tar.gz - remove-docutils-depend.patch -" -builddir="$srcdir/python-daemon-$pkgver" - -prepare() { - default_prepare - - # Remove unnecessary dependency for building, twine is - # required for uploading the package to pypi which we don't - # do - sed -e '/twine/d' -i setup.py -} - -build() { - python3 setup.py build -} - -package() { - python3 setup.py install --root="$pkgdir" -} - -sha512sums=" -d9f6e6c376a496fae96bd9efed0a56d00a137617a3d1d5ef74802ef176bc813bb1d49bbb9164cdbec03213529f944b32b257bcc64283abfa4a3522ff00826bfd python-daemon-2.3.2.tar.gz -20bc4bce7fba9754d1c9bca298f9b4ff7fe90ecf51769df2020912f370650a5997f91c99c6be2ecffed10a6b359a29b1f64b0c391772451eb3c04769df381015 remove-docutils-depend.patch -" diff --git a/backports/py3-daemon/remove-docutils-depend.patch b/backports/py3-daemon/remove-docutils-depend.patch deleted file mode 100644 index 2bbc3be..0000000 --- a/backports/py3-daemon/remove-docutils-depend.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/setup.py.orig b/setup.py -index 24f0e7cb98a..d712294c20b 100644 ---- a/setup.py.orig -+++ b/setup.py -@@ -96,11 +96,6 @@ setup_kwargs = dict( - ], - ) - --# Docutils is only required for building, but Setuptools can't distinguish --# dependencies properly. --# See . --setup_kwargs['install_requires'].append("docutils") -- - - if __name__ == '__main__': - setup(**setup_kwargs) -- 2.45.2 From fb129bf575ac7c49121c7482d5231833494c7193 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:08:04 -0400 Subject: [PATCH 19/45] backports/py3-pytube: drop due to community --- backports/py3-pytube/APKBUILD | 42 ----------------------------------- 1 file changed, 42 deletions(-) delete mode 100644 backports/py3-pytube/APKBUILD diff --git a/backports/py3-pytube/APKBUILD b/backports/py3-pytube/APKBUILD deleted file mode 100644 index 6d27b69..0000000 --- a/backports/py3-pytube/APKBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Contributor: Antoine Martin (ayakael) -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-pytube -#_pkgreal is used by apkbuild-pypi to find modules at PyPI -_pkgreal=pytube -pkgver=15.0.0 -pkgrel=1 -pkgdesc="Python 3 library for downloading YouTube Videos." -url="https://pypi.python.org/project/pytube" -arch="noarch" -license="Unlicense" -checkdepends="py3-pytest" -makedepends="py3-setuptools py3-gpep517 py3-wheel" -source="$pkgname-$pkgver.tar.gz::https://github.com/pytube/pytube/archive/refs/tags/v$pkgver.tar.gz" -builddir="$srcdir/$_pkgreal-$pkgver" -subpackages="$pkgname-pyc" -# 7/131 units failing due to: -# AttributeError: 'NoneType' object has no attribute 'register_on_progress_callback' -# AttributeError: 'YouTube' object has no attribute 'stream_monostate' -# StopIteration -options="!check" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl - .testenv/bin/python3 -m pytest -v -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -fc28d87c56bae9da3def68224a03687cc521c26e6f38dd41abe81e84f91bb2cab73dc8c7dbbc388787cf066f7d7304c78162cc60c544b99e75187b760c64b4a3 py3-pytube-15.0.0.tar.gz -" -- 2.45.2 From 7d3c26c249943bd84e9ac9c46156d5e12dc338c1 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:08:19 -0400 Subject: [PATCH 20/45] backports/py3-utils: drop due to community --- backports/py3-utils/APKBUILD | 46 ------------------- .../fix-setuptools-deprecation.patch | 11 ----- backports/py3-utils/pytest.patch | 14 ------ backports/py3-utils/typing-ext.patch | 22 --------- 4 files changed, 93 deletions(-) delete mode 100644 backports/py3-utils/APKBUILD delete mode 100644 backports/py3-utils/fix-setuptools-deprecation.patch delete mode 100644 backports/py3-utils/pytest.patch delete mode 100644 backports/py3-utils/typing-ext.patch diff --git a/backports/py3-utils/APKBUILD b/backports/py3-utils/APKBUILD deleted file mode 100644 index b89b2bf..0000000 --- a/backports/py3-utils/APKBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Contributor: Marian Buschsieweke -# Maintainer: Marian Buschsieweke -pkgname=py3-utils -_pkgname=python-utils -pkgver=3.8.1 -pkgrel=1 -pkgdesc="Convenient utilities not included with the standard Python install" -url="https://github.com/WoLpH/python-utils" -arch="noarch" -license="BSD-3-Clause" -makedepends="py3-gpep517 py3-setuptools py3-wheel" -checkdepends="py3-pytest py3-pytest-asyncio py3-loguru" -subpackages="$pkgname-pyc" -source=" - https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz - - fix-setuptools-deprecation.patch - pytest.patch - typing-ext.patch - " - -builddir="$srcdir/$_pkgname-$pkgver" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -ccba9651cc99a8f4e3f13e7ff66a43a40d2e85bc735b6246524269495ff321225a0dcad9abd03ca9cb61b4b1b35a27009fac3fe87e3f748ffc5c87a956acd335 python-utils-3.8.1.tar.gz -c001453b958b8231806ef6a04fcd21e1d252eeec36d4e6cbfce35f0662bae76c3f7484e0e8ff06d68a3e9cc7d19c9cdbf792c13e0101c580bb5e8de9d837fde7 fix-setuptools-deprecation.patch -99cc91ad155f8140aedc9420659c0e560a4d816ac1f85468ddb3a9fdc87526d591da916441d63b601146a86fb2c26f61c9dfbe37e31b86ee605f732e24e7b465 pytest.patch -d68943e3301eaafe2a9ea27f382a2eba1ce98149d8cbbe91aa9222cf76a8f7bebba3d9dbfced54bd88c90688a6e18373f011fbb83cd36cbf2ecd3e36b034aa22 typing-ext.patch -" diff --git a/backports/py3-utils/fix-setuptools-deprecation.patch b/backports/py3-utils/fix-setuptools-deprecation.patch deleted file mode 100644 index 16b5e5a..0000000 --- a/backports/py3-utils/fix-setuptools-deprecation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.cfg -+++ b/setup.cfg -@@ -2,7 +2,7 @@ - test = pytest - - [metadata] --description-file = README.rst -+description_file = README.rst - - [nosetests] - verbosity = 3 diff --git a/backports/py3-utils/pytest.patch b/backports/py3-utils/pytest.patch deleted file mode 100644 index a7f016d..0000000 --- a/backports/py3-utils/pytest.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/pytest.ini b/pytest.ini -index a8e632a..e28ed7d 100644 ---- a/pytest.ini -+++ b/pytest.ini -@@ -5,9 +5,6 @@ python_files = - - addopts = - --doctest-modules -- --cov python_utils -- --cov-report term-missing --; --mypy - - doctest_optionflags = - ALLOW_UNICODE diff --git a/backports/py3-utils/typing-ext.patch b/backports/py3-utils/typing-ext.patch deleted file mode 100644 index ee6acb2..0000000 --- a/backports/py3-utils/typing-ext.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/python_utils/types.py b/python_utils/types.py -index 01c319a..79ef950 100644 ---- a/python_utils/types.py -+++ b/python_utils/types.py -@@ -1,7 +1,6 @@ - # pyright: reportWildcardImportFromLibrary=false - import datetime - import decimal --from typing_extensions import * # type: ignore # noqa: F403 - from typing import * # type: ignore # pragma: no cover # noqa: F403 - from types import * # type: ignore # pragma: no cover # noqa: F403 - ---- a/setup.py -+++ b/setup.py -@@ -29,7 +29,6 @@ - ), - package_data={'python_utils': ['py.typed']}, - long_description=long_description, -- install_requires=['typing_extensions>3.10.0.2'], - tests_require=['pytest'], - extras_require={ - 'loguru': [ -- 2.45.2 From dbc61a522f712a3423b4cd64dc4dda0e5ca2a7b0 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:08:34 -0400 Subject: [PATCH 21/45] backports/py3-microdata: drop due to community --- backports/py3-microdata/APKBUILD | 37 -------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 backports/py3-microdata/APKBUILD diff --git a/backports/py3-microdata/APKBUILD b/backports/py3-microdata/APKBUILD deleted file mode 100644 index ecc0268..0000000 --- a/backports/py3-microdata/APKBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Contributor: Antoine Martin (ayakael) -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-microdata -#_pkgreal is used by apkbuild-pypi to find modules at PyPI -_pkgreal=microdata -pkgver=0.8.0 -pkgrel=0 -pkgdesc="html5lib extension for parsing microdata" -url="https://pypi.python.org/project/microdata" -license="CC0-1.0" -arch="noarch" -depends="py3-html5lib" -makedepends="py3-setuptools py3-gpep517 py3-wheel" -source="$pkgname-$pkgver.tar.gz::https://github.com/edsu/microdata/archive/refs/tags/v$pkgver.tar.gz" -builddir="$srcdir/$_pkgreal-$pkgver" -subpackages="$pkgname-pyc" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 setup.py test -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -e48c8c267f595faec97397fae470a3aa1f4f33d9f4ea7d186f07b104166b373ea768db7d73423aedd28af3e310f6b9fa268d946420c6aed9676d15f38396b07e py3-microdata-0.8.0.tar.gz -" -- 2.45.2 From b8fc5fc77f119ec2604777f6567550b09c391285 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:09:06 -0400 Subject: [PATCH 22/45] backports/py3-dataparser: fix check --- backports/py3-dateparser/APKBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backports/py3-dateparser/APKBUILD b/backports/py3-dateparser/APKBUILD index 6a342fb..fa01fe0 100644 --- a/backports/py3-dateparser/APKBUILD +++ b/backports/py3-dateparser/APKBUILD @@ -40,7 +40,9 @@ build() { } check() { - _test_filter='not test_parsing_date_should_fail_using_datetime_strptime_if_locale_is_non_english' + # test_relative_base_setting_2_en fails due to tzinfo mismatch + _test_filter="not test_parsing_date_should_fail_using_datetime_strptime_if_locale_is_non_english \ + and not test_relative_base_setting_2_en" # test_custom_language_detect_fast_text fails due to wrong file format case "$CARCH" in s390x) -- 2.45.2 From a2879576eaecfe177d95f9599cae44677188f8bf Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:09:19 -0400 Subject: [PATCH 23/45] backports/py3-flask-limiter: bump pkgrel --- backports/py3-flask-limiter/APKBUILD | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/backports/py3-flask-limiter/APKBUILD b/backports/py3-flask-limiter/APKBUILD index 9555218..afeb6cf 100644 --- a/backports/py3-flask-limiter/APKBUILD +++ b/backports/py3-flask-limiter/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: lauren n. liberda pkgname=py3-flask-limiter pkgver=3.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="Rate Limiting extension for Flask" url="https://github.com/alisaifee/flask-limiter" arch="noarch" @@ -14,7 +14,7 @@ depends=" py3-rich python3 " -makedepends="py3-setuptools" +makedepends="py3-setuptools py3-gpep517" checkdepends=" py3-flask-restful py3-flask-restx @@ -23,7 +23,6 @@ checkdepends=" py3-pytest py3-pytest-cov " -options="!check" # tests depend on unpackaged modules subpackages="$pkgname-pyc" source=" https://github.com/alisaifee/flask-limiter/archive/refs/tags/$pkgver/flask-limiter-$pkgver.tar.gz @@ -31,17 +30,23 @@ source=" our-std-is-good-enough.patch " builddir="$srcdir/flask-limiter-$pkgver" +options="!check" # tests depend on unpackaged modules build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - pytest + python3 -m venv --clear --without-pip --system-site-packages .testenv + gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl + .testenv/bin/python3 -m pytest } package() { - python3 setup.py install --prefix=/usr --root="$pkgdir" + gpep517 install-wheel --destdir "$pkgdir" \ + .dist/*.whl } sha512sums=" -- 2.45.2 From f4d9e64eff081c50612d374bd732f262b15bc913 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:09:55 -0400 Subject: [PATCH 24/45] backports/py3-fuzzywuzzy: move to gpep517 --- backports/py3-fuzzywuzzy/APKBUILD | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/backports/py3-fuzzywuzzy/APKBUILD b/backports/py3-fuzzywuzzy/APKBUILD index ad0fce2..c659b1b 100644 --- a/backports/py3-fuzzywuzzy/APKBUILD +++ b/backports/py3-fuzzywuzzy/APKBUILD @@ -3,28 +3,33 @@ pkgname=py3-fuzzywuzzy _pyname=fuzzywuzzy pkgver=0.18.0 -pkgrel=6 +pkgrel=7 pkgdesc="Fuzzy string matching in python" url="https://github.com/seatgeek/fuzzywuzzy" arch="noarch" license="GPL-2.0-only" depends="python3 py3-levenshtein" -makedepends="py3-setuptools" +makedepends="py3-setuptools py3-gpep517" checkdepends="py3-pytest py3-pycodestyle py3-hypothesis" subpackages="$pkgname-pyc" source="https://files.pythonhosted.org/packages/source/${_pyname%${_pyname#?}}/$_pyname/$_pyname-$pkgver.tar.gz" builddir="$srcdir/$_pyname-$pkgver" build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - PYTHONPATH="$PWD/build/lib" pytest -v + python3 -m venv --clear --without-pip --system-site-packages .testenv + gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl + .testenv/bin/python3 -m pytest } package() { - python3 setup.py install --skip-build --root="$pkgdir" + gpep517 install-wheel --destdir "$pkgdir" \ + .dist/*.whl } sha512sums=" -- 2.45.2 From d3528ec8f3e4135a45fe4322852dc5d986f964e6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:10:13 -0400 Subject: [PATCH 25/45] backports/py3-limits: upgrade to 3.13.0 --- backports/py3-limits/APKBUILD | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/backports/py3-limits/APKBUILD b/backports/py3-limits/APKBUILD index ed4a82e..814a4bd 100644 --- a/backports/py3-limits/APKBUILD +++ b/backports/py3-limits/APKBUILD @@ -1,8 +1,8 @@ # Contributor: lauren n. liberda # Maintainer: lauren n. liberda pkgname=py3-limits -pkgver=3.12.0 -pkgrel=0 +pkgver=3.13.0 +pkgrel=1 pkgdesc="Rate limiting using various strategies and storage backends such as redis & memcached" url="https://github.com/alisaifee/limits" arch="noarch" @@ -11,7 +11,7 @@ depends=" py3-deprecated python3 " -makedepends="py3-setuptools" +makedepends="py3-setuptools py3-gpep517" checkdepends=" py3-flaky py3-mongo @@ -22,7 +22,7 @@ checkdepends=" py3-redis " subpackages="$pkgname-pyc" -options="!check" # most tests are integration with db connections, assume all connectors installed +options="!check" # most tests are integration with db connections, assume all connectors installed source=" https://github.com/alisaifee/limits/archive/refs/tags/$pkgver/limits-$pkgver.tar.gz @@ -31,20 +31,25 @@ source=" builddir="$srcdir/limits-$pkgver" build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - pytest \ + python3 -m venv --clear --without-pip --system-site-packages .testenv + gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl + .testenv/bin/python3 -m pytest \ -m 'not benchmark and not etcd and not integration and not memcached' \ -k 'not aio and not Storage and not strategy' -v } package() { - python3 setup.py install --prefix=/usr --root="$pkgdir" + gpep517 install-wheel --destdir "$pkgdir" \ + .dist/*.whl } sha512sums=" -2803dc26b18015e177342ed89e879f4dd680908579c99f9069d695edfa2beb3008b5bc47454ea2120a425bbcbc8a08928ab93a3058b33e11a2ae29431dfd9cd1 limits-3.12.0.tar.gz +0a13d08001c2f95e559ac1be35fa8cc178ad2d41bd5bf7b7e85781a428f550c350c21b92942b5b7e45f0f4c0604e96e579c8a26b5e9ca1196e6605608721030a limits-3.13.0.tar.gz 0364d51f9f879b95c6a4a3c9e9fd3d7d1e15ea214c50ae98cd36826b8c0b2d903cf1128741ac83738e305a207dae8955a0b2c8679484d2d6643e334595bdb1d7 our-std-is-good-enough.patch " -- 2.45.2 From 74c4c19621d54391858361a9c786123eca18747c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:10:41 -0400 Subject: [PATCH 26/45] backports/py3-mapbox-earcut: move to gpep517 --- backports/py3-mapbox-earcut/APKBUILD | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/backports/py3-mapbox-earcut/APKBUILD b/backports/py3-mapbox-earcut/APKBUILD index 99db5b5..fe17670 100644 --- a/backports/py3-mapbox-earcut/APKBUILD +++ b/backports/py3-mapbox-earcut/APKBUILD @@ -1,30 +1,33 @@ # Contributor: Aiden Grossman -# Maintainer: Aiden Grossman +# Maintainer: pkgname=py3-mapbox-earcut pkgver=1.0.1 -pkgrel=0 +pkgrel=2 pkgdesc="Python bindings for the mapbox earcut c++ library" url="https://github.com/skogler/mapbox_earcut_python" arch="all" license="ISC" depends="py3-numpy" -makedepends="py3-setuptools py3-pybind11-dev python3-dev" -checkdepends="pytest" +makedepends="py3-setuptools py3-pybind11-dev python3-dev py3-gpep517" +checkdepends="py3-pytest" source="$pkgname-$pkgver.tar.gz::https://github.com/skogler/mapbox_earcut_python/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/mapbox_earcut_python-$pkgver" build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - python3 -m venv --clear --without-pip --system-site-packages test-env - test-env/bin/python3 setup.py install - test-env/bin/python3 -m pytest + python3 -m venv --clear --without-pip --system-site-packages .testenv + gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl + .testenv/bin/python3 -m pytest } package() { - python3 setup.py install --skip-build --root="$pkgdir" + gpep517 install-wheel --destdir "$pkgdir" \ + .dist/*.whl } sha512sums=" -- 2.45.2 From bd882e36a24efdd3950f264039f13f0e47136b98 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:11:09 -0400 Subject: [PATCH 27/45] backports/py3-numpy-stl: move to gpep517 --- backports/py3-numpy-stl/APKBUILD | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/backports/py3-numpy-stl/APKBUILD b/backports/py3-numpy-stl/APKBUILD index 6ef430b..1c72a2e 100644 --- a/backports/py3-numpy-stl/APKBUILD +++ b/backports/py3-numpy-stl/APKBUILD @@ -1,32 +1,37 @@ # Contributor: Aiden Grossman -# Maintainer: Aiden Grossman +# Maintainer: pkgname=py3-numpy-stl pkgver=3.0.1 -pkgrel=2 +pkgrel=4 pkgdesc="Library for working with STLs" url="https://github.com/WoLpH/numpy-stl" # s390x: no py3-utils arch="noarch !s390x" license="BSD-3-Clause" depends="python3 py3-utils py3-numpy" -makedepends="py3-setuptools" +makedepends="py3-setuptools py3-gpep517" checkdepends="py3-pytest" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/wolph/numpy-stl/releases/download/v$pkgver/numpy-stl-$pkgver.tar.gz" builddir="$srcdir/numpy-stl-$pkgver" build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl # deselected test needs xvfb-run and fails - pytest \ + .testenv/bin/python3 -m pytest \ --deselect tests/test_ascii.py::test_use_with_qt_with_custom_locale_decimal_delimeter } package() { - python3 setup.py install --skip-build --root="$pkgdir" + gpep517 install-wheel --destdir "$pkgdir" \ + .dist/*.whl } sha512sums=" -- 2.45.2 From 074c97ac41159f3ad3b96ae2c74b74a4373d451c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:11:31 -0400 Subject: [PATCH 28/45] backports/py3-pathvalidate: upgrade to 3.2.1 --- backports/py3-pathvalidate/APKBUILD | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backports/py3-pathvalidate/APKBUILD b/backports/py3-pathvalidate/APKBUILD index 6ea6d42..fc26a08 100644 --- a/backports/py3-pathvalidate/APKBUILD +++ b/backports/py3-pathvalidate/APKBUILD @@ -1,8 +1,8 @@ # Contributor: lauren n. liberda # Maintainer: lauren n. liberda pkgname=py3-pathvalidate -pkgver=3.2.0 -pkgrel=1 +pkgver=3.2.1 +pkgrel=0 pkgdesc="Python library to sanitize/validate a string such as filenames/file-paths/etc" url="https://github.com/thombashi/pathvalidate" arch="noarch" @@ -11,6 +11,7 @@ depends="python3" makedepends=" py3-gpep517 py3-setuptools + py3-setuptools_scm py3-wheel " checkdepends="py3-pytest py3-click py3-faker" @@ -20,6 +21,7 @@ source="https://github.com/thombashi/pathvalidate/archive/refs/tags/v$pkgver/pat builddir="$srcdir/pathvalidate-$pkgver" build() { + export SETUPTOOLS_SCM_PRETEND_VERSION="$pkgver" gpep517 build-wheel \ --wheel-dir .dist \ --output-fd 3 3>&1 >&2 @@ -31,5 +33,5 @@ package() { } sha512sums=" -d1b0e49028bc5497558d9a0c15b4e3c301cacb439bebccffc467fc23001854877dbc81a214cc6eb34c5a905a88c4f9394f5865a4de42f354b2450a3bfe10bb9e pathvalidate-3.2.0.tar.gz +094bb442258ba58fff11691f5b60976513924443247e808effbc26b9dd6c336f5f84d8e4563643b7def19d9f82170eb9ec6cd89491f9115df8d1634d2aa12206 pathvalidate-3.2.1.tar.gz " -- 2.45.2 From 61d8be608cf750714f0a055c4a13a11d8fa017c6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:11:51 -0400 Subject: [PATCH 29/45] backports/py3-pivy: bump pkgrel --- backports/py3-pivy/APKBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backports/py3-pivy/APKBUILD b/backports/py3-pivy/APKBUILD index 86d3112..31627ea 100644 --- a/backports/py3-pivy/APKBUILD +++ b/backports/py3-pivy/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Aiden Grossman -# Maintainer: Aiden Grossman +# Maintainer: pkgname=py3-pivy -pkgver=0.6.9_alpha0 +pkgver=0.6.9 pkgrel=0 pkgdesc="Python3 bindings for coin" url="https://github.com/coin3d/pivy" -# riscv64 blocked by py3-pyside6 +# riscv64: blocked by py3-pyside6 arch="all !riscv64" license="ISC" depends="py3-pyside6" @@ -32,5 +32,5 @@ package() { } sha512sums=" -1bfefd58d2921c8be170a97efa30cad53b01f636ea0cf236acca242be4f691669a4c310cd61c64d3e0c55e55e8be96d36945cd244380ddc0b3a06170d0f8b691 py3-pivy-0.6.9_alpha0.tar.gz +fd9587c69ad7468b771fbae59e68620f67a3c20850edadd65bf7994c1789d3444feb419e65dce34c6ee897c98eaca9f2f29f0bbfb4d1f0bbde26e4db56f74f78 py3-pivy-0.6.9.tar.gz " -- 2.45.2 From af09eb04891afc95f36dde8f2ccf31f68e84abd4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:12:06 -0400 Subject: [PATCH 30/45] backports/py3-pyinstrument: upgrade to 4.7.3 --- backports/py3-pyinstrument/APKBUILD | 31 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/backports/py3-pyinstrument/APKBUILD b/backports/py3-pyinstrument/APKBUILD index 50f4f80..e4ab2cf 100644 --- a/backports/py3-pyinstrument/APKBUILD +++ b/backports/py3-pyinstrument/APKBUILD @@ -1,18 +1,29 @@ # Contributor: Aiden Grossman -# Maintainer: Aiden Grossman +# Maintainer: Celeste +maintainer="Celeste " pkgname=py3-pyinstrument -pkgver=4.6.2 -pkgrel=1 +pkgver=4.7.3 +pkgrel=0 pkgdesc="Call stack profiler for Python" url="https://github.com/joerick/pyinstrument" arch="all" license="BSD-3-Clause" -makedepends="py3-gpep517 py3-setuptools py3-wheel python3-dev" -checkdepends="py3-pytest py3-flaky py3-trio py3-greenlet" +makedepends=" + py3-gpep517 + py3-setuptools + py3-wheel + python3-dev + " +checkdepends=" + py3-flaky + py3-greenlet + py3-pytest + py3-pytest-asyncio + py3-trio + " subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/joerick/pyinstrument/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/pyinstrument-$pkgver" -options="!check" # currently not working build() { gpep517 build-wheel \ @@ -21,9 +32,13 @@ build() { } check() { + [ -d "pyinstrument" ] && mv -v pyinstrument pyinstrument.src + python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest + + # test_cmdline.py tries to run "pyinstrument" executable + PATH="$builddir/.testenv/bin:$PATH" .testenv/bin/python3 -m pytest } package() { @@ -31,5 +46,5 @@ package() { } sha512sums=" -da23988e6c68876cb8920ce284326f349425303ae36718c5c479b72b5f5ca5d48ced1674bcab71851f60e81a0985bb668bfa89a8b96cc20a1faa0dd7e623ec50 py3-pyinstrument-4.6.2.tar.gz +24feac08a9726379b749f391bdb6ddbca6d3631cf3515d3ead85ace7a96f213bf60e2cd4d4f3c7cade68b5e481b4bfd562482817befe6322579101a8d91add66 py3-pyinstrument-4.7.3.tar.gz " -- 2.45.2 From a3c50358f55188f15b9d0b56851d856eb936dc78 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:12:38 -0400 Subject: [PATCH 31/45] backports/py3-rapidjson: build using gpep517 --- backports/py3-rapidjson/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backports/py3-rapidjson/APKBUILD b/backports/py3-rapidjson/APKBUILD index 1418ad7..54cd11f 100644 --- a/backports/py3-rapidjson/APKBUILD +++ b/backports/py3-rapidjson/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Marian Buschsieweke -# Maintainer: Marian Buschsieweke +# Contributor: Marian Buschsieweke +# Maintainer: Marian Buschsieweke pkgname=py3-rapidjson pkgver=1.12 pkgrel=1 -- 2.45.2 From 8d51c28255d2cb4fc8faa6321311d6b35855c5a8 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:13:02 -0400 Subject: [PATCH 32/45] backports/py3-rtree: build using gpep517 --- backports/py3-rtree/APKBUILD | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/backports/py3-rtree/APKBUILD b/backports/py3-rtree/APKBUILD index 52acba3..491e8e9 100644 --- a/backports/py3-rtree/APKBUILD +++ b/backports/py3-rtree/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-rtree _pkgname=rtree pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python3 library for r-tree spatial index (wrapper for libspatialindex)" url="https://pypi.org/project/Rtree/" # s390x: Test failed: IndexSerialization::test_interleaving - AssertionError @@ -11,22 +11,27 @@ url="https://pypi.org/project/Rtree/" arch="noarch !s390x" license="MIT" depends="python3 libspatialindex-dev" -makedepends="py3-setuptools py3-wheel" +makedepends="py3-setuptools py3-wheel py3-gpep517" checkdepends="py3-pytest py3-numpy" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/Toblerity/rtree/archive/$pkgver.tar.gz" builddir="$srcdir"/$_pkgname-$pkgver build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - python3 -m pytest -v --doctest-modules rtree tests + python3 -m venv --clear --without-pip --system-site-packages .testenv + gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl + .testenv/bin/python3 -m pytest -v --doctest-modules rtree tests } package() { - python3 setup.py install --skip-build --root="$pkgdir" + gpep517 install-wheel --destdir "$pkgdir" \ + .dist/*.whl } sha512sums=" -- 2.45.2 From bea9c52c5abf69d45586631e865fd3d62ffcb2ff Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:13:13 -0400 Subject: [PATCH 33/45] backports/py3-svgpath: build using gpep517 --- backports/py3-svgpath/APKBUILD | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/backports/py3-svgpath/APKBUILD b/backports/py3-svgpath/APKBUILD index 12901b9..3cfbc91 100644 --- a/backports/py3-svgpath/APKBUILD +++ b/backports/py3-svgpath/APKBUILD @@ -1,8 +1,9 @@ # Contributor: Aiden Grossman -# Maintainer: Aiden Grossman +# Maintainer: Celeste +maintainer="Celeste " pkgname=py3-svgpath pkgver=6.3 -pkgrel=2 +pkgrel=3 pkgdesc="SVG path and object parser" url="https://github.com/regebro/svg.path" arch="noarch" @@ -12,7 +13,8 @@ checkdepends="py3-pytest py3-pillow" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/regebro/svg.path/archive/refs/tags/$pkgver.tar.gz 105_use-better-than-nothing-font.patch - no-install-tests.patch" + no-install-tests.patch + " builddir="$srcdir/svg.path-$pkgver" build() { @@ -22,7 +24,9 @@ build() { } check() { - PYTHONPATH=build/lib pytest + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest } package() { -- 2.45.2 From 538c8354f8ad015b4ec8962eea855bb6901b5cbb Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:13:37 -0400 Subject: [PATCH 34/45] backports/py3-trimesh: bump pkgrel --- backports/py3-trimesh/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backports/py3-trimesh/APKBUILD b/backports/py3-trimesh/APKBUILD index bab0b96..7087c8d 100644 --- a/backports/py3-trimesh/APKBUILD +++ b/backports/py3-trimesh/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman -# Maintainer: Aiden Grossman +# Maintainer: pkgname=py3-trimesh pkgver=3.22.1 -pkgrel=1 +pkgrel=2 pkgdesc="Python library for working with triangular meshes" url="https://github.com/mikedh/trimesh" # x86, armhf, armv7 Tests fail on int64 to int32 casts on these arches -- 2.45.2 From 07e7e1aec7bba727220a9e0d565d5806cdfcc3d0 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:13:52 -0400 Subject: [PATCH 35/45] backports/signal-desktop: upgrade to 7.30.0 --- backports/signal-desktop/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backports/signal-desktop/APKBUILD b/backports/signal-desktop/APKBUILD index 30a07b9..a12c250 100644 --- a/backports/signal-desktop/APKBUILD +++ b/backports/signal-desktop/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=signal-desktop -pkgver=7.29.0 -pkgrel=0 +pkgver=7.30.0 +pkgrel=1 pkgdesc="A messaging app for simple private communication with friends" url="https://github.com/signalapp/Signal-Desktop/" # same as electron @@ -475,7 +475,7 @@ package() { } sha512sums=" -b97155dc2ca70436d6fdf15fff059f905f065738a288679aeee2199d43824206f4c7e4bae0c228b55b4cc76b7e00875b738ee4f7dea3c2a5414acec3e208aa1e Signal-Desktop-7.29.0.tar.gz +b8c330ac0ec05b31c27c5e8b3a3d269fbd407fc1aa5b3deec7e27810a674deaf4e7075ac424753ba5ed04b6781710531c56d77038201e3cad325c9776cdd3eda Signal-Desktop-7.30.0.tar.gz 6fb62213d8177ac5abe83ea71a18ea4b1c7b323983c41087166658fe9c47c1fd39e5323ca6acefe3db2a9a9376b6f385b5f2c006154da3ab705741d848b28943 libsignal-0.58.0.tar.gz 6777354b60650c6c3d359714f3aff92a315996f3725ba05c74ed054d3c4ba5506406b30c940853b5ba426ac0271cdb4dd930a759c570f486a70e1f5adc5a2aae ringrtc-2.48.3.tar.gz fe04fcf13f55b124f03ce9d516b1c53fc4f20c6a016819c62eeaa0500eda92c5a0c0d7dc5d1e360a27691dfd404c254e91bed9fb25d0fc40a27795c1b674a82e webrtc-6613c.tar.zst -- 2.45.2 From bf0e2b33ee7164b22ea5b2f368e73ec7ced5df5e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:14:19 -0400 Subject: [PATCH 36/45] backports/soqt: fix check --- backports/soqt/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backports/soqt/APKBUILD b/backports/soqt/APKBUILD index 778776e..359bfb2 100644 --- a/backports/soqt/APKBUILD +++ b/backports/soqt/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman -# Maintainer: Aiden Grossman +# Maintainer: pkgname=soqt pkgver=1.6.0 -pkgrel=0 +pkgrel=1 pkgdesc="GUI binding library for coin" url="https://github.com/coin3d/soqt" arch="all" -- 2.45.2 From 0dd3721c622e2573c15bb2553837561efb65f21e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:14:28 -0400 Subject: [PATCH 37/45] backports/uranium: fix check --- backports/uranium/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backports/uranium/APKBUILD b/backports/uranium/APKBUILD index 2b98a85..7badd09 100644 --- a/backports/uranium/APKBUILD +++ b/backports/uranium/APKBUILD @@ -42,7 +42,7 @@ build() { check() { # useless code style test with another dependency - ctest -j $JOBS --output-on-failure -T Test + ctest --output-on-failure -T Test } package() { -- 2.45.2 From 64c84ea9ab3f1d9fc99b4ca435df87c695354c92 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 30 Nov 2024 13:18:23 -0500 Subject: [PATCH 38/45] backports/calibre: upgrade to 7.21.0 --- backports/calibre/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backports/calibre/APKBUILD b/backports/calibre/APKBUILD index 74af5a9..64a7a04 100644 --- a/backports/calibre/APKBUILD +++ b/backports/calibre/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Cowington Post pkgname=calibre -pkgver=7.20.0 +pkgver=7.21.0 pkgrel=0 pkgdesc="Ebook management application" # qt6-webengine @@ -111,6 +111,6 @@ package() { } sha512sums=" -3b6e2d4ed8d0755096b466f4bdcc8b6ca4810398caa2322c1efc30280680ff8b10dc5fb8cb763bed8fee82746e7c51c6f31f56e5d9689d5f43c671442004c532 calibre-7.20.0.tar.xz +0c2ee610833df83219c0c33b09e1374a8262f1630ccd48e3c4725c92922a3ac5d102ad83fc213457fb9de3efa4f5a2c98ff6dff039828e1661085a1054d7f631 calibre-7.21.0.tar.xz eb8e7ce40ff8b8daf6e7e55a5dff8ec4dff06c45744266bb48b3194e92ab1196bc91468203e3c2ca1e5144166a7d6be90e6cf0253513e761b56a4c85be4c2c76 0001-calibre-no-update.patch " -- 2.45.2 From 51a3f048ca1c7ed4ef14cca4479ee15f9aa2981c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 30 Nov 2024 13:18:38 -0500 Subject: [PATCH 39/45] backports/electron: upgrade to 33.2.1 --- backports/electron/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backports/electron/APKBUILD b/backports/electron/APKBUILD index 12d58f4..72d6e87 100644 --- a/backports/electron/APKBUILD +++ b/backports/electron/APKBUILD @@ -1,10 +1,10 @@ # Contributor: lauren n. liberda # Maintainer: Antoine Martin (ayakael) pkgname=electron -pkgver=33.0.2 +pkgver=33.2.1 _gittag=v"${pkgver/_beta/-beta.}" pkgrel=0 -_chromium=130.0.6723.59 +_chromium=130.0.6723.127 _copium_tag=129.1 _depot_tools=495b23b39aaba2ca3b55dd27cadc523f1cb17ee6 pkgdesc="Electron cross-platform desktop toolkit" @@ -544,7 +544,7 @@ lang() { } sha512sums=" -6523db0feb88a742a8c7228481ae25ed9ea4eaf1cbab84d9a91212bf3590f1b87fd244bc6583e90e78ab15e4be28cc70ddaa270d582c68eaa131e3be455c58fe electron-v33.0.2-130.0.6723.59.tar.zst +e2df4454f4178af859c13aadee4ea04a5b6aa202972cad625e54bc68f5b8c25e098e50d428ec9c1886c37ccf49aaaedb4c5f02fc8bdd498314ba216901932185 electron-v33.2.1-130.0.6723.127.tar.zst 6138b3dbf3903c78f4ca1ed5a6c3c3c485471ded31976010484ce8893d03953df2b8f066a4fe84bbde5ae7ef9bbff664ef917e247b2e95dd471de40f2774d7d0 copium-129.1.tar.gz 29bb685e03356a77df5fd347cdf55194cc8b3265c421cc76e54d64edefc329dbcb052deb26b22e8f587ce68456876c071de1b7d258dd0fcc6ee66c875ec4a020 chromium-revert-drop-of-system-java.patch 53b7cdee8f7bfb4c9371cb385c473e34ed3d8ac7efaa43c0af061107560be30d8747b07fb0b16c01079b8c770f2c721bb5a8081313b7c126856ea4078a74da2a compiler.patch -- 2.45.2 From f4bedbfab6796ef991d1075c2912ee0c737cb3f9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 30 Nov 2024 13:19:07 -0500 Subject: [PATCH 40/45] backports/py3-dateparser: fix tests --- backports/py3-dateparser/APKBUILD | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/backports/py3-dateparser/APKBUILD b/backports/py3-dateparser/APKBUILD index fa01fe0..17b905e 100644 --- a/backports/py3-dateparser/APKBUILD +++ b/backports/py3-dateparser/APKBUILD @@ -1,8 +1,8 @@ -# Maintainer: Hoang Nguyen +maintainer="Hoang Nguyen " pkgname=py3-dateparser _pyname=${pkgname#py3-} pkgver=1.2.0 -pkgrel=1 +pkgrel=0 pkgdesc="Python parser for human readable dates" url="https://github.com/scrapinghub/dateparser" arch="noarch" @@ -41,14 +41,9 @@ build() { check() { # test_relative_base_setting_2_en fails due to tzinfo mismatch - _test_filter="not test_parsing_date_should_fail_using_datetime_strptime_if_locale_is_non_english \ - and not test_relative_base_setting_2_en" # test_custom_language_detect_fast_text fails due to wrong file format - case "$CARCH" in - s390x) - _test_filter="$_test_filter and not test_custom_language_detect_fast_text" - ;; - esac + _test_filter="not test_parsing_date_should_fail_using_datetime_strptime_if_locale_is_non_english \ + and not test_relative_base_setting_2_en and not test_custom_language_detect_fast_text" python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl -- 2.45.2 From 6b1b7d38e05456eaf46f6413006323745292d942 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 30 Nov 2024 13:19:29 -0500 Subject: [PATCH 41/45] backports/py3-flask-limiter: upgrade to 3.9.2 --- backports/py3-flask-limiter/APKBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backports/py3-flask-limiter/APKBUILD b/backports/py3-flask-limiter/APKBUILD index afeb6cf..9bca96d 100644 --- a/backports/py3-flask-limiter/APKBUILD +++ b/backports/py3-flask-limiter/APKBUILD @@ -1,8 +1,8 @@ # Contributor: lauren n. liberda -# Maintainer: lauren n. liberda +maintainer="lauren n. liberda " pkgname=py3-flask-limiter -pkgver=3.7.0 -pkgrel=1 +pkgver=3.9.2 +pkgrel=0 pkgdesc="Rate Limiting extension for Flask" url="https://github.com/alisaifee/flask-limiter" arch="noarch" @@ -50,6 +50,6 @@ package() { } sha512sums=" -f546536e3efb86571515aac5b578155c240049fb1ccf96e55d4b1814d9e227e41cc18fc587f115706606154bb12a84b381533cf069cdfc56453b0f170ec19449 flask-limiter-3.7.0.tar.gz +69e488a641ab39c088185fabcde19ebb4cbe1683e9143efdf146163bb0254e0c4f8b4b72df407542d540394e7e3b2d7498b9c93c25ae8a8128e05e319f342318 flask-limiter-3.9.2.tar.gz 1b90e9134076cda249695d5ea741db9d205a2ae452c7d6edfe01eb37a221ce6f64b0e8ddcdbbee9b0e0fb16a28e5eabf14f1c1e41e965c7e3b93ea4f42caf553 our-std-is-good-enough.patch " -- 2.45.2 From 35dd541e948a6754ac5ddc858f433251d8133e29 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 30 Nov 2024 13:20:02 -0500 Subject: [PATCH 42/45] backports/py3-privy: bump pkgrel --- backports/py3-pivy/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backports/py3-pivy/APKBUILD b/backports/py3-pivy/APKBUILD index 31627ea..6b5f0f5 100644 --- a/backports/py3-pivy/APKBUILD +++ b/backports/py3-pivy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-pivy pkgver=0.6.9 -pkgrel=0 +pkgrel=2 pkgdesc="Python3 bindings for coin" url="https://github.com/coin3d/pivy" # riscv64: blocked by py3-pyside6 -- 2.45.2 From 556797609499a9b17e1e91cf28cb9b17ad3a3f61 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 30 Nov 2024 13:20:23 -0500 Subject: [PATCH 43/45] backports/signal-desktop: upgrade to 7.34.0 --- backports/signal-desktop/APKBUILD | 116 +++++++----------- .../bettersqlite-use-system-sqlcipher.patch | 56 --------- .../signal-desktop/libsignal-auditable.patch | 6 +- .../ringrtc-webrtc-renamed.patch | 4 +- .../signal-use-system-sqlcipher.patch | 43 +++++++ .../signal-desktop/webrtc-compiler.patch | 4 +- backports/signal-desktop/webrtc-gcc13.patch | 8 +- .../signal-desktop/webrtc-shared-libs.patch | 22 ++-- 8 files changed, 109 insertions(+), 150 deletions(-) delete mode 100644 backports/signal-desktop/bettersqlite-use-system-sqlcipher.patch create mode 100644 backports/signal-desktop/signal-use-system-sqlcipher.patch diff --git a/backports/signal-desktop/APKBUILD b/backports/signal-desktop/APKBUILD index a12c250..0bfb575 100644 --- a/backports/signal-desktop/APKBUILD +++ b/backports/signal-desktop/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=signal-desktop -pkgver=7.30.0 -pkgrel=1 +pkgver=7.34.0 +pkgrel=0 pkgdesc="A messaging app for simple private communication with friends" url="https://github.com/signalapp/Signal-Desktop/" # same as electron @@ -66,9 +66,9 @@ makedepends=" options="net !check" # use _check_depends to validate this -_libsignalver=0.58.0 -_ringrtcver=2.48.3 -_webrtcver=6613c +_libsignalver=0.60.2 +_ringrtcver=2.48.7 +_webrtcver=6723a _stokenizerver=0.2.1 source=" @@ -78,8 +78,8 @@ source=" https://ayakael.net/api/packages/mirrors/generic/webrtc/$_webrtcver/webrtc-$_webrtcver.tar.zst https://github.com/signalapp/Signal-FTS5-Extension/archive/refs/tags/v$_stokenizerver/stokenizer-$_stokenizerver.tar.gz - bettersqlite-use-system-sqlcipher.patch libsignal-auditable.patch + signal-use-system-sqlcipher.patch signal-disable-updates.patch signal-update-links.patch signal-show-window-please.patch @@ -123,7 +123,8 @@ _check_depends() { local _ringrtcver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package-lock.json | grep "@signalapp/ringrtc\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1) local _bsqlitever=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package-lock.json | grep "@signalapp/better-sqlite3\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1) local _webrtcver=$(curl --silent https://raw.githubusercontent.com/signalapp/ringrtc/v$_ringrtcver/config/version.properties | awk -F '=' '{if($1 == "webrtc.version"){print $2}}' | head -n 1) - local _stokenizerver=$(curl --silent https://raw.githubusercontent.com/signalapp/better-sqlite3/v$_bsqlitever/deps/download.js | grep "const TOKENIZER_VERSION" | awk '{print $4}' | tr -d "'" | tr -d ';' | head -n 1) + local _extensionver=$(curl --silent https://raw.githubusercontent.com/signalapp/better-sqlite3/v$_bsqlitever/deps/download.js | grep "const EXTENSION_VERSION" | awk '{print $4}' | tr -d "'" | tr -d ';' | head -n 1) + local _stokenizerver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Sqlcipher-Extension/refs/tags/v$_extensionver/Cargo.lock | sed -n "/^name = \"signal-tokenizer\"$/,/^$/p" | awk -F ' = ' '{if($1=="version"){print $2}}' | tr -d '"') echo _libsignalver=$_libsignalver echo _ringrtcver=$_ringrtcver @@ -180,38 +181,19 @@ target_cpu_only = True mcli cp "$SRCDEST"/webrtc-$_webrtcver.tar.zst "$_distbucket" } -# manual patches -default_prepare() { :; } - prepare() { - default_prepare - msg "Applying patches" - for x in $source; do - case "$x" in - signal-*.patch) - msg "$x" - patch -p1 -i "$srcdir"/$x -d "$srcdir"/Signal-Desktop-$pkgver - ;; - libsignal-*.patch) - msg "$x" - patch -p1 -i "$srcdir"/$x -d "$srcdir"/libsignal-$_libsignalver - ;; - ringrtc-*.patch) - msg "$x" - patch -p1 -i "$srcdir"/$x -d "$srcdir"/ringrtc-$_ringrtcver - ;; - webrtc-*.patch) - msg "$x" - patch -p1 -i "$srcdir"/$x -d "$srcdir"/webrtc-$_webrtcver - ;; - esac + # Moves to builddir to use abuild patch logics + for i in libsignal-$_libsignalver ringrtc-$_ringrtcver webrtc-$_webrtcver Signal-FTS5-Extension-$_stokenizerver; do + mv "$srcdir"/$i "$builddir"/${i%-*} done msg "Installing signal-desktop JS dependencies" npm ci --ignore-scripts + default_prepare + ( - cd "$srcdir"/webrtc-$_webrtcver + cd "$builddir"/webrtc local use_system=" brotli @@ -272,35 +254,35 @@ prepare() { ) ( - cd "$srcdir"/ringrtc-$_ringrtcver/src/rust + cd "$builddir"/ringrtc/src/rust msg "Installing ringrtc rust dependencies" cargo fetch --target="$CTARGET" --locked ) ( - cd "$srcdir"/libsignal-$_libsignalver + cd "$builddir"/libsignal msg "Installing libsignal rust dependencies" cargo fetch --target="$CTARGET" --locked ) ( - cd "$srcdir"/Signal-FTS5-Extension-$_stokenizerver + cd "$builddir"/Signal-FTS5-Extension msg "Installing signal tokenizer rust dependencies" cargo fetch --target="$CTARGET" --locked ) ( - cd "$srcdir"/ringrtc-$_ringrtcver/src/node + cd "$builddir"/ringrtc/src/node msg "Installing ringrtc js dependencies" npm ci --ignore-scripts ) ( - cd "$srcdir"/libsignal-$_libsignalver/node + cd "$builddir"/libsignal/node # fix target sed -i 's/unknown-linux-gnu/alpine-linux-musl/g' binding.gyp @@ -318,7 +300,7 @@ build() { # required dependency of ringrtc ( - cd "$srcdir"/webrtc-$_webrtcver + cd "$builddir"/webrtc export PATH="$PWD/path:$PATH" # shellcheck disable=2089 @@ -350,18 +332,18 @@ build() { use_lld=true use_sysroot=false " - mkdir -p "$srcdir"/ringrtc-$_ringrtcver/out/release + mkdir -p "$builddir"/ringrtc/out/release msg "Building signal's webrtc" # shellcheck disable=2090,2116 - gn gen "$srcdir"/ringrtc-$_ringrtcver/out/release --args="$(echo $webrtc_args)" - ninja -C "$srcdir"/ringrtc-$_ringrtcver/out/release signaldeswebrtc + gn gen "$builddir"/ringrtc/out/release --args="$(echo $webrtc_args)" + ninja -C "$builddir"/ringrtc/out/release signaldeswebrtc ) ( - cd "$srcdir"/ringrtc-$_ringrtcver + cd "$builddir"/ringrtc msg "Building libringrtc" - OUTPUT_DIR="$srcdir"/ringrtc-$_ringrtcver/out \ + OUTPUT_DIR="$builddir"/ringrtc/out \ cargo auditable build --features electron --release -p ringrtc mkdir -p src/node/build/linux @@ -370,7 +352,7 @@ build() { ) ( - cd "$srcdir"/ringrtc-$_ringrtcver/src/node + cd "$builddir"/ringrtc/src/node msg "Building ringrtc JS glue code" npm run build @@ -380,7 +362,7 @@ build() { # module on npm intentionally unbuildable: https://github.com/signalapp/libsignal/issues/464#issuecomment-1160665052 ( - cd "$srcdir"/libsignal-$_libsignalver/node + cd "$builddir"/libsignal/node msg "Building libsignal" node-gyp configure --nodedir=/usr/include/electron/node_headers --build-from-source @@ -397,7 +379,7 @@ build() { ) ( - cd "$srcdir"/Signal-FTS5-Extension-$_stokenizerver + cd "$builddir"/Signal-FTS5-Extension msg "Building signal tokenizer" cargo auditable build --features extension --release --frozen @@ -423,25 +405,15 @@ build() { # use our libsignal rm -rf node_modules/@signalapp/libsignal-client/ - mv "$srcdir"/libsignal-$_libsignalver/node/ node_modules/@signalapp/libsignal-client + mv libsignal/node/ node_modules/@signalapp/libsignal-client # use our libringrtc rm -rf node_modules/@signalapp/ringrtc/ - mv "$srcdir"/ringrtc-$_ringrtcver/src/node/ node_modules/@signalapp/ringrtc - - # patch the sqlcipher module - for x in $source; do - case "$x" in - bettersqlite-*.patch) - msg "$x" - patch -Np1 -i "$srcdir"/$x -d "$srcdir"/Signal-Desktop-$pkgver/node_modules/@signalapp/better-sqlite3/ - ;; - esac - done + mv ringrtc/src/node/ node_modules/@signalapp/ringrtc mkdir node_modules/@signalapp/better-sqlite3/tokenizer - mv "$srcdir"/Signal-FTS5-Extension-$_stokenizerver/target/release/libsignal_tokenizer.a node_modules/@signalapp/better-sqlite3/tokenizer/ - mv "$srcdir"/Signal-FTS5-Extension-$_stokenizerver/target/release/signal-tokenizer.h node_modules/@signalapp/better-sqlite3/tokenizer/ + mv Signal-FTS5-Extension/target/release/libsignal_tokenizer.a node_modules/@signalapp/better-sqlite3/tokenizer/ + mv Signal-FTS5-Extension/target/release/signal-tokenizer.h node_modules/@signalapp/better-sqlite3/tokenizer/ npm rebuild \ sharp @signalapp/better-sqlite3 spellchecker websocket \ @@ -465,9 +437,9 @@ package() { install -Dm644 signal.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop # this should be in /usr/lib/signal-desktop. however, it does not simply work and I stopped to care - install -Dm755 "$srcdir"/ringrtc-$_ringrtcver/out/release/libsignaldeswebrtc.so "$pkgdir"/usr/lib/libsignaldeswebrtc.so + install -Dm755 "$builddir"/ringrtc/out/release/libsignaldeswebrtc.so "$pkgdir"/usr/lib/libsignaldeswebrtc.so - install -Dm755 "$srcdir"/$pkgname "$pkgdir"/usr/bin/$pkgname + install -Dm755 "$srcdir"/signal-desktop "$pkgdir"/usr/bin/signal-desktop while read -r size; do install -Dm644 icons/$size.png "$pkgdir"/usr/share/icons/hicolor/$size/apps/$pkgname.png @@ -475,19 +447,19 @@ package() { } sha512sums=" -b8c330ac0ec05b31c27c5e8b3a3d269fbd407fc1aa5b3deec7e27810a674deaf4e7075ac424753ba5ed04b6781710531c56d77038201e3cad325c9776cdd3eda Signal-Desktop-7.30.0.tar.gz -6fb62213d8177ac5abe83ea71a18ea4b1c7b323983c41087166658fe9c47c1fd39e5323ca6acefe3db2a9a9376b6f385b5f2c006154da3ab705741d848b28943 libsignal-0.58.0.tar.gz -6777354b60650c6c3d359714f3aff92a315996f3725ba05c74ed054d3c4ba5506406b30c940853b5ba426ac0271cdb4dd930a759c570f486a70e1f5adc5a2aae ringrtc-2.48.3.tar.gz -fe04fcf13f55b124f03ce9d516b1c53fc4f20c6a016819c62eeaa0500eda92c5a0c0d7dc5d1e360a27691dfd404c254e91bed9fb25d0fc40a27795c1b674a82e webrtc-6613c.tar.zst +30e06721b01e580414c5e57b63350fc42edbe837b0a60a9cd100bc6ab1758fa6fd5744dc3a35d991db62f363eab791c45b43e1d9d5c81af9e67685114ae2e630 Signal-Desktop-7.34.0.tar.gz +26780a0a6a529cee18f5c3b58f0395c6b5b630dbc8d2bbaa345dd7dd319a0e8548575c915dc16de6ac5d421fffdbe898f2dedb1fa3b4eab5d26debdfc1da515b libsignal-0.60.2.tar.gz +e5e5ab27dc3bd37ef577c248d450e70fa11e72bdfab00fef233aad84d3d8aa3434166c03267f6b95b69d593e9da2f37017b5b7a0913f68499f387354742ba50a ringrtc-2.48.7.tar.gz +64eed5c2a6f5a505d014bc4fa80e15b21103df1ea27825eaa1dfecc23c269f198a7e98472f29de7cae4ac7fa4fede6e837c27494b8ec4d03e36b85b029c64831 webrtc-6723a.tar.zst 84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz -be5b4e823543b79175a12314f10c6326d9f0d59f470136962daed4665887006acc05b48b40dc1b67747396d8f6f7d23be298c1e110ccdd35ff9b09d5e6b80bab bettersqlite-use-system-sqlcipher.patch -2e5fadff725f1d62e7134c8929c672ec88cae602b065480f1b799d34160daa0cb1ad0f5511e60676f81464ae8752c3bec7b3d7bc5a432533be004b4d20ac32c2 libsignal-auditable.patch +8d2d2d82c8546c2dd1fef161b61df79918f8c22235a56a46adb375a0beb4acef12c5fe53e67242a4be97f77adc522ff79b47949c352956c742a70d50f4179f7f libsignal-auditable.patch +cee74edb504ee5ae685e8a449ac35fabf949c33bfee5905778f850c3b18e17f9ae9bd501c89a7fd2c9c81a5bb2b0af0c0b3c72e32128603b3923c32d2a493ce9 signal-use-system-sqlcipher.patch 152435231cdcf52a17a9e24aadf95d77511258e818172941ba074a73a90a541f0136feb58868674f2bcb19191a6d12933fe6cd5baf3ee99e508915c72523163b signal-disable-updates.patch d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d signal-update-links.patch bfc8acdd13aa48d29c7657311733cc9d33c4899782efbd1ef6d25ad1698be4de7cc67e829324bc0309715d69ae37ea9f782cf54887317e817213e110d73d68e7 signal-show-window-please.patch -b11fdd930943ca327650e4738ed85cd6b5eea779455a5895bccebba98e449bafc6b0f09bcf4545f2b2e16644355664e9768dd6d4d62f87619207c430367f72c5 ringrtc-webrtc-renamed.patch -0888673ba687747beda61cd50efbc25095f4a3d26f1dd58bf003e3a0bf1d302c3f2ebd1deecf630fbf04aedb7b8cd409e9efda4d1e6fda63234c9a9b9755bff4 webrtc-shared-libs.patch -e07ae8544988d402aaf0fbd95ea36a64c94c59566c561132578aa6dcf8ff11a34058530e64dc204e5cadc2482f1401e74b32384a144e5e08017c663d0cf7c2fc webrtc-compiler.patch -88515d8b8cc82355c9f9b0f44fac83b7ff149b13e9fb102fd46036ec5234cfb2385fa5ad58a0520ee604b93dc4ddd6ae18a7005978ef207841645724ef7a9749 webrtc-gcc13.patch +10284e0d86ab88de161ae689871082194f689ce416f3ebada8991d5db707994ea1cb8b4212756dd93ba5a3469964050988220f18afc37e38f3404a6e17ec8caf ringrtc-webrtc-renamed.patch +98a7e4df27c3ed56c5968ebc3ae8e08bfb54362d0c910f9af1d414079a6d5fe0f18aa570ae3c38042f4691af6a130cb3ff689625e26a3987720dd319a5f587b1 webrtc-shared-libs.patch +fe78cdc58c18826fc4227cc8e9377980766229390544578f6a1a6f7322bc3243c066963b589323dbfe4f2bfd37f8859ad84f63cb3783317892e5ae3652270a3a webrtc-compiler.patch +48ab5c733e643eaff08ccbe839086bebbb68d397984ad7c5c5b68df8071f75d2dfe92c3f52d9fbf9b81754934bdfa8a67c69addd476ce4265b978592fb4ff9bd webrtc-gcc13.patch 87534e7b5ad7365509eab75629e6bd1a9ed61ee92f7e358405a0abaf0df57de14623fb3894eb082f8785422e5c087e1c50f9e2e5cafbb2529591fd7bf447f7f5 signal-desktop " diff --git a/backports/signal-desktop/bettersqlite-use-system-sqlcipher.patch b/backports/signal-desktop/bettersqlite-use-system-sqlcipher.patch deleted file mode 100644 index f0dfe0d..0000000 --- a/backports/signal-desktop/bettersqlite-use-system-sqlcipher.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/binding.gyp -+++ b/binding.gyp -@@ -7,7 +7,16 @@ - 'targets': [ - { - 'target_name': 'better_sqlite3', -- 'dependencies': ['deps/sqlite3.gyp:sqlite3'], -+ 'include_dirs': [ -+ '/usr/include/sqlcipher', -+ 'tokenizer', -+ ], -+ 'link_settings': { -+ 'libraries': [ -+ '-lsqlcipher', -+ ' int: if 'npm_config_libsignal_debug_level_logs' not in os.environ: features.append('log/release_max_level_info') diff --git a/backports/signal-desktop/ringrtc-webrtc-renamed.patch b/backports/signal-desktop/ringrtc-webrtc-renamed.patch index 228c308..6f8a2b3 100644 --- a/backports/signal-desktop/ringrtc-webrtc-renamed.patch +++ b/backports/signal-desktop/ringrtc-webrtc-renamed.patch @@ -1,5 +1,5 @@ ---- ./src/rust/build.rs.orig -+++ ./src/rust/build.rs +--- ./ringrtc/src/rust/build.rs.orig ++++ ./ringrtc/src/rust/build.rs @@ -79,6 +79,7 @@ if cfg!(feature = "native") { diff --git a/backports/signal-desktop/signal-use-system-sqlcipher.patch b/backports/signal-desktop/signal-use-system-sqlcipher.patch new file mode 100644 index 0000000..22b2e2f --- /dev/null +++ b/backports/signal-desktop/signal-use-system-sqlcipher.patch @@ -0,0 +1,43 @@ +diff --git a/node_modules/@signalapp/better-sqlite3/binding.gyp.orig b/node_modules/@signalapp/better-sqlite3/binding.gyp +index c370c30b309..bf0207e6fec 100644 +--- a/node_modules/@signalapp/better-sqlite3/binding.gyp.orig ++++ b/node_modules/@signalapp/better-sqlite3/binding.gyp +@@ -7,7 +7,16 @@ + 'targets': [ + { + 'target_name': 'better_sqlite3', +- 'dependencies': ['deps/sqlite3.gyp:sqlite3'], ++ 'include_dirs': [ ++ '/usr/include/sqlcipher', ++ 'tokenizer', ++ ], ++ 'link_settings': { ++ 'libraries': [ ++ '-lsqlcipher', ++ ' @@ -8,8 +8,8 @@ #include ---- ./modules/audio_coding/neteq/reorder_optimizer.cc.orig -+++ ./modules/audio_coding/neteq/reorder_optimizer.cc +--- ./webrtc/modules/audio_coding/neteq/reorder_optimizer.cc.orig ++++ ./webrtc/modules/audio_coding/neteq/reorder_optimizer.cc @@ -11,6 +11,7 @@ #include "modules/audio_coding/neteq/reorder_optimizer.h" diff --git a/backports/signal-desktop/webrtc-shared-libs.patch b/backports/signal-desktop/webrtc-shared-libs.patch index 3916fe0..f4bf714 100644 --- a/backports/signal-desktop/webrtc-shared-libs.patch +++ b/backports/signal-desktop/webrtc-shared-libs.patch @@ -1,5 +1,5 @@ ---- ./BUILD.gn.orig -+++ ./BUILD.gn +--- ./webrtc/BUILD.gn.orig ++++ ./webrtc/BUILD.gn @@ -38,7 +38,7 @@ # 'ninja default' and then 'ninja all', the second build should do no work. group("default") { @@ -26,10 +26,10 @@ suppressed_configs += [ "//build/config/compiler:thin_archive" ] defines = [] -diff --git a/third_party/googletest/BUILD.gn.orig b/third_party/googletest/BUILD.gn +diff --git a/webrtc/third_party/googletest/BUILD.gn.orig b/webrtc/third_party/googletest/BUILD.gn index 14089f0..b7dc621 100644 ---- a/third_party/googletest/BUILD.gn.orig -+++ b/third_party/googletest/BUILD.gn +--- a/webrtc/third_party/googletest/BUILD.gn.orig ++++ b/webrtc/third_party/googletest/BUILD.gn @@ -48,7 +48,6 @@ config("gtest_config") { configs = [ @@ -38,10 +38,10 @@ index 14089f0..b7dc621 100644 ] } -diff --git a/third_party/googletest/BUILD.gn.orig b/third_party/googletest/BUILD.gn +diff --git a/webrtc/third_party/googletest/BUILD.gn.orig b/webrtc/third_party/googletest/BUILD.gn index b7dc621..367f929 100644 ---- a/third_party/googletest/BUILD.gn.orig -+++ b/third_party/googletest/BUILD.gn +--- a/webrtc/third_party/googletest/BUILD.gn.orig ++++ b/webrtc/third_party/googletest/BUILD.gn @@ -133,7 +133,6 @@ source_set("gtest") { # googletest only needs `absl`, but this makes gn check happier. @@ -50,10 +50,10 @@ index b7dc621..367f929 100644 if (is_nacl || !build_with_chromium) { defines += [ "GTEST_DISABLE_PRINT_STACK_TRACE" ] sources -= [ -diff --git a/third_party/fuzztest/BUILD.gn.orig b/third_party/fuzztest/BUILD.gn +diff --git a/webrtc/third_party/fuzztest/BUILD.gn.orig b/webrtc/third_party/fuzztest/BUILD.gn index 57ee790..ba1d297 100644 ---- a/third_party/fuzztest/BUILD.gn.orig -+++ b/third_party/fuzztest/BUILD.gn +--- a/webrtc/third_party/fuzztest/BUILD.gn.orig ++++ b/webrtc/third_party/fuzztest/BUILD.gn @@ -309,7 +309,6 @@ source_set("fuzztest_internal") { # For RE2 mutators. It's questionable whether we want to pull this library # into every fuzztest target, but this is the approach used in other -- 2.45.2 From dc65b8373593636aff772e689829062fb1e60aa9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 30 Nov 2024 19:47:42 -0500 Subject: [PATCH 44/45] backports/libmedc: drop --- backports/libmedc/APKBUILD | 43 ----------- backports/libmedc/cmake-config-dir.patch | 11 --- backports/libmedc/hdf5.patch | 94 ------------------------ 3 files changed, 148 deletions(-) delete mode 100644 backports/libmedc/APKBUILD delete mode 100644 backports/libmedc/cmake-config-dir.patch delete mode 100644 backports/libmedc/hdf5.patch diff --git a/backports/libmedc/APKBUILD b/backports/libmedc/APKBUILD deleted file mode 100644 index 8976805..0000000 --- a/backports/libmedc/APKBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Contributor: Aiden Grossman -# Maintainer: -pkgname=libmedc -pkgver=4.1.1 -pkgrel=4 -pkgdesc="Open source library for numerical simulation" -url="https://www.salome-platform.org/" -arch="all" -license="GPL-3.0-or-later" -makedepends="cmake hdf5-dev swig python3-dev samurai" -options="!check" #test suite is nonfunctional with python bindings -subpackages="$pkgname-dev $pkgname-doc $pkgname-python-pyc $pkgname-python:_py" -source=" - https://files.salome-platform.org/Salome/medfile/med-$pkgver.tar.gz - hdf5.patch - cmake-config-dir.patch - " -builddir="$srcdir/med-$pkgver" - -build() { - cmake -B build -G Ninja \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMEDFILE_BUILD_TESTS=OFF \ - -DMEDFILE_BUILD_PYTHON=ON - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build -} - -_py() { - pkgdesc="Python bindings for libmedc" - depends="python3" - amove usr/lib/python3* -} - -sha512sums=" -f211fa82750a7cc935baa3a50a55d16e40117a0f2254b482492ba8396d82781ca84960995da7a16b2b5be0b93ce76368bf4b311bb8af0e5f0243e7051c9c554c med-4.1.1.tar.gz -68d9291e73a68d674081314028c0fce7bbd4a7b78b93b7e5078117ce62f2d07318bc33ec95091ce677148ec3926c1ce653d0760c34e74b29257a7be59210f040 hdf5.patch -8d0f58cd67d205fbacaff0e6da76e2ee5473457b478ede13a551ebe5853c0716c7406b74c3792e1ace33a34d352fccca8dd2940f063a7c060a12529d060a991a cmake-config-dir.patch -" diff --git a/backports/libmedc/cmake-config-dir.patch b/backports/libmedc/cmake-config-dir.patch deleted file mode 100644 index e1f43a4..0000000 --- a/backports/libmedc/cmake-config-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -101,7 +101,7 @@ - IF(WIN32 AND NOT CYGWIN) - SET(INSTALL_CMAKE_CONFIG_DIR cmake) - ELSE() -- SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/medfile-${MED_STR_VERSION}) -+ SET(INSTALL_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/medfile-${MED_STR_VERSION}) - ENDIF() - SET(INSTALL_INCLUDE_DIR include) - diff --git a/backports/libmedc/hdf5.patch b/backports/libmedc/hdf5.patch deleted file mode 100644 index bc4764b..0000000 --- a/backports/libmedc/hdf5.patch +++ /dev/null @@ -1,94 +0,0 @@ -Originally from https://gist.github.com/jedbrown/527ef81ff59a0dccf833da40fdd15a47 -diff -rupN med-4.1.0/config/cmake_files/medMacros.cmake med-4.1.0-new/config/cmake_files/medMacros.cmake ---- med-4.1.0/config/cmake_files/medMacros.cmake 2021-12-03 09:35:30.675827163 +0100 -+++ med-4.1.0-new/config/cmake_files/medMacros.cmake 2021-12-03 09:32:31.894994147 +0100 -@@ -447,7 +447,7 @@ MACRO(MED_FIND_HDF5) - ## - ## Requires 1.10.x version - ## -- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1) -+ IF (HDF5_VERSION VERSION_LESS 1.10.2) - MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") - ENDIF() - ## -diff -rupN med-4.1.0/src/ci/MEDfileCompatibility.c med-4.1.0-new/src/ci/MEDfileCompatibility.c ---- med-4.1.0/src/ci/MEDfileCompatibility.c 2021-12-03 09:35:30.676827162 +0100 -+++ med-4.1.0-new/src/ci/MEDfileCompatibility.c 2021-12-03 09:33:26.292942149 +0100 -@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const f - _hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease; - /* ISCRUTE(_hversionMMR); */ - /* ISCRUTE(HDF_VERSION_NUM_REF); */ -- if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE; -+ if (_hversionMMR >= HDF_VERSION_NUM_REF) *hdfok = MED_TRUE; - - /* TODO : Vérifier si la version mineure HDF du fichier est supérieure - à la version mineure de la bibliothèque HDF utilisée : -@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const f - #if MED_NUM_MAJEUR != 4 - #error "Don't forget to update the test version here when you change the major version of the library !" - #endif --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !" - #error "Cf. _MEDfileCreate ..." - #endif -diff -rupN med-4.1.0/src/hdfi/_MEDfileCreate.c med-4.1.0-new/src/hdfi/_MEDfileCreate.c ---- med-4.1.0/src/hdfi/_MEDfileCreate.c 2021-12-03 09:35:30.677827161 +0100 -+++ med-4.1.0-new/src/hdfi/_MEDfileCreate.c 2021-12-03 09:32:31.894994147 +0100 -@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * cons - * En HDF5-1.10.0p1 cela n'a aucun effet ! - * Un test autoconf permet de fixer un intervalle de version HDF à MED. - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - -diff -rupN med-4.1.0/src/hdfi/_MEDfileOpen.c med-4.1.0-new/src/hdfi/_MEDfileOpen.c ---- med-4.1.0/src/hdfi/_MEDfileOpen.c 2021-12-03 09:35:30.677827161 +0100 -+++ med-4.1.0-new/src/hdfi/_MEDfileOpen.c 2021-12-03 09:32:31.894994147 +0100 -@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const - - • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - /* L'avantage de bloquer le modèle interne HDF5 -diff -rupN med-4.1.0/src/hdfi/_MEDmemFileOpen.c med-4.1.0-new/src/hdfi/_MEDmemFileOpen.c ---- med-4.1.0/src/hdfi/_MEDmemFileOpen.c 2021-12-03 09:35:30.678827160 +0100 -+++ med-4.1.0-new/src/hdfi/_MEDmemFileOpen.c 2021-12-03 09:32:31.894994147 +0100 -@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * con - goto ERROR; - } - --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) { -diff -rupN med-4.1.0/src/hdfi/_MEDparFileCreate.c med-4.1.0-new/src/hdfi/_MEDparFileCreate.c ---- med-4.1.0/src/hdfi/_MEDparFileCreate.c 2021-12-03 09:35:30.678827160 +0100 -+++ med-4.1.0-new/src/hdfi/_MEDparFileCreate.c 2021-12-03 09:32:31.894994147 +0100 -@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * c - * En HDF5-1.10.0p1 cela n'a aucun effet ! - * Un test autoconf permet de fixer un intervalle de version HDF à MED. - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - -diff -rupN med-4.1.0/src/hdfi/_MEDparFileOpen.c med-4.1.0-new/src/hdfi/_MEDparFileOpen.c ---- med-4.1.0/src/hdfi/_MEDparFileOpen.c 2021-12-03 09:35:30.679827159 +0100 -+++ med-4.1.0-new/src/hdfi/_MEDparFileOpen.c 2021-12-03 09:32:31.894994147 +0100 -@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * con - MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG); - goto ERROR; - } --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) { -- 2.45.2 From b08b505dcf67c10e63f2082288c13c4400966ca2 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 30 Nov 2024 19:49:37 -0500 Subject: [PATCH 45/45] backports/py3-numpy-stl: upgrade to 3.2.0 --- backports/py3-numpy-stl/APKBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backports/py3-numpy-stl/APKBUILD b/backports/py3-numpy-stl/APKBUILD index 1c72a2e..1191396 100644 --- a/backports/py3-numpy-stl/APKBUILD +++ b/backports/py3-numpy-stl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman # Maintainer: pkgname=py3-numpy-stl -pkgver=3.0.1 -pkgrel=4 +pkgver=3.2.0 +pkgrel=0 pkgdesc="Library for working with STLs" url="https://github.com/WoLpH/numpy-stl" # s390x: no py3-utils @@ -10,9 +10,9 @@ arch="noarch !s390x" license="BSD-3-Clause" depends="python3 py3-utils py3-numpy" makedepends="py3-setuptools py3-gpep517" -checkdepends="py3-pytest" +checkdepends="py3-pytest py3-pytest-cov py3-pygments" subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/wolph/numpy-stl/releases/download/v$pkgver/numpy-stl-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/wolph/numpy-stl/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/numpy-stl-$pkgver" build() { @@ -35,5 +35,5 @@ package() { } sha512sums=" -d01abb8f54738600ce36c8c44e1392957061030e7accbbfa0352aea4a904323a96712099146b311ce9518f243317c25c47cfb30930469602c0ad439de9f43c5f py3-numpy-stl-3.0.1.tar.gz +a08053ed264dbfd629229af3db9c38deed2932b28feced56e2d4c20476f1ba85ddc80881fb82330ea3f4fff9a3f91da20db7447050da5c75f1c04455a67538dc py3-numpy-stl-3.2.0.tar.gz " -- 2.45.2