summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-11-08 14:52:58 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2024-11-08 14:53:54 +0100
commit1b3adbf3f0555f461325df2b64cc3398b66bf02b (patch)
treee5ce3555a6be29490dcfcc8123ba02db4cb50b08 /dev-python/pivy
parentmedia-libs/harfbuzz: drop 8.5.0 (diff)
downloadgentoo-1b3adbf3f0555f461325df2b64cc3398b66bf02b.tar.gz
gentoo-1b3adbf3f0555f461325df2b64cc3398b66bf02b.tar.bz2
gentoo-1b3adbf3f0555f461325df2b64cc3398b66bf02b.zip
dev-python/pivy: Fix build if media-libs/SoQt is installed
This is at least dealing with the immediate issue. Bug: https://bugs.gentoo.org/920482 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-python/pivy')
-rw-r--r--dev-python/pivy/files/pivy-0.6.8-SoQtViewer-w-cmath.patch14
-rw-r--r--dev-python/pivy/pivy-0.6.8.ebuild8
2 files changed, 18 insertions, 4 deletions
diff --git a/dev-python/pivy/files/pivy-0.6.8-SoQtViewer-w-cmath.patch b/dev-python/pivy/files/pivy-0.6.8-SoQtViewer-w-cmath.patch
new file mode 100644
index 000000000000..2150f9806139
--- /dev/null
+++ b/dev-python/pivy/files/pivy-0.6.8-SoQtViewer-w-cmath.patch
@@ -0,0 +1,14 @@
+From a5fad6bb07d994d6e727d5759965611c6e4d57d6 Mon Sep 17 00:00:00 2001
+From: Konstantin Podsvirov <konstantin@podsvirov.pro>
+Date: Fri, 24 Nov 2023 21:09:53 +0300
+Subject: [PATCH] Add fake header for recently introduced cmath include in
+ SoQtViewer.h
+
+---
+ fake_headers/cmath | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 fake_headers/cmath
+
+diff --git a/fake_headers/cmath b/fake_headers/cmath
+new file mode 100644
+index 00000000..e69de29b
diff --git a/dev-python/pivy/pivy-0.6.8.ebuild b/dev-python/pivy/pivy-0.6.8.ebuild
index 73dc11cf83dd..3095dba32c74 100644
--- a/dev-python/pivy/pivy-0.6.8.ebuild
+++ b/dev-python/pivy/pivy-0.6.8.ebuild
@@ -49,10 +49,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
"${FILESDIR}"/${PN}-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
"${FILESDIR}"/${PN}-0.6.7-find-qmake.patch
- # https://github.com/coin3d/pivy/issues/105
- "${FILESDIR}"/${PN}-0.6.8-python312.patch
- # https://github.com/coin3d/pivy/pull/109
- "${DISTDIR}"/${PN}-0.6.8-python312-unittests.patch
+ # in 0.6.9:
+ "${FILESDIR}"/${P}-python312.patch # https://github.com/coin3d/pivy/issues/105
+ "${DISTDIR}"/${P}-python312-unittests.patch # https://github.com/coin3d/pivy/pull/109
+ "${FILESDIR}"/${P}-SoQtViewer-w-cmath.patch # bug 920482
)
DOCS=( AUTHORS HACKING NEWS README.md THANKS )