* update to -

2023-03-07 10:22:08 +01:00 · 2023-03-07 10:22:08 +01:00 · 1cb099a2fa
commit 1cb099a2fa
parent 26175b53da
16 changed files with 573 additions and 1437 deletions
--- a/convertlit/PKGBUILD
+++ b/convertlit/PKGBUILD
@ -7,7 +7,7 @@ pkgname=convertlit
 pkgver=1.8
 pkgrel=11
 pkgdesc='An extractor/converter for .LIT eBooks'
-arch=(x86_64 powerpc64le powerpcriscv64)
+arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url='http://www.convertlit.com/'
 license=(GPL)
 depends=(libtommath)
--- a/xfce4/elementary-icon-theme/PKGBUILD
+++ b/xfce4/elementary-icon-theme/PKGBUILD
--- a/firefox/PKGBUILD
+++ b/firefox/PKGBUILD
@ -4,7 +4,7 @@
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>

 pkgname=firefox
-pkgver=108.0.2
+pkgver=110.0.1
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64 powerpc64le)
@ -22,38 +22,38 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
            'hunspell-en_US: Spell checking, American English')
 options=(!emptydirs !makeflags strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
-        zstandard-0.18.0.diff
        $pkgname.desktop
        identity-icons-brand.svg
+        0001-libwebrtc-screen-cast-sync.patch
        big-endian-image-decoders.patch
        fix-image-format-warning.patch
        avoid-redefinition.patch
-        firefox-pgo.patch
        skia-sucks3.patch
        skia-sucks2.patch
        skia-sucks1.patch
        lto-thin.patch
        sandbox-fork.patch
        sandbox-largefile.patch
-        libwebrtc-gn.patch
-        makotokato-riscv64-support-and-zenithal-backported.patch)
-sha256sums=('42e6d6b27ad0694a4fc9dd736888ad36c99eb2dbcce96e134584805d644ca300'
+        firefox-pgo.patch
+        firefox-gcc-12.2.1.patch
+        libwebrtc-gn.patch)
+sha256sums=('f19bb74d684b992625abca68f5776198974cd2785eb5d02d51ba007fc998491f'
            'SKIP'
-            'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be'
            'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33'
            'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
+            '43c83101b7ad7dba6f5fffeb89b70a661a547d506a031ea2beada42ccf04eec7'
            '0df637d44218524e213814d15d623f27724d8e405390173f6cc385e145110bfe'
            '958cf5016e9845b6ee6e2ed05ad96cc2fc6f74bebbb338a7b7ce29bffd2be716'
            '3ebba6c6c59dbf754b522d2535c27eae3e724aab575b8e7be9658e0d33183bcf'
-            'bb1e775512137859ee0dd6eaebd4580257f793196fb074c660247d3935ca9148'
            '5a0fea05cf1828f102b0b73878a27c0d05b0cf21c81e1a2f463242a0d3121251'
            'a4ad198fc98acb0a16a013f1ae0a09ab1b96d9b49eadc52045138de5ae2c5ee2'
            'c36b73c23975ef72b6f562c4e9199e4958ea5083473926562b96ea255c08b148'
            '59f29af746912d5bd74f7e253d54ce43696614fb8c2b8385ba0a5ab43f3c0e30'
            'ef9bd794b322482ec7ba217da0cc7cf9e079e05e27bdb37b241b9e16551295ad'
            'b6019e8b9e8e08d6e9ee7b68dc476a7430d18d8d754ab9d0c49ace10fea6f703'
-            '82d25d789483805cb547a1199eb59798e1ce6cbee7bdbbf53c06a8f251a40140'
-            'cea7997c6613d374535b3450c725f32fd1497d71d66709e1406c4238a01b49d4')
+            'c636ddb9e85626f5cadabbf051551ac2e6db44d764e993d3b64dabcb1bfa80bc'
+            '3949966e56c503441c2b7ea367efb31c99bc715a2ad06e1aeecbdf931fe9dd97'
+            '94a5c893f74cdab54cc38243a1818235e447bc69310720b78a5ce96d02f60e2c')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>

 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@ -72,9 +72,8 @@ prepare() {
  mkdir -p mozbuild
  cd ${srcdir}/firefox-$pkgver

-  # Unbreak build with python-zstandard 0.18.0
-  patch -Np1 -i ../zstandard-0.18.0.diff
-  
+  patch -Np1 -i ${srcdir}/0001-libwebrtc-screen-cast-sync.patch
+
  # sourced from Voidlinux, thanks!
  patch -Np0 -i ${srcdir}/big-endian-image-decoders.patch
  patch -Np0 -i ${srcdir}/fix-image-format-warning.patch
@ -85,10 +84,11 @@ prepare() {
  patch -Np1 -i ${srcdir}/lto-thin.patch
  patch -Np1 -i ${srcdir}/sandbox-fork.patch
  patch -Np1 -i ${srcdir}/sandbox-largefile.patch
-  patch -Np1 -i ${srcdir}/libwebrtc-gn.patch

  # Talospace goodness
  patch -Np1 -i ${srcdir}/firefox-pgo.patch
+  patch -Np1 -i ${srcdir}/firefox-gcc-12.2.1.patch
+  #patch -Np1 -i ${srcdir}/libwebrtc-gn.patch

  sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/num-traits/.cargo-checksum.json

@ -129,7 +129,7 @@ ac_add_options --enable-jack
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --enable-webrtc
+ac_add_options --disable-webrtc
 END

  case "${CARCH}" in
--- a/firefox/firefox-pgo.patch
+++ b/firefox/firefox-pgo.patch
@ -80,36 +80,6 @@ diff -r b22cb12f611c build/pgo/profileserver.py
                     "Could not find profraw files in the current directory: %s"
                     % os.getcwd()
                 )
-diff -r b22cb12f611c mfbt/tests/moz.build
--- a/mfbt/tests/moz.build	Thu Oct 07 08:11:19 2021 +0000
-+++ b/mfbt/tests/moz.build	Sun Oct 10 20:36:46 2021 -0700
-@@ -80,21 +80,21 @@
-             "TestSPSCQueue",
-             "TestThreadSafeWeakPtr",
-         ]
-     )
- 
- # Not to be unified with the rest, because this test
- # sets MOZ_PRETEND_NO_JSRUST, which changes the behavior
- # of the included headers.
-CppUnitTests(
-    [
-        "TestUtf8",
-    ]
-)
-+#CppUnitTests(
-+#    [
-+#        "TestUtf8",
-+#    ]
-+#)
- 
- # Wasi doesn't support <signal> yet so skip this test.
- if not CONFIG["MOZ_ASAN"] and CONFIG["OS_ARCH"] != "WASI":
-     CppUnitTests(
-         [
-             "TestPoisonArea",
-         ]
-     )
 diff -r b22cb12f611c toolkit/components/terminator/nsTerminator.cpp
 --- a/toolkit/components/terminator/nsTerminator.cpp	Thu Apr 07 15:11:19 2022 +0000
 +++ b/toolkit/components/terminator/nsTerminator.cpp	Thu Apr 07 20:44:28 2022 -0700
