From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] webkit2gtk: fix cross build
Date: Sat, 22 Oct 2022 08:58:26 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40100@inbox.vuxu.org> (raw)
[-- 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"
next reply other threads:[~2022-10-22 6:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-22 6:58 oreo639 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40100@inbox.vuxu.org \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).