commit:     c08c1c99b59feeae7a5dfcf8b1403ce2aeeac285
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Wed Apr  2 14:56:48 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr  2 18:43:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c08c1c99

sci-mathematics/mathmod: add 12.0, qt6

qt6

license GPL2+ only :
https://github.com/parisolab/mathmod/wiki/documentation#copyright

Closes: https://bugs.gentoo.org/951137
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/41433
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-mathematics/mathmod/Manifest                   |  1 +
 .../mathmod/files/mathmod-12.0-rm_complex.patch    | 21 +++++++++++
 sci-mathematics/mathmod/mathmod-12.0.ebuild        | 42 ++++++++++++++++++++++
 3 files changed, 64 insertions(+)

diff --git a/sci-mathematics/mathmod/Manifest b/sci-mathematics/mathmod/Manifest
index 979247d0ef63..a65498e02b2b 100644
--- a/sci-mathematics/mathmod/Manifest
+++ b/sci-mathematics/mathmod/Manifest
@@ -1 +1,2 @@
 DIST mathmod-11.1.tar.gz 7934535 BLAKE2B 
ccb5ba1ee74b0e6f2d605bf76f107ce43f695f2dc81fe0ef8498fdb29978f3da214178ed433eea9536f3ee801c24887988e0c1064833a6a1069e0349fb209a05
 SHA512 
50485094a5c0f08077a27215d4189ba28085ad9d6cc3323043955d63723271adf80ba2c8a75afd0b50ea7443a55f5d4efd8f8d5eae32a9c0718450784ff728ab
+DIST mathmod-12.0.tar.gz 9392067 BLAKE2B 
2144c4aa06c3c13bdb5dca333134195d92bea5dcf0478e80f2ca25b41e4c74344725cced3bc72fc4b4f571da5b3ec734b0ea05fc7b1f80566f8b83d229e5627f
 SHA512 
d8a247a14e03c4d6fb4812b4404338162d7ff79745ebe31c467a444fdb48441b950a9d39c7b31fedb3f2bb1961d3075e44eb264b863708bd48f949b8185d60c6

diff --git a/sci-mathematics/mathmod/files/mathmod-12.0-rm_complex.patch 
b/sci-mathematics/mathmod/files/mathmod-12.0-rm_complex.patch
new file mode 100644
index 000000000000..51ba2930a306
--- /dev/null
+++ b/sci-mathematics/mathmod/files/mathmod-12.0-rm_complex.patch
@@ -0,0 +1,21 @@
+From 61b94a59728fd691fb363ccc4e5f5bbb35e2b3c2 Mon Sep 17 00:00:00 2001
+From: Abderrahman Taha <[email protected]>
+Date: Wed, 2 Apr 2025 01:04:49 -0400
+Subject: [PATCH] #269 Collision between <complex.h> and QT
+
+---
+ pariso/commun.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pariso/commun.h b/pariso/commun.h
+index 2d647f3..0827cb8 100644
+--- a/pariso/commun.h
++++ b/pariso/commun.h
+@@ -22,7 +22,6 @@
+ 
+ #include "../fparser/fparser.hh"
+ #include <qthread.h>
+-#include <complex.h>
+ #include <tgmath.h>
+ 
+ #define PI (double(314159265) / double(100000000))

diff --git a/sci-mathematics/mathmod/mathmod-12.0.ebuild 
b/sci-mathematics/mathmod/mathmod-12.0.ebuild
new file mode 100644
index 000000000000..ff8480ffbff9
--- /dev/null
+++ b/sci-mathematics/mathmod/mathmod-12.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Plot parametric and implicit surfaces"
+HOMEPAGE="https://github.com/parisolab/mathmod
+       https://sourceforge.net/projects/mathmod/
+       https://www.facebook.com/parisolab";
+SRC_URI="https://github.com/parisolab/mathmod/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+       dev-qt/qtbase:6[gui,opengl,widgets]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+       # Fix collision between <complex.h> and QT
+       # Merged, to be removed with release 12.1
+       "${FILESDIR}"/${P}-rm_complex.patch
+)
+
+src_configure() {
+       eqmake6 MathMod.pro
+}
+
+src_install() {
+       dobin MathMod
+       insinto /usr/share/${P}
+       doins mathmodconfig.js mathmodcollection.js advancedmodels.js
+       local size
+       for size in 16 32 64; do
+               newicon -s ${size} 
images/icon/catenoid_mini_${size}x${size}.png catenoid.png
+       done
+       make_desktop_entry MathMod MathMod catenoid
+}

Reply via email to