@ -134,4 +104,4 @@ diff -r b22cb12f611c toolkit/components/terminator/nsTerminator.cpp
 
   DebugOnly<PRThread*> watchdogThread =
       CreateSystemThread(RunWatchdog, options.release());
-   MOZ_ASSERT(watchdogThread);
+   MOZ_ASSERT(watchdogThread);
--- a/firefox/libwebrtc-gn.patch
+++ b/firefox/libwebrtc-gn.patch
@ -1,17 +1,12 @@
-diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
-index 8579f8bb3622..d9ca79d4fcb8 100644
--- a/third_party/libwebrtc/moz.build
-+++ b/third_party/libwebrtc/moz.build
-@@ -520,7 +520,10 @@ if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
+--- firefox-110.0.1/third_party/libwebrtc/moz.build.orig	2023-03-07 09:09:36.206079325 +0100
+++ firefox-110.0.1/third_party/libwebrtc/moz.build	2023-03-07 09:10:35.471885182 +0100
+@@ -624,7 +624,8 @@
         "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
         "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
         "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
 -        "/third_party/libwebrtc/modules/audio_coding/isac_gn"
 +        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
-+        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
-+        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
 +        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
     ]
 
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
--- a/kde/phonon-gstreamer/PKGBUILD
+++ b/kde/phonon-gstreamer/PKGBUILD
@ -5,8 +5,8 @@
 pkgbase=phonon-gstreamer
 pkgname=(phonon-qt5-gstreamer)
 pkgver=4.10.0
-pkgrel=6
-arch=(x86_64 powerpc64le powerpc riscv64)
+pkgrel=6.1
+arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 pkgdesc='Phonon GStreamer backend for Qt5'
 url='https://community.kde.org/Phonon'
 license=(LGPL)
@ -15,11 +15,16 @@ optdepends=('pulseaudio: PulseAudio support' 'gst-plugins-good: PulseAudio suppo
            'gst-plugins-ugly: additional codecs' 'gst-libav: libav codec')
 makedepends=(extra-cmake-modules qt5-tools)
 provides=(phonon-qt5-backend)
