Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] webkit2gtk: update to 2.44.0
@ 2024-03-31 22:27 chrysos349
  2024-04-12 15:09 ` [PR PATCH] [Updated] " chrysos349
  0 siblings, 1 reply; 2+ messages in thread
From: chrysos349 @ 2024-03-31 22:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]

There is a new pull request by chrysos349 against master on the void-packages repository

https://github.com/chrysos349/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/49642

webkit2gtk: update to 2.44.0
[ci skip]

I've been testing this for about a week now (as a part of gnome-46.0). So far everything works. 

**NOTES:**
See ["What's new in 2.44"](https://webkitgtk.org/2024/03/27/webkigit-2.44.html)

- `-DUSE_GTK4` is used by default now.
- `-DUSE_WPE_RENDERER` (and related deps) has been removed.
- OpenJPEG is no longer a dep, because support for the JPEG2000 image format has been removed.
- `disable-dmabud-nvidia.patch` has been removed because it has been merged into webkit.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl x
  - armv7l x
  - armv6l-musl x
  - x86_64-musl 
  - i686 x
  - aarch64 x

A patch file from https://github.com/void-linux/void-packages/pull/49642.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-49642.patch --]
[-- Type: text/x-diff, Size: 8090 bytes --]

From f80afd2a665931a7e67bffae2578682080df851a Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 1 Apr 2024 01:01:38 +0300
Subject: [PATCH] webkit2gtk: update to 2.44.0

---
 .../patches/disable-dmabuf-nvidia.patch       | 63 -------------------
 .../webkit2gtk/patches/fix-ftbfs-i386.patch   | 33 +++++-----
 srcpkgs/webkit2gtk/template                   | 17 +++--
 3 files changed, 27 insertions(+), 86 deletions(-)
 delete mode 100644 srcpkgs/webkit2gtk/patches/disable-dmabuf-nvidia.patch

diff --git a/srcpkgs/webkit2gtk/patches/disable-dmabuf-nvidia.patch b/srcpkgs/webkit2gtk/patches/disable-dmabuf-nvidia.patch
deleted file mode 100644
index 652c639ce38bfa..00000000000000
--- a/srcpkgs/webkit2gtk/patches/disable-dmabuf-nvidia.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Carlos Garcia Campos <cgarcia@igalia.com>
-Subject: Disable DMABuf renderer for NVIDIA proprietary drivers
-Bug: https://bugs.webkit.org/show_bug.cgi?id=262607
-Bug-Debian: https://bugs.debian.org/1039720
-Origin: https://github.com/WebKit/WebKit/pull/18614
-Index: webkitgtk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-===================================================================
---- webkitgtk.orig/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-+++ webkitgtk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-@@ -38,11 +38,13 @@
- #include <WebCore/GLContext.h>
- #include <WebCore/IntRect.h>
- #include <WebCore/PlatformDisplay.h>
-+#include <WebCore/PlatformDisplaySurfaceless.h>
- #include <epoxy/egl.h>
- #include <wtf/glib/GUniquePtr.h>
- 
- #if USE(GBM)
- #include <WebCore/DMABufFormat.h>
-+#include <WebCore/PlatformDisplayGBM.h>
- #include <gbm.h>
- static constexpr uint64_t s_dmabufInvalidModifier = uint64_t(WebCore::DMABufFormat::Modifier::Invalid);
- #else
-@@ -55,6 +57,29 @@ static constexpr uint64_t s_dmabufInvali
- 
- namespace WebKit {
- 
-+static bool isNVIDIA()
-+{
-+    const char* forceDMABuf = getenv("WEBKIT_FORCE_DMABUF_RENDERER");
-+    if (forceDMABuf && strcmp(forceDMABuf, "0"))
-+        return false;
-+
-+    std::unique_ptr<WebCore::PlatformDisplay> platformDisplay;
-+#if USE(GBM)
-+    const char* disableGBM = getenv("WEBKIT_DMABUF_RENDERER_DISABLE_GBM");
-+    if (!disableGBM || !strcmp(disableGBM, "0")) {
-+        if (auto* device = WebCore::PlatformDisplay::sharedDisplay().gbmDevice())
-+            platformDisplay = WebCore::PlatformDisplayGBM::create(device);
-+    }
-+#endif
-+    if (!platformDisplay)
-+        platformDisplay = WebCore::PlatformDisplaySurfaceless::create();
-+
-+    WebCore::GLContext::ScopedGLContext glContext(WebCore::GLContext::createOffscreen(platformDisplay ? *platformDisplay : WebCore::PlatformDisplay::sharedDisplay()));
-+    if (strstr(reinterpret_cast<const char*>(glGetString(GL_VENDOR)), "NVIDIA"))
-+        return true;
-+    return false;
-+}
-+
- OptionSet<DMABufRendererBufferMode> AcceleratedBackingStoreDMABuf::rendererBufferMode()
- {
-     static OptionSet<DMABufRendererBufferMode> mode;
-@@ -70,6 +95,9 @@ OptionSet<DMABufRendererBufferMode> Acce
-             return;
-         }
- 
-+        if (isNVIDIA())
-+            return;
-+
-         mode.add(DMABufRendererBufferMode::SharedMemory);
- 
-         const auto& eglExtensions = WebCore::PlatformDisplay::sharedDisplay().eglExtensions();
diff --git a/srcpkgs/webkit2gtk/patches/fix-ftbfs-i386.patch b/srcpkgs/webkit2gtk/patches/fix-ftbfs-i386.patch
index 1b5ec0da142c09..be6a8db22bd96a 100644
--- a/srcpkgs/webkit2gtk/patches/fix-ftbfs-i386.patch
+++ b/srcpkgs/webkit2gtk/patches/fix-ftbfs-i386.patch
@@ -1,16 +1,21 @@
-From: Alberto Garcia <berto@igalia.com>
-Subject: Fix FTBFS in i386
-Bug: https://bugs.webkit.org/show_bug.cgi?id=268739
-Index: webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Subject: Fix FTBFS on i386: static assertion failed: Timer should stay small
+Bug: https://bugs.webkit.org/show_bug.cgi?id=271108
+Origin: https://github.com/WebKit/WebKit/commit/2922af379dc70b4b1a63b01d67179eb431f03ac4
+Index: webkitgtk/Source/WebCore/platform/Timer.cpp
 ===================================================================
---- webkitgtk.orig/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-+++ webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpc
-     UNUSED_VARIABLE(t2);
-     UNUSED_VARIABLE(t3);
-     UNUSED_VARIABLE(t5);
--    UNUSED_VARIABLE(t6);
--    UNUSED_VARIABLE(t7);
+--- webkitgtk.orig/Source/WebCore/platform/Timer.cpp
++++ webkitgtk/Source/WebCore/platform/Timer.cpp
+@@ -263,7 +263,11 @@ struct SameSizeAsTimer {
  
-     struct StackPointerScope {
-         StackPointerScope(CLoopStack& stack)
+     WeakPtr<TimerAlignment> timerAlignment;
+     double times[2];
+-    void* pointers[3];
++    void* pointers[2];
++#if CPU(ADDRESS32)
++    uint8_t bitfields;
++#endif
++    void* pointer;
+ };
+ 
+ static_assert(sizeof(Timer) == sizeof(SameSizeAsTimer), "Timer should stay small");
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 5fc8c66d7a2782..6d7468c3fcb6f5 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,12 +1,12 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.42.5
+version=2.44.0
 revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DPORT=GTK
  -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc -DCMAKE_SKIP_RPATH=ON
- -DENABLE_JOURNALD_LOG=OFF -DUSE_WOFF2=ON -DUSE_WPE_RENDERER=ON
+ -DENABLE_JOURNALD_LOG=OFF -DUSE_WOFF2=ON
  -DENABLE_MINIBROWSER=$(vopt_if minibrowser ON OFF)
  -DENABLE_JIT=$(vopt_if jit ON OFF)
  -DENABLE_C_LOOP=$(vopt_if jit OFF ON)
@@ -16,7 +16,7 @@ configure_args="-DPORT=GTK
  -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
  -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
  -DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)
- -DUSE_JPEGXL=OFF"
+ -DUSE_JPEGXL=OFF -DUSE_LIBBACKTRACE=OFF -DUSE_GTK4=OFF"
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python3 pkg-config gperf flex ruby gettext glib-devel
@@ -27,8 +27,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsoup-devel libsoup3-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
  dbus-glib-devel libwebp-devel gtk+3-devel gtk4-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
- woff2-devel freetype-devel libopenjpeg2-devel libavif-devel
- qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
+ woff2-devel freetype-devel libavif-devel qt5-devel libmanette-devel
  libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 depends="gst-plugins-good1"
@@ -37,7 +36,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749
+checksum=c66530e41ba59b1edba4ee89ef20b2188e273bed0497e95084729e3cfbe30c87
 make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
@@ -190,7 +189,7 @@ webkit2gtk-devel_package() {
 			vmove "usr/share/gir-1.0/*-4.0.gir"
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove "usr/share/gtk-doc/html/*-4.0"
+			vmove "usr/share/doc/*-4.0"
 		fi
 		vmove "usr/lib/*-4.0.so"
 	}
@@ -226,7 +225,7 @@ libwebkit2gtk41-devel_package() {
 			vmove "usr/share/gir-1.0/*-4.1.gir"
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove "usr/share/gtk-doc/html/*-4.1"
+			vmove "usr/share/doc/*-4.1"
 		fi
 		vmove "usr/lib/*-4.1.so"
 	}
@@ -261,7 +260,7 @@ libwebkitgtk60-devel_package() {
 			vmove "usr/share/gir-1.0/*-6.0.gir"
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove "usr/share/gtk-doc/html/*-6.0"
+			vmove "usr/share/doc/*-6.0"
 		fi
 		vmove "usr/lib/*-6.0.so"
 	}

^ permalink raw reply	[flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: update to 2.44.0
  2024-03-31 22:27 [PR PATCH] webkit2gtk: update to 2.44.0 chrysos349
@ 2024-04-12 15:09 ` chrysos349
  0 siblings, 0 replies; 2+ messages in thread
