public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pivy/, dev-python/pivy/files/
Date: Fri,  8 Nov 2024 13:54:18 +0000 (UTC)	[thread overview]
Message-ID: <1731074034.1b3adbf3f0555f461325df2b64cc3398b66bf02b.asturm@gentoo> (raw)

commit:     1b3adbf3f0555f461325df2b64cc3398b66bf02b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  8 13:52:58 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov  8 13:53:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3adbf3

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 <AT> gentoo.org>

 dev-python/pivy/files/pivy-0.6.8-SoQtViewer-w-cmath.patch | 14 ++++++++++++++
 dev-python/pivy/pivy-0.6.8.ebuild                         |  8 ++++----
 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 )


             reply	other threads:[~2024-11-08 13:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-08 13:54 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-11-20 15:06 [gentoo-commits] repo/gentoo:master commit in: dev-python/pivy/, dev-python/pivy/files/ Andrew Ammerlaan
2021-05-10 10:57 Miroslav Šulc
2021-04-10 13:29 Miroslav Šulc

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=1731074034.1b3adbf3f0555f461325df2b64cc3398b66bf02b.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.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