| index : packages | |
| Archlinux32 package modifications | gitolite user |
| summaryrefslogtreecommitdiff |
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/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/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/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/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/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/linux/PKGBUILD b/core/linux/PKGBUILD index 76b4daa6..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 \ 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/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/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/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/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/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/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/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/libjxl/PKGBUILD b/extra/libjxl/PKGBUILD index 29fb0241..9785a119 100644 --- a/extra/libjxl/PKGBUILD +++ b/extra/libjxl/PKGBUILD @@ -12,9 +12,18 @@ if [ "${CARCH}" = "i486" ]; then 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/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/lirc/PKGBUILD b/extra/lirc/PKGBUILD index 31bc8139..2bdada51 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,2 +1,7 @@ -# ftdi.h missing, needs libftdi-compat -makedepends+=(libftdi-compat) +# For some reason the systemd files get installed in /lib, which makes this package unusable +# So move them manually to /usr/lib + +eval "$( + declare -f package | \ + sed '$ d' | sed '$ a mv "${pkgdir}"/lib/systemd "${pkgdir}"/usr/lib/; rm -r "${pkgdir}"/lib; }' +)" 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/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/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/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..585863fe 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,15 @@ 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 "../protobuf-5.${pkgver}"; python -m build --wheel --no-isolation ; }' + declare -f package_python-protobuf | sed 's@ \".*bazel-bin/python@ \"protobuf-5.${pkgver}\"@' +)" 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/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/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/spirv-llvm-translator/PKGBUILD b/extra/spirv-llvm-translator/PKGBUILD index f00a3a39..8b137891 100644 --- a/extra/spirv-llvm-translator/PKGBUILD +++ b/extra/spirv-llvm-translator/PKGBUILD @@ -1,15 +1 @@ -# ignore failing tests around debug info -# Failed Tests (7): -# LLVM_SPIRV :: DebugInfo/X86/dbg-declare-alloca.ll -# LLVM_SPIRV :: DebugInfo/X86/dbg-declare-arg.ll -# LLVM_SPIRV :: DebugInfo/X86/dbg-value-const-byref.ll -# LLVM_SPIRV :: DebugInfo/X86/dw_op_minus_direct.ll -# LLVM_SPIRV :: DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll -# LLVM_SPIRV :: DebugInfo/X86/frame-register.ll -# LLVM_SPIRV :: DebugInfo/X86/this-stack_value.ll -eval "$( - declare -f check | \ - sed ' - s/\(.*make.*test\)/\1 || true/ - ' -)" + 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/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/yazi/PKGBUILD b/extra/yazi/PKGBUILD new file mode 100644 index 00000000..76d1fc9d --- /dev/null +++ b/extra/yazi/PKGBUILD @@ -0,0 +1,2 @@ +# Fails to build with LTO +options+=(!lto) |