* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/giac/, sci-mathematics/giac/files/
@ 2021-06-15 14:32 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2021-06-15 14:32 UTC (permalink / raw
To: gentoo-commits
commit: e781f5382378e5af4cb614389ba8fa05c5f214df
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 12:38:53 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 14:28:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e781f538
sci-mathematics/giac: new upstream version 1.7.0.13.
This includes a temporary patch to fix the xcas.desktop file, whose
"Version" field contains an invalid value. The next release of giac
should make the patch irrelevant.
Closes: https://bugs.gentoo.org/795813
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/giac/Manifest | 2 +-
.../giac/files/giac-1.7.0.13-xcas-desktop.patch | 33 ++++++++++++++++++++++
.../{giac-1.7.0.5.ebuild => giac-1.7.0.13.ebuild} | 1 +
3 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index dba7ba2106a..a6d7f7d74e6 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1 +1 @@
-DIST giac_1.7.0-5.tar.gz 82481999 BLAKE2B b322c7008fc6fd687ef11355d3c1dfe48abdbbff6415968d4476dd7760e03f5d174e2ab88f87d638a77c16762d977b5e211b54a71529cf65af0ad4c7d6d16403 SHA512 39e0d1fca0497365ddebe9eba871bbcff790cbcb33f2a61bfbf0e018f300d7429eee7d97a446f0cbb45f2e8abe3af4ed77e3c58a74e919b9f907959f270df355
+DIST giac_1.7.0-13.tar.gz 86447065 BLAKE2B 4d91e83608f7ec376d133c2784ffce99447a9dd78b5c8582b81a0aae0b8ac59eec4db3ee4a8bcb39202c777c300178a181f2dc2ac74ab445ddba2f3efa0ecb1b SHA512 99fff7ce5117fd8c106601ead03679805d529fe12d5372cdd4ae54824aa6fdcbdaaa1a62ea1153391a1a65af8970e38fca7d95ca9983755ff06053f1d8b6d65a
diff --git a/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch b/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch
new file mode 100644
index 00000000000..bc542b0a615
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch
@@ -0,0 +1,33 @@
+From 51fa4502039ec09d4a9e1d6b2fa73e5a1f789f94 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 15 Jun 2021 08:31:06 -0400
+Subject: [PATCH 1/1] xcas.desktop: fix "Version" field.
+
+The "Version" field in a desktop file refers to the version of the
+specification, not the version of the software it launches:
+
+ https://specifications.freedesktop.org/desktop-entry-spec
+
+This issue has already been fixed upstream:
+
+ https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2716
+
+and will be part of the next release.
+---
+ xcas.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xcas.desktop b/xcas.desktop
+index 9e1b648..fad99cd 100644
+--- a/xcas.desktop
++++ b/xcas.desktop
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=1.7
++Version=1.0
+ Keywords=computer algebra system;CAS;
+ Keywords[fr]=calcul formel;CAS;
+ Name=Xcas
+--
+2.31.1
+
diff --git a/sci-mathematics/giac/giac-1.7.0.5.ebuild b/sci-mathematics/giac/giac-1.7.0.13.ebuild
similarity index 98%
rename from sci-mathematics/giac/giac-1.7.0.5.ebuild
rename to sci-mathematics/giac/giac-1.7.0.13.ebuild
index 8dcab375adc..2d6ab4387bf 100644
--- a/sci-mathematics/giac/giac-1.7.0.5.ebuild
+++ b/sci-mathematics/giac/giac-1.7.0.13.ebuild
@@ -49,6 +49,7 @@ BDEPEND="dev-tex/hevea
PATCHES=(
"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
"${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
+ "${FILESDIR}/${PN}-1.7.0.13-xcas-desktop.patch"
)
REQUIRED_USE="test? ( gui )"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/giac/, sci-mathematics/giac/files/
@ 2022-12-24 0:03 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2022-12-24 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 5d6abb999ccb54facb07232778e01454358e1ba9
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 23:53:50 2022 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 23:58:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d6abb99
sci-mathematics/giac: drop 1.7.0.13-r1
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/giac/Manifest | 1 -
.../giac/files/giac-1.7.0.13-xcas-desktop.patch | 33 ----
sci-mathematics/giac/giac-1.7.0.13-r1.ebuild | 166 ---------------------
3 files changed, 200 deletions(-)
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index c7a3c6ffb13e..175acc15f391 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,2 +1 @@
-DIST giac_1.7.0-13.tar.gz 86447065 BLAKE2B 4d91e83608f7ec376d133c2784ffce99447a9dd78b5c8582b81a0aae0b8ac59eec4db3ee4a8bcb39202c777c300178a181f2dc2ac74ab445ddba2f3efa0ecb1b SHA512 99fff7ce5117fd8c106601ead03679805d529fe12d5372cdd4ae54824aa6fdcbdaaa1a62ea1153391a1a65af8970e38fca7d95ca9983755ff06053f1d8b6d65a
DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
diff --git a/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch b/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch
deleted file mode 100644
index bc542b0a615c..000000000000
--- a/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 51fa4502039ec09d4a9e1d6b2fa73e5a1f789f94 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 15 Jun 2021 08:31:06 -0400
-Subject: [PATCH 1/1] xcas.desktop: fix "Version" field.
-
-The "Version" field in a desktop file refers to the version of the
-specification, not the version of the software it launches:
-
- https://specifications.freedesktop.org/desktop-entry-spec
-
-This issue has already been fixed upstream:
-
- https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2716
-
-and will be part of the next release.
----
- xcas.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xcas.desktop b/xcas.desktop
-index 9e1b648..fad99cd 100644
---- a/xcas.desktop
-+++ b/xcas.desktop
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Version=1.7
-+Version=1.0
- Keywords=computer algebra system;CAS;
- Keywords[fr]=calcul formel;CAS;
- Name=Xcas
---
-2.31.1
-
diff --git a/sci-mathematics/giac/giac-1.7.0.13-r1.ebuild b/sci-mathematics/giac/giac-1.7.0.13-r1.ebuild
deleted file mode 100644
index 301046562c6f..000000000000
--- a/sci-mathematics/giac/giac-1.7.0.13-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic xdg-utils
-
-FETCH_P="${PN}_"$(ver_rs 3 '-')
-MY_PV=$(ver_cut 1-3)
-DESCRIPTION="A free C++ Computer Algebra System library and its interfaces"
-HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
-SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-LANGS="el en es pt"
-IUSE="ao doc +ecm examples gc +glpk gui static-libs test"
-for X in ${LANGS} ; do
- IUSE="${IUSE} l10n_${X}"
-done
-
-# nauty and cliquer are automagical dependencies
-RDEPEND="dev-libs/gmp:=[cxx(+)]
- sys-libs/readline:=
- gui? ( x11-libs/fltk
- media-libs/libpng:= )
- ao? ( media-libs/libao )
- dev-libs/mpfr:=
- sci-libs/mpfi
- sci-libs/gsl:=
- sci-mathematics/pari:=[threads]
- dev-libs/ntl:=
- virtual/lapack
- virtual/blas
- net-misc/curl
- sci-mathematics/cliquer
- sci-mathematics/nauty
- ecm? ( sci-mathematics/gmp-ecm )
- glpk? ( sci-mathematics/glpk )
- gc? ( dev-libs/boehm-gc )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-tex/hevea
- virtual/pkgconfig
- app-alternatives/yacc"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
- "${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
- "${FILESDIR}/${PN}-1.7.0.13-xcas-desktop.patch"
-)
-
-REQUIRED_USE="test? ( gui )"
-
-# The mirror restriction is due to the French documentation for which
-# "Other kind of redistributions require the consent of the copyright
-# holder."
-RESTRICT="!test? ( test ) mirror"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-cxxflags -std=c++14 # bug 788283
-
- if use gui; then
- append-cppflags -I$(fltk-config --includedir)
- append-lfs-flags
-
- # Get the big-L flags from fltk's LDFLAGS.
- append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/')
- fi
-
- # Using libsamplerate is currently broken
- #
- # The giac build system supports --docdir, but the path /usr/share/giac/doc
- # is hard-coded throughout the source code, so passing anything else to
- # ./configure --docdir just causes problems. Later, we'll put things right.
- #
- # micropython is for specific use in an upstream project
- econf \
- --enable-gmpxx \
- --disable-samplerate \
- --disable-micropy \
- --docdir="${EPREFIX}"/usr/share/giac/doc \
- $(use_enable static-libs static) \
- $(use_enable gui) \
- $(use_enable gui png) \
- $(use_enable ao) \
- $(use_enable ecm) \
- $(use_enable glpk) \
- $(use_enable gc)
-
-}
-
-src_install() {
- docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples}
- emake install DESTDIR="${D}"
-
- # Move all of /usr/share/giac (which contains only documentation) to
- # its /usr/share/doc/${PF} counterpart.
- dodir /usr/share/doc
- mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die
-
- # and create a symlink from the original location to the new one
- dosym "./doc/${PF}" /usr/share/giac
-
- # This is duplicated in ${ED}/usr/share/doc/${PF}/examples
- rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die
-
- # These aren't supposed to be installed at all.
- find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die
-
- # The French docs are not freely licensed according to the README.
- rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die
-
- dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES
- if ! use gui; then
- rm -rf \
- "${ED}"/usr/bin/x* \
- "${ED}"/usr/share/application-registry \
- "${ED}"/usr/share/applications \
- "${ED}"/usr/share/icons \
- || die "failed to clean up fltk files"
- fi
-
- if ! use doc; then
- rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory"
- else
- for lang in ${LANGS}; do
- if use l10n_$lang; then
- dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas"
- else
- rm -r "${ED}/usr/share/giac/doc/${lang}" \
- || die "failed to remove ${lang} documentation"
- fi
- done
- fi
-
- if ! use examples; then
- rm -r "${ED}/usr/share/doc/${PF}/examples" \
- || die "failed to remove examples"
- fi
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- if use gui; then
- xdg_desktop_database_update
- xdg_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use gui; then
- xdg_desktop_database_update
- xdg_icon_cache_update
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/giac/, sci-mathematics/giac/files/
@ 2023-06-22 22:17 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2023-06-22 22:17 UTC (permalink / raw
To: gentoo-commits
commit: 82f9df370a68e34b5f2f95ed805b8c924cdb947a
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 21:00:22 2023 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 22:04:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f9df37
sci-mathematics/giac: add 1.9.0.55
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/giac/Manifest | 1 +
.../giac-1.9.0.55-disable-failing-tests.patch | 35 ++++
sci-mathematics/giac/giac-1.9.0.55.ebuild | 177 +++++++++++++++++++++
3 files changed, 213 insertions(+)
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index 175acc15f391..c7aa8276edf2 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1 +1,2 @@
DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
+DIST giac_1.9.0-55.tar.gz 113729553 BLAKE2B 8e95693623cfc8558e9a3b2dcc5e11cdbc4f2e25f0c2e88322dee986c5e010a63ced682bdbcb8b6dda61c8309477e8a106360a56f3a88d76043359bdb64f5d61 SHA512 c8043893fbe8951662c6c2fdd53adf6d2602ae7d3810254cd76d8478992005d9320de5e6be9453a03d5ed976900ec7721790ee61dace58e7121e0cfc330ecad9
diff --git a/sci-mathematics/giac/files/giac-1.9.0.55-disable-failing-tests.patch b/sci-mathematics/giac/files/giac-1.9.0.55-disable-failing-tests.patch
new file mode 100644
index 000000000000..fdb0cf9f0396
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.55-disable-failing-tests.patch
@@ -0,0 +1,35 @@
+From e9ad950f7838921b1d0c85b503d7c9668be663b6 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 22 Jun 2023 16:57:55 -0400
+Subject: [PATCH 1/1] check/Makefile.am: disable two failing tests.
+
+Mentioned on Github at,
+
+ https://github.com/sagemath/sage/pull/35745#issuecomment-1603298668
+
+For the moment, and without more information, disabling them is the
+simplest thing to do.
+---
+ check/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/check/Makefile.am b/check/Makefile.am
+index ef0aa03..be1260c 100644
+--- a/check/Makefile.am
++++ b/check/Makefile.am
+@@ -1,10 +1,10 @@
+ TESTS = chk_integrate \
+ chk_factor chk_normalize chk_partfrac chk_limit \
+ chk_cas chk_geo chk_morley_demo chk_xavier \
+- chk_fhan1 chk_fhan2 chk_fhan3 chk_fhan4 chk_fhan5 \
++ chk_fhan1 chk_fhan2 chk_fhan3 chk_fhan5 \
+ chk_fhan6 chk_fhan8 chk_fhan0 \
+ chk_fhan11 chk_fhan12 chk_fhan13 chk_fhan14 chk_fhan15 \
+- chk_fhan16 chk_fhan17 chk_fhan19 chk_fhan20 \
++ chk_fhan16 chk_fhan19 chk_fhan20 \
+ chk_fhan21 chk_fhan9 chk_fhan18 chk_fhan7
+ EXTRA_DIST = chk_integrate chk_intinda chk_intindbo chk_intindbr \
+ chk_intindc chk_intindj chk_intindm \
+--
+2.39.3
+
diff --git a/sci-mathematics/giac/giac-1.9.0.55.ebuild b/sci-mathematics/giac/giac-1.9.0.55.ebuild
new file mode 100644
index 000000000000..dc56ce5cff71
--- /dev/null
+++ b/sci-mathematics/giac/giac-1.9.0.55.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic xdg-utils
+
+FETCH_P="${PN}_"$(ver_rs 3 '-')
+MY_PV=$(ver_cut 1-3)
+DESCRIPTION="A free C++ Computer Algebra System library and its interfaces"
+HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
+SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS="el en es pt"
+IUSE="ao doc +ecm examples gc +glpk gui test"
+for X in ${LANGS} ; do
+ IUSE="${IUSE} l10n_${X}"
+done
+
+# nauty and cliquer are automagical dependencies
+RDEPEND="dev-libs/gmp:=[cxx(+)]
+ sys-libs/readline:=
+ gui? ( x11-libs/fltk[opengl]
+ media-libs/libpng:= )
+ ao? ( media-libs/libao )
+ dev-libs/mpfr:=
+ sci-libs/mpfi
+ sci-libs/gsl:=
+ sci-mathematics/pari:=[threads]
+ dev-libs/ntl:=
+ virtual/lapack
+ virtual/blas
+ net-misc/curl
+ sci-mathematics/cliquer
+ sci-mathematics/nauty
+ ecm? ( sci-mathematics/gmp-ecm )
+ glpk? ( sci-mathematics/glpk )
+ gc? ( dev-libs/boehm-gc )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-tex/hevea
+ virtual/pkgconfig
+ app-alternatives/yacc"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
+ "${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
+ "${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
+ "${FILESDIR}/${PN}-1.9.0.55-disable-failing-tests.patch"
+)
+
+REQUIRED_USE="test? ( gui )"
+
+# The mirror restriction is due to the French documentation for which
+# "Other kind of redistributions require the consent of the copyright
+# holder."
+RESTRICT="!test? ( test ) mirror"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+ # giac-1.9.0.55 tries to compile a bundled version of FLTK for you
+ # if you pass --enable-fltk but the system version isn't detected.
+ # We make sure that cannot happen under any circumstances.
+ rm fltk-1.3.8-source.tar.bz2 || die
+ default
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -std=c++14 # bug 788283
+
+ if use gui; then
+ append-cppflags -I$(fltk-config --includedir)
+ append-lfs-flags
+
+ # Get the big-L flags from fltk's LDFLAGS.
+ append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/')
+ fi
+
+ # Using libsamplerate is currently broken
+ #
+ # The giac build system supports --docdir, but the path /usr/share/giac/doc
+ # is hard-coded throughout the source code, so passing anything else to
+ # ./configure --docdir just causes problems. Later, we'll put things right.
+ #
+ # micropython is for specific use in an upstream project, so is quickjs.
+ # Note that disabling fltk is not a real option. It just skip autodetection
+ # but doesn't disable compiling against fltk. png is needed as part of fltk
+ # support.
+ #
+ # As of 1.9.0.25, --{en,dis}able-gui is no op. The only way to
+ # disable the gui is though --disable-fltk.
+ econf \
+ --enable-gmpxx \
+ --disable-samplerate \
+ --disable-micropy \
+ --disable-quickjs \
+ --docdir="${EPREFIX}"/usr/share/giac/doc \
+ $(use_enable gui fltk) \
+ $(use_enable gui png) \
+ $(use_enable ao) \
+ $(use_enable ecm) \
+ $(use_enable glpk) \
+ $(use_enable gc)
+
+}
+
+src_install() {
+ docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples}
+ emake install DESTDIR="${D}"
+
+ # Move all of /usr/share/giac (which contains only documentation) to
+ # its /usr/share/doc/${PF} counterpart.
+ dodir /usr/share/doc
+ mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die
+
+ # and create a symlink from the original location to the new one
+ dosym "./doc/${PF}" /usr/share/giac
+
+ # This is duplicated in ${ED}/usr/share/doc/${PF}/examples
+ rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die
+
+ # These aren't supposed to be installed at all.
+ find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die
+
+ # The French docs are not freely licensed according to the README.
+ rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die
+
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES
+ if ! use gui; then
+ rm -rf \
+ "${ED}"/usr/bin/x* \
+ "${ED}"/usr/share/application-registry \
+ "${ED}"/usr/share/applications \
+ "${ED}"/usr/share/icons \
+ || die "failed to clean up fltk files"
+ fi
+
+ if ! use doc; then
+ rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory"
+ else
+ for lang in ${LANGS}; do
+ if use l10n_$lang; then
+ dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas"
+ else
+ rm -r "${ED}/usr/share/giac/doc/${lang}" \
+ || die "failed to remove ${lang} documentation"
+ fi
+ done
+ fi
+
+ if ! use examples; then
+ rm -r "${ED}/usr/share/doc/${PF}/examples" \
+ || die "failed to remove examples"
+ fi
+
+ find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ if use gui; then
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use gui; then
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/giac/, sci-mathematics/giac/files/
@ 2023-07-07 13:18 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2023-07-07 13:18 UTC (permalink / raw
To: gentoo-commits
commit: adc3f1cb14828b2d90925192705e63f0c548993c
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 7 03:18:13 2023 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jul 7 13:17:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc3f1cb
sci-mathematics/giac: unbundle x11-libs/gl2ps.
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../giac/files/giac-1.9.0.55-system-gl2ps.patch | 69 ++++++++++++++++++++++
...iac-1.9.0.55.ebuild => giac-1.9.0.55-r1.ebuild} | 26 +++++---
2 files changed, 86 insertions(+), 9 deletions(-)
diff --git a/sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch b/sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch
new file mode 100644
index 000000000000..e82d892560da
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch
@@ -0,0 +1,69 @@
+From ca8eda770e36d2649bfc808464415308a5e9fc47 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 6 Jul 2023 21:27:09 -0400
+Subject: [PATCH 1/1] src: unbundle gl2ps.
+
+Updated patch based on the one by infinity0@debian.org. Ours links
+only libxcas (and not libgiac) to gl2ps.
+---
+ configure.ac | 4 ++++
+ src/Graph3d.cc | 2 +-
+ src/Makefile.am | 6 +++---
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8e1813e..2f7f644 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -465,6 +465,10 @@ dnl AC_CHECK_LIB(GLU, main)
+ AC_CHECK_LIB(fltk_images, main)
+ FLTK_LIBS="$LIBS $X_LIBS"
+ AC_SUBST(FLTK_LIBS)
++
++ # GL2PS is only used by xcas (the GUI)
++ GL2PS_LIBS="-lgl2ps"
++ AC_SUBST(GL2PS_LIBS)
+ cd src && ln -sf ../fltk-1.3.8 && cd ..
+ fi
+ fi
+diff --git a/src/Graph3d.cc b/src/Graph3d.cc
+index 7f54327..12d4723 100644
+--- a/src/Graph3d.cc
++++ b/src/Graph3d.cc
+@@ -45,7 +45,7 @@
+ #include "Xcas1.h"
+ #include "Cfg.h"
+ #include "Print.h"
+-#include "gl2ps.h"
++#include <gl2ps.h>
+
+ #ifdef __APPLE__
+ //#include <OpenGL/gl.h>
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3fdd209..120ccb6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -35,17 +35,17 @@ libbf.h list.h cutils.h qjsgiac.h \
+ quickjs.h js.h quickjs-atom.h quickjs-libc.h quickjs-opcode.h bf2gmp.h
+
+ noinst_LTLIBRARIES = libxcas.la
+-libxcas_la_LIBADD = libgiac.la $(FLTK_LIBS)
++libxcas_la_LIBADD = libgiac.la $(FLTK_LIBS) $(GL2PS_LIBS)
+
+ libxcas_la_SOURCES = History.cc Input.cc Xcas1.cc Equation.cc Print.cc \
+ Tableur.cc Editeur.cc Graph.cc Graph3d.cc Help1.cc Cfg.cc \
+ Flv_CStyle.cc \
+ Flve_Check_Button.cc Flve_Input.cc Flv_Style.cc Flv_Data_Source.cc \
+- Flve_Combo.cc Flv_List.cc Flv_Table.cc gl2ps.c \
++ Flve_Combo.cc Flv_List.cc Flv_Table.cc \
+ History.h Input.h Xcas1.h Equation.h Print.h Tableur.h \
+ Editeur.h Graph.h Graph3d.h Help1.h Cfg.h Python.cc Python.h \
+ Flv_CStyle.H Flve_Check_Button.H Flve_Input.H Flv_Style.H \
+- Flv_Data_Source.H Flve_Combo.H Flv_List.H Flv_Table.H gl2ps.h
++ Flv_Data_Source.H Flve_Combo.H Flv_List.H Flv_Table.H
+
+ ##libjavagiac_la_LIBADD = libgiac.la
+
+--
+2.39.3
+
diff --git a/sci-mathematics/giac/giac-1.9.0.55.ebuild b/sci-mathematics/giac/giac-1.9.0.55-r1.ebuild
similarity index 95%
rename from sci-mathematics/giac/giac-1.9.0.55.ebuild
rename to sci-mathematics/giac/giac-1.9.0.55-r1.ebuild
index 287394488a2d..ecc901270b63 100644
--- a/sci-mathematics/giac/giac-1.9.0.55.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.55-r1.ebuild
@@ -22,23 +22,26 @@ done
# nauty and cliquer are automagical dependencies
RDEPEND="dev-libs/gmp:=[cxx(+)]
- sys-libs/readline:=
- gui? ( x11-libs/fltk[opengl]
- media-libs/libpng:= )
- ao? ( media-libs/libao )
dev-libs/mpfr:=
+ dev-libs/ntl:=
+ net-misc/curl
sci-libs/mpfi
sci-libs/gsl:=
+ sci-mathematics/cliquer
+ sci-mathematics/nauty
sci-mathematics/pari:=[threads]
- dev-libs/ntl:=
+ sys-libs/readline:=
virtual/lapack
virtual/blas
- net-misc/curl
- sci-mathematics/cliquer
- sci-mathematics/nauty
+ ao? ( media-libs/libao )
ecm? ( sci-mathematics/gmp-ecm )
+ gc? ( dev-libs/boehm-gc )
glpk? ( sci-mathematics/glpk )
- gc? ( dev-libs/boehm-gc )"
+ gui? (
+ media-libs/libpng:=
+ x11-libs/fltk[opengl]
+ x11-libs/gl2ps
+ )"
DEPEND="${RDEPEND}"
@@ -52,6 +55,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
"${FILESDIR}/${PN}-1.9.0.55-pari-2.15-test.patch"
"${FILESDIR}/${PN}-1.9.0.55-undefined-behavior.patch"
+ "${FILESDIR}/${PN}-1.9.0.55-system-gl2ps.patch"
)
REQUIRED_USE="test? ( gui )"
@@ -68,6 +72,10 @@ src_prepare() {
# if you pass --enable-fltk but the system version isn't detected.
# We make sure that cannot happen under any circumstances.
rm fltk-1.3.8-source.tar.bz2 || die
+
+ # similar deal with gl2ps
+ rm src/gl2ps.[ch] || die
+
default
eautoreconf
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/giac/, sci-mathematics/giac/files/
@ 2023-10-31 12:59 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2023-10-31 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 78c461e76cd6cf349fc2fda89618b2cfa56fe60f
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 02:19:12 2023 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 12:56:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c461e7
sci-mathematics/giac: add 1.9.0.67, drop 1.9.0.55-r1
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/giac/Manifest | 2 +-
.../files/giac-1.9.0.67-glibcxx-assertions.patch | 30 ++++++++++++++++++++++
...l2ps.patch => giac-1.9.0.67-system-gl2ps.patch} | 30 +++++++++++-----------
...iac-1.9.0.55-r1.ebuild => giac-1.9.0.67.ebuild} | 4 +--
4 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index c7aa8276edf2..0ba59daf473f 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,2 +1,2 @@
DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
-DIST giac_1.9.0-55.tar.gz 113729553 BLAKE2B 8e95693623cfc8558e9a3b2dcc5e11cdbc4f2e25f0c2e88322dee986c5e010a63ced682bdbcb8b6dda61c8309477e8a106360a56f3a88d76043359bdb64f5d61 SHA512 c8043893fbe8951662c6c2fdd53adf6d2602ae7d3810254cd76d8478992005d9320de5e6be9453a03d5ed976900ec7721790ee61dace58e7121e0cfc330ecad9
+DIST giac_1.9.0-67.tar.gz 114193594 BLAKE2B aaa43b9b0eb9db04b55f995e4b47a5513a6a7238111d63900a33e8cc0d632cc24f1136e2bc5a2e3d6109fbd06405105684e571eacea5f887ef96f0f70a51adf5 SHA512 c03a7d22ea64f6281671eace533b7d7581ed3a3af060c112f8634fc7f13d450ba42568d9e26f8d8736e851f53ba1e9de8482fdb775427b71fcd78e2ca0ba4a69
diff --git a/sci-mathematics/giac/files/giac-1.9.0.67-glibcxx-assertions.patch b/sci-mathematics/giac/files/giac-1.9.0.67-glibcxx-assertions.patch
new file mode 100644
index 000000000000..dcdcfb5a728e
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.67-glibcxx-assertions.patch
@@ -0,0 +1,30 @@
+From 8fa2b53ee0db1827a4ddd88a7e754a7b1d91ca2c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 25 Aug 2023 20:33:31 -0400
+Subject: [PATCH 1/1] configure.ac: delete _GLIBCXX_ASSERTIONS override
+
+This was added upstream when it was pointed out that the codebase
+contains undefined behavior that triggers glibcxx's assertions.
+Disabling the assertions without fixing the undefined behavior is not
+a satisfactory solution, so we drop the override.
+---
+ configure.ac | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d66c3e1..6fef28b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,10 +45,6 @@ GINAC_STD_CXX_HEADERS
+ AC_CHECK_HEADERS(regex)
+ AC_CHECK_FUNCS(tgammaf)
+
+-dnl CXXFLAGS="$CXXFLAGS -std=c++0x"
+-dnl avoid "security" checks for vectors
+-CXXFLAGS="$CXXFLAGS -U_GLIBCXX_ASSERTIONS"
+-
+ dnl Define DOUBLEVAL if bigendian
+ if test "x$ac_cv_c_bigendian" = "xyes"; then
+ CXXFLAGS="$CXXFLAGS -DDOUBLEVAL"
+--
+2.41.0
diff --git a/sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch b/sci-mathematics/giac/files/giac-1.9.0.67-system-gl2ps.patch
similarity index 80%
rename from sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch
rename to sci-mathematics/giac/files/giac-1.9.0.67-system-gl2ps.patch
index e82d892560da..88c0fbc4f5a8 100644
--- a/sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch
+++ b/sci-mathematics/giac/files/giac-1.9.0.67-system-gl2ps.patch
@@ -1,7 +1,7 @@
-From ca8eda770e36d2649bfc808464415308a5e9fc47 Mon Sep 17 00:00:00 2001
+From 753b67c88d7feb166cf99243118943c09beba62a Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 6 Jul 2023 21:27:09 -0400
-Subject: [PATCH 1/1] src: unbundle gl2ps.
+Date: Mon, 30 Oct 2023 21:40:57 -0400
+Subject: [PATCH 1/1] src: unbundle gl2ps
Updated patch based on the one by infinity0@debian.org. Ours links
only libxcas (and not libgiac) to gl2ps.
@@ -12,10 +12,10 @@ only libxcas (and not libgiac) to gl2ps.
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 8e1813e..2f7f644 100644
+index d66c3e1..2acbf30 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -465,6 +465,10 @@ dnl AC_CHECK_LIB(GLU, main)
+@@ -469,6 +469,10 @@ dnl AC_CHECK_LIB(GLU, main)
AC_CHECK_LIB(fltk_images, main)
FLTK_LIBS="$LIBS $X_LIBS"
AC_SUBST(FLTK_LIBS)
@@ -27,20 +27,20 @@ index 8e1813e..2f7f644 100644
fi
fi
diff --git a/src/Graph3d.cc b/src/Graph3d.cc
-index 7f54327..12d4723 100644
+index e653cc4..a6c3468 100644
--- a/src/Graph3d.cc
+++ b/src/Graph3d.cc
-@@ -45,7 +45,7 @@
- #include "Xcas1.h"
- #include "Cfg.h"
- #include "Print.h"
+@@ -23,7 +23,7 @@
+ #define __CARBONSOUND__
+ #ifdef HAVE_LIBFLTK
+ #ifdef HAVE_LIBFLTK_GL
-#include "gl2ps.h"
+#include <gl2ps.h>
-
- #ifdef __APPLE__
- //#include <OpenGL/gl.h>
+ #else
+ void gl_font(int fontid, int size){}
+ void gl_draw(const char *){}
diff --git a/src/Makefile.am b/src/Makefile.am
-index 3fdd209..120ccb6 100644
+index 7c90381..2ae8003 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,17 +35,17 @@ libbf.h list.h cutils.h qjsgiac.h \
@@ -65,5 +65,5 @@ index 3fdd209..120ccb6 100644
##libjavagiac_la_LIBADD = libgiac.la
--
-2.39.3
+2.41.0
diff --git a/sci-mathematics/giac/giac-1.9.0.55-r1.ebuild b/sci-mathematics/giac/giac-1.9.0.67.ebuild
similarity index 97%
rename from sci-mathematics/giac/giac-1.9.0.55-r1.ebuild
rename to sci-mathematics/giac/giac-1.9.0.67.ebuild
index ecc901270b63..a9165fd96178 100644
--- a/sci-mathematics/giac/giac-1.9.0.55-r1.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.67.ebuild
@@ -51,11 +51,11 @@ BDEPEND="dev-tex/hevea
PATCHES=(
"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
- "${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
"${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
"${FILESDIR}/${PN}-1.9.0.55-pari-2.15-test.patch"
"${FILESDIR}/${PN}-1.9.0.55-undefined-behavior.patch"
- "${FILESDIR}/${PN}-1.9.0.55-system-gl2ps.patch"
+ "${FILESDIR}/${PN}-1.9.0.67-system-gl2ps.patch"
+ "${FILESDIR}/${PN}-1.9.0.67-glibcxx-assertions.patch"
)
REQUIRED_USE="test? ( gui )"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/giac/, sci-mathematics/giac/files/
@ 2024-03-04 16:33 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2024-03-04 16:33 UTC (permalink / raw
To: gentoo-commits
commit: 7facf697ccbc2e3cec6664958d942ab10180d167
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 16:29:15 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 16:31:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7facf697
sci-mathematics/giac: add 1.9.0.93, drop 1.9.0.67
This fixes the build with USE="-gui" thanks to a patch by François
Bissey.
Closes: https://bugs.gentoo.org/916718
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/giac/Manifest | 2 +-
.../files/giac-1.9.0.93-glibcxx-assertions.patch | 31 +++++++++++
.../files/giac-1.9.0.93-no-fltk-buildfix.patch | 60 ++++++++++++++++++++++
.../{giac-1.9.0.67.ebuild => giac-1.9.0.93.ebuild} | 7 ++-
4 files changed, 95 insertions(+), 5 deletions(-)
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index 0ba59daf473f..c8840a6dbd27 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,2 +1,2 @@
DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
-DIST giac_1.9.0-67.tar.gz 114193594 BLAKE2B aaa43b9b0eb9db04b55f995e4b47a5513a6a7238111d63900a33e8cc0d632cc24f1136e2bc5a2e3d6109fbd06405105684e571eacea5f887ef96f0f70a51adf5 SHA512 c03a7d22ea64f6281671eace533b7d7581ed3a3af060c112f8634fc7f13d450ba42568d9e26f8d8736e851f53ba1e9de8482fdb775427b71fcd78e2ca0ba4a69
+DIST giac_1.9.0-93.tar.gz 115117442 BLAKE2B 397c64c5587fadca37b3298fef8c15c2977ded30849af2f3d3ee8a083d26f8db4645ac6a0db2fce4e254144cdc70b88d3313de58a502510e21a22927e1af3505 SHA512 b8c7d7070218afdfdb8f9a94911407860ab81ead9a60adf7f0c0cec3c50cec5fad3a439269192a01ef4d55ed822a4a619b123b6938ba76f9aba3537d14bc4680
diff --git a/sci-mathematics/giac/files/giac-1.9.0.93-glibcxx-assertions.patch b/sci-mathematics/giac/files/giac-1.9.0.93-glibcxx-assertions.patch
new file mode 100644
index 000000000000..d11eaf9ab01d
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.93-glibcxx-assertions.patch
@@ -0,0 +1,31 @@
+From 77a08fddd1687e245f9f7567376f858607a76db0 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 4 Mar 2024 10:58:21 -0500
+Subject: [PATCH] configure.ac: delete _GLIBCXX_ASSERTIONS override
+
+This was added upstream when it was pointed out that the codebase
+contains undefined behavior that triggers glibcxx's assertions.
+Disabling the assertions without fixing the undefined behavior is not
+a satisfactory solution, so we drop the override.
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 62b63fb..3e4909f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,9 +46,8 @@ AC_CHECK_HEADERS(regex)
+ AC_CHECK_FUNCS(tgammaf)
+
+ dnl CXXFLAGS="$CXXFLAGS -std=c++0x"
+-dnl avoid "security" checks for vectors
+ dnl -DUSE_OBJET_BIDON added because xcas::localisation() does not load locales correctly for modules loaded before main() is executed
+-CXXFLAGS="$CXXFLAGS -U_GLIBCXX_ASSERTIONS -DUSE_OBJET_BIDON"
++CXXFLAGS="$CXXFLAGS -DUSE_OBJET_BIDON"
+
+ dnl Define DOUBLEVAL if bigendian
+ if test "x$ac_cv_c_bigendian" = "xyes"; then
+--
+2.43.0
+
diff --git a/sci-mathematics/giac/files/giac-1.9.0.93-no-fltk-buildfix.patch b/sci-mathematics/giac/files/giac-1.9.0.93-no-fltk-buildfix.patch
new file mode 100644
index 000000000000..970ba22c6cca
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.93-no-fltk-buildfix.patch
@@ -0,0 +1,60 @@
+diff --git a/src/Editeur.cc b/src/Editeur.cc
+index d69dce2..f7725bb 100644
+--- a/src/Editeur.cc
++++ b/src/Editeur.cc
+@@ -3,7 +3,6 @@
+ #include "Input.h"
+ #include "Tableur.h"
+ #include "Python.h"
+-Fl_Tabs * xcas_main_tab=0;
+ #ifdef HAVE_LIBMICROPYTHON
+ extern "C" int mp_token(const char * line);
+ #endif
+@@ -27,6 +26,7 @@ extern "C" int mp_token(const char * line);
+
+
+ #ifdef HAVE_LIBFLTK
++Fl_Tabs * xcas_main_tab=0;
+ #include <FL/fl_ask.H>
+ #include <FL/fl_ask.H>
+ #include <FL/Fl_Return_Button.H>
+diff --git a/src/icas.cc b/src/icas.cc
+index a5e3711..44ec905 100644
+--- a/src/icas.cc
++++ b/src/icas.cc
+@@ -2166,11 +2166,13 @@ int main(int ARGC, char *ARGV[]){
+ printf("%s\n","Running ./xcas");
+ continue;
+ }
++#ifdef HAVE_LIBFLTK
+ if (s=="xcas"){
+ giac::gen ge; std::string filename;
+ xcas::fltk_view(0,ge,"session.xws",filename,5,contextptr);
+ continue;
+ }
++#endif
+ if (s=="giac"){
+ python_compat(python_compat(contextptr)&3,contextptr);
+ printf("%s\n","Switching to giac interpreter");
+@@ -2251,7 +2253,9 @@ int main(int ARGC, char *ARGV[]){
+ #else
+ start=clock();
+ #endif
++#ifdef HAVE_LIBFLTK
+ xcas::icas_eval(gq,ge,reading_file,filename,contextptr);
++#endif
+ #ifdef __APPLE_
+ startc=clock()-startc;
+ #endif
+@@ -2265,9 +2269,11 @@ int main(int ARGC, char *ARGV[]){
+ // 2-d plot?
+ int graph_output=graph_output_type(ge);
+ if (reading_file>=2 || graph_output || (giac::ckmatrix(ge,true) &&ge.subtype==giac::_SPREAD__VECT) ){
++#ifdef HAVE_LIBFLTK
+ if (xcas::fltk_view(gq,ge,"",filename,reading_file,contextptr))
+ cout << "Done";
+ else
++#endif
+ cout << "Plot cancelled or unable to plot";
+ }
+ else {
diff --git a/sci-mathematics/giac/giac-1.9.0.67.ebuild b/sci-mathematics/giac/giac-1.9.0.93.ebuild
similarity index 96%
rename from sci-mathematics/giac/giac-1.9.0.67.ebuild
rename to sci-mathematics/giac/giac-1.9.0.93.ebuild
index 8e4bf2f1a4ce..9f42bdacc1a7 100644
--- a/sci-mathematics/giac/giac-1.9.0.67.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -56,10 +56,9 @@ BDEPEND="dev-tex/hevea
PATCHES=(
"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
"${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
- "${FILESDIR}/${PN}-1.9.0.55-pari-2.15-test.patch"
- "${FILESDIR}/${PN}-1.9.0.55-undefined-behavior.patch"
"${FILESDIR}/${PN}-1.9.0.67-system-gl2ps.patch"
- "${FILESDIR}/${PN}-1.9.0.67-glibcxx-assertions.patch"
+ "${FILESDIR}/${P}-glibcxx-assertions.patch"
+ "${FILESDIR}/${P}-no-fltk-buildfix.patch"
)
REQUIRED_USE="test? ( gui )"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/giac/, sci-mathematics/giac/files/
@ 2024-09-06 0:35 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2024-09-06 0:35 UTC (permalink / raw
To: gentoo-commits
commit: 07a2116aa1b13393dad67070653f5397fe224091
Author: François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Wed Aug 21 23:03:11 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 23:48:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a2116a
sci-mathematics/giac: add 1.9.0.995
Signed-off-by: François Bissey <frp.bissey <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/giac/Manifest | 1 +
.../files/giac-1.9.0.995-glibcxx-assertions.patch | 21 +++
sci-mathematics/giac/giac-1.9.0.995.ebuild | 191 +++++++++++++++++++++
3 files changed, 213 insertions(+)
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index c8840a6dbd27..b69209a45253 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,2 +1,3 @@
DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
DIST giac_1.9.0-93.tar.gz 115117442 BLAKE2B 397c64c5587fadca37b3298fef8c15c2977ded30849af2f3d3ee8a083d26f8db4645ac6a0db2fce4e254144cdc70b88d3313de58a502510e21a22927e1af3505 SHA512 b8c7d7070218afdfdb8f9a94911407860ab81ead9a60adf7f0c0cec3c50cec5fad3a439269192a01ef4d55ed822a4a619b123b6938ba76f9aba3537d14bc4680
+DIST giac_1.9.0-995.tar.gz 128346387 BLAKE2B c275d2cad511b906a3822156bd05f83cd77265cf489da82b111973b0a80de7abd1875d0cf0116e34610aa20b5ea2cc36550950dbf1eb1a321db8c7145c789137 SHA512 7111a21df5efe1ef5f14dc744277e18f3e4701842d827da0f8d745e1bcec4c06b45e3306b7ed3c4affee59c5df2454643900eefe32d46019771e6bb07bc971d9
diff --git a/sci-mathematics/giac/files/giac-1.9.0.995-glibcxx-assertions.patch b/sci-mathematics/giac/files/giac-1.9.0.995-glibcxx-assertions.patch
new file mode 100644
index 000000000000..60172a814d2c
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.995-glibcxx-assertions.patch
@@ -0,0 +1,21 @@
+From Michael Orlitzky <michael@orlitzky.com> in the original version
+of the patch:
+
+This was added upstream when it was pointed out that the codebase
+contains undefined behavior that triggers glibcxx's assertions.
+Disabling the assertions without fixing the undefined behavior is not
+a satisfactory solution, so we drop the override.
+
+diff --git a/configure.ac b/configure.ac
+index 96b0223..cdc5618 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,7 +48,7 @@ AC_CHECK_FUNCS(tgammaf)
+ dnl avoid "security" checks for vectors is also included in first.h
+ dnl use -std=c++17 -march=native for vectorclass v2 optimizations
+ dnl -DUSE_OBJET_BIDON added because xcas::localisation() does not load locales correctly for modules loaded before main() is executed
+-CXXFLAGS="$CXXFLAGS -U_GLIBCXX_ASSERTIONS -DUSE_OBJET_BIDON"
++CXXFLAGS="$CXXFLAGS -DUSE_OBJET_BIDON"
+
+ dnl Define DOUBLEVAL if bigendian
+ if test "x$ac_cv_c_bigendian" = "xyes"; then
diff --git a/sci-mathematics/giac/giac-1.9.0.995.ebuild b/sci-mathematics/giac/giac-1.9.0.995.ebuild
new file mode 100644
index 000000000000..32f7faec217b
--- /dev/null
+++ b/sci-mathematics/giac/giac-1.9.0.995.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic xdg-utils
+
+FETCH_P="${PN}_"$(ver_rs 3 '-')
+MY_PV=$(ver_cut 1-3)
+DESCRIPTION="A free C++ Computer Algebra System library and its interfaces"
+HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
+SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# The licensing is explained in README. We disable or delete several
+# bundled features (MicroPytho, QuickJS, FLTK, gl2ps) that are
+# specifically mentioned there.
+LICENSE="GPL-3+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS="el en es pt"
+IUSE="ao doc +ecm examples gc +glpk gui test"
+for X in ${LANGS} ; do
+ IUSE="${IUSE} l10n_${X}"
+done
+
+# nauty and cliquer are automagical dependencies
+RDEPEND="dev-libs/gmp:=[cxx(+)]
+ dev-libs/mpfr:=
+ dev-libs/ntl:=
+ net-misc/curl
+ sci-libs/mpfi
+ sci-libs/gsl:=
+ sci-mathematics/cliquer
+ sci-mathematics/nauty
+ sci-mathematics/pari:=[threads]
+ sys-libs/readline:=
+ virtual/lapack
+ virtual/blas
+ ao? ( media-libs/libao )
+ ecm? ( sci-mathematics/gmp-ecm )
+ gc? ( dev-libs/boehm-gc )
+ glpk? ( sci-mathematics/glpk )
+ gui? (
+ media-libs/libpng:=
+ x11-libs/fltk[opengl]
+ x11-libs/gl2ps
+ )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-tex/hevea
+ virtual/pkgconfig
+ app-alternatives/yacc"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
+ "${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
+ "${FILESDIR}/${PN}-1.9.0.67-system-gl2ps.patch"
+ "${FILESDIR}/${P}-glibcxx-assertions.patch"
+)
+
+REQUIRED_USE="test? ( gui )"
+
+# The mirror restriction is due to the French documentation for which
+# "Other kind of redistributions require the consent of the copyright
+# holder."
+RESTRICT="!test? ( test ) mirror"
+
+src_prepare() {
+ # giac-1.9.0.55 tries to compile a bundled version of FLTK for you
+ # if you pass --enable-fltk but the system version isn't detected.
+ # We make sure that cannot happen under any circumstances.
+ rm fltk-1.3.8-source.tar.bz2 || die
+
+ # similar deal with gl2ps
+ rm src/gl2ps.[ch] || die
+
+ # mjs is an arm executable artifact that should not have been shipped
+ # Removing it so it can be rebuilt with the host architecture
+ rm src/mkjs || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -std=c++17 # bug 788283
+
+ if use gui; then
+ append-cppflags -I$(fltk-config --includedir)
+ append-lfs-flags
+
+ # Get the big-L flags from fltk's LDFLAGS.
+ append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/')
+ fi
+
+ # Using libsamplerate is currently broken
+ #
+ # The giac build system supports --docdir, but the path /usr/share/giac/doc
+ # is hard-coded throughout the source code, so passing anything else to
+ # ./configure --docdir just causes problems. Later, we'll put things right.
+ #
+ # micropython is for specific use in an upstream project, so is quickjs.
+ # Note that disabling fltk is not a real option. It just skip autodetection
+ # but doesn't disable compiling against fltk. png is needed as part of fltk
+ # support.
+ #
+ # As of 1.9.0.25, --{en,dis}able-gui is no op. The only way to
+ # disable the gui is though --disable-fltk.
+ econf \
+ --enable-gmpxx \
+ --disable-samplerate \
+ --disable-micropy \
+ --disable-quickjs \
+ --docdir="${EPREFIX}"/usr/share/giac/doc \
+ $(use_enable gui fltk) \
+ $(use_enable gui png) \
+ $(use_enable ao) \
+ $(use_enable ecm) \
+ $(use_enable glpk) \
+ $(use_enable gc)
+
+}
+
+src_install() {
+ docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples}
+ emake install DESTDIR="${D}"
+
+ # Move all of /usr/share/giac (which contains only documentation) to
+ # its /usr/share/doc/${PF} counterpart.
+ dodir /usr/share/doc
+ mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die
+
+ # and create a symlink from the original location to the new one
+ dosym "./doc/${PF}" /usr/share/giac
+
+ # This is duplicated in ${ED}/usr/share/doc/${PF}/examples
+ rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die
+
+ # These aren't supposed to be installed at all.
+ find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die
+
+ # The French docs are not freely licensed according to the README.
+ rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die
+
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES
+ if ! use gui; then
+ rm -rf \
+ "${ED}"/usr/bin/x* \
+ "${ED}"/usr/share/application-registry \
+ "${ED}"/usr/share/applications \
+ "${ED}"/usr/share/icons \
+ || die "failed to clean up fltk files"
+ fi
+
+ if ! use doc; then
+ rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory"
+ else
+ for lang in ${LANGS}; do
+ if use l10n_$lang; then
+ dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas"
+ else
+ rm -r "${ED}/usr/share/giac/doc/${lang}" \
+ || die "failed to remove ${lang} documentation"
+ fi
+ done
+ fi
+
+ if ! use examples; then
+ rm -r "${ED}/usr/share/doc/${PF}/examples" \
+ || die "failed to remove examples"
+ fi
+
+ find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ if use gui; then
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use gui; then
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-09-06 0:35 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-06 0:35 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/giac/, sci-mathematics/giac/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2024-03-04 16:33 Michael Orlitzky
2023-10-31 12:59 Michael Orlitzky
2023-07-07 13:18 Michael Orlitzky
2023-06-22 22:17 Michael Orlitzky
2022-12-24 0:03 Michael Orlitzky
2021-06-15 14:32 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox