* [PR PATCH] webkit2gtk: fix cross build
@ 2022-10-22 6:58 oreo639
2022-10-22 6:58 ` [PR PATCH] [Updated] " oreo639
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: oreo639 @ 2022-10-22 6:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/40100
webkit2gtk: fix cross build
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40100.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-40100.patch --]
[-- Type: text/x-diff, Size: 3183 bytes --]
From 45a426f08aadca3a89311a681b01b482ed2389b2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
+ 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"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: fix cross build
2022-10-22 6:58 [PR PATCH] webkit2gtk: fix cross build oreo639
@ 2022-10-22 6:58 ` oreo639
2022-10-22 7:21 ` oreo639
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: oreo639 @ 2022-10-22 6:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/40100
webkit2gtk: fix cross build
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40100.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-40100.patch --]
[-- Type: text/x-diff, Size: 3183 bytes --]
From d015998c8b84a1ab1083d90795f7436708dac189 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
+ 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"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: fix cross build
2022-10-22 6:58 [PR PATCH] webkit2gtk: fix cross build oreo639
2022-10-22 6:58 ` [PR PATCH] [Updated] " oreo639
@ 2022-10-22 7:21 ` oreo639
2022-10-22 7:24 ` oreo639
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: oreo639 @ 2022-10-22 7:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/40100
webkit2gtk: fix cross build
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40100.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-40100.patch --]
[-- Type: text/x-diff, Size: 4829 bytes --]
From 05d6f197cb8dbdc95521527d819014ae6ff78035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 21 +++++++++++----
2 files changed, 43 insertions(+), 5 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 "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
+ set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
+ endfunction()
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 359def513106..35a495bad6a0 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -14,6 +14,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
-DENABLE_INTROSPECTION=$(vopt_if gir ON OFF)
-DENABLE_WAYLAND_TARGET=$(vopt_if wayland ON OFF)
-DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
+ -DENABLE_DOCUMENTATION=$(vopt_if gtk_doc ON OFF)
-DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
-DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)"
# Don't remove which from hostmakedepends
@@ -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,7 +174,9 @@ webkit2gtk-devel_package() {
vmove "usr/lib/pkgconfig/*-4.0.pc"
if [ "$build_option_gir" ]; then
vmove "usr/share/gir-1.0/*-4.0.gir"
- vmove "usr/share/gtk-doc/html/*-4.0"
+ if [ "$build_option_gtk_doc" ]; then
+ vmove "usr/share/gtk-doc/html/*-4.0"
+ fi
fi
vmove "usr/lib/*-4.0.so"
}
@@ -181,6 +187,7 @@ webkit2gtk-common_package() {
pkg_install() {
vmove usr/share/locale/
vmove usr/share/licenses/
+
}
}
@@ -206,7 +213,9 @@ libwebkit2gtk41-devel_package() {
vmove "usr/lib/pkgconfig/*-4.1.pc"
if [ "$build_option_gir" ]; then
vmove "usr/share/gir-1.0/*-4.1.gir"
- vmove "usr/share/gtk-doc/html/*-4.1"
+ if [ "$build_option_gtk_doc" ]; then
+ vmove "usr/share/gtk-doc/html/*-4.1"
+ fi
fi
vmove "usr/lib/*-4.1.so"
}
@@ -233,7 +242,9 @@ libwebkit2gtk50-devel_package() {
vmove "usr/lib/pkgconfig/*-5.0.pc"
if [ "$build_option_gir" ]; then
vmove "usr/share/gir-1.0/*-5.0.gir"
- vmove "usr/share/gtk-doc/html/*-5.0"
+ if [ "$build_option_gtk_doc" ]; then
+ vmove "usr/share/gtk-doc/html/*-5.0"
+ fi
fi
vmove "usr/lib/*-5.0.so"
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: fix cross build
2022-10-22 6:58 [PR PATCH] webkit2gtk: fix cross build oreo639
2022-10-22 6:58 ` [PR PATCH] [Updated] " oreo639
2022-10-22 7:21 ` oreo639
@ 2022-10-22 7:24 ` oreo639
2022-10-22 7:26 ` oreo639
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: oreo639 @ 2022-10-22 7:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/40100
webkit2gtk: fix cross build
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40100.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-40100.patch --]
[-- Type: text/x-diff, Size: 4693 bytes --]
From b79c23c1c9499abe809653959e56d7e436fa6d6b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 20 ++++++++++----
2 files changed, 42 insertions(+), 5 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 "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
+ set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
+ endfunction()
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 359def513106..794d65a79c3d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -14,6 +14,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
-DENABLE_INTROSPECTION=$(vopt_if gir ON OFF)
-DENABLE_WAYLAND_TARGET=$(vopt_if wayland ON OFF)
-DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
+ -DENABLE_DOCUMENTATION=$(vopt_if gtk_doc ON OFF)
-DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
-DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)"
# Don't remove which from hostmakedepends
@@ -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,7 +174,9 @@ webkit2gtk-devel_package() {
vmove "usr/lib/pkgconfig/*-4.0.pc"
if [ "$build_option_gir" ]; then
vmove "usr/share/gir-1.0/*-4.0.gir"
- vmove "usr/share/gtk-doc/html/*-4.0"
+ if [ "$build_option_gtk_doc" ]; then
+ vmove "usr/share/gtk-doc/html/*-4.0"
+ fi
fi
vmove "usr/lib/*-4.0.so"
}
@@ -206,7 +212,9 @@ libwebkit2gtk41-devel_package() {
vmove "usr/lib/pkgconfig/*-4.1.pc"
if [ "$build_option_gir" ]; then
vmove "usr/share/gir-1.0/*-4.1.gir"
- vmove "usr/share/gtk-doc/html/*-4.1"
+ if [ "$build_option_gtk_doc" ]; then
+ vmove "usr/share/gtk-doc/html/*-4.1"
+ fi
fi
vmove "usr/lib/*-4.1.so"
}
@@ -233,7 +241,9 @@ libwebkit2gtk50-devel_package() {
vmove "usr/lib/pkgconfig/*-5.0.pc"
if [ "$build_option_gir" ]; then
vmove "usr/share/gir-1.0/*-5.0.gir"
- vmove "usr/share/gtk-doc/html/*-5.0"
+ if [ "$build_option_gtk_doc" ]; then
+ vmove "usr/share/gtk-doc/html/*-5.0"
+ fi
fi
vmove "usr/lib/*-5.0.so"
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: fix cross build
2022-10-22 6:58 [PR PATCH] webkit2gtk: fix cross build oreo639
` (2 preceding siblings ...)
2022-10-22 7:24 ` oreo639
@ 2022-10-22 7:26 ` oreo639
2022-10-22 7:29 ` oreo639
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: oreo639 @ 2022-10-22 7:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/40100
webkit2gtk: fix cross build
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40100.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-40100.patch --]
[-- Type: text/x-diff, Size: 4545 bytes --]
From 4742fb3db89a716a83a345938290efaa7a979b6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 14 ++++++++--
2 files changed, 39 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 "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
+ set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
+ endfunction()
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 359def513106..89268dd9ef7b 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -14,6 +14,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
-DENABLE_INTROSPECTION=$(vopt_if gir ON OFF)
-DENABLE_WAYLAND_TARGET=$(vopt_if wayland ON OFF)
-DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
+ -DENABLE_DOCUMENTATION=$(vopt_if gtk_doc ON OFF)
-DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
-DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)"
# Don't remove which from hostmakedepends
@@ -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"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: fix cross build
2022-10-22 6:58 [PR PATCH] webkit2gtk: fix cross build oreo639
` (3 preceding siblings ...)
2022-10-22 7:26 ` oreo639
@ 2022-10-22 7:29 ` oreo639
2022-10-22 7:39 ` oreo639
2022-10-22 9:34 ` [PR PATCH] [Merged]: " paper42
6 siblings, 0 replies; 8+ messages in thread
From: oreo639 @ 2022-10-22 7:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/40100
webkit2gtk: fix cross build
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40100.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-40100.patch --]
[-- Type: text/x-diff, Size: 4519 bytes --]
From 0e2422fe3998eaae996194c47b7c95bf7423c186 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 14 ++++++++--
2 files changed, 39 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 "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
+ set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
+ endfunction()
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 359def513106..7f4f39eb2978 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -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)
@@ -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"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: fix cross build
2022-10-22 6:58 [PR PATCH] webkit2gtk: fix cross build oreo639
` (4 preceding siblings ...)
2022-10-22 7:29 ` oreo639
@ 2022-10-22 7:39 ` oreo639
2022-10-22 9:34 ` [PR PATCH] [Merged]: " paper42
6 siblings, 0 replies; 8+ messages in thread
From: oreo639 @ 2022-10-22 7:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/40100
webkit2gtk: fix cross build
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40100.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-40100.patch --]
[-- Type: text/x-diff, Size: 5077 bytes --]
From 428bf545887ea257fd1734203f2c213bb147fc15 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 16 ++++++++---
2 files changed, 40 insertions(+), 3 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 "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
+ set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
+ endfunction()
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 359def513106..10602fae9f2d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -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"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: webkit2gtk: fix cross build
2022-10-22 6:58 [PR PATCH] webkit2gtk: fix cross build oreo639
` (5 preceding siblings ...)
2022-10-22 7:39 ` oreo639
@ 2022-10-22 9:34 ` paper42
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2022-10-22 9:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1105 bytes --]
There's a merged pull request on the void-packages repository
webkit2gtk: fix cross build
https://github.com/void-linux/void-packages/pull/40100
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-10-22 9:34 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-22 6:58 [PR PATCH] webkit2gtk: fix cross build oreo639
2022-10-22 6:58 ` [PR PATCH] [Updated] " oreo639
2022-10-22 7:21 ` oreo639
2022-10-22 7:24 ` oreo639
2022-10-22 7:26 ` oreo639
2022-10-22 7:29 ` oreo639
2022-10-22 7:39 ` oreo639
2022-10-22 9:34 ` [PR PATCH] [Merged]: " paper42
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).