| index : packages | |
| Archlinux32 package modifications | gitolite user |
| summaryrefslogtreecommitdiff |
diff --git a/blacklist/any/deepin/deepin-qt6integration b/blacklist/any/deepin/deepin-qt6integration new file mode 100644 index 00000000..d95ce350 --- /dev/null +++ b/blacklist/any/deepin/deepin-qt6integration @@ -0,0 +1 @@ +deepin fails to build/bootstrap for a long time now diff --git a/blacklist/any/deepin/deepin-qt6platform-plugins b/blacklist/any/deepin/deepin-qt6platform-plugins new file mode 100644 index 00000000..d95ce350 --- /dev/null +++ b/blacklist/any/deepin/deepin-qt6platform-plugins @@ -0,0 +1 @@ +deepin fails to build/bootstrap for a long time now diff --git a/blacklist/any/deepin/dtk6declarative b/blacklist/any/deepin/dtk6declarative new file mode 100644 index 00000000..d95ce350 --- /dev/null +++ b/blacklist/any/deepin/dtk6declarative @@ -0,0 +1 @@ +deepin fails to build/bootstrap for a long time now diff --git a/blacklist/any/deepin/dtk6gui b/blacklist/any/deepin/dtk6gui new file mode 100644 index 00000000..d95ce350 --- /dev/null +++ b/blacklist/any/deepin/dtk6gui @@ -0,0 +1 @@ +deepin fails to build/bootstrap for a long time now diff --git a/blacklist/any/deepin/dtk6widget b/blacklist/any/deepin/dtk6widget new file mode 100644 index 00000000..d95ce350 --- /dev/null +++ b/blacklist/any/deepin/dtk6widget @@ -0,0 +1 @@ +deepin fails to build/bootstrap for a long time now diff --git a/blacklist/any/riscv64-linux-gnu-glibc/riscv64-linux-gnu-glibc b/blacklist/any/riscv64-linux-gnu-glibc/riscv64-linux-gnu-glibc deleted file mode 100644 index bfaa0b02..00000000 --- a/blacklist/any/riscv64-linux-gnu-glibc/riscv64-linux-gnu-glibc +++ /dev/null @@ -1 +0,0 @@ -see riscv64-linux-gnu-gcc diff --git a/blacklist/i686/libjxl/libjxl b/blacklist/i686/libjxl/libjxl deleted file mode 100644 index f0d788f3..00000000 --- a/blacklist/i686/libjxl/libjxl +++ /dev/null @@ -1 +0,0 @@ -Too hard to enable non-SSE2 version diff --git a/blacklist/pentium4/ceph/ceph b/blacklist/pentium4/ceph/ceph deleted file mode 100644 index 34fee63f..00000000 --- a/blacklist/pentium4/ceph/ceph +++ /dev/null @@ -1 +0,0 @@ -fails fatally in check() - see <a href="https://bugs.archlinux32.org/index.php?do=details&task_id=21">FS32#21</a> diff --git a/blacklist/pentium4/ceph/xrootd b/blacklist/pentium4/ceph/xrootd deleted file mode 100644 index 34fee63f..00000000 --- a/blacklist/pentium4/ceph/xrootd +++ /dev/null @@ -1 +0,0 @@ -fails fatally in check() - see <a href="https://bugs.archlinux32.org/index.php?do=details&task_id=21">FS32#21</a> diff --git a/blacklist/pentium4/chromium/chromium b/blacklist/pentium4/chromium/chromium new file mode 100644 index 00000000..51406351 --- /dev/null +++ b/blacklist/pentium4/chromium/chromium @@ -0,0 +1 @@ +LLVM runs out of memory doing LTO. No time to look at it right now and it's pointlessly taking up build time. diff --git a/blacklist/pentium4/deno b/blacklist/pentium4/deno new file mode 100644 index 00000000..cd11b2ed --- /dev/null +++ b/blacklist/pentium4/deno @@ -0,0 +1 @@ +doesn't build diff --git a/blacklist/pentium4/dolphin-emu/dolphin-emu b/blacklist/pentium4/dolphin-emu/dolphin-emu new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/dolphin-emu/dolphin-emu diff --git a/blacklist/pentium4/electron/electron29 b/blacklist/pentium4/electron/electron29 new file mode 100644 index 00000000..78bf1a60 --- /dev/null +++ b/blacklist/pentium4/electron/electron29 @@ -0,0 +1 @@ +see above diff --git a/blacklist/pentium4/electron/electron30 b/blacklist/pentium4/electron/electron30 new file mode 100644 index 00000000..78bf1a60 --- /dev/null +++ b/blacklist/pentium4/electron/electron30 @@ -0,0 +1 @@ +see above diff --git a/blacklist/pentium4/electron/electron31 b/blacklist/pentium4/electron/electron31 new file mode 100644 index 00000000..78bf1a60 --- /dev/null +++ b/blacklist/pentium4/electron/electron31 @@ -0,0 +1 @@ +see above diff --git a/blacklist/pentium4/electron/electron32 b/blacklist/pentium4/electron/electron32 new file mode 100644 index 00000000..78bf1a60 --- /dev/null +++ b/blacklist/pentium4/electron/electron32 @@ -0,0 +1 @@ +see above diff --git a/blacklist/pentium4/electron/electron33 b/blacklist/pentium4/electron/electron33 new file mode 100644 index 00000000..78bf1a60 --- /dev/null +++ b/blacklist/pentium4/electron/electron33 @@ -0,0 +1 @@ +see above diff --git a/blacklist/pentium4/fractal/fractal b/blacklist/pentium4/fractal/fractal new file mode 100644 index 00000000..e5e11cff --- /dev/null +++ b/blacklist/pentium4/fractal/fractal @@ -0,0 +1 @@ +Out of memory even without LTO and Debug symbols diff --git a/blacklist/pentium4/ghc/haskell-os-string b/blacklist/pentium4/ghc/haskell-os-string new file mode 100644 index 00000000..0c5b7d0b --- /dev/null +++ b/blacklist/pentium4/ghc/haskell-os-string @@ -0,0 +1 @@ +Haskell doesn't build or bootstrap on IA-32 anymore. Packages are broken since years now on Arch32.. diff --git a/blacklist/pentium4/ghc/haskell-prettyprinter-interp b/blacklist/pentium4/ghc/haskell-prettyprinter-interp new file mode 100644 index 00000000..0c5b7d0b --- /dev/null +++ b/blacklist/pentium4/ghc/haskell-prettyprinter-interp @@ -0,0 +1 @@ +Haskell doesn't build or bootstrap on IA-32 anymore. Packages are broken since years now on Arch32.. diff --git a/blacklist/pentium4/jupyter-notebook/jupyter-notebook b/blacklist/pentium4/jupyter-notebook/jupyter-notebook new file mode 100644 index 00000000..9d91fde6 --- /dev/null +++ b/blacklist/pentium4/jupyter-notebook/jupyter-notebook @@ -0,0 +1,7 @@ +➤ YN0001: │ Error: Couldn't allocate enough memory + at ZipFS.allocateBuffer ([worker eval]:1:40610) + at ZipFS.allocateSource ([worker eval]:1:41045) + at ZipFS.setFileSource ([worker eval]:1:41318) + at ZipFS.writeFileSync ([worker eval]:1:46409) + at extractArchiveTo ([worker eval]:1:466938) + at async MessagePort.<anonymous> ([worker eval]:1:468587) diff --git a/blacklist/pentium4/libfabric b/blacklist/pentium4/libfabric new file mode 100644 index 00000000..f8d64c67 --- /dev/null +++ b/blacklist/pentium4/libfabric @@ -0,0 +1 @@ +makes creative use of uint64_t to pointer casts, hardly portable diff --git a/blacklist/pentium4/linux-rt/linux-rt b/blacklist/pentium4/linux-rt/linux-rt new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/linux-rt/linux-rt diff --git a/blacklist/pentium4/linux-rt/linux-rt-lts b/blacklist/pentium4/linux-rt/linux-rt-lts new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/linux-rt/linux-rt-lts diff --git a/blacklist/pentium4/mysql/xtrabackup b/blacklist/pentium4/mysql/xtrabackup new file mode 100644 index 00000000..6f4f4ca3 --- /dev/null +++ b/blacklist/pentium4/mysql/xtrabackup @@ -0,0 +1,5 @@ +-- Check size of void * +-- Check size of void * - done +-- SIZEOF_VOIDP 4 +CMake Error at CMakeLists.txt:656 (MESSAGE): + MySQL supports only 64-bit platforms. diff --git a/blacklist/pentium4/openmpi/comgr b/blacklist/pentium4/openmpi/comgr new file mode 100644 index 00000000..61943a63 --- /dev/null +++ b/blacklist/pentium4/openmpi/comgr @@ -0,0 +1,2 @@ +presumably due to rocm-llvm: +<command-line>: error: token "=" is not valid in preprocessor expressions diff --git a/blacklist/pentium4/openmpi/hip-runtime-amd b/blacklist/pentium4/openmpi/hip-runtime-amd new file mode 100644 index 00000000..9ee4984e --- /dev/null +++ b/blacklist/pentium4/openmpi/hip-runtime-amd @@ -0,0 +1 @@ +doesn't build and prerequisites don't build diff --git a/blacklist/pentium4/openmpi/hsa-rocr b/blacklist/pentium4/openmpi/hsa-rocr new file mode 100644 index 00000000..c23c199b --- /dev/null +++ b/blacklist/pentium4/openmpi/hsa-rocr @@ -0,0 +1,2 @@ +presumably due to rocm-llvm +clang-17: error: invalid target ID 'gfx1150'; format is a processor name followed by an optional colon-delimited list of features followed by an enable/disable sign (e.g., 'gfx908:sramecc+:xnack-') diff --git a/blacklist/pentium4/openmpi/nccl b/blacklist/pentium4/openmpi/nccl new file mode 100644 index 00000000..b1692332 --- /dev/null +++ b/blacklist/pentium4/openmpi/nccl @@ -0,0 +1 @@ +requires cuda diff --git a/blacklist/pentium4/openmpi/openmpi b/blacklist/pentium4/openmpi/openmpi new file mode 100644 index 00000000..b4a7b8f5 --- /dev/null +++ b/blacklist/pentium4/openmpi/openmpi @@ -0,0 +1,2 @@ +configure: WARNING: Open MPI no longer supports 32 bit builds. +configure: WARNING: Please use Open MPI v4.x or earlier if you need 32 bit support. diff --git a/blacklist/pentium4/openmpi/openucc b/blacklist/pentium4/openmpi/openucc new file mode 100644 index 00000000..6cc129f3 --- /dev/null +++ b/blacklist/pentium4/openmpi/openucc @@ -0,0 +1 @@ +requires cuda, hip-runtime-amd, nccl, rccl diff --git a/blacklist/pentium4/openmpi/openucx b/blacklist/pentium4/openmpi/openucx new file mode 100644 index 00000000..5b1567e3 --- /dev/null +++ b/blacklist/pentium4/openmpi/openucx @@ -0,0 +1 @@ +requires cuda, rocm-language-runtime
\ No newline at end of file diff --git a/blacklist/pentium4/openmpi/rccl b/blacklist/pentium4/openmpi/rccl new file mode 100644 index 00000000..1d1d7a28 --- /dev/null +++ b/blacklist/pentium4/openmpi/rccl @@ -0,0 +1 @@ +requires hipify-clang diff --git a/blacklist/pentium4/openmpi/rocminfo b/blacklist/pentium4/openmpi/rocminfo new file mode 100644 index 00000000..0f5b14b0 --- /dev/null +++ b/blacklist/pentium4/openmpi/rocminfo @@ -0,0 +1 @@ +needs hsa-rocr diff --git a/blacklist/pentium4/p2pool/p2pool b/blacklist/pentium4/p2pool/p2pool new file mode 100644 index 00000000..a66ef7c0 --- /dev/null +++ b/blacklist/pentium4/p2pool/p2pool @@ -0,0 +1 @@ +Fails to compile diff --git a/blacklist/pentium4/prrte b/blacklist/pentium4/prrte new file mode 100644 index 00000000..02703ffa --- /dev/null +++ b/blacklist/pentium4/prrte @@ -0,0 +1 @@ +configure: WARNING: PRRTE does not support 32 bit builds. diff --git a/blacklist/pentium4/python-onnx/python-onnx b/blacklist/pentium4/python-onnx/python-onnx new file mode 100644 index 00000000..8fd76560 --- /dev/null +++ b/blacklist/pentium4/python-onnx/python-onnx @@ -0,0 +1 @@ +constantly makes the buildmaster insane diff --git a/blacklist/pentium4/python-onnx/python-onnxruntime b/blacklist/pentium4/python-onnx/python-onnxruntime new file mode 100644 index 00000000..fc41a4cd --- /dev/null +++ b/blacklist/pentium4/python-onnx/python-onnxruntime @@ -0,0 +1 @@ +needs python-onnx diff --git a/blacklist/pentium4/python-onnx/python-onnxruntime-opt b/blacklist/pentium4/python-onnx/python-onnxruntime-opt new file mode 100644 index 00000000..fc41a4cd --- /dev/null +++ b/blacklist/pentium4/python-onnx/python-onnxruntime-opt @@ -0,0 +1 @@ +needs python-onnx diff --git a/blacklist/pentium4/python-onnx/python-onnxruntime-opt-rocm b/blacklist/pentium4/python-onnx/python-onnxruntime-opt-rocm new file mode 100644 index 00000000..fc41a4cd --- /dev/null +++ b/blacklist/pentium4/python-onnx/python-onnxruntime-opt-rocm @@ -0,0 +1 @@ +needs python-onnx diff --git a/blacklist/pentium4/riscv64-linux-gnu-gcc/riscv64-linux-gnu-gcc b/blacklist/pentium4/riscv64-linux-gnu-gcc/riscv64-linux-gnu-gcc deleted file mode 100644 index 6f32f548..00000000 --- a/blacklist/pentium4/riscv64-linux-gnu-gcc/riscv64-linux-gnu-gcc +++ /dev/null @@ -1 +0,0 @@ -needs manual bootstrap - is it worth the effort? diff --git a/blacklist/pentium4/sccache/sccache b/blacklist/pentium4/sccache/sccache new file mode 100644 index 00000000..8b75fc53 --- /dev/null +++ b/blacklist/pentium4/sccache/sccache @@ -0,0 +1 @@ +https://github.com/mozilla/sccache/blob/330d160824659c43f811fc0bd486fed4440404ac/src/bin/sccache-dist/main.rs#L38 diff --git a/blacklist/pentium4/system76-scheduler/system76-scheduler b/blacklist/pentium4/system76-scheduler/system76-scheduler new file mode 100644 index 00000000..c685b695 --- /dev/null +++ b/blacklist/pentium4/system76-scheduler/system76-scheduler @@ -0,0 +1 @@ +Unsupported architecture: i686-unknown-linux-gnu diff --git a/blacklist/pentium4/vault/vault b/blacklist/pentium4/vault/vault new file mode 100644 index 00000000..c5a8383f --- /dev/null +++ b/blacklist/pentium4/vault/vault @@ -0,0 +1,12 @@ +➤ YN0001: │ RangeError: Array buffer allocation failed + at new ArrayBuffer (<anonymous>) + at new Uint8Array (<anonymous>) + at new FastBuffer (node:internal/buffer:961:5) + at createUnsafeBuffer (node:internal/buffer:1064:12) + at allocate (node:buffer:438:10) + at Function.allocUnsafe (node:buffer:403:10) + at Function.concat (node:buffer:580:25) + at readEntry.<anonymous> ([worker eval]:1:465864) + at readEntry.emit (node:events:519:28) + at readEntry.on ([worker eval]:1:345239) + diff --git a/blacklist/pentium4/vc/vc b/blacklist/pentium4/vc/vc deleted file mode 100644 index b029df42..00000000 --- a/blacklist/pentium4/vc/vc +++ /dev/null @@ -1 +0,0 @@ -"Unsupported target architecture 'i686'. No support_???.cpp file exists for this architecture", complain upstream if you need it diff --git a/blacklist/pentium4/virtualbox/virtualbox b/blacklist/pentium4/virtualbox/virtualbox new file mode 100644 index 00000000..36126c8b --- /dev/null +++ b/blacklist/pentium4/virtualbox/virtualbox @@ -0,0 +1 @@ +32 bit is no longer supported diff --git a/blacklist/pentium4/zed/zed b/blacklist/pentium4/zed/zed new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/zed/zed diff --git a/blacklist/pentium4/zig/cargo-zigbuild b/blacklist/pentium4/zig/cargo-zigbuild new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/zig/cargo-zigbuild diff --git a/blacklist/pentium4/zig/linuxwave b/blacklist/pentium4/zig/linuxwave new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/zig/linuxwave diff --git a/blacklist/pentium4/zig/ly b/blacklist/pentium4/zig/ly new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/zig/ly diff --git a/blacklist/pentium4/zig/ncdu b/blacklist/pentium4/zig/ncdu new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/zig/ncdu diff --git a/blacklist/pentium4/zig/river b/blacklist/pentium4/zig/river new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/zig/river diff --git a/blacklist/pentium4/zig/waylock b/blacklist/pentium4/zig/waylock new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/zig/waylock diff --git a/blacklist/pentium4/zig/zig b/blacklist/pentium4/zig/zig new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/zig/zig diff --git a/blacklist/pentium4/zig/zls b/blacklist/pentium4/zig/zls new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/blacklist/pentium4/zig/zls diff --git a/build-support/nodoc-cli/PKGBUILD b/build-support/nodoc-cli/PKGBUILD index 9d91db44..d9d61aef 100644 --- a/build-support/nodoc-cli/PKGBUILD +++ b/build-support/nodoc-cli/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Felix Yan <felixonmars@archlinux.org> -# Maintainer: Caleb Maclennan <caleb@alerque.com> +# Contributor: Felix Yan <felixonmars@archlinux.org> +# Contributor: Caleb Maclennan <caleb@alerque.com> pkgname=nodoc-cli -pkgver=1 +pkgver=4 pkgrel=1 pkgdesc="Conversion between documentation formats" url="https://github.com/tatokis/nodoc" diff --git a/build-support/shellnocheck/PKGBUILD b/build-support/shellnocheck/PKGBUILD new file mode 100644 index 00000000..2efc21fb --- /dev/null +++ b/build-support/shellnocheck/PKGBUILD @@ -0,0 +1,23 @@ +pkgname=shellnocheck +pkgver=1 +pkgrel=1 +pkgdesc="Shell script analysis tool" +url="https://github.com/tatokis/shellnocheck" +license=("GPL-2.0-or-later") +arch=('i486' 'i686' 'pentium4') +provides=('shellcheck') +conflicts=('shellcheck') +replaces=('shellcheck') +source=("git+https://github.com/tatokis/shellnocheck.git") +sha256sums=('SKIP') +makedepends=('git') + +build() { + cd shellnocheck + make +} + +package() { + cd shellnocheck + install -D -m755 shellcheck -t "$pkgdir"/usr/bin/ +} diff --git a/core/archlinux32-keyring/PKGBUILD b/core/archlinux32-keyring/PKGBUILD index 0f3d38a4..840a79e6 100644 --- a/core/archlinux32-keyring/PKGBUILD +++ b/core/archlinux32-keyring/PKGBUILD @@ -1,8 +1,7 @@ # Maintainer: Erich Eckner <deep42thought@archlinux32.org> pkgname=archlinux32-keyring -pkgver='20240131' -_pkgver='20240131-1-g00da5c3' -pkgrel='5' +pkgver='20240924' +pkgrel='1' pkgdesc='Arch Linux 32 PGP keyring' arch=('any') url='https://archlinux32.org' @@ -10,13 +9,13 @@ license=('GPL') install="${pkgname}.install" conflicts=('archlinux32-keyring-transition') replaces=('archlinux32-keyring-transition') -source=("https://sources.archlinux32.org/sources/${pkgname}-v${_pkgver}.tar.gz"{,.sig}) -sha256sums=('b64db02d172ec9fa93e9e0f17dc2eca422656a18f549ae4abf2aff98fa44f0e2' +source=("https://sources.archlinux32.org/sources/${pkgname}-v${pkgver}.tar.gz"{,.sig}) +sha512sums=('a1b16e4cf43b5f5cfea2184d55c1d19ccd6398d224a09c36bbd29d36a6685eb8a18035c76b33b6363850cfb7243d484f537c661c8f3a6bbfb68ab1bbeb8a94a9' 'SKIP') validpgpkeys=('33CA3597B0D161AAE4173F65C17F1214114574A4') # obtain from https://archlinux32.org/keys.php package() { - cd "${srcdir}/${pkgname}-v${_pkgver}" + cd "${srcdir}/${pkgname}-v${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 5385a852..48b03317 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -2,7 +2,7 @@ if [ "${CARCH}" = "i486" ]; then # make uname return i486 instead of i686 when used with setarch source+=('coreutils-9.5-uname-i486.patch') - sha256sums+=('9c8b9c88a2f737808ef43dca4c7ea03c638930e33f3c01e7c407ec6f9f67f218') + b2sums+=('94be6a03eeb940609d65af90b9977744ae5627c5e99f73924e57cd36df5b9212c6e0fb1a71008a2f97d83c23cfd30bd8e386e7ffd0718ff59c0dc1ff03e6e6ef') fi # FS#66506: temporarily ignore test-login failure diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index ca003988..5c9ac509 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -123,3 +123,21 @@ eval "$( s/--enable-cet=auto/--disable-cet/ ' )" + +# remove rust on i486 +makedepends=(${makedepends[@]//rust/}) +makedepends_i686+=('rust') +makedepends_pentium4+=('rust') +if [ "${CARCH}" = "i486" ]; then + package_gcc-rust() { + echo "No Rust on i486." + } + + eval "$( + declare -f build | \ + sed ' + /enable-languages/ s/,rust// + ' + )" +fi + diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 2d6cf671..03004ef9 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -6,3 +6,9 @@ declare -f check | \ s/\(meson test.*\)/\1 || true/ ' )" + +# Crappy hack to work around glib2-devel not being installed +eval "$( + declare -f package_glib2 | \ + sed '3i depends+=(glib2-devel)' +)" diff --git a/core/gnutls/PKGBUILD b/core/gnutls/PKGBUILD index 3056d6a0..02b833fc 100644 --- a/core/gnutls/PKGBUILD +++ b/core/gnutls/PKGBUILD @@ -3,6 +3,6 @@ eval "$( declare -f check | \ sed ' - s/make -j1 check/make -j1 check || true/ + s/make check/make check || true/ ' )" diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD index e1b4abf1..472d6ab5 100644 --- a/core/gpgme/PKGBUILD +++ b/core/gpgme/PKGBUILD @@ -34,3 +34,29 @@ eval "$( s/make/make CXXFLAGS='-D_FILE_OFFSET_BITS=64' / ' )" + +if [[ $CARCH == i486 ]]; then + # ignore gui (for now, needs Qt6, which needs atomics) + makedepends=(${makedepends[@]//qt6-base/}) + eval "$( + declare -f package_qgpgme-qt6 | \ + sed ' + s/--sphinx-man// + s/--sphinx-html// + ' + declare -f package_gpgme | \ + sed ' + /libqgpgmeqt6/d + ' + + declare -f package_qgpgme-qt6 | \ + sed ' + 3 i if false; then + $ i fi + ' + )" +fi + +if [[ $CARCH == pentium4 ]]; then + eval "$(declare -f build | sed 's@./configure@CC="gcc -msse2" CXX="g++ -msse2" ./configure@')" +fi diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index 7ee56472..e8cf0d85 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -25,10 +25,19 @@ eval "$( a \ install -t "${builddir}/arch/x86" -m644 arch/x86/Makefile_32.cpu } - $ i depends+=(gcc-libs=$(_get_gcc_version_from_config)) ' )" +# pin gcc-libs version (for pahole, kernel modules etc.) +# currently not working because of 'creative' pkgver +# versions upstream '14.1.1+r58+gfc9fb69ad62-1' +#eval "$( +# declare -f package_${pkgbase}-headers | \ +# sed ' +# $ i depends+=(gcc-libs=$(_get_gcc_version_from_config)) +# ' +#)" + _get_gcc_version_from_config() { if [ -z "$srcdir" ]; then gcc --version \ @@ -41,7 +50,7 @@ _get_gcc_version_from_config() { [ -f "$_config_file" ] && break done sed ' - s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/ + s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9\.]\+\) [0-9]\+"$/\1/ t d ' "$_config_file" @@ -143,3 +152,4 @@ makedepends=(${makedepends[@]//python-sphinx<6.0.0/}) makedepends=(${makedepends[@]//graphviz/}) makedepends=(${makedepends[@]//imagemagick/}) makedepends=(${makedepends[@]//texlive-latexextra/}) + diff --git a/core/nss/PKGBUILD b/core/nss/PKGBUILD index f88ce921..91955360 100644 --- a/core/nss/PKGBUILD +++ b/core/nss/PKGBUILD @@ -36,3 +36,8 @@ eval "$( s/build.sh/build.sh --clang/g ' )" + +# for clang on i486 +if [ "${CARCH}" = "i486" ]; then + makedepends+=(llvm14-libs) +fi diff --git a/core/pacman-mirrorlist/PKGBUILD b/core/pacman-mirrorlist/PKGBUILD index 8d2fbbc4..69d3b77e 100644 --- a/core/pacman-mirrorlist/PKGBUILD +++ b/core/pacman-mirrorlist/PKGBUILD @@ -1,4 +1,4 @@ # Maintainer: Erich Eckner <deep42thought@archlinux32.org> -pkgver=20240614 -sha256sums=('e9bdc480ed2ac1ff9c704689685ecea0f7c3e903580bf356dbbe0569f64759e7') -md5sums=('46938049275a28bd5e839233106c79b9') +pkgver=20240616 +sha256sums=('b03ce07a380d8a2c9048831b58932ece01de23b32da64549fe38f607b9a369ea') +md5sums=('bf64410ce9050ef6e737d21a89e78c98') diff --git a/core/pacman-mirrorlist/mirrorlist b/core/pacman-mirrorlist/mirrorlist index 04830e36..8602753b 100644 --- a/core/pacman-mirrorlist/mirrorlist +++ b/core/pacman-mirrorlist/mirrorlist @@ -1,10 +1,10 @@ ## ## Arch Linux repository mirrorlist for i686 -## Generated on 2024-06-14 +## Generated on 2024-06-16 ## ## Canada -Server = https://mirror.qctronics.com/arch32/$arch/$repo +#Server = https://mirror.qctronics.com/arch32/$arch/$repo ## Belarus #Server = http://mirror.datacenter.by/pub/archlinux32/$arch/$repo diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index e5966c06..99b6a18e 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -1,14 +1,16 @@ -# upstream git revision: 557099dcb495b55b563735a21fdc393d0fc050fb +# upstream git revision: 1a52f2e1d641587a1514c99b96d839368076288d depends+=(archlinux32-keyring) # fail if upstream changes makepkg.conf or pacman.conf for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = '2465d495cb275dce434eb3bfe4d293a223e301b968c14861aea42bc7c60404ef' ]; then - sha256sums[${i}]='82e963060a02c9a04cf5296bb4c5e732d3c3d0666d221ddaf2b3367989b9d894' + # pacman.conf + if [ "${sha256sums[${i}]}" = '0e84952e4b8eacbb38c018608d152ddd6f98e205c4c6c7d3cdca854d4b7d4179' ]; then + sha256sums[${i}]='3e482ca4e98386679cec02b51e32c6a13caf3dee365a850567547f616a69408f' fi - if [ "${sha256sums[${i}]}" = '656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a' ]; then - sha256sums[${i}]='663cbfe0643ff78c1eeb38d59046707da49bde6ab8226fbc5844457a985cb5bc' + # makepkg.conf + if [ "${sha256sums[${i}]}" = 'd99c1f9608362fff9ab3a2ca0a3096a317927b42a6725bc86599da6849c9c67c' ]; then + sha256sums[${i}]='82e963060a02c9a04cf5296bb4c5e732d3c3d0666d221ddaf2b3367989b9d894' fi done diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf index 75ba5b82..780c9a87 100644 --- a/core/pacman/pacman.conf +++ b/core/pacman/pacman.conf @@ -35,6 +35,8 @@ Architecture = auto CheckSpace #VerbosePkgLists #ParallelDownloads = 5 +DownloadUser = alpm +DisableSandbox # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. diff --git a/core/pcre2/PKGBUILD b/core/pcre2/PKGBUILD index da90f860..fa4189bb 100644 --- a/core/pcre2/PKGBUILD +++ b/core/pcre2/PKGBUILD @@ -11,3 +11,5 @@ if [ "${CARCH}" = "i486" ]; then ' )" fi + +unset check diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index c8d3b267..46ef2329 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,9 +1,6 @@ -# temporary workaround for not having the locale set in build chroots -# (is fixed upstream in devtools, but must update all build slaves first, -# otherwise the whole Perl rebuild fails!) eval "$( declare -f check | \ sed ' - s/make test/LC_ALL=C LANGUAGE=C make test/ + s/make test/make test || true/ ' )" diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD index fb6dfc37..bb3c9176 100644 --- a/core/pinentry/PKGBUILD +++ b/core/pinentry/PKGBUILD @@ -12,3 +12,16 @@ if [ "${CARCH}" = "i486" ]; then ' )" fi + +# disable qt6 and wayland on i486 +if [ "${CARCH}" = "i486" ]; then + makedepends=(${makedepends[@]//qt6-base/}) + makedepends=(${makedepends[@]//kwayland5/}) + eval "$( + declare -f build | \ + sed ' + s/--enable-pinentry-qt/--disable-pinentry-qt/ + ' + )" +fi + diff --git a/core/pkgconf/PKGBUILD b/core/pkgconf/PKGBUILD index 2cc6e9ca..1c4ba27b 100644 --- a/core/pkgconf/PKGBUILD +++ b/core/pkgconf/PKGBUILD @@ -1,13 +1,10 @@ # use i686 personality as main personality, no lib32, no 64-bit source=(${source[@]//x86_64-pc-linux-gnu.personality/}) -sha256sums=(${sha256sums[@]//c8297817ba0b57d003878db247ff34b4c47a7594c9f67dcfe8ff8d6567956cd5/}) -sha256sums[1]='4df633eb84275d51c94bc70a6c56def678ad76dd58573a2ac9b1360732883d96' +b2sums=(${b2sums[@]//c04583e19149c1035cb7777a59f0fbc4988b672d8e45105e33def3d0f9054464e33a400a3e7c7e8b99b334e4fe06aaa9d7e34662e806096d4374bd6b12d803db/}) +b2sums[1]='b44d82b4c4fd32eeed11a3e5a5ab7331f27467d0f83c118eb381d872cc41a1d69e00605a598a35e9288edf5e8fdadaebfff4bd83131506665c7ab94ef7a678a3' eval "$( declare -f package | \ - sed ' - /install/s/x86_64-pc-linux-gnu.personality// - /ln.*x86_64-pc-linux-gnu-pkg-config/d - ' -)" + sed 's@{x86_64,i686}@i686@' +)" diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 535411ce..32b22179 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -42,3 +42,8 @@ eval "$( $ i fi ' )" + +# for clang on i486 +if [ "${CARCH}" = "i486" ]; then + makedepends+=(llvm14-libs) +fi diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD new file mode 100644 index 00000000..49f1d11e --- /dev/null +++ b/extra/abiword/PKGBUILD @@ -0,0 +1,2 @@ +source[0]='http://www.nl.abisource.com/downloads/abiword/3.0.5/source/abiword-3.0.5.tar.gz' +source[1]='http://www.nl.abisource.com/downloads/abiword/3.0.5/source/abiword-3.0.5.tar.gz.asc' diff --git a/extra/abseil-cpp/PKGBUILD b/extra/abseil-cpp/PKGBUILD index b5c9ca6b..b81a17fb 100644 --- a/extra/abseil-cpp/PKGBUILD +++ b/extra/abseil-cpp/PKGBUILD @@ -1,3 +1,18 @@ # Tests are flaky - eval "$(declare -f check | sed 's/ctest/ctest || true/')" + +# Test cause OOM on u486 +if [ "$CARCH" = 'i486' ]; then + unset check + unset checkdepends +fi + +# libatomic for i486 +if [ "$CARCH" = "i486" ]; then + eval "$( + declare -f build | \ + sed ' + 3 i export LDFLAGS=-latomic + ' + )" +fi diff --git a/extra/aida-x/PKGBUILD b/extra/aida-x/PKGBUILD new file mode 100644 index 00000000..dff76157 --- /dev/null +++ b/extra/aida-x/PKGBUILD @@ -0,0 +1,12 @@ +# This requires SSE, so enable it on i686 + +if [ "$CARCH" = "i686" ]; then + eval "$( + declare -f build | \ + sed ' + 3 i export CXXFLAGS="$CXXFLAGS -msse" CFLAGS="$CFLAGS -msse" + ' + )" +fi + +eval "$(declare -f package_aida-x-vst3 | sed 's@\$CARCH@i386@g')" diff --git a/extra/arrow/PKGBUILD b/extra/arrow/PKGBUILD new file mode 100644 index 00000000..387ce327 --- /dev/null +++ b/extra/arrow/PKGBUILD @@ -0,0 +1,5 @@ +# Avoid linker OOM +options=('!debug' '!lto') + +# Sometimes the tests hang +unset check diff --git a/extra/bear/PKGBUILD b/extra/bear/PKGBUILD new file mode 100644 index 00000000..7841ee96 --- /dev/null +++ b/extra/bear/PKGBUILD @@ -0,0 +1,4 @@ +# Timeout +eval "$( + declare -f prepare | sed 's@cmake@cmake -DENABLE_UNIT_TESTS=OFF -DENABLE_FUNC_TESTS=OFF@' +)" diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 12fb68df..cf17845a 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -12,3 +12,12 @@ if [ "$CARCH" == 'i486' ]; then ' )" fi + +# disable complaining about stack trace feature which leaks memory +eval "$( + declare -f build | \ + sed ' + s/cflags="\([^"]*\)"/cflags="\1 -DBOOST_STACKTRACE_LIBCXX_RUNTIME_MAY_CAUSE_MEMORY_LEAK"/g + s/cxxflags="\([^"]*\)"/cxxflags="\1 -DBOOST_STACKTRACE_LIBCXX_RUNTIME_MAY_CAUSE_MEMORY_LEAK"/g + ' +)" diff --git a/extra/c-ares/PKGBUILD b/extra/c-ares/PKGBUILD new file mode 100644 index 00000000..1074c004 --- /dev/null +++ b/extra/c-ares/PKGBUILD @@ -0,0 +1,3 @@ +if [[ $pkgver == "1.29.0" ]]; then + source=(https://github.com/c-ares/c-ares/releases/download/cares-1_29_0/c-ares-1.29.0.tar.gz{,.asc}) +fi diff --git a/extra/c3c/PKGBUILD b/extra/c3c/PKGBUILD new file mode 100644 index 00000000..4ba3cd7a --- /dev/null +++ b/extra/c3c/PKGBUILD @@ -0,0 +1,6 @@ +eval "$( + declare -f build | \ + sed ' + 3 i CFLAGS="$CFLAGS -Wno-error=int-to-pointer-cast" + ' +)" diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD index c916da7f..8b137891 100644 --- a/extra/chromaprint/PKGBUILD +++ b/extra/chromaprint/PKGBUILD @@ -1,3 +1 @@ -# temporary fix for FS#70567 -makedepends=(${makedepends[@]//gtest/}) -makedepends+=(gmock) + diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD index d0d51af5..9233edd0 100644 --- a/extra/chromium/PKGBUILD +++ b/extra/chromium/PKGBUILD @@ -8,12 +8,12 @@ declare -f build | \ # no SAMUFLAGS, see https://www.mail-archive.com/pacman-dev@archlinux.org/msg17258.html # going the sed-way -eval "$( - declare -f build | \ - sed ' - s/ninja/ninja -j 1/ - ' -)" +#eval "$( +# declare -f build | \ +# sed ' +# s/ninja/ninja -j 1/ +# ' +#)" # can't create dynamic relocation R_386_32 against local symbol in readonly segment eval "$( @@ -59,3 +59,5 @@ eval "$( /cd chromium-$pkgver/a patch -Np1 -i "$srcdir/reenable-linux-i686-builds.patch" ' )" + +options+=(!debug !lto) diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index d394180e..2552462b 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -42,3 +42,6 @@ if [[ $CARCH = 'i486' ]]; then ' )" fi + +# git checkout with checksum upstream, works maybe in pacman 7.0.0? +sha512sums[0]='SKIP' diff --git a/extra/cppcheck/PKGBUILD b/extra/cppcheck/PKGBUILD new file mode 100644 index 00000000..e0b50c95 --- /dev/null +++ b/extra/cppcheck/PKGBUILD @@ -0,0 +1,5 @@ +# The package asks pacman for the version, but our version string differs +eval "$( + declare -f build | \ + sed 's/xsversion=.*/xsversion=\*/' +)" diff --git a/extra/dragonfly-reverb/PKGBUILD b/extra/dragonfly-reverb/PKGBUILD new file mode 100644 index 00000000..bf8b2d48 --- /dev/null +++ b/extra/dragonfly-reverb/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f package_dragonfly-reverb-vst3 | sed 's@\$CARCH@i686@g')" diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD new file mode 100644 index 00000000..a8f8d809 --- /dev/null +++ b/extra/dvdauthor/PKGBUILD @@ -0,0 +1,2 @@ +# Fix size_t issue for GetMagickVer() +eval "$(declare -f prepare | sed 's@patch.*@\0 sed -i "s/unsigned long magickver;/size_t magickver;/" src/subgen-image.c@')" diff --git a/extra/efifs/PKGBUILD b/extra/efifs/PKGBUILD new file mode 100644 index 00000000..3b2cb869 --- /dev/null +++ b/extra/efifs/PKGBUILD @@ -0,0 +1,7 @@ +# Does w32-mingw32-gcc exist? I thought it was w64. +eval "$(declare -f prepare | sed 's@^}$@sed -i "s/MINGW_HOST = w32/MINGW_HOST = w64/" EfiFs/Make.common EfiFs-ia32/Make.common; }@')" + +# I can't figure this out, so bodge it instead +# error adding symbols: Archive has no index; run ranlib to add one +# Adding "s" to the ar command doesn't do it either +eval "$(declare -f build | sed "s@make -C EfiFs-ia32 ARCH='ia32'@make -C EfiFs-ia32 ARCH='ia32' || true; i686-w64-mingw32-ranlib EfiFs-ia32/grub/libgrub.a; make -C EfiFs-ia32 ARCH='ia32'@")" diff --git a/extra/exim/PKGBUILD b/extra/exim/PKGBUILD new file mode 100644 index 00000000..c9345dc8 --- /dev/null +++ b/extra/exim/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f package | sed 's/.CARCH/i386/')" diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index ace68ef8..c15b2314 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -143,3 +143,6 @@ fi if [ "$CARCH" == 'i486' ]; then makedepends+=(librsvg-og) fi + +# Bad workaround +eval "$(declare -f build | sed '3i export CFLAGS="$CFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion"')" diff --git a/extra/ffmpeg2theora/PKGBUILD b/extra/ffmpeg2theora/PKGBUILD new file mode 100644 index 00000000..971afd35 --- /dev/null +++ b/extra/ffmpeg2theora/PKGBUILD @@ -0,0 +1,3 @@ +if [[ $pkgver == 0.30 ]]; then + source[0]="https://web.archive.org/web/20160315194631/http://v2v.cc/~j/ffmpeg2theora/downloads/ffmpeg2theora-0.30.tar.bz2" +fi diff --git a/extra/ffmpeg4.4/PKGBUILD b/extra/ffmpeg4.4/PKGBUILD index cfff0492..3e60ce8b 100644 --- a/extra/ffmpeg4.4/PKGBUILD +++ b/extra/ffmpeg4.4/PKGBUILD @@ -136,3 +136,6 @@ fi if [ "$CARCH" == 'i486' ]; then makedepends+=(librsvg-og) fi + +# Bad workaround +eval "$(declare -f build | sed '3i export CFLAGS="$CFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion"')" diff --git a/extra/fractal/PKGBUILD b/extra/fractal/PKGBUILD new file mode 100644 index 00000000..111844f4 --- /dev/null +++ b/extra/fractal/PKGBUILD @@ -0,0 +1 @@ +options+=(!debug !lto) diff --git a/extra/fricas/PKGBUILD b/extra/fricas/PKGBUILD new file mode 100644 index 00000000..4fd4f853 --- /dev/null +++ b/extra/fricas/PKGBUILD @@ -0,0 +1,3 @@ +# dynamic-space-size argument is out of range: 6000 +eval "$(declare -f prepare | sed 's@^}$@sed s/3072/2048/ -i "$pkgname-$pkgver/configure"; }@')" +eval "$(declare -f build | sed s/6000/2048/)" diff --git a/extra/gcc12/PKGBUILD b/extra/gcc12/PKGBUILD deleted file mode 100644 index e27c5506..00000000 --- a/extra/gcc12/PKGBUILD +++ /dev/null @@ -1,125 +0,0 @@ -# remove tsan (thread sanitizer) plugin, not available for i686 -pkgname=( - $( - printf '%s\n' "${pkgname[@]}" | \ - grep -vFx 'lib32-gcc-libs' - ) -) -unset -f 'package_lib32-gcc-libs' -eval "$( - declare -f prepare | \ - sed ' - \,/s/lib64/lib/, d - ' - declare -f build | \ - sed ' - /configure/ s/--enable-multilib/--disable-multilib/ - /configure/ s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/, - /configure/ s/;$/ --build=$CHOST;/ - ' - declare -f package_gcc11-libs | \ - sed ' - s/\$pkgname-multilib// - s@libsanitizer/{a,l,ub,t}san@libsanitizer/{a,l,ub}san@ - \@/usr/lib32/@ d - ' - declare -f package_gcc11 | \ - sed ' - s/"lib32-gcc-libs[^"]*"//g - s@make.*tsan.*install@#\0@ - ' -)" -eval "$( - for name in "${pkgname[@]}"; do - declare -f package_${name} | \ - sed ' - s/$pkgname-multilib// - s/{,32}// - \,/lib32/,d - \,/32/,d - ' - done -)" - -# i486-specific - -# no ADA -makedepends=(${makedepends[@]//gcc-ada/}) -makedepends_i686+=('gcc-ada') -makedepends_pentium4+=('gcc-ada') - -if [ "${CARCH}" = "i486" ]; then - package_gcc11-ada() { - touch "$pkgdir/this-is-a-dummy-package" - } - - eval "$( - declare -f build | \ - sed ' - /enable-languages/ s/,ada// - ' - )" - - eval "$( - declare -f package_gcc11 | \ - sed ' - s/,gnat-style,gnat_rm,gnat_ugn// - ' - )" - - # building toolchain (gcc): again, lobtool problems - # /usr/lib/gcc/i486-pc-linux-gnu/7.3.0/ld: cannot find -lquadmath - # collect2: error: ld returned 1 exit status - # libtool: install: error: relink `libgfortran.la' with the above command before installing it - # make: Leaving directory '/build/gcc/src/gcc-build/i486-pc-linux-gnu/libgfortran' - # => wrong link order: libgfortran requires libquadmath - eval "$( - declare -f package_gcc11-libs | \ - sed ' - /for lib in / s/libgfortran/libquadmath libgfortran/ - ' - )" - - # disable CET (Control Flow instructions endbr32/enbr64) - eval "$( - declare -f build | \ - sed ' - s/--enable-cet=auto/--disable-cet/ - ' - )" - -else - - # force enable CET (Control Flow instructions endbr32/enbr64) - eval "$( - declare -f build | \ - sed ' - s/--enable-cet=auto/--enable-cet/ - ' - )" - -fi - -makedepends=(${makedepends[@]//lib32-glibc/}) -makedepends=(${makedepends[@]//lib32-gcc-libs/}) - -# i486-specific: disable PGO/LTO build, uses too much resources, -# also disabling LTO for now -if [ "${CARCH}" = "i486" ]; then - eval "$( - declare -f build | \ - sed ' - s/--enable-pgo-build=.*/--disable-pgo-build/ - s/--enable-lto/--disable-lto/ - s/--with-build-config=bootstrap-lto// - ' - declare -f package_gcc11 | \ - sed ' - /make.*lto-plugin.*install/d - /ln.*liblto_plugin.so/d - ' - )" -fi - -# tons of stuff fails anyway -unset check diff --git a/extra/gcc13/PKGBUILD b/extra/gcc13/PKGBUILD index ca003988..82823927 100644 --- a/extra/gcc13/PKGBUILD +++ b/extra/gcc13/PKGBUILD @@ -17,19 +17,19 @@ eval "$( /configure/ s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/, /configure/ s/;$/ --build=$CHOST;/ ' - declare -f package_gcc-libs | \ + declare -f package_gcc13-libs | \ sed ' s/\$pkgname-multilib// - s@libsanitizer/{a,l,ub,t}san@libsanitizer/{a,l,ub}san@ + s@libtsan.so@@ /provides=/s/libtsan.so// \@/usr/lib32/@ d ' - declare -f package_gcc | \ + declare -f package_gcc13 | \ sed ' s/"lib32-gcc-libs[^"]*"//g s@make.*tsan.*install@#\0@ ' - declare -f package_gcc-ada | \ + declare -f package_gcc13-ada | \ sed ' \,cd .*/32/libada,{ N @@ -57,7 +57,7 @@ makedepends_i686+=('gcc-ada') makedepends_pentium4+=('gcc-ada') if [ "${CARCH}" = "i486" ]; then - package_gcc-ada() { + package_gcc13-ada() { touch "$pkgdir/this-is-a-dummy-package" } @@ -69,7 +69,7 @@ if [ "${CARCH}" = "i486" ]; then )" eval "$( - declare -f package_gcc | \ + declare -f package_gcc13 | \ sed ' s/,gnat-style,gnat_rm,gnat_ugn// ' @@ -82,7 +82,7 @@ if [ "${CARCH}" = "i486" ]; then # make: Leaving directory '/build/gcc/src/gcc-build/i486-pc-linux-gnu/libgfortran' # => wrong link order: libgfortran requires libquadmath eval "$( - declare -f package_gcc-libs | \ + declare -f package_gcc13-libs | \ sed ' /for lib in / s/libgfortran/libquadmath libgfortran/ ' @@ -103,7 +103,7 @@ if [ "${CARCH}" = "i486" ]; then s/--enable-lto/--disable-lto/ s/--with-build-config=bootstrap-lto// ' - declare -f package_gcc | \ + declare -f package_gcc13 | \ sed ' /make.*lto-plugin.*install/d /ln.*liblto_plugin.so/d @@ -123,3 +123,8 @@ eval "$( s/--enable-cet=auto/--disable-cet/ ' )" + +# ??? +eval "$( + declare -f package_gcc13-libs | sed '/\/\.\.\/lib/d' +)" diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD new file mode 100644 index 00000000..bf0c483c --- /dev/null +++ b/extra/gdb/PKGBUILD @@ -0,0 +1,9 @@ +# gdb 15.1 doesn't build objects needed in libopcodes which results in linking failures +source+=('opcodes.patch') +unset sha1sums +b2sums+=('aa286172afb28434384bc30309d6c864343aae01ee0e234f76676dda49aa34227740564b40fe6292a8778cd705b3a2cb67944e7dd810d5f93388328b650d4586') + +prepare() { + cd gdb-$pkgver + patch -p1 -i ../opcodes.patch +} diff --git a/extra/gdb/opcodes.patch b/extra/gdb/opcodes.patch new file mode 100644 index 00000000..7c0c72f0 --- /dev/null +++ b/extra/gdb/opcodes.patch @@ -0,0 +1,40 @@ +--- a/opcodes/Makefile.am 2024-08-25 18:41:21.171164634 +0000 ++++ b/opcodes/Makefile.am 2024-08-25 18:42:58.328802756 +0000 +@@ -119,6 +119,8 @@ + arm-dis.c \ + avr-dis.c \ + bfin-dis.c \ ++ bpf-dis.c \ ++ bpf-opc.c \ + cgen-asm.c \ + cgen-bitset.c \ + cgen-dis.c \ +@@ -230,6 +232,8 @@ + ppc-opc.c \ + pru-dis.c \ + pru-opc.c \ ++ riscv-dis.c \ ++ riscv-opc.c \ + rl78-decode.c \ + rl78-dis.c \ + rx-decode.c \ +--- a/opcodes/Makefile.in 2024-08-25 18:44:34.402406480 +0000 ++++ b/opcodes/Makefile.in 2024-08-25 18:37:04.302726979 +0000 +@@ -522,6 +522,8 @@ + arm-dis.c \ + avr-dis.c \ + bfin-dis.c \ ++ bpf-dis.c \ ++ bpf-opc.c \ + cgen-asm.c \ + cgen-bitset.c \ + cgen-dis.c \ +@@ -633,6 +635,8 @@ + ppc-opc.c \ + pru-dis.c \ + pru-opc.c \ ++ riscv-dis.c \ ++ riscv-opc.c \ + rl78-decode.c \ + rl78-dis.c \ + rx-decode.c \ diff --git a/extra/gitea/PKGBUILD b/extra/gitea/PKGBUILD new file mode 100644 index 00000000..37b6a44d --- /dev/null +++ b/extra/gitea/PKGBUILD @@ -0,0 +1,3 @@ +unset check +# ⎯⎯⎯⎯⎯⎯ Unhandled Error ⎯⎯⎯⎯⎯⎯⎯ +# Error: Your current platform "linux" and architecture "ia32" combination is not yet supported by the native Rollup build. Please use the WASM build "@rollup/wasm-node" instead. diff --git a/extra/godot/PKGBUILD b/extra/godot/PKGBUILD new file mode 100644 index 00000000..849d64a5 --- /dev/null +++ b/extra/godot/PKGBUILD @@ -0,0 +1,2 @@ +eval "$(declare -f build | sed 's@$CARCH@x86_32@')" +eval "$(declare -f package | sed 's@$CARCH@x86_32@')" diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD index 7442af2c..e37c1a44 100644 --- a/extra/gstreamer/PKGBUILD +++ b/extra/gstreamer/PKGBUILD @@ -9,6 +9,18 @@ eval "$( # svt-hevc is blacklisted makedepends=(${makedepends[@]//svt-hevc/}) +# onnxruntime won't build currently (and probably ever but who knows) +makedepends=(${makedepends[@]//onnxruntime/}) +pkgname=(${pkgname[@]//gst-plugin-onnx/}) + +eval "$( + declare -f build | \ + sed ' + /local meson_options.*/ a \ + meson_options+=(-Dgst-plugins-bad:onnx=disabled) + ' +)" + eval "$( declare -f build | \ sed ' diff --git a/extra/gtk4/PKGBUILD b/extra/gtk4/PKGBUILD index b24ac63d..8682c5ab 100644 --- a/extra/gtk4/PKGBUILD +++ b/extra/gtk4/PKGBUILD @@ -27,3 +27,5 @@ if [ "${CARCH}" = 'i486' ]; then makedepends+=(icu70 icu69) fi + +eval "$(declare -f build | sed '3i export CFLAGS="$CFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion"')" diff --git a/extra/hunspell-de/PKGBUILD b/extra/hunspell-de/PKGBUILD new file mode 100644 index 00000000..5904e19e --- /dev/null +++ b/extra/hunspell-de/PKGBUILD @@ -0,0 +1,6 @@ +eval "$( + declare -f package | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" diff --git a/extra/hunspell-el/PKGBUILD b/extra/hunspell-el/PKGBUILD new file mode 100644 index 00000000..5904e19e --- /dev/null +++ b/extra/hunspell-el/PKGBUILD @@ -0,0 +1,6 @@ +eval "$( + declare -f package | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" diff --git a/extra/hunspell-en/PKGBUILD b/extra/hunspell-en/PKGBUILD new file mode 100644 index 00000000..6621774e --- /dev/null +++ b/extra/hunspell-en/PKGBUILD @@ -0,0 +1,27 @@ +eval "$( + declare -f package_hunspell-en_us | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" + +eval "$( + declare -f package_hunspell-en_au | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" + +eval "$( + declare -f package_hunspell-en_ca | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" + +eval "$( + declare -f package_hunspell-en_gb | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" diff --git a/extra/hunspell-es/PKGBUILD b/extra/hunspell-es/PKGBUILD new file mode 100644 index 00000000..ea78e53f --- /dev/null +++ b/extra/hunspell-es/PKGBUILD @@ -0,0 +1,6 @@ +eval "$( + declare -f package_hunspell-es_any | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" diff --git a/extra/hunspell-fr/PKGBUILD b/extra/hunspell-fr/PKGBUILD new file mode 100644 index 00000000..5904e19e --- /dev/null +++ b/extra/hunspell-fr/PKGBUILD @@ -0,0 +1,6 @@ +eval "$( + declare -f package | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" diff --git a/extra/hunspell-hu/PKGBUILD b/extra/hunspell-hu/PKGBUILD new file mode 100644 index 00000000..118258cc --- /dev/null +++ b/extra/hunspell-hu/PKGBUILD @@ -0,0 +1,6 @@ +eval "$( + declare -f package | \ + sed ' + /qtwebengine_dictionaries/,/ln/d + ' +)" diff --git a/extra/hunspell-it/PKGBUILD b/extra/hunspell-it/PKGBUILD new file mode 100644 index 00000000..5904e19e --- /dev/null +++ b/extra/hunspell-it/PKGBUILD @@ -0,0 +1,6 @@ +eval "$( + declare -f package | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" diff --git a/extra/hunspell-nl/PKGBUILD b/extra/hunspell-nl/PKGBUILD new file mode 100644 index 00000000..5904e19e --- /dev/null +++ b/extra/hunspell-nl/PKGBUILD @@ -0,0 +1,6 @@ +eval "$( + declare -f package | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" diff --git a/extra/hunspell-pl/PKGBUILD b/extra/hunspell-pl/PKGBUILD new file mode 100644 index 00000000..0c7161ef --- /dev/null +++ b/extra/hunspell-pl/PKGBUILD @@ -0,0 +1,8 @@ +source[0]='https://people.freebsd.org/~sunpoet/sunpoet/hunspell/sjp-myspell-pl-20230701.zip' + +eval "$( + declare -f package | \ + sed ' + /qtwebengine_dictionaries/,/ln/d + ' +)" diff --git a/extra/hunspell-ro/PKGBUILD b/extra/hunspell-ro/PKGBUILD new file mode 100644 index 00000000..5904e19e --- /dev/null +++ b/extra/hunspell-ro/PKGBUILD @@ -0,0 +1,6 @@ +eval "$( + declare -f package | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" diff --git a/extra/hunspell-ru/PKGBUILD b/extra/hunspell-ru/PKGBUILD new file mode 100644 index 00000000..0c2fd74a --- /dev/null +++ b/extra/hunspell-ru/PKGBUILD @@ -0,0 +1,10 @@ +source[0]="${pkgname}.aff::https://raw.githubusercontent.com/LibreOffice/dictionaries/master/ru_RU/ru_RU.aff" +source[1]="${pkgname}.dic::https://raw.githubusercontent.com/LibreOffice/dictionaries/master/ru_RU/ru_RU.dic" +source[2]="${pkgname}-README.txt::https://raw.githubusercontent.com/LibreOffice/dictionaries/master/ru_RU/README_ru_RU.txt" + +eval "$( + declare -f package | \ + sed ' + /qtwebengine_dictionaries/,/done/d + ' +)" diff --git a/extra/iempluginsuite/PKGBUILD b/extra/iempluginsuite/PKGBUILD new file mode 100644 index 00000000..76c2f26a --- /dev/null +++ b/extra/iempluginsuite/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f package_iempluginsuite-vst3 | sed 's@\$CARCH@i386@g')" diff --git a/extra/intel-metee/PKGBUILD b/extra/intel-metee/PKGBUILD new file mode 100644 index 00000000..e3613201 --- /dev/null +++ b/extra/intel-metee/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f build | sed 's/cmake/CFLAGS="$CFLAGS -Wno-error=sign-conversion" cmake/')" diff --git a/extra/iso-codes/PKGBUILD b/extra/iso-codes/PKGBUILD new file mode 100644 index 00000000..d2e60e67 --- /dev/null +++ b/extra/iso-codes/PKGBUILD @@ -0,0 +1,2 @@ +# upstream has a checksum on a git repo, no clue, how they were able to build this +sha256sums[0]='SKIP' diff --git a/extra/jrnl/PKGBUILD b/extra/jrnl/PKGBUILD new file mode 100644 index 00000000..3692e5fe --- /dev/null +++ b/extra/jrnl/PKGBUILD @@ -0,0 +1 @@ +unset check diff --git a/extra/js128/PKGBUILD b/extra/js128/PKGBUILD new file mode 100644 index 00000000..111844f4 --- /dev/null +++ b/extra/js128/PKGBUILD @@ -0,0 +1 @@ +options+=(!debug !lto) diff --git a/extra/js80p/PKGBUILD b/extra/js80p/PKGBUILD new file mode 100644 index 00000000..592b4c5d --- /dev/null +++ b/extra/js80p/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f package | sed 's@\$CARCH@i386@g')" diff --git a/extra/kimageformats/PKGBUILD b/extra/kimageformats/PKGBUILD new file mode 100644 index 00000000..d619fa3b --- /dev/null +++ b/extra/kimageformats/PKGBUILD @@ -0,0 +1,2 @@ +# /build/kimageformats/src/kimageformats-6.5.0/src/imageformats/jxr.cpp:845:88: error: no matching function for call to ‘min(qint64&, qsizetype)’ +eval "$(declare -f build | sed 's@DKIMAGEFORMATS_JXR=ON@DKIMAGEFORMATS_JXR=OFF@')" diff --git a/extra/knockd/PKGBUILD b/extra/knockd/PKGBUILD new file mode 100644 index 00000000..705afae6 --- /dev/null +++ b/extra/knockd/PKGBUILD @@ -0,0 +1,3 @@ +if [[ $pkgver == "0.8" ]]; then + source[0]='knockd-0.8.tar.gz::https://github.com/jvinet/knock/releases/download/v0.8/knock-0.8.tar.gz' +fi diff --git a/extra/libavif/PKGBUILD b/extra/libavif/PKGBUILD index 10c53c42..23d34206 100644 --- a/extra/libavif/PKGBUILD +++ b/extra/libavif/PKGBUILD @@ -9,7 +9,7 @@ eval "$( # on i486 we ignore rav1e for now (needs rust) if [ "$CARCH" = 'i486' ]; then - depends=(${depends[@]//rav1e/}) + depends=(${depends[@]//librav1e.so/}) eval "$( declare -f build | \ sed ' @@ -17,4 +17,3 @@ if [ "$CARCH" = 'i486' ]; then ' )" fi - diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD new file mode 100644 index 00000000..696e7d78 --- /dev/null +++ b/extra/libcdio/PKGBUILD @@ -0,0 +1,15 @@ +# large file support needed for lseek64 on 32-bit +eval "$( + declare -f build | \ + sed ' + /configure/ i export CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE" + ' +)" + +# tests don't find their test ISO images? +eval "$( + declare -f check | \ + sed ' + s/\(make -C test check\)/\1 || true/ + ' +)" diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD new file mode 100644 index 00000000..dfe274e5 --- /dev/null +++ b/extra/libcroco/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libcroco +pkgver=0.6.13 +pkgrel=2 +pkgdesc="A CSS parsing library" +url="https://gitlab.gnome.org/GNOME/libcroco" +arch=(x86_64) +depends=(glib2 libxml2) +makedepends=(intltool git gtk-doc) +license=(LGPL) +_commit=7e15ca6c2c29a4b78367e6efa6195b331a92b2a7 # tags/0.6.13^0 +source=("git+https://gitlab.gnome.org/GNOME/libcroco.git#commit=$_commit") +sha256sums=('SKIP') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd $pkgname + NOCONFIGURE=1 ./autogen.sh +} + +check() { + cd $pkgname + make check +} + +build() { + cd $pkgname + ./configure --prefix=/usr --disable-static --enable-gtk-doc + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +} diff --git a/extra/libgphoto2/721f7f8c3ec8058d504607873e4c317aac0c99c5.patch b/extra/libgphoto2/721f7f8c3ec8058d504607873e4c317aac0c99c5.patch new file mode 100644 index 00000000..cf7768dd --- /dev/null +++ b/extra/libgphoto2/721f7f8c3ec8058d504607873e4c317aac0c99c5.patch @@ -0,0 +1,34 @@ +From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <marcus@jet.franken.de> +Date: Mon, 4 Dec 2023 13:26:08 +0100 +Subject: [PATCH] align outlen length with jpeg jeaders. fixes + https://github.com/gphoto/libgphoto2/issues/941 + +--- + camlibs/ptp2/chdk.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c +index e1d898f378..e775ea1d4b 100644 +--- a/camlibs/ptp2/chdk.c ++++ b/camlibs/ptp2/chdk.c +@@ -1150,7 +1150,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, + struct jpeg_error_mgr jerr; + JSAMPROW row_ptr[1]; + uint8_t *outbuf = NULL, *tmprowbuf = NULL; +- uint64_t outlen = 0; ++ unsigned long outlen = 0; + unsigned int row_inc; + int sshift, dshift, xshift, skip; + +@@ -1161,8 +1161,8 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, + sshift = 6; + dshift = (width/height > 2) ? 6 : 12; + xshift = 4; +- /* Digic 6 cameras: 8 bit per element UYVY, +- * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ ++ /* Digic 6 cameras: 8 bit per element UYVY, ++ * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ + } else { + row_inc = buf_width*2; + sshift = 4; diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD new file mode 100644 index 00000000..32b1b88c --- /dev/null +++ b/extra/libgphoto2/PKGBUILD @@ -0,0 +1,6 @@ +# Next version will have this patch +if [[ $pkgver == "2.5.31" ]]; then + source+=(721f7f8c3ec8058d504607873e4c317aac0c99c5.patch) + b2sums+=(SKIP) + eval "$(declare -f prepare | sed 's@autoreconf@patch -p1 -i ../721f7f8c3ec8058d504607873e4c317aac0c99c5.patch; autoreconf@')" +fi diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index ad9cdef4..e34411bb 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -8,6 +8,9 @@ if [ "${CARCH}" = "i486" ]; then ' )" + # ctest ist broken on libexpat + unset check + # Java broken on i486 temporarily makedepends=(${makedepends[@]//java-environment>11/}) eval "$( @@ -15,6 +18,7 @@ if [ "${CARCH}" = "i486" ]; then sed ' /local cmake_options/ a \ cmake_options+=(-DWITH_JAVA=0) + /strip-nondeterminism/d ' )" fi diff --git a/extra/libjxl/PKGBUILD b/extra/libjxl/PKGBUILD index 29fb0241..000f3c03 100644 --- a/extra/libjxl/PKGBUILD +++ b/extra/libjxl/PKGBUILD @@ -8,13 +8,29 @@ if [ "${CARCH}" = "i486" ]; then ' )" + eval "$( + declare -f package_libjxl | \ + sed ' + /mv.*jar/d + ' + )" + # break circle with gimp makedepends=(${makedepends[@]//gimp/}) fi -# blacklisted on i486 and i686 as I don't really know how to switch -# off SSE2 in this mess. It builds on i686 in a chroot on AMD64 but -# wrongly tests positive for SSE2. +# Disable SSE2 +if [ "$CARCH" = 'i486' -o "$CARCH" = 'i686' ]; then + eval "$( + declare -f build | \ + sed 's/-DCMAKE_BUILD_TYPE/-DSJPEG_ENABLE_SIMD=OFF -DCMAKE_BUILD_TYPE/' + )" + + eval "$( + declare -f prepare | \ + sed '$ d' | sed '$ a sed -i s/HWY_SSSE3/HWY_SSSE3\\|HWY_SSE2\\|HWY_SSE4/ "${srcdir}/libjxl/CMakeLists.txt";}' + )" +fi -# they fail in various waus +# they fail in various ways unset check diff --git a/extra/libpgm/PKGBUILD b/extra/libpgm/PKGBUILD index af490aa7..dbb0fa1d 100644 --- a/extra/libpgm/PKGBUILD +++ b/extra/libpgm/PKGBUILD @@ -2,3 +2,7 @@ # checksum.c:952:34: warning: implicit declaration of function '_mm_cvtm64_si64'; did you mean '_mm_cvtsi64_si32'? [-Wimplicit-function-declaration] makedepends+=('clang') eval "$(declare -f build | sed 's@./configure@CC=clang ./configure@')" + +if [ "$CARCH" = 'i486' ]; then + makedepends+=(llvm14-libs) +fi diff --git a/extra/librsvg-og/PKGBUILD b/extra/librsvg-og/PKGBUILD index 72b5a26a..c31f7c4d 100644 --- a/extra/librsvg-og/PKGBUILD +++ b/extra/librsvg-og/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Andreas Baumann <mail@andreasbaumann.cc> pkgname=librsvg-og -pkgver=2.40.20+23+g0f3eef9e -pkgrel=3 +pkgver=2.40.20+28+g9aa9f838 +pkgrel=1 epoch=1 pkgdesc="SVG rendering library old gen" url="https://github.com/oaken-source/librsvg-og" @@ -10,10 +10,10 @@ arch=(i486 i686 pentium4 x86_64) license=(LGPL) depends=(gdk-pixbuf2 pango libcroco) conflicts_i486=(libsrvg) -makedepends=(gobject-introspection gtk-doc git) +makedepends=(gobject-introspection gtk-doc git glib2-devel) provides_i486=(librsvg=${pkgver} librsvg-${pkgver%%.*}.so) #source=("https://github.com/oaken-source/librsvg-og/archive/2.40.20.tar.gz") -_commit=0f3eef9e6924130c74d7a7b16aac3e7f5bef9b4c # branch api2 +_commit=9aa9f838fdbad5129fbe9ff1d1641b0f9cf1edcf # branch api2 source=("git+https://github.com/andreasbaumann/librsvg-og.git#commit=$_commit") #sha256sums=('5bcbd8aa34a81478f990dc62a308ee2a42ff89a4e2bc905c09fd68f525bf5643') diff --git a/extra/libsieve/PKGBUILD b/extra/libsieve/PKGBUILD new file mode 100644 index 00000000..d900f3d8 --- /dev/null +++ b/extra/libsieve/PKGBUILD @@ -0,0 +1,4 @@ +if [[ $pkgver == "2.3.1" ]]; then + # Thank you for the mirror. (Since it matches the existing checksums, it's safe.) + source[0]='http://www.mirrorservice.org/sites/ftp.netbsd.org/pub/pkgsrc/distfiles/libsieve-2.3.1.tar.gz' +fi diff --git a/extra/libunwind/PKGBUILD b/extra/libunwind/PKGBUILD index a2ebca7e..7c5f4ec5 100644 --- a/extra/libunwind/PKGBUILD +++ b/extra/libunwind/PKGBUILD @@ -1,4 +1,12 @@ # no TeX for documentation on i486 -makedepends=(${makedepends[@]//texlive-core/}) -makedepends_i686+=(texlive-core) +makedepends=(${makedepends[@]//texlive-binextra/}) +makedepends_i686+=(texlive-binextra) makedepends_pentium4=("${makedepends_i686[@]}") + +# ignore failing tests for now +eval "$( + declare -f check | \ + sed ' + s/\(make check\)/\1 || true/ + ' +)" diff --git a/extra/libusbsio/PKGBUILD b/extra/libusbsio/PKGBUILD new file mode 100644 index 00000000..c8ea98ea --- /dev/null +++ b/extra/libusbsio/PKGBUILD @@ -0,0 +1,6 @@ +# There's no P4 or i486 in the path; it's always i686 + +eval "$( + declare -f package_libusbsio | sed 's/$CARCH/i686/g' + declare -f package_python-libusbsio | sed 's/$CARCH/i686/g' +)" diff --git a/extra/libwpe/PKGBUILD b/extra/libwpe/PKGBUILD index 1623a33f..daa08457 100644 --- a/extra/libwpe/PKGBUILD +++ b/extra/libwpe/PKGBUILD @@ -2,3 +2,24 @@ if [ "$CARCH" = 'i486' ]; then makedepends+=(libglvnd) fi + +# no available currently +makedepends=(${makedepends[@]//hotdoc/}) +eval "$( + declare -f build | \ + sed ' + s/-D build-docs=true//g + ' +)" +eval "$( + declare -f package_libwpe | \ + sed ' + /doc/d + ' +)" +eval "$( + declare -f package_libwpe-docs | \ + sed ' + /mv doc/d + ' +)" diff --git a/extra/libx86/PKGBUILD b/extra/libx86/PKGBUILD new file mode 100644 index 00000000..553cc5c4 --- /dev/null +++ b/extra/libx86/PKGBUILD @@ -0,0 +1,3 @@ +if [[ $pkgver == "1.1" ]]; then + source[0]='https://web.archive.org/web/20170209231545if_/http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz' +fi diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD deleted file mode 100644 index 31bc8139..00000000 --- a/extra/lirc/PKGBUILD +++ /dev/null @@ -1,2 +0,0 @@ -# ftdi.h missing, needs libftdi-compat -makedepends+=(libftdi-compat) diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 9054f194..afdd934b 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,3 +1,6 @@ # Tests fail and hang the builders unset check unset checkdepends + +# fix wrong checksum for llvm-SelectionDAG.patch +sha256sums[6]='9b53e584f8b8a44648a2a066da1860155b61118c8cdebed3632161db0b680462' diff --git a/extra/luajit/PKGBUILD b/extra/luajit/PKGBUILD index a0d9c9af..3f91f700 100644 --- a/extra/luajit/PKGBUILD +++ b/extra/luajit/PKGBUILD @@ -1,69 +1,20 @@ -# Maintainer: Daurnimator <daurnimator@archlinux.org> -# Maintainer: Lukas Fleischer <lfleischer@archlinux.org> -# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> -# Contributor: Chris Brannon <chris@the-brannons.com> -# Contributor: Paulo Matias <matiasΘarchlinux-br·org> -# Contributor: Anders Bergh <anders1@gmail.com> - -pkgname=luajit -# LuaJIT has abandoned versioned releases and now advises using git HEAD -# https://github.com/LuaJIT/LuaJIT/issues/665#issuecomment-784452583 -_commit=505e2c03de35e2718eef0d2d3660712e06dadf1f -pkgver="2.1.0.beta3.r471.g${_commit::8}" -pkgrel=1 -pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1' -arch=(i486 i686 pentium4 'x86_64') -url='https://luajit.org/' -license=('MIT') -depends=('gcc-libs') -source=("LuaJIT-${_commit}.tar.gz::https://repo.or.cz/luajit-2.0.git/snapshot/${_commit}.tar.gz") -md5sums=('0847dc535736846a9a1436e18d8c509d') -sha256sums=('b89d081aac4189a06b736c667f47cc60e0cc4591933b7ed50db38cf58496386e') -b2sums=('89bed923ff34d2de813dee17f130496ffeaa6bc5caf9252be1df7d35e87fa7398930f1fe35f95650694d344bc99d5b2c0c4abc4568f1dac318822a832d44c3a4') - -build() { - cd "luajit-2.0-${_commit::7}" - # Avoid early stripping - make amalg PREFIX=/usr BUILDMODE=dynamic TARGET_STRIP=" @:" -} - -package() { - cd "luajit-2.0-${_commit::7}" - - make install DESTDIR="$pkgdir" PREFIX=/usr - install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" - - ln -sf luajit-2.1.0-beta3 "$pkgdir/usr/bin/luajit" -} -# Re-enable x87 support for i686 CPUs (fix from KitsuWhooa) if [ "$CARCH" = 'i486' ]; then source+=('luajit-2.0-505e2c0-i486.patch') - md5sums+=('44317c2d006d45b0970cee8b55a4c05e') - sha256sums+=('6a758da52d9ddd0162ba342276c4aa4454662b2fe8b89c8a7aa987677679fd30') b2sums+=('4a467db526fa550942dee7da7dd599f5976f519573773afab74c372bbb2aa243d60384699c50695dadf0be086fc5b54253692d0836c22da4b079a73b0eb7a822') - eval "$( - { - declare -f prepare \ - || printf 'prepare ()\n{\ncd "luajit-2.0-${_commit::7}"\n}\n' - } \ - | sed ' - $ i patch -p1 -i "$srcdir/luajit-2.0-505e2c0-i486.patch" - ' - )" - + prepare() { + cd "LuaJIT-${_commit}" + patch -p1 -i "$srcdir/luajit-2.0-505e2c0-i486.patch" + } fi + if [ "$CARCH" = 'i686' ]; then source+=('c7815e1a1b49871e645252bb12e722fb4879df11.patch') - md5sums+=('25a3483026a359e06ec828bc666dc853') - sha256sums+=('a711e1d7ad7a16d0e6ba044fedc284cc0c4bee710c2d910fd9f0f0af8765c1a7') - b2sums+=('2d79b2dad25ba3a771348cfd38883334f511de703d2ccfdd00b808867ecf53201d680388c730aaf8941cb5159f6b819020c2da04b75346bc42428973c7f27420') - eval "$( - { - declare -f prepare \ - || printf 'prepare ()\n{\ncd "luajit-2.0-${_commit::7}"\n}\n' - } \ - | sed ' - $ i patch -p1 -i "$srcdir/c7815e1a1b49871e645252bb12e722fb4879df11.patch" - ' - )" + b2sums+=('fabd0be78309d8211e96d4d0cf105ae6a27f46110d8b19513d10bdd7c6045221fc5c8e21d1bcc1def854d7d1bf6473c99fb7bc7e4d5307188129c3c87cf8c69b') + prepare() { + cd "LuaJIT-${_commit}" + patch -p1 -i "$srcdir/c7815e1a1b49871e645252bb12e722fb4879df11.patch" + } fi + +unset md5sums +unset sha256sums diff --git a/extra/luajit/c7815e1a1b49871e645252bb12e722fb4879df11.patch b/extra/luajit/c7815e1a1b49871e645252bb12e722fb4879df11.patch index 13048730..f9082b45 100644 --- a/extra/luajit/c7815e1a1b49871e645252bb12e722fb4879df11.patch +++ b/extra/luajit/c7815e1a1b49871e645252bb12e722fb4879df11.patch @@ -11,7 +11,6 @@ JIT is disabled by default and untested src/lj_asm.c | 16 + src/lj_jit.h | 18 +- src/lj_vm.h | 3 +- - src/msvcbuild.bat | 1 - src/vm_x86.dasc | 798 +++++++++++++++++++++++++++++++++++++++++----- 7 files changed, 793 insertions(+), 100 deletions(-) @@ -217,18 +216,6 @@ index c66db0049f..9bc6d62fab 100644 #define lj_vm_floor floor #define lj_vm_ceil ceil #else -diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat -index d323d8d44d..67e53574de 100644 ---- a/src/msvcbuild.bat -+++ b/src/msvcbuild.bat -@@ -41,7 +41,6 @@ if exist minilua.exe.manifest^ - @set DASC=vm_x86.dasc
- @set DASMFLAGS=-D WIN -D JIT -D FFI
- @set LJARCH=x86
--@set LJCOMPILE=%LJCOMPILE% /arch:SSE2
- :X64
- @if "%1" neq "nogc64" goto :GC64
- @shift
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc index 18ca87b545..3efbba6cdd 100644 --- a/src/vm_x86.dasc diff --git a/extra/mdcat/PKGBUILD b/extra/mdcat/PKGBUILD index 6883ef75..9fcda81b 100644 --- a/extra/mdcat/PKGBUILD +++ b/extra/mdcat/PKGBUILD @@ -1 +1,2 @@ eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" +options+=(!lto) diff --git a/extra/mesa-amber/PKGBUILD b/extra/mesa-amber/PKGBUILD index 3d1b434b..8fadf6dc 100644 --- a/extra/mesa-amber/PKGBUILD +++ b/extra/mesa-amber/PKGBUILD @@ -22,3 +22,6 @@ if [ "$CARCH" == 'i486' ]; then ' )" fi + +# python-mako test also imports version comparition from distutils +makedepends+=('python-distutils-extra') diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 0705c7b8..3f72c547 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -85,3 +85,19 @@ eval "$( /find.*rmdir/d ' )" + +# intel-rt is amd64 only +eval "$( + declare -f build | \ + sed ' + s/-D intel-rt=enabled/-D intel-rt=disabled/ + ' +)" + +# d3d12 causes linking errors +eval "$( + declare -f build | \ + sed ' + s/,d3d12// + ' +)" diff --git a/extra/meson/PKGBUILD b/extra/meson/PKGBUILD index 5e49a967..0f009bb1 100644 --- a/extra/meson/PKGBUILD +++ b/extra/meson/PKGBUILD @@ -16,12 +16,3 @@ checkdepends_pentium4=("${checkdepends_i686[@]}") # still far too many tests fail, ignoring for now unset check unset checkdepends - -# fail if upstream changes arch-meson -# we patch a version of arch-meson reading CARCH (later maybe LTOFLAGS) -# to find out whether it should add blto to the arch flags -for ((i=0; i<${#b2sums[@]}; i++)); do - if [ "${b2sums[${i}]}" = '70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af' ]; then - b2sums[${i}]='09f3035aaff3fe8ac8e57a6e718acd654c04604500abb897a4d6e3946c9e4d9db6a257b5cd3d27007bfcfd4799a2b52d8eaab38ecda16f8af69848ed3b8ac7ff' - fi -done diff --git a/extra/meson/arch-meson b/extra/meson/arch-meson deleted file mode 100755 index fac70e6a..00000000 --- a/extra/meson/arch-meson +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -ex -# Highly opinionated wrapper for Arch Linux packaging - -CARCH=$(. /etc/makepkg.conf; echo $CARCH) - -if [ "${CARCH}" = "i486" ]; then - LTO="b_lto=false" -else - LTO="b_lto=true" -fi - -exec meson setup \ - --prefix /usr \ - --libexecdir lib \ - --sbindir bin \ - --buildtype plain \ - --auto-features enabled \ - --wrap-mode nodownload \ - -D "${LTO}" \ - -D b_pie=true \ - -D python.bytecompile=1 \ - "$@" diff --git a/extra/mingw-w64-gcc/PKGBUILD b/extra/mingw-w64-gcc/PKGBUILD new file mode 100644 index 00000000..8ddd10fb --- /dev/null +++ b/extra/mingw-w64-gcc/PKGBUILD @@ -0,0 +1,5 @@ +if [[ $pkgver == "13.1.0" ]]; then + # Ada fails with style errors... + eval "$(declare -f build | sed 's/--enable-languages=ada,/--enable-languages=/')" + eval "$(declare -f package | sed s/,gnat1//)" +fi diff --git a/extra/nanobind/PKGBUILD b/extra/nanobind/PKGBUILD index 9c49573b..63927ac4 100644 --- a/extra/nanobind/PKGBUILD +++ b/extra/nanobind/PKGBUILD @@ -2,3 +2,4 @@ checkdepends=(${checkdepends[@]//python-pytorch/}) checkdepends=(${checkdepends[@]//python-tensorflow/}) +unset check diff --git a/extra/netplan/PKGBUILD b/extra/netplan/PKGBUILD index 3bd27377..12dc923c 100644 --- a/extra/netplan/PKGBUILD +++ b/extra/netplan/PKGBUILD @@ -1,13 +1,2 @@ -# currently Haskell is broken -makedepends=(${makedepends[@]//pandoc/}) -source+=('netplan-0.102-no-pandoc.patch') -sha256sums+=('0ab919601e4a30585f0e3e3dc224fd598d2183e2df9250c1e6e4bc894d0ace95') -eval "$( - { - declare -f prepare || \ - printf 'prepare() { cd "${pkgname}-${pkgver}"\n}\n' - } \ - | sed ' - $i patch -Np1 -i "$srcdir/netplan-0.102-no-pandoc.patch" - ' -)" +# Tests fail upstream too +unset check diff --git a/extra/netplan/netplan-0.102-no-pandoc.patch b/extra/netplan/netplan-0.102-no-pandoc.patch deleted file mode 100644 index a1ed598d..00000000 --- a/extra/netplan/netplan-0.102-no-pandoc.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rauN netplan-0.102/Makefile netplan-0.102-no-pandoc-patch/Makefile ---- netplan-0.102/Makefile 2022-02-03 12:21:36.988275585 +0100 -+++ netplan-0.102-no-pandoc-patch/Makefile 2022-02-03 12:23:01.654960528 +0100 -@@ -133,12 +133,15 @@ - - - %.html: %.md -- pandoc -s --toc -o $@ $< -+# pandoc -s --toc -o $@ $< -+ echo "no pandoc" > $@ - - doc/netplan.5: doc/manpage-header.md doc/netplan.md doc/manpage-footer.md -- pandoc -s -o $@ $^ -+# pandoc -s -o $@ $^ -+ echo "no pandoc" > $@ - - %.8: %.md -- pandoc -s -o $@ $^ -+# pandoc -s -o $@ $^ -+ echo "no pandoc" > $@ - - .PHONY: clean diff --git a/extra/newsboat-og/.SRCINFO b/extra/newsboat-og/.SRCINFO new file mode 100644 index 00000000..e916af9b --- /dev/null +++ b/extra/newsboat-og/.SRCINFO @@ -0,0 +1,27 @@ +pkgbase = newsboat-og + pkgdesc = An RSS/Atom feed reader for text terminals (old gen) + pkgver = 2.13.2 + pkgrel = 1 + url = https://newsboat.org/ + arch = x86_64 + arch = i486 + arch = i686 + arch = pentium4 + license = MIT + makedepends = asciidoc + depends = curl + depends = hicolor-icon-theme + depends = json-c + depends = libxml2 + depends = sqlite + depends = stfl + optdepends = perl: for pinboard.pl + optdepends = python: for exportOPMLWithTags.py + optdepends = ruby: for feedgrabber.rb, heise.rb, and slashdot.rb + conflicts = newsboat + replaces = newsbeuter + options = !makeflags + source = https://github.com/andreasbaumann/newsboat-og/archive/r2.13.2.tar.gz + sha256sums = b6646c92e87590b8780111a03ecda139faa846c1fb030bf02f0d89edbff9b8cc + +pkgname = newsboat-og diff --git a/extra/newsboat-og/PKGBUILD b/extra/newsboat-og/PKGBUILD index 418d97e1..0c5fea70 100644 --- a/extra/newsboat-og/PKGBUILD +++ b/extra/newsboat-og/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Andreas Baumann <mail@andreasbaumann.cc> pkgname=newsboat-og -pkgver=2.13.1 -pkgrel=2 +pkgver=2.13.2 +pkgrel=1 pkgdesc="An RSS/Atom feed reader for text terminals (old gen)" arch=('x86_64' 'i486' 'i686' 'pentium4') url="https://newsboat.org/" @@ -16,7 +16,7 @@ replaces=('newsbeuter') conflicts=('newsboat') options=('!makeflags') source=("https://github.com/andreasbaumann/$pkgname/archive/r$pkgver.tar.gz") -sha256sums=('074228c0597f20ac72aff0b99685e5af4b28b428adafbbd8a1f207a156eb63c9') +sha256sums=('b6646c92e87590b8780111a03ecda139faa846c1fb030bf02f0d89edbff9b8cc') build() { cd $pkgname-r$pkgver diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 406c2a07..fb396f1a 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -2,3 +2,12 @@ if [ "$CARCH" = 'i486' ]; then depends=(${depends[@]//qscintilla-qt5/}) fi + +# At the time of writing, the upstream PGBUILD does the following at the end: +# jar --extract --file="$pkgdir/usr/share/octave/$pkgver/m/java/octave.jar" +# rm -rf "$pkgdir/usr/share/octave/$pkgver/m/java/octave.jar" +# jar --create --date="$ARCHIVE_DATE" --file="$pkgdir/usr/share/octave/$pkgver/m/java/octave.jar" ./* +# +# Our jar currently is too old to support --date, so for now, don't run those. +# And yes, I can't be bothered escaping the . in .jar +eval "$(declare -f package | sed '/jar /d;/rm -rf.*octave.jar/d')" diff --git a/extra/openmpi4/.SRCINFO b/extra/openmpi4/.SRCINFO new file mode 100644 index 00000000..67d48985 --- /dev/null +++ b/extra/openmpi4/.SRCINFO @@ -0,0 +1,52 @@ +pkgbase = openmpi4 + pkgdesc = High performance message passing library (MPI) + pkgver = 4.1.6 + pkgrel = 3 + url = https://www.open-mpi.org + arch = x86_64 + arch = pentium4 + arch = i686 + arch = i486 + license = custom:OpenMPI + makedepends = gcc-fortran + makedepends = valgrind + depends = gcc-libs + depends = glibc + depends = hwloc + depends = libevent + depends = libnl + depends = openpmix + depends = openssh + depends = zlib + optdepends = cuda: cuda support + optdepends = gcc-fortran: fortran support + optdepends = perl: for aggregate_profile.pl and profile2mat.pl + provides = openmpi + provides = libmca_common_cuda.so + provides = libmca_common_monitoring.so + provides = libmca_common_ompio.so + provides = libmca_common_sm.so + provides = libmpi.so + provides = libmpi_cxx.so + provides = libmpi_mpifh.so + provides = libmpi_usempi_ignore_tkr.so + provides = libmpi_usempif08.so + provides = libompitrace.so + provides = libopen-pal.so + provides = libopen-rte.so + conflicts = openmpi + replaces = openmpi + source = https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.6.tar.bz2 + sha256sums = f740994485516deb63b5311af122c265179f5328a0d857a567b85db00b11e415 + b2sums = 4f119e1ed9b8787f0f860295ab1721fe2fd5300b8e182230a9eba3a864680b02bbd30618cc6d798a693a121626fc0ad5f447144d9ba91becb734f1a530d7a23a + +pkgname = openmpi4 + depends = gcc-libs + depends = glibc + depends = hwloc + depends = libevent + depends = libnl + depends = openpmix + depends = openssh + depends = zlib + depends = libpmix.so diff --git a/extra/openmpi4/PKGBUILD b/extra/openmpi4/PKGBUILD new file mode 100644 index 00000000..295cc9a6 --- /dev/null +++ b/extra/openmpi4/PKGBUILD @@ -0,0 +1,115 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: David Runge <dvzrv@archlinux.org> +# Contributor: Anatol Pomozov <anatol dot pomozov at gmail> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=openmpi4 +_pkgname=${pkgname%4} +pkgver=4.1.6 +pkgrel=3 +pkgdesc='High performance message passing library (MPI)' +arch=(x86_64 pentium4 i686 i486) +url='https://www.open-mpi.org' +license=('custom:OpenMPI') +depends=( + gcc-libs + glibc + hwloc + libevent + libnl + openpmix + openssh + zlib +) +makedepends=( + cuda + gcc-fortran + valgrind +) +optdepends=( + 'cuda: cuda support' + 'gcc-fortran: fortran support' + 'perl: for aggregate_profile.pl and profile2mat.pl' +) +provides=( + openmpi + libmca_common_cuda.so + libmca_common_monitoring.so + libmca_common_ompio.so + libmca_common_sm.so + libmpi.so + libmpi_cxx.so + libmpi_mpifh.so + libmpi_usempi_ignore_tkr.so + libmpi_usempif08.so + libompitrace.so + libopen-pal.so + libopen-rte.so +) +conflicts=(openmpi) +replaces=(openmpi) +source=( + https://download.open-mpi.org/release/open-mpi/v${pkgver%.*}/${pkgname%4}-$pkgver.tar.bz2) +sha256sums=('f740994485516deb63b5311af122c265179f5328a0d857a567b85db00b11e415') +b2sums=('4f119e1ed9b8787f0f860295ab1721fe2fd5300b8e182230a9eba3a864680b02bbd30618cc6d798a693a121626fc0ad5f447144d9ba91becb734f1a530d7a23a') + +build() { + local configure_options=( + --prefix=/usr + --enable-builtin-atomics + --enable-memchecker + --enable-mpi-cxx + --enable-mpi-fortran=all + --enable-pretty-print-stacktrace + --libdir=/usr/lib + --sysconfdir=/etc/$_pkgname + --with-cuda=/opt/cuda + --with-hwloc=external + --with-libevent=external + --with-pmix=external + --with-valgrind + ) + cd $_pkgname-$pkgver + + # set environment variables for reproducible build + # see https://github.com/open-mpi/ompi/blob/main/docs/release-notes/general.rst + export HOSTNAME=buildhost + export USER=builduser + + # TODO: depend on prrte with openmpi >= 5 + # TODO: remove ac_cv_func_sem_open=no when there is a glibc release fixing https://sourceware.org/bugzilla/show_bug.cgi?id=30789 + ac_cv_func_sem_open=no ./configure "${configure_options[@]}" + # prevent excessive overlinking due to libtool + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make V=1 +} + +check() { + make check -C $_pkgname-$pkgver +} + +package() { + depends+=(libpmix.so) + + make DESTDIR="$pkgdir" install -C $_pkgname-$pkgver + install -Dm 644 $_pkgname-$pkgver/LICENSE -t "$pkgdir/usr/share/licenses/$_pkgname/" +} + +# vim: ts=2 sw=2 et: + +# -- Arch32 specific -- + +# no CUDA +makedepends=(${makedepends[@]//cuda/}) +eval "$( + declare -f build | \ + sed ' + /local configure_options.*/ a \ + configure_options=(${configure_options[@]//--with-cuda=\\/opt\\/cuda}) + ' +)" + +# new tests break happilly on 32-bit and with newer gccs +unset check +unset checkdepends + diff --git a/extra/openvdb/PKGBUILD b/extra/openvdb/PKGBUILD index 37857a5d..99a7e967 100644 --- a/extra/openvdb/PKGBUILD +++ b/extra/openvdb/PKGBUILD @@ -1,10 +1,4 @@ -# problems with python numpy everywhere -eval "$( - declare -f build | \ - sed ' - s/-DUSE_NUMPY=ON/-DUSE_NUMPY=OFF/ - ' -)" +options+=(!debug) # -latomic on i486 if [ "$CARCH" = 'i486' ]; then diff --git a/extra/ot-keys/PKGBUILD b/extra/ot-keys/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/ot-keys/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/ot-simian/PKGBUILD b/extra/ot-simian/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/ot-simian/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index 7f7cc8b6..b5c884cc 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -1,13 +1,3 @@ -# remove dependency on sysprof -depends=(${depends[@]//sysprof/}) -makedepends=(${makedepends[@]//sysprof/}) -eval "$( - declare -f build | \ - sed ' - s@-D sysprof=enabled@-D sysprof=disabled@g - ' -)" - # ignore failing tests eval "$( declare -f check | \ diff --git a/extra/pre-commit/PKGBUILD b/extra/pre-commit/PKGBUILD new file mode 100644 index 00000000..10fb1a1c --- /dev/null +++ b/extra/pre-commit/PKGBUILD @@ -0,0 +1,3 @@ +# Requires haskell +unset check +unset checkdepends diff --git a/extra/prometheus-node-exporter/PKGBUILD b/extra/prometheus-node-exporter/PKGBUILD new file mode 100644 index 00000000..3692e5fe --- /dev/null +++ b/extra/prometheus-node-exporter/PKGBUILD @@ -0,0 +1 @@ +unset check diff --git a/extra/protobuf/PKGBUILD b/extra/protobuf/PKGBUILD index ca6fdb6b..aa67b1db 100644 --- a/extra/protobuf/PKGBUILD +++ b/extra/protobuf/PKGBUILD @@ -1,10 +1,5 @@ # ignore failing tests -eval "$( - declare -f check | \ - sed ' - s@\(ctest .*\);@\1 || true;@ - ' -)" +unset check # no LTO on i486 if [ "$CARCH" = 'i486' ]; then @@ -12,3 +7,19 @@ if [ "$CARCH" = 'i486' ]; then 1i options=(!lto) ' PKGBUILD fi + +# We need Bazel to build the python package from the git tree +# Instead, download the source package from pypi and use that +# See https://github.com/protocolbuffers/protobuf/pull/15708 +source+=("https://files.pythonhosted.org/packages/source/p/protobuf/protobuf-5.${pkgver}.tar.gz") +sha512sums+=("SKIP") +makedepends=(${makedepends[@]//bazel/}) + +eval "$( + declare -f build | sed '/bazel build/d' | sed '$ d' | sed '$ a cd "$srcdir/protobuf-5.${pkgver}"; python -m build --wheel --no-isolation ; }' + declare -f package_python-protobuf | sed 's@ \".*bazel-bin/python@ \"protobuf-5.${pkgver}\"@' +)" + +if [[ $pkgver == "27.3" ]]; then + sha512sums[1]='18bc71031bbcbc3810a9985fa670465040f06a6c104ab8079b56bdfc499bb6cec40805a0cefd455031142490a576dc60aa8000523877ac0353b93558e9beabbd' +fi diff --git a/extra/python-datrie/PKGBUILD b/extra/python-datrie/PKGBUILD new file mode 100644 index 00000000..b7385378 --- /dev/null +++ b/extra/python-datrie/PKGBUILD @@ -0,0 +1,3 @@ +eval "$(declare -f build | sed '3i export CFLAGS="$CFLAGS -Wno-error=incompatible-pointer-types"')" +# Can't figure out how to properly escape the $ and I'm out of patience +eval "$(declare -f check | sed 's@.CARCH@i686@')" diff --git a/extra/python-openai/PKGBUILD b/extra/python-openai/PKGBUILD new file mode 100644 index 00000000..3692e5fe --- /dev/null +++ b/extra/python-openai/PKGBUILD @@ -0,0 +1 @@ +unset check diff --git a/extra/python-pyarrow/PKGBUILD b/extra/python-pyarrow/PKGBUILD new file mode 100644 index 00000000..7bb8e9c6 --- /dev/null +++ b/extra/python-pyarrow/PKGBUILD @@ -0,0 +1,2 @@ +# Tests hang +unset check diff --git a/extra/python-qdldl/0001-Fix-i686-builds.patch b/extra/python-qdldl/0001-Fix-i686-builds.patch new file mode 100644 index 00000000..e8eb42bb --- /dev/null +++ b/extra/python-qdldl/0001-Fix-i686-builds.patch @@ -0,0 +1,63 @@ +From 3516c7a43624d991b05669064ec1c00549f1d853 Mon Sep 17 00:00:00 2001 +From: Tasos Sahanidis <tasos@tasossah.com> +Date: Sun, 8 Sep 2024 20:31:05 +0300 +Subject: [PATCH] Fix i686 builds + +--- + c/amd/include/SuiteSparse_config.h | 1 - + c/amd/include/amd_internal.h | 3 --- + cpp/qdldl.cpp | 5 +++++ + 3 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/c/amd/include/SuiteSparse_config.h b/c/amd/include/SuiteSparse_config.h +index ea3cea4..5a15deb 100644 +--- a/c/amd/include/SuiteSparse_config.h ++++ b/c/amd/include/SuiteSparse_config.h +@@ -43,7 +43,6 @@ extern "C" { + #endif + + #include "qdldl_types.h" +-#define DLONG + typedef QDLDL_float c_float; + + #include <limits.h> +diff --git a/c/amd/include/amd_internal.h b/c/amd/include/amd_internal.h +index eccde9f..cd745fd 100644 +--- a/c/amd/include/amd_internal.h ++++ b/c/amd/include/amd_internal.h +@@ -38,9 +38,6 @@ + #endif + + #include "qdldl_types.h" +-#ifndef DLONG +-#define DLONG +-#endif + + /* + To enable debugging, uncomment the following line: +diff --git a/cpp/qdldl.cpp b/cpp/qdldl.cpp +index e304dbe..4751926 100644 +--- a/cpp/qdldl.cpp ++++ b/cpp/qdldl.cpp +@@ -1,5 +1,6 @@ + #include "qdldl.hpp" + ++#include "qdldl/include/qdldl_types.h" + using namespace qdldl; + + +@@ -31,7 +32,11 @@ Solver::Solver(QDLDL_int n, QDLDL_int * Ap, QDLDL_int *Ai, QDLDL_float * Ax){ + Pinv = new QDLDL_int[n]; + + // Permutation ++#ifdef DLONG + QDLDL_int amd_status = amd_l_order(nx, Ap, Ai, P, NULL, NULL); ++#else ++ QDLDL_int amd_status = amd_order(nx, Ap, Ai, P, NULL, NULL); ++#endif + if (amd_status < 0) + throw std::runtime_error(std::string("Error in AMD computation ") + std::to_string(amd_status)); + +-- +2.34.1 + diff --git a/extra/python-qdldl/PKGBUILD b/extra/python-qdldl/PKGBUILD index c6ea8ecb..e2a25c26 100644 --- a/extra/python-qdldl/PKGBUILD +++ b/extra/python-qdldl/PKGBUILD @@ -1,7 +1,5 @@ -# Temporary hack for gcc14 -eval "$( - declare -f build | \ - sed ' - 3 i CFLAGS="-Wno-incompatible-pointer-types $CFLAGS" - ' -)" +# Thanks to imciner2 on GitHub +# https://github.com/osqp/qdldl-python/pull/16 +source+=(0001-Fix-i686-builds.patch) +sha256sums+=(SKIP) +eval "$(declare -f prepare | sed '4ipatch -p1 -i ../0001-Fix-i686-builds.patch')" diff --git a/extra/python-redis/PKGBUILD b/extra/python-redis/PKGBUILD new file mode 100644 index 00000000..987f25ae --- /dev/null +++ b/extra/python-redis/PKGBUILD @@ -0,0 +1,3 @@ +# just hangs build machines +unset checkdepends +unset check diff --git a/extra/python-scipy/PKGBUILD b/extra/python-scipy/PKGBUILD index 1036c3f0..1b8c634b 100644 --- a/extra/python-scipy/PKGBUILD +++ b/extra/python-scipy/PKGBUILD @@ -1,11 +1,2 @@ -# increase standard relative tolerance of verify_gauss_quad - -eval "$( - declare -f prepare | \ - sed ' - 2 a sed -i '"'"'/def verify_gauss_quad/ { N; s/rtol=[^,]\+,/rtol=2e-15,/; } '"'"' "scipy-${pkgver}/scipy/special/tests/test_orthogonal.py" - ' -)" - # kill slaves, so disabled for now unset check diff --git a/extra/python-setuptools/PKGBUILD b/extra/python-setuptools/PKGBUILD index 3b048d6c..a0969d24 100644 --- a/extra/python-setuptools/PKGBUILD +++ b/extra/python-setuptools/PKGBUILD @@ -12,13 +12,12 @@ # Add the tarball source[0]="https://pypi.python.org/packages/source/s/setuptools/setuptools-$pkgver.tar.gz" -# Depending on how annoying this gets, maybe comment it to switch back to SKIP -sha512sums[0]='11df934931f4b73f7e07ea5713479593c6baa134d423556b2ae7aff0f1e5bdbdee1f5b516131adb169c838231ceb0293441fbf275ef7030dabecf74122565b6d' +sha512sums[0]='SKIP' # Work around the directory name containing the version. eval "$( declare -f prepare | \ - sed -r 's/cd setuptools;?$/cd setuptools-$pkgver/' + sed -r 's/cd setuptools;?$/cd setuptools-$pkgver/' | sed '/git /d' )" eval "$( declare -f build | \ @@ -38,3 +37,5 @@ eval "$( declare -f prepare | \ sed '/add-dependency.patch/d' )" + +unset check diff --git a/extra/python-validate-pyproject/PKGBUILD b/extra/python-validate-pyproject/PKGBUILD index 7d66985c..8b137891 100644 --- a/extra/python-validate-pyproject/PKGBUILD +++ b/extra/python-validate-pyproject/PKGBUILD @@ -1,4 +1 @@ -# Doesn't validate -if [[ $pkgver == 0.16 && $pkgrel == 1 ]]; then - sha512sums=(SKIP) -fi + diff --git a/extra/qt6-base/PKGBUILD b/extra/qt6-base/PKGBUILD index 5ce557f9..131ce0c0 100644 --- a/extra/qt6-base/PKGBUILD +++ b/extra/qt6-base/PKGBUILD @@ -9,3 +9,11 @@ if [ "$CARCH" = 'i486' ]; then ' )" fi + +# Fix SSE2 issues on i486/i686 +if [ "$CARCH" = 'i486' -o "$CARCH" = 'i686' ]; then + eval "$( + declare -f prepare | \ + sed '$ d' | sed '$ a sed -i s/defined\\(__FLT16_MAX__\\)/0/ src/corelib/global/qtypes.h; }' + )" +fi diff --git a/extra/qt6-doc/PKGBUILD b/extra/qt6-doc/PKGBUILD new file mode 100644 index 00000000..b4f2de33 --- /dev/null +++ b/extra/qt6-doc/PKGBUILD @@ -0,0 +1,9 @@ +# Thanks for the patch! +source+=(https://git.alpinelinux.org/aports/plain/community/qt6-qtwebengine/0015-enable-x86.patch) +sha256sums+=(903a5d101d24bfd2190c6dae2d3d89df0823c00844b3c242df7a4af87c80a072) +prepare() { + cd "qt-everywhere-src-${pkgver}" + sed -i s/defined\(__FLT16_MAX__\)/0/ qtbase/src/corelib/global/qtypes.h + cd qtwebengine + patch -p1 -i ../../0015-enable-x86.patch +} diff --git a/extra/qt6-quick3dphysics/PKGBUILD b/extra/qt6-quick3dphysics/PKGBUILD new file mode 100644 index 00000000..a145cef7 --- /dev/null +++ b/extra/qt6-quick3dphysics/PKGBUILD @@ -0,0 +1,8 @@ +if [[ $CARCH == 'i686' ]]; then + eval "$(declare -f build | sed '3iexport CFLAGS="$CFLAGS -msse -DPX_SIMD_DISABLED=1"; export CXXFLAGS="$CXXFLAGS -msse -DPX_SIMD_DISABLED=1";')" +fi + +if [[ $CARCH == 'i486' ]]; then + eval "$(declare -f build | sed '3iexport CFLAGS="$CFLAGS -DPX_SIMD_DISABLED=1"; export CXXFLAGS="$CXXFLAGS -DPX_SIMD_DISABLED=1";')" +fi + diff --git a/extra/qt6-webengine/PKGBUILD b/extra/qt6-webengine/PKGBUILD new file mode 100644 index 00000000..33d01460 --- /dev/null +++ b/extra/qt6-webengine/PKGBUILD @@ -0,0 +1,9 @@ +source+=(https://git.alpinelinux.org/aports/plain/community/qt6-qtwebengine/0015-enable-x86.patch + https://git.alpinelinux.org/aports/plain/community/qt6-qtwebengine/devtools-frontend-compress_files.patch +) +sha256sums+=(903a5d101d24bfd2190c6dae2d3d89df0823c00844b3c242df7a4af87c80a072 + c1a5c89c7be57103de2de770c169a1206c1527e4d2f5120d39cee9f67690c122 +) + +options+=(!debug !lto) +eval "$(declare -f prepare | sed 's@^}$@patch -p1 -i ../0015-enable-x86.patch; patch -p1 -i ../devtools-frontend-compress_files.patch; }'@)" diff --git a/extra/reaper/PKGBUILD b/extra/reaper/PKGBUILD new file mode 100644 index 00000000..40653cc6 --- /dev/null +++ b/extra/reaper/PKGBUILD @@ -0,0 +1,10 @@ +source[0]="https://reaper.fm/files/${pkgver::1}.x/reaper${pkgver//.}_linux_i686.tar.xz" +sha512sums[0]="9bdacadd1d10d39f6c5bbcf5fce29c863c6b97d6944a8c45c1b13785b5a80db2636f11ee3d147aee54ef91ebff0bebab3f6b545bc5ba47d8d2a398d399f55282" +b2sums[0]="6ddae30561f6b902e8ff01cfc78147d607d436c98260a3a862789f92a98e5248b31ce1d80add981fdba0b391356a7b504aca0be50ea4b5687792083eedebab5d" + +eval "$( + declare -f package | \ + sed ' + s/\$CARCH/i686/g + ' +)" diff --git a/extra/ruby-erb/PKGBUILD b/extra/ruby-erb/PKGBUILD new file mode 100644 index 00000000..8dd101a6 --- /dev/null +++ b/extra/ruby-erb/PKGBUILD @@ -0,0 +1,3 @@ +unset check +# rdoc depends on erb, so disable the docs +eval "$(declare -f build | sed 's@--local@--local --no-document@')" diff --git a/extra/ruby-hoe/PKGBUILD b/extra/ruby-hoe/PKGBUILD new file mode 100644 index 00000000..fcc37cc1 --- /dev/null +++ b/extra/ruby-hoe/PKGBUILD @@ -0,0 +1,2 @@ +unset checkdepends +unset check diff --git a/extra/ruby-minitest/PKGBUILD b/extra/ruby-minitest/PKGBUILD new file mode 100644 index 00000000..fcc37cc1 --- /dev/null +++ b/extra/ruby-minitest/PKGBUILD @@ -0,0 +1,2 @@ +unset checkdepends +unset check diff --git a/extra/ruby-puma/PKGBUILD b/extra/ruby-puma/PKGBUILD new file mode 100644 index 00000000..d941a73f --- /dev/null +++ b/extra/ruby-puma/PKGBUILD @@ -0,0 +1,2 @@ +unset check + diff --git a/extra/ruby-rake-compiler/PKGBUILD b/extra/ruby-rake-compiler/PKGBUILD new file mode 100644 index 00000000..6403c888 --- /dev/null +++ b/extra/ruby-rake-compiler/PKGBUILD @@ -0,0 +1,2 @@ +unset check +unset checkdepends diff --git a/extra/ruby-ruby_memcheck/PKGBUILD b/extra/ruby-ruby_memcheck/PKGBUILD new file mode 100644 index 00000000..6403c888 --- /dev/null +++ b/extra/ruby-ruby_memcheck/PKGBUILD @@ -0,0 +1,2 @@ +unset check +unset checkdepends diff --git a/extra/ruby-stackprof/PKGBUILD b/extra/ruby-stackprof/PKGBUILD new file mode 100644 index 00000000..6403c888 --- /dev/null +++ b/extra/ruby-stackprof/PKGBUILD @@ -0,0 +1,2 @@ +unset check +unset checkdepends diff --git a/extra/ruby-sys-filesystem/PKGBUILD b/extra/ruby-sys-filesystem/PKGBUILD new file mode 100644 index 00000000..f3b33334 --- /dev/null +++ b/extra/ruby-sys-filesystem/PKGBUILD @@ -0,0 +1,2 @@ +# https://github.com/djberg96/sys-filesystem/issues/71 +unset check diff --git a/extra/ruby/055613fd868a8c94e43893f8c58a00cdd2a81f6d.patch b/extra/ruby/055613fd868a8c94e43893f8c58a00cdd2a81f6d.patch new file mode 100644 index 00000000..b2ad8437 --- /dev/null +++ b/extra/ruby/055613fd868a8c94e43893f8c58a00cdd2a81f6d.patch @@ -0,0 +1,24 @@ +From 055613fd868a8c94e43893f8c58a00cdd2a81f6d Mon Sep 17 00:00:00 2001 +From: Nobuyoshi Nakada <nobu@ruby-lang.org> +Date: Fri, 22 Mar 2024 18:18:35 +0900 +Subject: [PATCH] Fix pointer incompatiblity + +Since the subsecond part is discarded, WIDEVAL to VALUE conversion is +needed. +--- + time.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/time.c b/time.c +index 6179b081c02fc9..3304b2f4f4856a 100644 +--- a/time.c ++++ b/time.c +@@ -2346,7 +2346,7 @@ zone_timelocal(VALUE zone, VALUE time) + struct time_object *tobj = RTYPEDDATA_GET_DATA(time); + wideval_t t, s; + +- split_second(tobj->timew, &t, &s); ++ wdivmod(tobj->timew, WINT2FIXWV(TIME_SCALE), &t, &s); + tm = tm_from_time(rb_cTimeTM, time); + utc = rb_check_funcall(zone, id_local_to_utc, 1, &tm); + if (UNDEF_P(utc)) return 0; diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index b03abc17..8408153f 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -18,3 +18,25 @@ if [ "${CARCH}" = "i486" ]; then ' )" fi + +prepare() { + cd "ruby-${pkgver}" + patch -p1 -i ../055613fd868a8c94e43893f8c58a00cdd2a81f6d.patch +} + +# Seems like 3.2.x will require this patch +if [[ $pkgver == 3.2.* ]]; then + source+=(055613fd868a8c94e43893f8c58a00cdd2a81f6d.patch) + unset sha512sums + b2sums+=(SKIP) + #eval "$(declare -f prepare | sed 's@patch @patch -p1 -i ../055613fd868a8c94e43893f8c58a00cdd2a81f6d.patch; patch @')" + # MJIT might work on 3.3.x (might also need an explicit LDFLAGS="$LDFLAGS -fstack-protector" patch) + eval "$(declare -f build | sed 's@./configure@./configure --disable-jit-support@')" + # Global variable $0 actually sets the program name FAILED + # Suspect ^ is a container-related failure + eval "$(declare -f check | sed 's@make check@make check || true@')" +fi + +if [ "${CARCH}" = "i486" ]; then + makedepends=(${makedepends[@]//rust/}) +fi diff --git a/extra/rubygems/PKGBUILD b/extra/rubygems/PKGBUILD new file mode 100644 index 00000000..3692e5fe --- /dev/null +++ b/extra/rubygems/PKGBUILD @@ -0,0 +1 @@ +unset check diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 131948ae..79f56e4d 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,20 +1,4 @@ -# disable CEPH support -makedepends=(${makedepends[@]//ceph-libs/}) - -eval "$( - declare -f package_samba | \ - sed ' - /depends/ a \ - depends=(${depends[@]//ceph-libs/}) - ' -)" - -eval "$( - declare -f build | \ - sed ' - s|./configure|./configure --disable-cephfs| - ' -)" +# -- Arch32 specific -- if test "$CARCH" == "i486"; then eval "$( @@ -24,3 +8,5 @@ if test "$CARCH" == "i486"; then ' )" fi + +eval "$(declare -f package_ldb | sed 's@x86_64@i386@')" diff --git a/extra/scaleway-cli/PKGBUILD b/extra/scaleway-cli/PKGBUILD new file mode 100644 index 00000000..3692e5fe --- /dev/null +++ b/extra/scaleway-cli/PKGBUILD @@ -0,0 +1 @@ +unset check diff --git a/extra/scrapy/PKGBUILD b/extra/scrapy/PKGBUILD new file mode 100644 index 00000000..3692e5fe --- /dev/null +++ b/extra/scrapy/PKGBUILD @@ -0,0 +1 @@ +unset check diff --git a/extra/sdl2_mixer/PKGBUILD b/extra/sdl2_mixer/PKGBUILD index cd49536e..8b137891 100644 --- a/extra/sdl2_mixer/PKGBUILD +++ b/extra/sdl2_mixer/PKGBUILD @@ -1,2 +1 @@ -# temporary workaround for failing checksum -sha512sums[1]='161a4e57b7bc3316e093c4f91f5733e2c0b05013a9cd79f7430b8d33d17303b0ad3af6fe6592d27f7edd448531a05847d26fb0ebcf8e390999abc96c61130131' + diff --git a/extra/sequoia-sq/PKGBUILD b/extra/sequoia-sq/PKGBUILD index 3cdf97b9..9cd7f3af 100644 --- a/extra/sequoia-sq/PKGBUILD +++ b/extra/sequoia-sq/PKGBUILD @@ -1,3 +1,5 @@ # eval "$(declare -f prepare | sed 's@rustc -vV@echo "host: i686-unknown-linux-gnu"@')" # Essentially apply https://gitlab.archlinux.org/archlinux/packaging/packages/cargo-audit/-/commit/dd4c71adb934157153ec65bc0361fc6d30544158 eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" + +unset check diff --git a/extra/sfizz/PKGBUILD b/extra/sfizz/PKGBUILD new file mode 100644 index 00000000..3692e5fe --- /dev/null +++ b/extra/sfizz/PKGBUILD @@ -0,0 +1 @@ +unset check diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD new file mode 100644 index 00000000..91e38339 --- /dev/null +++ b/extra/socat/PKGBUILD @@ -0,0 +1,2 @@ +# Tests hang builders +unset check diff --git a/extra/stochas/PKGBUILD b/extra/stochas/PKGBUILD new file mode 100644 index 00000000..734814d5 --- /dev/null +++ b/extra/stochas/PKGBUILD @@ -0,0 +1,12 @@ +# This requires SSE, so enable it on i686 + +if [ "$CARCH" = "i686" ]; then + eval "$( + declare -f build | \ + sed ' + 3 i export CXXFLAGS="$CXXFLAGS -msse" CFLAGS="$CFLAGS -msse" + ' + )" +fi + +eval "$(declare -f package_stochas-vst3 | sed 's@\$CARCH@i386@g')" diff --git a/extra/syslog-ng/581bb46db5c3e7bc4abd1ea45487652756ce022f.patch b/extra/syslog-ng/581bb46db5c3e7bc4abd1ea45487652756ce022f.patch new file mode 100644 index 00000000..937eacfa --- /dev/null +++ b/extra/syslog-ng/581bb46db5c3e7bc4abd1ea45487652756ce022f.patch @@ -0,0 +1,33 @@ +From 581bb46db5c3e7bc4abd1ea45487652756ce022f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kov=C3=A1cs=2C=20Gerg=C5=91=20Ferenc?= <kovgeri01@gmail.com> +Date: Mon, 5 Feb 2024 22:59:44 +0100 +Subject: [PATCH] secure-logging: Fix printing of guint64 by using it's format + macro. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Kovács, Gergő Ferenc <kovgeri01@gmail.com> +--- + modules/secure-logging/slogkey/slogkey.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules/secure-logging/slogkey/slogkey.c b/modules/secure-logging/slogkey/slogkey.c +index 13c5786943..685205cd07 100644 +--- a/modules/secure-logging/slogkey/slogkey.c ++++ b/modules/secure-logging/slogkey/slogkey.c +@@ -1,4 +1,5 @@ + /* ++ * Copyright (c) 2024 Gergo Ferenc Kovacs + * Copyright (c) 2019 Airbus Commercial Aircraft + * + * This library is free software; you can redistribute it and/or +@@ -157,7 +158,7 @@ int main(int argc, char **argv) + msg_error("[SLOG] ERROR: Unable to read key file", evt_tag_str("file", keyfile)); + return ret; + } +- printf("counter=%zu\n", counterValue); ++ printf("counter=%" G_GUINT64_FORMAT "\n", counterValue); + } + else if (host) + { diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD new file mode 100644 index 00000000..50a4b2db --- /dev/null +++ b/extra/syslog-ng/PKGBUILD @@ -0,0 +1,7 @@ +if [[ $pkgver = 4.6.* ]]; then + source+=('ac13999810bced8f623b0e027579a95f23dc0641.patch' + '581bb46db5c3e7bc4abd1ea45487652756ce022f.patch') + sha512sums+=('SKIP' 'SKIP') + + eval "$(declare -f prepare | sed '$ d' | sed '$ a patch -p1 -i ../ac13999810bced8f623b0e027579a95f23dc0641.patch; patch -p1 -i ../581bb46db5c3e7bc4abd1ea45487652756ce022f.patch; }')" +fi diff --git a/extra/syslog-ng/ac13999810bced8f623b0e027579a95f23dc0641.patch b/extra/syslog-ng/ac13999810bced8f623b0e027579a95f23dc0641.patch new file mode 100644 index 00000000..673f0fef --- /dev/null +++ b/extra/syslog-ng/ac13999810bced8f623b0e027579a95f23dc0641.patch @@ -0,0 +1,53 @@ +From ac13999810bced8f623b0e027579a95f23dc0641 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kov=C3=A1cs=2C=20Gerg=C5=91=20Ferenc?= <kovgeri01@gmail.com> +Date: Mon, 5 Feb 2024 23:01:08 +0100 +Subject: [PATCH] secure-logging: Changed local variable type as + g_io_channel_write_chars as it's 4th parameter accepts gsize. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Kovács, Gergő Ferenc <kovgeri01@gmail.com> +--- + modules/secure-logging/slog.c | 3 ++- + modules/secure-logging/tests/test_secure_logging.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/modules/secure-logging/slog.c b/modules/secure-logging/slog.c +index 7bc8fcf7d4..4f585fe599 100644 +--- a/modules/secure-logging/slog.c ++++ b/modules/secure-logging/slog.c +@@ -1,4 +1,5 @@ + /* ++ * Copyright (c) 2024 Gergo Ferenc Kovacs + * Copyright (c) 2019 Airbus Commercial Aircraft + * + * This library is free software; you can redistribute it and/or +@@ -932,7 +933,7 @@ int writeKey(char *key, guint64 counter, gchar *keypath) + return 0; + } + +- guint64 outlen = 0; ++ gsize outlen = 0; + // Write key + status = g_io_channel_write_chars(keyfile, key, KEY_LENGTH, &outlen, &error); + if(status != G_IO_STATUS_NORMAL) +diff --git a/modules/secure-logging/tests/test_secure_logging.c b/modules/secure-logging/tests/test_secure_logging.c +index 0f11d52e6d..0005b48652 100644 +--- a/modules/secure-logging/tests/test_secure_logging.c ++++ b/modules/secure-logging/tests/test_secure_logging.c +@@ -1,4 +1,5 @@ + /* ++ * Copyright (c) 2024 Gergo Ferenc Kovacs + * Copyright (c) 2019 Airbus Commercial Aircraft + * + * This library is free software; you can redistribute it and/or +@@ -373,7 +374,7 @@ void corruptKey(TestData *testData) + + cr_assert(status == G_IO_STATUS_NORMAL, " Unable to set encoding for key file %s", testData->keyFile->str); + +- guint64 outlen = 0; ++ gsize outlen = 0; + + int buflen = KEY_LENGTH + CMAC_LENGTH + sizeof(guint64); + diff --git a/extra/texlive-bin/PKGBUILD b/extra/texlive-bin/PKGBUILD new file mode 100644 index 00000000..111844f4 --- /dev/null +++ b/extra/texlive-bin/PKGBUILD @@ -0,0 +1 @@ +options+=(!debug !lto) diff --git a/extra/tiled/PKGBUILD b/extra/tiled/PKGBUILD new file mode 100644 index 00000000..e49e6848 --- /dev/null +++ b/extra/tiled/PKGBUILD @@ -0,0 +1,3 @@ +if [[ $CARCH == pentium4 ]]; then + eval "$(declare -f build | sed 's@qbs@qbs modules.cpp.cxxFlags:"-msse2"@')" +fi diff --git a/extra/tinysparql/PKGBUILD b/extra/tinysparql/PKGBUILD new file mode 100644 index 00000000..a3ab997a --- /dev/null +++ b/extra/tinysparql/PKGBUILD @@ -0,0 +1,7 @@ +# 33/41 tinysparql:sparql / sparql fails with out of memory +eval "$( + declare -f check | \ + sed ' + s/\(.*meson test.*\)/\1 || true/ + ' +)" diff --git a/extra/tslib/PKGBUILD b/extra/tslib/PKGBUILD new file mode 100644 index 00000000..b344eb15 --- /dev/null +++ b/extra/tslib/PKGBUILD @@ -0,0 +1,5 @@ +# Ignore pgp for now as it seems to fail with unknown pubkey (it's the correct one) +if [[ $pkgver == "1.23" ]]; then + unset source[1] + unset sha256sums[1] +fi diff --git a/extra/webkit2gtk-4.1/PKGBUILD b/extra/webkit2gtk-4.1/PKGBUILD new file mode 100644 index 00000000..ed606e4a --- /dev/null +++ b/extra/webkit2gtk-4.1/PKGBUILD @@ -0,0 +1,16 @@ +options+=('!debug' '!lto') + +if [ "${CARCH}" != "pentium4" ]; then + eval "$( + declare -f prepare | \ + sed ' + 4 i patch -p1 -i "${srcdir}/${CARCH}.diff" + ' + )" +fi + +unset sha256sums +source_i486+=('i486.diff') +source_i686+=('i686.diff') +b2sums_i486+=('84b147cd7c1c5bb324af8bc1451fe048b72f8c3c43001fb7a2ab01112566e48194264ab65491c4a7b80669bb101069744915faa03b0ae844f734170e3958760e') +b2sums_i686+=('3c765caa8e153722c7791fb6c1168e27b5b72922f433a9614969003900adeee5784d41b7836d18f177491369cf5929782296ef88a5e076719a44cda42c0abea1') diff --git a/extra/webkit2gtk-4.1/i486.diff b/extra/webkit2gtk-4.1/i486.diff new file mode 100644 index 00000000..f794a6f5 --- /dev/null +++ b/extra/webkit2gtk-4.1/i486.diff @@ -0,0 +1,36 @@ +diff -ru webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h +--- webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h 2024-03-16 06:45:47.852676000 +0000 ++++ webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h 2024-07-13 05:48:45.724474953 +0000 +@@ -112,7 +112,7 @@ + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) + # include <intrin.h> + # define ANGLE_USE_SSE +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) ++#elif 0 + # include <x86intrin.h> + # define ANGLE_USE_SSE + #endif +diff -ru webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake +--- webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake 2024-03-16 06:45:51.284670000 +0000 ++++ webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake 2024-07-13 05:50:15.429706698 +0000 +@@ -175,13 +175,13 @@ + endif () + + # Force SSE2 fp on x86 builds. +- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) +- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) +- include(DetectSSE2) +- if (NOT SSE2_SUPPORT_FOUND) +- message(FATAL_ERROR "SSE2 support is required to compile WebKit") +- endif () +- endif () ++# if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) ++# WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) ++# include(DetectSSE2) ++# if (NOT SSE2_SUPPORT_FOUND) ++# message(FATAL_ERROR "SSE2 support is required to compile WebKit") ++# endif () ++# endif () + + # Makes builds faster. The GCC manual warns about the possibility that the assembler being + # used may not support input from a pipe, but in practice the toolchains we support all do. diff --git a/extra/webkit2gtk-4.1/i686.diff b/extra/webkit2gtk-4.1/i686.diff new file mode 100644 index 00000000..814b4e3b --- /dev/null +++ b/extra/webkit2gtk-4.1/i686.diff @@ -0,0 +1,37 @@ +diff -ru webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h +--- webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h 2024-03-16 06:45:47.852676000 +0000 ++++ webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h 2024-07-13 05:48:45.724474953 +0000 +@@ -112,7 +112,7 @@ + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) + # include <intrin.h> + # define ANGLE_USE_SSE +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) ++#elif 0 + # include <x86intrin.h> + # define ANGLE_USE_SSE + #endif +diff -ru webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake +--- webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake 2024-03-16 06:45:51.284670000 +0000 ++++ webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake 2024-07-13 05:47:42.679555436 +0000 +@@ -175,13 +175,14 @@ + endif () + + # Force SSE2 fp on x86 builds. +- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) +- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) +- include(DetectSSE2) +- if (NOT SSE2_SUPPORT_FOUND) +- message(FATAL_ERROR "SSE2 support is required to compile WebKit") +- endif () +- endif () ++ WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse -mfpmath=387) ++# if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) ++# WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) ++# include(DetectSSE2) ++# if (NOT SSE2_SUPPORT_FOUND) ++# message(FATAL_ERROR "SSE2 support is required to compile WebKit") ++# endif () ++# endif () + + # Makes builds faster. The GCC manual warns about the possibility that the assembler being + # used may not support input from a pipe, but in practice the toolchains we support all do. diff --git a/extra/webkit2gtk/PKGBUILD b/extra/webkit2gtk/PKGBUILD index 6e0af735..ed606e4a 100644 --- a/extra/webkit2gtk/PKGBUILD +++ b/extra/webkit2gtk/PKGBUILD @@ -1,39 +1,16 @@ -# disable SSE2 on 486 and 686 -source_i486+=('webkitgtk-2.36.3-no-sse2.arch32.patch') -source_i686+=('webkitgtk-2.36.3-no-sse2.arch32.patch') -sha256sums_i486+=('58a724b7f1092a9049186a3b8c61689c31558b6c2b587c827cec04219397adac') -sha256sums_i686+=('58a724b7f1092a9049186a3b8c61689c31558b6c2b587c827cec04219397adac') +options+=('!debug' '!lto') + if [ "${CARCH}" != "pentium4" ]; then eval "$( declare -f prepare | \ sed ' - /cd.*/a patch -Rp1 -i "$srcdir"/webkitgtk-2.36.3-no-sse2.arch32.patch + 4 i patch -p1 -i "${srcdir}/${CARCH}.diff" ' - )" + )" fi -# do not build JIT code on non-pentium4 (breaks in micro-optimizations) -eval "$( - declare -f build | \ - sed ' - /cmake --build build/ ! { - /^\s*cmake / { - h - s/^.*$/[ "${CARCH}" != pentium4 ] || \0/ - p - g - s/^\s*cmake /[ "${CARCH}" = pentium4 ] || \0-DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF / - } - } - ' -)" - -# linker runs out of memory on 32-bit -eval "$( - declare -f build | \ - sed ' - 3 i LDFLAGS+=" -Wl,--no-keep-memory" - 3 i CFLAGS+=" -g1" - 3 i CXXFLAGS+=" -g1" - ' -)" +unset sha256sums +source_i486+=('i486.diff') +source_i686+=('i686.diff') +b2sums_i486+=('84b147cd7c1c5bb324af8bc1451fe048b72f8c3c43001fb7a2ab01112566e48194264ab65491c4a7b80669bb101069744915faa03b0ae844f734170e3958760e') +b2sums_i686+=('3c765caa8e153722c7791fb6c1168e27b5b72922f433a9614969003900adeee5784d41b7836d18f177491369cf5929782296ef88a5e076719a44cda42c0abea1') diff --git a/extra/webkit2gtk/i486.diff b/extra/webkit2gtk/i486.diff new file mode 100644 index 00000000..f794a6f5 --- /dev/null +++ b/extra/webkit2gtk/i486.diff @@ -0,0 +1,36 @@ +diff -ru webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h +--- webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h 2024-03-16 06:45:47.852676000 +0000 ++++ webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h 2024-07-13 05:48:45.724474953 +0000 +@@ -112,7 +112,7 @@ + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) + # include <intrin.h> + # define ANGLE_USE_SSE +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) ++#elif 0 + # include <x86intrin.h> + # define ANGLE_USE_SSE + #endif +diff -ru webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake +--- webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake 2024-03-16 06:45:51.284670000 +0000 ++++ webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake 2024-07-13 05:50:15.429706698 +0000 +@@ -175,13 +175,13 @@ + endif () + + # Force SSE2 fp on x86 builds. +- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) +- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) +- include(DetectSSE2) +- if (NOT SSE2_SUPPORT_FOUND) +- message(FATAL_ERROR "SSE2 support is required to compile WebKit") +- endif () +- endif () ++# if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) ++# WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) ++# include(DetectSSE2) ++# if (NOT SSE2_SUPPORT_FOUND) ++# message(FATAL_ERROR "SSE2 support is required to compile WebKit") ++# endif () ++# endif () + + # Makes builds faster. The GCC manual warns about the possibility that the assembler being + # used may not support input from a pipe, but in practice the toolchains we support all do. diff --git a/extra/webkit2gtk/i686.diff b/extra/webkit2gtk/i686.diff new file mode 100644 index 00000000..814b4e3b --- /dev/null +++ b/extra/webkit2gtk/i686.diff @@ -0,0 +1,37 @@ +diff -ru webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h +--- webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h 2024-03-16 06:45:47.852676000 +0000 ++++ webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h 2024-07-13 05:48:45.724474953 +0000 +@@ -112,7 +112,7 @@ + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) + # include <intrin.h> + # define ANGLE_USE_SSE +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) ++#elif 0 + # include <x86intrin.h> + # define ANGLE_USE_SSE + #endif +diff -ru webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake +--- webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake 2024-03-16 06:45:51.284670000 +0000 ++++ webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake 2024-07-13 05:47:42.679555436 +0000 +@@ -175,13 +175,14 @@ + endif () + + # Force SSE2 fp on x86 builds. +- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) +- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) +- include(DetectSSE2) +- if (NOT SSE2_SUPPORT_FOUND) +- message(FATAL_ERROR "SSE2 support is required to compile WebKit") +- endif () +- endif () ++ WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse -mfpmath=387) ++# if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) ++# WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) ++# include(DetectSSE2) ++# if (NOT SSE2_SUPPORT_FOUND) ++# message(FATAL_ERROR "SSE2 support is required to compile WebKit") ++# endif () ++# endif () + + # Makes builds faster. The GCC manual warns about the possibility that the assembler being + # used may not support input from a pipe, but in practice the toolchains we support all do. diff --git a/extra/webkit2gtk/webkitgtk-2.36.3-no-sse2.arch32.patch b/extra/webkit2gtk/webkitgtk-2.36.3-no-sse2.arch32.patch deleted file mode 100644 index 63a098a7..00000000 --- a/extra/webkit2gtk/webkitgtk-2.36.3-no-sse2.arch32.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -rauN webkitgtk-2.36.3/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.36.3-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake ---- webkitgtk-2.36.3/Source/cmake/WebKitCompilerFlags.cmake 2022-06-02 08:44:07.302049344 +0200 -+++ webkitgtk-2.36.3-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake 2022-06-02 08:32:46.169362098 +0200 -@@ -163,13 +163,13 @@ - endif () - - # Force SSE2 fp on x86 builds. --# if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) --# WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) --# include(DetectSSE2) --# if (NOT SSE2_SUPPORT_FOUND) --# message(FATAL_ERROR "SSE2 support is required to compile WebKit") --# endif () --# endif () -+ if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) -+ WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) -+ include(DetectSSE2) -+ if (NOT SSE2_SUPPORT_FOUND) -+ message(FATAL_ERROR "SSE2 support is required to compile WebKit") -+ endif () -+ endif () - - # Makes builds faster. The GCC manual warns about the possibility that the assembler being - # used may not support input from a pipe, but in practice the toolchains we support all do. -diff -rauN webkitgtk-2.36.3/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.36.3-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/platform.h ---- webkitgtk-2.36.3/Source/ThirdParty/ANGLE/src/common/platform.h 2022-06-02 08:45:17.042348743 +0200 -+++ webkitgtk-2.36.3-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/platform.h 2022-06-02 08:32:46.189362180 +0200 -@@ -97,8 +97,8 @@ - # include <intrin.h> - # define ANGLE_USE_SSE - #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) --//# include <x86intrin.h> --//# define ANGLE_USE_SSE -+# include <x86intrin.h> -+# define ANGLE_USE_SSE - #endif - - // Mips and arm devices need to include stddef for size_t. -diff -rauN webkitgtk-2.36.3/Source/WTF/wtf/PlatformCPU.h webkitgtk-2.36.3-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h ---- webkitgtk-2.36.3/Source/WTF/wtf/PlatformCPU.h 2022-06-02 08:46:55.912771827 +0200 -+++ webkitgtk-2.36.3-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h 2022-06-02 08:32:45.789360661 +0200 -@@ -99,7 +99,7 @@ - #define WTF_CPU_KNOWN 1 - - #if defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2) --/* #define WTF_CPU_X86_SSE2 1 */ -+#define WTF_CPU_X86_SSE2 1 - #endif - - #endif diff --git a/extra/webkitgtk-6.0/PKGBUILD b/extra/webkitgtk-6.0/PKGBUILD new file mode 100644 index 00000000..ed606e4a --- /dev/null +++ b/extra/webkitgtk-6.0/PKGBUILD @@ -0,0 +1,16 @@ +options+=('!debug' '!lto') + +if [ "${CARCH}" != "pentium4" ]; then + eval "$( + declare -f prepare | \ + sed ' + 4 i patch -p1 -i "${srcdir}/${CARCH}.diff" + ' + )" +fi + +unset sha256sums +source_i486+=('i486.diff') +source_i686+=('i686.diff') +b2sums_i486+=('84b147cd7c1c5bb324af8bc1451fe048b72f8c3c43001fb7a2ab01112566e48194264ab65491c4a7b80669bb101069744915faa03b0ae844f734170e3958760e') +b2sums_i686+=('3c765caa8e153722c7791fb6c1168e27b5b72922f433a9614969003900adeee5784d41b7836d18f177491369cf5929782296ef88a5e076719a44cda42c0abea1') diff --git a/extra/webkitgtk-6.0/i486.diff b/extra/webkitgtk-6.0/i486.diff new file mode 100644 index 00000000..f794a6f5 --- /dev/null +++ b/extra/webkitgtk-6.0/i486.diff @@ -0,0 +1,36 @@ +diff -ru webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h +--- webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h 2024-03-16 06:45:47.852676000 +0000 ++++ webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h 2024-07-13 05:48:45.724474953 +0000 +@@ -112,7 +112,7 @@ + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) + # include <intrin.h> + # define ANGLE_USE_SSE +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) ++#elif 0 + # include <x86intrin.h> + # define ANGLE_USE_SSE + #endif +diff -ru webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake +--- webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake 2024-03-16 06:45:51.284670000 +0000 ++++ webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake 2024-07-13 05:50:15.429706698 +0000 +@@ -175,13 +175,13 @@ + endif () + + # Force SSE2 fp on x86 builds. +- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) +- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) +- include(DetectSSE2) +- if (NOT SSE2_SUPPORT_FOUND) +- message(FATAL_ERROR "SSE2 support is required to compile WebKit") +- endif () +- endif () ++# if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) ++# WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) ++# include(DetectSSE2) ++# if (NOT SSE2_SUPPORT_FOUND) ++# message(FATAL_ERROR "SSE2 support is required to compile WebKit") ++# endif () ++# endif () + + # Makes builds faster. The GCC manual warns about the possibility that the assembler being + # used may not support input from a pipe, but in practice the toolchains we support all do. diff --git a/extra/webkitgtk-6.0/i686.diff b/extra/webkitgtk-6.0/i686.diff new file mode 100644 index 00000000..814b4e3b --- /dev/null +++ b/extra/webkitgtk-6.0/i686.diff @@ -0,0 +1,37 @@ +diff -ru webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h +--- webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h 2024-03-16 06:45:47.852676000 +0000 ++++ webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h 2024-07-13 05:48:45.724474953 +0000 +@@ -112,7 +112,7 @@ + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) + # include <intrin.h> + # define ANGLE_USE_SSE +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) ++#elif 0 + # include <x86intrin.h> + # define ANGLE_USE_SSE + #endif +diff -ru webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake +--- webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake 2024-03-16 06:45:51.284670000 +0000 ++++ webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake 2024-07-13 05:47:42.679555436 +0000 +@@ -175,13 +175,14 @@ + endif () + + # Force SSE2 fp on x86 builds. +- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) +- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) +- include(DetectSSE2) +- if (NOT SSE2_SUPPORT_FOUND) +- message(FATAL_ERROR "SSE2 support is required to compile WebKit") +- endif () +- endif () ++ WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse -mfpmath=387) ++# if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) ++# WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) ++# include(DetectSSE2) ++# if (NOT SSE2_SUPPORT_FOUND) ++# message(FATAL_ERROR "SSE2 support is required to compile WebKit") ++# endif () ++# endif () + + # Makes builds faster. The GCC manual warns about the possibility that the assembler being + # used may not support input from a pipe, but in practice the toolchains we support all do. diff --git a/extra/webrtc-audio-processing-1/PKGBUILD b/extra/webrtc-audio-processing-1/PKGBUILD new file mode 100644 index 00000000..9be7d41f --- /dev/null +++ b/extra/webrtc-audio-processing-1/PKGBUILD @@ -0,0 +1,10 @@ +# This requires SSE, so enable it on i686 + +if [ "$CARCH" = "i686" ]; then + eval "$( + declare -f build | \ + sed ' + 3 i export CXXFLAGS="$CXXFLAGS -msse" CFLAGS="$CFLAGS -msse" + ' + )" +fi diff --git a/extra/wireplumber/PKGBUILD b/extra/wireplumber/PKGBUILD index 2a6458db..0e31f32e 100644 --- a/extra/wireplumber/PKGBUILD +++ b/extra/wireplumber/PKGBUILD @@ -1,23 +1,25 @@ -# disable documentation (needs sphinx, sphinx-rtd_theme, npm) -# python-sphinx_rdt_theme needs npm, which is broken on archlinux32 -# most likely since years.. -makedepends=(${makedepends[@]//python-sphinx_rtd_theme/}) -makedepends=(${makedepends[@]//python-sphinx/}) -eval "$( - declare -f build | \ - sed ' - /local meson_options.*/ a \ - meson_options+=(-D doc=disabled) - ' - declare -f package_wireplumber | \ - sed ' - s|_pick docs "$pkgdir"/usr/share/doc|| - ' - declare -f package_wireplumber-docs | \ - sed ' - /mv.*docs.*/d - ' -)" +if [[ $CARCH == 'i486' ]]; then + # disable documentation (needs sphinx, sphinx-rtd_theme, npm) + # python-sphinx_rdt_theme needs npm, which is broken on archlinux32 + # most likely since years.. + makedepends=(${makedepends[@]//python-sphinx_rtd_theme/}) + makedepends=(${makedepends[@]//python-sphinx/}) + eval "$( + declare -f build | \ + sed ' + /local meson_options.*/ a \ + meson_options+=(-D doc=disabled) + ' + declare -f package_wireplumber | \ + sed ' + s|_pick docs "$pkgdir"/usr/share/doc|| + ' + declare -f package_wireplumber-docs | \ + sed ' + /mv.*docs.*/d + ' + )" +fi # test-spa-json fails, ignoring for now eval "$( diff --git a/extra/wolf-shaper/PKGBUILD b/extra/wolf-shaper/PKGBUILD new file mode 100644 index 00000000..d0e54eb7 --- /dev/null +++ b/extra/wolf-shaper/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f package_wolf-shaper-vst3 | sed 's@\$CARCH@i686@g')" diff --git a/extra/yazi/PKGBUILD b/extra/yazi/PKGBUILD new file mode 100644 index 00000000..0cb529cc --- /dev/null +++ b/extra/yazi/PKGBUILD @@ -0,0 +1,2 @@ +# Prevent out of memory +options+=(!lto !debug) diff --git a/extra/yubico-piv-tool/PKGBUILD b/extra/yubico-piv-tool/PKGBUILD new file mode 100644 index 00000000..9de55861 --- /dev/null +++ b/extra/yubico-piv-tool/PKGBUILD @@ -0,0 +1,9 @@ +if [[ $pkgver == '2.6.0' ]]; then + source+=('https://github.com/Yubico/yubico-piv-tool/commit/653ce43556535504d7901a897ef5e96557b374af.patch') + sha256sums+=('e32c56be6d322767ea7a6c952c5ad897897887a06ce55e498a2bca9e868f1bed') + prepare() { + cd "${pkgname}-${pkgver}" + patch -p1 -i ../653ce43556535504d7901a897ef5e96557b374af.patch + cd - + } +fi |