[PR PATCH] freecad: don't build against qt5-webkit-devel on musl target.

[PR PATCH] freecad: don't build against qt5-webkit-devel on musl target.

[voidlinux-github]

[-- 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"
 

Re: [PR PATCH] [Merged]: freecad: don't build against qt5-webkit-devel on musl target.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 278 bytes --]

There's a merged pull request on the void-packages repository

freecad: don't build against qt5-webkit-devel on musl target.
https://github.com/void-linux/void-packages/pull/13214
Description: workaround for https://github.com/void-linux/void-packages/issues/12595

[ci skip]