-source=("https://download.kde.org/stable/phonon/phonon-backend-gstreamer/$pkgver/phonon-backend-gstreamer-$pkgver.tar.xz"{,.sig})
+source=(https://download.kde.org/stable/phonon/phonon-backend-gstreamer/$pkgver/phonon-backend-gstreamer-$pkgver.tar.xz{,.sig}
+        https://invent.kde.org/libraries/phonon-gstreamer/-/commit/bbbb160f.patch)
 sha256sums=('c5871835521d015ef2ad1276b1f58340d946c2903466337f3170bac3c58d61f2'
-            'SKIP')
+            'SKIP'
+            '79068597cd4ea57f3b1fe1b30ffeb4749bccefbbcbbf6585f57e2dc5944ae3d7')
 validpgpkeys=(CB9387521E1EE0127DA804843FDBB55084CC5D84) # Harald Sitter <sitter@kde.org>
-options=(debug)
+
+prepare() {
+  patch -d phonon-backend-gstreamer-$pkgver -p1 < bbbb160f.patch # Fix tearing on wayland
+}

 build() {
  cmake -B build -S phonon-backend-gstreamer-$pkgver
--- a/kde/phonon-gstreamer/trunk/PKGBUILD
+++ b/kde/phonon-gstreamer/trunk/PKGBUILD
@ -1,39 +0,0 @@
-# Maintainer: Antonio Rojas <arojas@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=phonon-gstreamer
-pkgname=(phonon-qt5-gstreamer)
-pkgver=4.9.0
-pkgrel=5
-arch=(x86_64)
-pkgdesc="Phonon GStreamer backend for Qt5"
-url='http://phonon.kde.org/'
-license=(LGPL)
-depends=(gst-plugins-base qt5-x11extras phonon-qt5)
-optdepends=('pulseaudio: PulseAudio support' 'gst-plugins-good: PulseAudio support and good codecs' 'gst-plugins-bad: additional codecs'
-            'gst-plugins-ugly: additional codecs' 'gst-libav: libav codec')
-makedepends=(extra-cmake-modules)
-provides=(phonon-qt5-backend)
-source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/$pkgver/phonon-backend-gstreamer-$pkgver.tar.xz")
-sha256sums=('cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgbase-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -D__KDE_HAVE_GCC_VISIBILITY=NO \
-    -DPHONON_BUILD_PHONON4QT5=ON
-  make
-}
-
-package_phonon-qt5-gstreamer() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}
--- a/kde/plasma-wayland-protocols/PKGBUILD
+++ b/kde/plasma-wayland-protocols/PKGBUILD
@ -5,7 +5,7 @@ pkgname=plasma-wayland-protocols
 pkgver=1.9.0
 pkgrel=1
 pkgdesc='Plasma Specific Protocols for Wayland'
-arch=(x86_64 powerpc64le powerpc riscv64)
+arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url='https://kde.org/plasma-desktop'
 license=(LGPL)
 depends=()
--- a/linux-4k/PKGBUILD
+++ b/linux-4k/PKGBUILD
@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>

 pkgbase=linux-4k
