updpatch: webkit2gtk{,-4.1}, webkitgtk-6.0, wpewebkit 2.44.3-3

Fix rotten patch.
felixonmars · Sep 6, 2024 · 2f77bb6 · 2f77bb6
1 parent 33b2063
commit 2f77bb6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/webkit2gtk-4.1/riscv64.patch b/webkit2gtk-4.1/riscv64.patch
@@ -1,14 +1,15 @@
 --- PKGBUILD
 +++ PKGBUILD
-@@ -90,6 +90,7 @@ validpgpkeys=(
-
- prepare() {
-   cd webkitgtk-$pkgver
+@@ -130,6 +130,8 @@ prepare() {
+   # https://bugs.webkit.org/show_bug.cgi?id=278113
+   # https://github.com/WebKit/WebKit/commit/9140ce712aa87091613874d802787ab476be0e39
+   patch -Np1 -i ../revert-271175.patch
++
 +  patch -Np1 -i ../fix-ftbfs-riscv64.patch
  }
 
  build() {
-@@ -170,3 +171,7 @@ package_webkit2gtk-4.1-docs() {
+@@ -197,3 +199,7 @@ package_webkit2gtk-4.1-docs() {
  }
 
  # vim:set sw=2 sts=-1 et:

diff --git a/webkit2gtk/riscv64.patch b/webkit2gtk/riscv64.patch
@@ -1,14 +1,15 @@
 --- PKGBUILD
 +++ PKGBUILD
-@@ -90,6 +90,7 @@ validpgpkeys=(
-
- prepare() {
-   cd webkitgtk-$pkgver
+@@ -130,6 +130,8 @@ prepare() {
+   # https://bugs.webkit.org/show_bug.cgi?id=278113
+   # https://github.com/WebKit/WebKit/commit/9140ce712aa87091613874d802787ab476be0e39
+   patch -Np1 -i ../revert-271175.patch
++
 +  patch -Np1 -i ../fix-ftbfs-riscv64.patch
  }
 
  build() {
-@@ -170,3 +171,7 @@ package_webkit2gtk-docs() {
+@@ -197,3 +199,7 @@ package_webkit2gtk-docs() {
  }
 
  # vim:set sw=2 sts=-1 et:

diff --git a/webkitgtk-6.0/riscv64.patch b/webkitgtk-6.0/riscv64.patch
@@ -1,14 +1,15 @@
 --- PKGBUILD
 +++ PKGBUILD
-@@ -90,6 +90,7 @@ validpgpkeys=(
-
- prepare() {
-   cd webkitgtk-$pkgver
+@@ -130,6 +130,8 @@ prepare() {
+   # https://bugs.webkit.org/show_bug.cgi?id=278113
+   # https://github.com/WebKit/WebKit/commit/9140ce712aa87091613874d802787ab476be0e39
+   patch -Np1 -i ../revert-271175.patch
++
 +  patch -Np1 -i ../fix-ftbfs-riscv64.patch
  }
 
  build() {
-@@ -168,3 +169,7 @@ package_webkitgtk-6.0-docs() {
+@@ -195,3 +197,7 @@ package_webkitgtk-6.0-docs() {
  }
 
  # vim:set sw=2 sts=-1 et:

diff --git a/wpewebkit/riscv64.patch b/wpewebkit/riscv64.patch
@@ -1,14 +1,15 @@
 --- PKGBUILD
 +++ PKGBUILD
-@@ -79,6 +79,7 @@ validpgpkeys=(
-
- prepare() {
-   cd wpewebkit-$pkgver
+@@ -121,6 +121,8 @@ prepare() {
+   # https://bugs.webkit.org/show_bug.cgi?id=278113
+   # https://github.com/WebKit/WebKit/commit/9140ce712aa87091613874d802787ab476be0e39
+   patch -Np1 -i ../revert-271175.patch
++
 +  patch -Np1 -i ../fix-ftbfs-riscv64.patch
  }
 
  build() {
-@@ -154,3 +155,7 @@ package_wpewebkit-docs() {
+@@ -187,3 +189,7 @@ package_wpewebkit-docs() {
  }
 
  # vim:set sw=2 sts=-1 et: