From d015998c8b84a1ab1083d90795f7436708dac189 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 21 Oct 2022 23:52:41 -0700 Subject: [PATCH] webkit2gtk: fix cross build --- .../webkit2gtk/patches/fix-cross-gir.patch | 27 +++++++++++++++++++ srcpkgs/webkit2gtk/template | 3 +-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch new file mode 100644 index 000000000000..91ce6bc78551 --- /dev/null +++ b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch @@ -0,0 +1,27 @@ +--- a/Source/cmake/FindGI.cmake ++++ b/Source/cmake/FindGI.cmake +@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi + foreach (dep IN LISTS opt_DEPENDENCIES) + if (TARGET "gir-${dep}") + get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH) ++ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY) + if (dep_gir_path) + list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}") + list(APPEND gir_deps "${dep_gir_path}") +@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi + "been previously configured with GI_INTROSPECT()" + ) + endif () ++ if (dep_gir_lib) ++ list(APPEND scanner_flags "--library=${dep_gir_lib}") ++ endif () + elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$") + list(APPEND scanner_flags + "--include=${CMAKE_MATCH_1}" +@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi + + # Record in targets to use later on e.g. with gi-docgen. + set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}") ++ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$") + set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}") + endfunction() diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 359def513106..1c99e27fe052 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -5,7 +5,7 @@ revision=1 wrksrc="webkitgtk-${version}" build_style=cmake build_helper="gir" -configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF +configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF -DENABLE_DOCUMENTATION=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc -DCMAKE_SKIP_RPATH=ON -DENABLE_JOURNALD_LOG=OFF -DUSE_WOFF2=ON -DUSE_WPE_RENDERER=ON -DENABLE_MINIBROWSER=$(vopt_if minibrowser ON OFF) @@ -38,7 +38,6 @@ homepage="https://webkitgtk.org/" distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz" checksum=02e195b3fb9e057743b3364ee7f1eec13f71614226849544c07c32a73b8f1848 make_check=no -nocross=yes # warning: libjavascriptcoregtk-4.1.so.0, needed by /builddir/webkitgtk-2.38.1/build/lib/libwebkit2gtk-4.1.so, not found (try using -rpath or -rpath-link) build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser clang lto"