-pkgver=6.2.arch1
+pkgver=6.2.2.arch1
 pkgrel=1
 pkgdesc='Linux (4K pagesize)'
 _srctag=v${pkgver%.*}-${pkgver##*.}
--- a/linux-g4/PKGBUILD
+++ b/linux-g4/PKGBUILD
@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>

 pkgbase=linux-g4
-pkgver=6.2.1.arch1
+pkgver=6.2.2.arch1
 pkgrel=1
 pkgdesc='Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
--- a/linux-ppc64/PKGBUILD
+++ b/linux-ppc64/PKGBUILD
@ -2,8 +2,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>

 pkgbase=linux-ppc64
-pkgver=6.2.1.arch1
-pkgrel=2
+pkgver=6.2.2.arch1
+pkgrel=1
 pkgdesc='Linux (powerpc64)'
 _srctag=v${pkgver%.*}-${pkgver##*.}
 url="https://github.com/archlinux/linux/commits/$_srctag"
@ -29,7 +29,7 @@ validpgpkeys=(
  'C7E7849466FE2358343588377258734B41C31549'  # David Runge <dvzrv@archlinux.org>
 )
 sha256sums=('SKIP'
-            '6d2caca4c6fbe04c23040b6ec343b765a6625f20149c756dcb8994510a35b1f7'
+            'ed7ce5af9ada0713bd0ffc1a582460ea5ce117253eebab5c6a6d2521d055d156'
            'c30e372bcf445bb40521a1568c69fc9d6d3c08c2d1a8a3e539c9b186b7b5ff38'
            '07dbbf3e8f743e8d2ad90891a8b567392271db139e339529df1ab4387e0e6400')

--- a/linux-ppc64/config
+++ b/linux-ppc64/config
--- a/movit/PKGBUILD
+++ b/movit/PKGBUILD
@ -7,17 +7,35 @@ pkgname=movit
 pkgver=1.6.3
 pkgrel=2
 pkgdesc="The modern video toolkit"
-arch=(x86_64 powerpc64le powerpc riscv64)
+arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url="https://movit.sesse.net/"
 license=('GPL')
 depends=('fftw' 'libepoxy')
 makedepends=('eigen' 'gtest' 'sdl2')
-source=(https://movit.sesse.net/$pkgname-$pkgver.tar.gz)
-sha256sums=('eb19f109ec99d6050de5267d059c7b351d3d5e39c77d43ca348a95f474a99498')
+source=(https://movit.sesse.net/$pkgname-$pkgver.tar.gz
+       movit-1.6.3-gcc12.patch
+       workaround-glsizeiptr-abi-change.patch)
+sha256sums=('eb19f109ec99d6050de5267d059c7b351d3d5e39c77d43ca348a95f474a99498'
+            'f1d0fc3c4f9693e4fca73fe9d6c2c29d74a3a7e06eda4de3f11fb888bb3f9855'
+            '48844a2ee65ae80c14f463a979a0adabf0e4c5f1e84889f6994d718bc136585c')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i $srcdir/movit-1.6.3-gcc12.patch
+  patch -Np1 -i $srcdir/workaround-glsizeiptr-abi-change.patch
+}

 build() {
  cd $pkgname-$pkgver

+  case "${CARCH}" in
+    powerpc64)
+      export CFLAGS='-O2 -pipe'
+      export CXXFLAGS='-O2 -pipe'
+    ;;
+  esac
+
+  CXXFLAGS+=' -std=c++14' \
  ./configure --prefix=/usr
  make GTEST_DIR=/usr/src/googletest
 }
--- a/netavark/PKGBUILD
+++ b/netavark/PKGBUILD
@ -3,18 +3,19 @@
 # Maintainer: Morten Linderud <foxboron@archlinux.org>

 pkgname=netavark
-_commit=a19889e165f146d8a5030450e0dff0ae9d91f2be  # refs/tags/v1.4.0
-pkgver=1.4.0
+_commit=0b5ab2e8648c801ff55a745ea0e32b7b9ab7ccb4  # refs/tags/v1.5.0
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="Container network stack"
 arch=(x86_64 powerpc64le powerpc riscv64)
 url="https://github.com/containers/netavark"
 license=(Apache)
 depends=(gcc-libs glibc)
-makedepends=(cargo git libgit2 mandown)
+makedepends=(cargo git libgit2 mandown protobuf)
 optdepends=('aardvark-dns: for authorative DNS server')
 provides=(container-network-stack=2)
-source=(git+https://github.com/containers/netavark.git#tag=$_commit)
+source=(git+https://github.com/containers/netavark.git#tag=$_commit
+        netavark-mozim-0.2.1.patch)
 sha256sums=('SKIP')
 # NOTE: pinning commit until upstream clarifies commitment to chain of trust:
 # https://github.com/containers/netavark/issues/231
@ -22,13 +23,16 @@ sha256sums=('SKIP')

 prepare() {
  cd $pkgname
+  patch -Np1 -i ${srcdir}/netavark-mozim-0.2.1.patch
+
+  # fix issue with yanked dependency: https://github.com/containers/netavark/issues/521
+  git cherry-pick -n 3a1ff2447d8cef1eeab0413bbbbb1f1fb8280a17
+
  case "${CARCH}" in
    riscv64) CARCH=riscv64gc ;;
  esac

-  # fix issue with yanked dependency: https://github.com/containers/netavark/issues/521
-  git cherry-pick -n 3a1ff2447d8cef1eeab0413bbbbb1f1fb8280a17
-  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+  cargo fetch --target "$CARCH-unknown-linux-gnu"
 }

 build() {
--- a/pdal/PKGBUILD
+++ b/pdal/PKGBUILD
@ -42,5 +42,7 @@ package() {

  DESTDIR="$pkgdir/" ninja -C build install

+  sed 's@^libdir=.*$@libdir=/usr/lib/@g' -i ${pkgdir}/usr/lib/pkgconfig/pdal.pc
+
  install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }
--- a/perl/perl-yaml/PKGBUILD
+++ b/perl/perl-yaml/PKGBUILD
@ -12,7 +12,7 @@ url="https://search.cpan.org/dist/YAML/"
 license=('GPL' 'PerlArtistic')
 depends=('perl')
 checkdepends=('perl-test-deep' 'perl-test-yaml')
-options=('!emptydirs')
+options=('!emptydirs' '!distcc')
 source=(https://www.cpan.org/authors/id/T/TI/TINITA/YAML-${pkgver}.tar.gz)
 sha512sums=('f73f2d9f3cd96edeb05ec098c859755dd6b80bf1a00049f8de2889ebbf4f41df9fcc1540116afa8648e965a0b780d993f256af2c5ffc03a9f1ba7df1f0cc8941')