From: chrysos349 @ 2024-04-12 15:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1167 bytes --]

There is an updated pull request by chrysos349 against master on the void-packages repository

https://github.com/chrysos349/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/49642

webkit2gtk: update to 2.44.0
[ci skip]

I've been testing this for about a week now (as a part of gnome-46.0). So far everything works. 

**NOTES:**
See ["What's new in 2.44"](https://webkitgtk.org/2024/03/27/webkigit-2.44.html)

- `-DUSE_GTK4` is used by default now.
- `-DUSE_WPE_RENDERER` (and related deps) has been removed.
- OpenJPEG is no longer a dep, because support for the JPEG2000 image format has been removed.
- `disable-dmabuf-nvidia.patch` has been removed because it has been merged into webkit.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl x
  - armv7l x
  - armv6l-musl x
  - x86_64-musl 
  - i686 x
  - aarch64 x

A patch file from https://github.com/void-linux/void-packages/pull/49642.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-49642.patch --]
[-- Type: text/x-diff, Size: 7368 bytes --]

From 057021557d13ad5eef54986f12acde563108e21e Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 1 Apr 2024 01:01:38 +0300
Subject: [PATCH] webkit2gtk: update to 2.44.1

---
 .../patches/disable-dmabuf-nvidia.patch       | 63 -------------------
 .../webkit2gtk/patches/fix-ftbfs-i386.patch   | 16 -----
 srcpkgs/webkit2gtk/template                   | 17 +++--
 3 files changed, 8 insertions(+), 88 deletions(-)
 delete mode 100644 srcpkgs/webkit2gtk/patches/disable-dmabuf-nvidia.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-ftbfs-i386.patch

diff --git a/srcpkgs/webkit2gtk/patches/disable-dmabuf-nvidia.patch b/srcpkgs/webkit2gtk/patches/disable-dmabuf-nvidia.patch
deleted file mode 100644
index 652c639ce38bfa..00000000000000
--- a/srcpkgs/webkit2gtk/patches/disable-dmabuf-nvidia.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Carlos Garcia Campos <cgarcia@igalia.com>
-Subject: Disable DMABuf renderer for NVIDIA proprietary drivers
-Bug: https://bugs.webkit.org/show_bug.cgi?id=262607
-Bug-Debian: https://bugs.debian.org/1039720
-Origin: https://github.com/WebKit/WebKit/pull/18614
-Index: webkitgtk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-===================================================================
---- webkitgtk.orig/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-+++ webkitgtk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-@@ -38,11 +38,13 @@
- #include <WebCore/GLContext.h>
- #include <WebCore/IntRect.h>
- #include <WebCore/PlatformDisplay.h>
-+#include <WebCore/PlatformDisplaySurfaceless.h>
- #include <epoxy/egl.h>
- #include <wtf/glib/GUniquePtr.h>
- 
- #if USE(GBM)
- #include <WebCore/DMABufFormat.h>
-+#include <WebCore/PlatformDisplayGBM.h>
- #include <gbm.h>
- static constexpr uint64_t s_dmabufInvalidModifier = uint64_t(WebCore::DMABufFormat::Modifier::Invalid);
- #else
-@@ -55,6 +57,29 @@ static constexpr uint64_t s_dmabufInvali
- 
- namespace WebKit {
- 
-+static bool isNVIDIA()
-+{
-+    const char* forceDMABuf = getenv("WEBKIT_FORCE_DMABUF_RENDERER");
-+    if (forceDMABuf && strcmp(forceDMABuf, "0"))
-+        return false;
-+
-+    std::unique_ptr<WebCore::PlatformDisplay> platformDisplay;
-+#if USE(GBM)
-+    const char* disableGBM = getenv("WEBKIT_DMABUF_RENDERER_DISABLE_GBM");
-+    if (!disableGBM || !strcmp(disableGBM, "0")) {
-+        if (auto* device = WebCore::PlatformDisplay::sharedDisplay().gbmDevice())
-+            platformDisplay = WebCore::PlatformDisplayGBM::create(device);
-+    }
-+#endif
-+    if (!platformDisplay)
-+        platformDisplay = WebCore::PlatformDisplaySurfaceless::create();
-+
-+    WebCore::GLContext::ScopedGLContext glContext(WebCore::GLContext::createOffscreen(platformDisplay ? *platformDisplay : WebCore::PlatformDisplay::sharedDisplay()));
-+    if (strstr(reinterpret_cast<const char*>(glGetString(GL_VENDOR)), "NVIDIA"))
-+        return true;
-+    return false;
-+}
-+
- OptionSet<DMABufRendererBufferMode> AcceleratedBackingStoreDMABuf::rendererBufferMode()
- {
-     static OptionSet<DMABufRendererBufferMode> mode;
-@@ -70,6 +95,9 @@ OptionSet<DMABufRendererBufferMode> Acce
-             return;
-         }
- 
-+        if (isNVIDIA())
-+            return;
-+
-         mode.add(DMABufRendererBufferMode::SharedMemory);
- 
-         const auto& eglExtensions = WebCore::PlatformDisplay::sharedDisplay().eglExtensions();
diff --git a/srcpkgs/webkit2gtk/patches/fix-ftbfs-i386.patch b/srcpkgs/webkit2gtk/patches/fix-ftbfs-i386.patch
deleted file mode 100644
index 1b5ec0da142c09..00000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-ftbfs-i386.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Alberto Garcia <berto@igalia.com>
-Subject: Fix FTBFS in i386
-Bug: https://bugs.webkit.org/show_bug.cgi?id=268739
-Index: webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-===================================================================
---- webkitgtk.orig/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-+++ webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpc
-     UNUSED_VARIABLE(t2);
-     UNUSED_VARIABLE(t3);
-     UNUSED_VARIABLE(t5);
--    UNUSED_VARIABLE(t6);
--    UNUSED_VARIABLE(t7);
- 
-     struct StackPointerScope {
-         StackPointerScope(CLoopStack& stack)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 5fc8c66d7a2782..2248f0f84fc9e2 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,12 +1,12 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.42.5
+version=2.44.1
 revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DPORT=GTK
  -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc -DCMAKE_SKIP_RPATH=ON
- -DENABLE_JOURNALD_LOG=OFF -DUSE_WOFF2=ON -DUSE_WPE_RENDERER=ON
+ -DENABLE_JOURNALD_LOG=OFF -DUSE_WOFF2=ON
  -DENABLE_MINIBROWSER=$(vopt_if minibrowser ON OFF)
  -DENABLE_JIT=$(vopt_if jit ON OFF)
  -DENABLE_C_LOOP=$(vopt_if jit OFF ON)
@@ -16,7 +16,7 @@ configure_args="-DPORT=GTK
  -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
  -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
  -DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)
- -DUSE_JPEGXL=OFF"
+ -DUSE_JPEGXL=OFF -DUSE_LIBBACKTRACE=OFF -DUSE_GTK4=OFF"
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python3 pkg-config gperf flex ruby gettext glib-devel
@@ -27,8 +27,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsoup-devel libsoup3-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
  dbus-glib-devel libwebp-devel gtk+3-devel gtk4-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
- woff2-devel freetype-devel libopenjpeg2-devel libavif-devel
- qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
+ woff2-devel freetype-devel libavif-devel qt5-devel libmanette-devel
  libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 depends="gst-plugins-good1"
@@ -37,7 +36,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749
+checksum=425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561
 make_check=no # TODO
 
 replaces="webkit2gtk-common>0"
@@ -190,7 +189,7 @@ webkit2gtk-devel_package() {
 			vmove "usr/share/gir-1.0/*-4.0.gir"
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove "usr/share/gtk-doc/html/*-4.0"
+			vmove "usr/share/doc/*-4.0"
 		fi
 		vmove "usr/lib/*-4.0.so"
 	}
@@ -226,7 +225,7 @@ libwebkit2gtk41-devel_package() {
 			vmove "usr/share/gir-1.0/*-4.1.gir"
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove "usr/share/gtk-doc/html/*-4.1"
+			vmove "usr/share/doc/*-4.1"
 		fi
 		vmove "usr/lib/*-4.1.so"
 	}
@@ -261,7 +260,7 @@ libwebkitgtk60-devel_package() {
 			vmove "usr/share/gir-1.0/*-6.0.gir"
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove "usr/share/gtk-doc/html/*-6.0"
+			vmove "usr/share/doc/*-6.0"
 		fi
 		vmove "usr/lib/*-6.0.so"
 	}

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-12 15:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-31 22:27 [PR PATCH] webkit2gtk: update to 2.44.0 chrysos349
2024-04-12 15:09 ` [PR PATCH] [Updated] " chrysos349

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).