From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] freecad: don't build against qt5-webkit-devel on musl target.
Date: Thu, 18 Jul 2019 23:43:15 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-13214@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
There is a new pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages freecad.musl.no.qt5-webkit
https://github.com/void-linux/void-packages/pull/13214
freecad: don't build against qt5-webkit-devel on musl target.
workaround for https://github.com/void-linux/void-packages/issues/12595
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/13214.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freecad.musl.no.qt5-webkit-13214.patch --]
[-- Type: application/text/x-diff, Size: 1262 bytes --]
From 4da09c9c878c68624edb37ba1fbc2117185813ef Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Thu, 18 Jul 2019 23:41:26 +0200
Subject: [PATCH] freecad: don't build against qt5-webkit-devel on musl target.
workaround for https://github.com/void-linux/void-packages/issues/12595
[ci skip]
---
srcpkgs/freecad/template | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index ae3a6148a10..1b82f765954 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.18.2
-revision=1
+revision=2
wrksrc="FreeCAD-${version}"
build_style=cmake
@@ -21,6 +21,12 @@ makedepends="python3-devel boost-devel libxerces-c-devel zlib-devel occt-devel
jsoncpp-devel qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel
qt5-x11extras-devel coin3-doc glew-devel"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl) # SIGSEGV with musl, see https://github.com/void-linux/void-packages/issues/12595
+ makedepends=${makedepends/qt5-webkit-devel/}
+ ;;
+esac
+
# FreeCAD help: qt5/assistant with datas in SQLite format
depends="python3-matplotlib python3-pyside2 qt5-plugin-sqlite python3-pivy"
next reply other threads:[~2019-07-18 21:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 21:43 voidlinux-github [this message]
2019-07-19 5:39 ` [PR PATCH] [Merged]: " voidlinux-github
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-13214@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--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).