snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests Actions 1 Activity

webkit2gtk: fix cross build

This commit is contained in:
oreo639 2022-10-21 23:52:41 -07:00 committed by Michal Vasilek
parent 5e36edefab
commit 3f51f222a2
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
srcpkgs/webkit2gtk/patches/fix-cross-gir.patch Normal file
View File

@ -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 "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
endfunction()

16
srcpkgs/webkit2gtk/template
View File

@ -12,6 +12,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
-DENABLE_JIT=$(vopt_if jit ON OFF)
-DENABLE_C_LOOP=$(vopt_if jit OFF ON)
-DENABLE_INTROSPECTION=$(vopt_if gir ON OFF)
-DENABLE_DOCUMENTATION=$(vopt_if gtk_doc ON OFF)
-DENABLE_WAYLAND_TARGET=$(vopt_if wayland ON OFF)
-DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
-DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
@ -19,7 +20,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=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
geoclue2 libharfbuzz which libpsl gi-docgen
geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
$(vopt_if wayland 'wayland-devel libxml2-devel')"
makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
@ -38,10 +39,9 @@ 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"
clang lto gtk_doc"
build_options_default="gir wayland x11 bubblewrap minibrowser"
desc_option_bubblewrap="Enable bubblewrap sandbox"
@ -59,6 +59,10 @@ export CXXFLAGS="$CFLAGS"
# but this is run under our control
export CCACHE_SLOPPINESS=time_macros,include_file_mtime
if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
# detection + runtime
if [ "$build_option_bubblewrap" ]; then
hostmakedepends+=" bubblewrap xdg-dbus-proxy"
@ -170,6 +174,8 @@ webkit2gtk-devel_package() {
vmove "usr/lib/pkgconfig/*-4.0.pc"
if [ "$build_option_gir" ]; then
vmove "usr/share/gir-1.0/*-4.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
vmove "usr/share/gtk-doc/html/*-4.0"
fi
vmove "usr/lib/*-4.0.so"
@ -206,6 +212,8 @@ libwebkit2gtk41-devel_package() {
vmove "usr/lib/pkgconfig/*-4.1.pc"
if [ "$build_option_gir" ]; then
vmove "usr/share/gir-1.0/*-4.1.gir"
fi
if [ "$build_option_gtk_doc" ]; then
vmove "usr/share/gtk-doc/html/*-4.1"
fi
vmove "usr/lib/*-4.1.so"
@ -233,6 +241,8 @@ libwebkit2gtk50-devel_package() {
vmove "usr/lib/pkgconfig/*-5.0.pc"
if [ "$build_option_gir" ]; then
vmove "usr/share/gir-1.0/*-5.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
vmove "usr/share/gtk-doc/html/*-5.0"
fi
vmove "usr/lib/*-5.0.so"