Control: tags -1 + patch Hello,
Jeremy Bícha, le lun. 08 déc. 2025 09:44:52 -0500, a ecrit: > Should webkit2gtk be changed back to build on any architecture instead > of only Linux architectures? Yes, please. The attached patch fixes the build for 2.50.3. Samuel
diff -Nru webkit2gtk-2.50.3/debian/changelog webkit2gtk-2.50.3/debian/changelog --- webkit2gtk-2.50.3/debian/changelog 2025-12-04 12:18:39.000000000 +0100 +++ webkit2gtk-2.50.3/debian/changelog 2025-12-08 23:20:55.000000000 +0100 @@ -1,3 +1,10 @@ +webkit2gtk (2.50.3-1+hurd.1) unreleased; urgency=medium + + * control, rules: Restore building on hurd-any. + * debian/libwebkit2gtk-4.0-37.symbols: Fix list for hurd-any. + + -- Samuel Thibault <[email protected]> Mon, 08 Dec 2025 22:20:55 +0000 + webkit2gtk (2.50.3-1) unstable; urgency=medium [ Alberto Garcia ] diff -Nru webkit2gtk-2.50.3/debian/control webkit2gtk-2.50.3/debian/control --- webkit2gtk-2.50.3/debian/control 2025-12-04 12:18:39.000000000 +0100 +++ webkit2gtk-2.50.3/debian/control 2025-12-08 23:20:55.000000000 +0100 @@ -25,14 +25,14 @@ libhyphen-dev, libjxl-dev, liblcms2-dev, - libmanette-0.2-dev [!i386], + libmanette-0.2-dev [!hurd-any !i386], libsysprof-capture-4-dev (>= 3.38.0) [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x hppa loong64 powerpc ppc64 sh4], libxslt1-dev, libxml2-dev, libsoup-3.0-dev,libgtk-3-dev,libgtk-4-dev, libsqlite3-dev, - libsystemd-dev, - libgudev-1.0-dev, + libsystemd-dev [!hurd-any], + libgudev-1.0-dev [!hurd-any], libwoff-dev, gperf, bison, @@ -63,7 +63,7 @@ Package: libjavascriptcoregtk-bin Section: interpreters -Architecture: linux-any +Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: libjavascriptcoregtk-4.1-0 (= ${binary:Version}), ${shlibs:Depends}, @@ -101,7 +101,7 @@ This package contains the documentation. Package: webkitgtk-webdriver -Architecture: linux-any +Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: libwebkit2gtk-4.1-0 (= ${binary:Version}), ${shlibs:Depends}, @@ -124,7 +124,7 @@ Package: libjavascriptcoregtk-4.1-0 Section: libs -Architecture: linux-any +Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, @@ -141,7 +141,7 @@ Package: libjavascriptcoregtk-4.1-dev Section: libdevel -Architecture: linux-any +Architecture: any Multi-Arch: same Depends: libjavascriptcoregtk-4.1-0 (= ${binary:Version}), libglib2.0-dev, @@ -160,7 +160,7 @@ Package: gir1.2-javascriptcoregtk-4.1 Section: introspection -Architecture: linux-any +Architecture: any Multi-Arch: same Depends: libjavascriptcoregtk-4.1-0 (= ${binary:Version}), ${gir:Depends}, @@ -179,7 +179,7 @@ Package: libwebkit2gtk-4.1-0 Section: libs -Architecture: linux-any +Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libjavascriptcoregtk-4.1-0 (= ${binary:Version}), @@ -212,7 +212,7 @@ Package: libwebkit2gtk-4.1-dev Section: libdevel -Architecture: linux-any +Architecture: any Depends: libwebkit2gtk-4.1-0 (= ${binary:Version}), libgtk-3-dev, libsoup-3.0-dev, @@ -236,7 +236,7 @@ Package: gir1.2-webkit2-4.1 Section: introspection -Architecture: linux-any +Architecture: any Multi-Arch: same Depends: libwebkit2gtk-4.1-0 (= ${binary:Version}), ${gir:Depends}, @@ -259,7 +259,7 @@ Package: libjavascriptcoregtk-6.0-1 Section: libs -Architecture: linux-any +Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, @@ -276,7 +276,7 @@ Package: libjavascriptcoregtk-6.0-dev Section: libdevel -Architecture: linux-any +Architecture: any Multi-Arch: same Depends: libjavascriptcoregtk-6.0-1 (= ${binary:Version}), libglib2.0-dev, @@ -295,7 +295,7 @@ Package: gir1.2-javascriptcoregtk-6.0 Section: introspection -Architecture: linux-any +Architecture: any Multi-Arch: same Depends: libjavascriptcoregtk-6.0-1 (= ${binary:Version}), ${gir:Depends}, @@ -314,7 +314,7 @@ Package: libwebkitgtk-6.0-4 Section: libs -Architecture: linux-any +Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libjavascriptcoregtk-6.0-1 (= ${binary:Version}), @@ -347,7 +347,7 @@ Package: libwebkitgtk-6.0-dev Section: libdevel -Architecture: linux-any +Architecture: any Depends: libwebkitgtk-6.0-4 (= ${binary:Version}), libgtk-4-dev, libsoup-3.0-dev, @@ -371,7 +371,7 @@ Package: gir1.2-webkit-6.0 Section: introspection -Architecture: linux-any +Architecture: any Multi-Arch: same Depends: libwebkitgtk-6.0-4 (= ${binary:Version}), ${gir:Depends}, diff -Nru webkit2gtk-2.50.3/debian/control-common.in webkit2gtk-2.50.3/debian/control-common.in --- webkit2gtk-2.50.3/debian/control-common.in 2025-12-04 12:18:39.000000000 +0100 +++ webkit2gtk-2.50.3/debian/control-common.in 2025-12-08 23:20:55.000000000 +0100 @@ -1,6 +1,6 @@ Package: @LIBJSC_PKG@ Section: libs -Architecture: linux-any +Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, @@ -17,7 +17,7 @@ Package: libjavascriptcoregtk-@WK_API_VERSION@-dev Section: libdevel -Architecture: linux-any +Architecture: any Multi-Arch: same Depends: @LIBJSC_PKG@ (= ${binary:Version}), libglib2.0-dev, @@ -36,7 +36,7 @@ Package: gir1.2-javascriptcoregtk-@WK_API_VERSION@ Section: introspection -Architecture: linux-any +Architecture: any Multi-Arch: same Depends: @LIBJSC_PKG@ (= ${binary:Version}), ${gir:Depends}, @@ -55,7 +55,7 @@ Package: @LIBWEBKITGTK_PKG@ Section: libs -Architecture: linux-any +Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: @LIBJSC_PKG@ (= ${binary:Version}), @@ -88,7 +88,7 @@ Package: lib@WEBKIT@gtk-@WK_API_VERSION@-dev Section: libdevel -Architecture: linux-any +Architecture: any Depends: @LIBWEBKITGTK_PKG@ (= ${binary:Version}), libgtk-@GTK_VERSION@-dev, @SOUPDEV_PKG@, @@ -112,7 +112,7 @@ Package: gir1.2-@WEBKIT@-@WK_API_VERSION@ Section: introspection -Architecture: linux-any +Architecture: any Multi-Arch: same Depends: @LIBWEBKITGTK_PKG@ (= ${binary:Version}), ${gir:Depends}, diff -Nru webkit2gtk-2.50.3/debian/control.in webkit2gtk-2.50.3/debian/control.in --- webkit2gtk-2.50.3/debian/control.in 2025-12-04 12:18:39.000000000 +0100 +++ webkit2gtk-2.50.3/debian/control.in 2025-12-08 23:17:50.000000000 +0100 @@ -24,14 +24,14 @@ libhyphen-dev, libjxl-dev, liblcms2-dev, - libmanette-0.2-dev [!i386], + libmanette-0.2-dev [!hurd-any !i386], libsysprof-capture-4-dev (>= 3.38.0) [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x hppa loong64 powerpc ppc64 sh4], libxslt1-dev, libxml2-dev, @EXTRA_BUILD_DEPS@ libsqlite3-dev, - libsystemd-dev, - libgudev-1.0-dev, + libsystemd-dev [!hurd-any], + libgudev-1.0-dev [!hurd-any], libwoff-dev, gperf, bison, @@ -62,7 +62,7 @@ Package: @LIBJSCBIN_PKG@ Section: interpreters -Architecture: linux-any +Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: @LIBJSCBIN_DEP_PKG@ (= ${binary:Version}), ${shlibs:Depends}, @@ -100,7 +100,7 @@ This package contains the documentation. Package: @WEBDRIVER_PKG@ -Architecture: linux-any +Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: @WEBDRIVER_DEP_PKG@ (= ${binary:Version}), ${shlibs:Depends}, diff -Nru webkit2gtk-2.50.3/debian/libwebkit2gtk-4.0-37.symbols webkit2gtk-2.50.3/debian/libwebkit2gtk-4.0-37.symbols --- webkit2gtk-2.50.3/debian/libwebkit2gtk-4.0-37.symbols 2025-12-04 12:18:39.000000000 +0100 +++ webkit2gtk-2.50.3/debian/libwebkit2gtk-4.0-37.symbols 2025-12-08 23:18:16.000000000 +0100 @@ -1,6 +1,6 @@ libwebkit2gtk-4.0.so.37 libwebkit2gtk-4.0-37 #MINVER# * Build-Depends-Package: libwebkit2gtk-4.0-dev - (c++)"WebKit::GPUProcessMain(int, char**)@Base" 2.47.1 + (c++|arch=!hurd-any)"WebKit::GPUProcessMain(int, char**)@Base" 2.47.1 (c++)"WebKit::NetworkProcessMain(int, char**)@Base" 2.27.90 (c++)"WebKit::WebProcessExtensionManager::initialize(WebKit::InjectedBundle*, API::Object*)@Base" 2.39.91 (c++)"WebKit::WebProcessExtensionManager::singleton()@Base" 2.39.91 diff -Nru webkit2gtk-2.50.3/debian/rules webkit2gtk-2.50.3/debian/rules --- webkit2gtk-2.50.3/debian/rules 2025-12-04 12:18:39.000000000 +0100 +++ webkit2gtk-2.50.3/debian/rules 2025-12-08 23:20:55.000000000 +0100 @@ -85,6 +85,16 @@ CPPFLAGS += -mlarge-data -mlarge-text endif +# These are not available in the Hurd (#1033999) +ifneq (,$(filter $(DEB_HOST_ARCH),hurd-i386 hurd-amd64)) + EXTRA_CMAKE_ARGUMENTS += -DUSE_GBM=OFF -DUSE_LIBDRM=OFF -DENABLE_WEBGL=OFF -DUSE_SYSTEM_MALLOC=ON +endif + +# Systemd/elogind and libmanette are Linux-only +ifneq ($(DEB_HOST_ARCH_OS),linux) + EXTRA_CMAKE_ARGUMENTS += -DENABLE_JOURNALD_LOG=OFF -DENABLE_GAMEPAD=OFF +endif + ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) EXTRA_CMAKE_ARGUMENTS += -DUSE_SYSTEM_MALLOC=ON CPPFLAGS += -DRELEASE_WITHOUT_OPTIMIZATIONS
