* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
@ 2017-05-14 12:49 Michael Weber
0 siblings, 0 replies; 11+ messages in thread
From: Michael Weber @ 2017-05-14 12:49 UTC (permalink / raw
To: gentoo-commits
commit: cac892e538e86aae4fac4c601bfda015c5a93494
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 12:49:30 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun May 14 12:49:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac892e5
media-gfx/openscad: Add emacs mode, thanks Emery Hemingway for the ebuild (bug 492220).
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-gfx/openscad/files/50openscad-gentoo.el | 3 ++
media-gfx/openscad/openscad-2015.03_p2-r2.ebuild | 69 ++++++++++++++++++++++++
2 files changed, 72 insertions(+)
diff --git a/media-gfx/openscad/files/50openscad-gentoo.el b/media-gfx/openscad/files/50openscad-gentoo.el
new file mode 100644
index 00000000000..3cc7c1a7c46
--- /dev/null
+++ b/media-gfx/openscad/files/50openscad-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'scad-mode "scad-mode" "Major mode for editing SCAD code." t)
+(add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode))
diff --git a/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild
new file mode 100644
index 00000000000..67206bfa9e1
--- /dev/null
+++ b/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp-common eutils qmake-utils
+
+MY_PV="2015.03-2"
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="http://www.openscad.org/"
+SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+
+DEPEND="media-gfx/opencsg
+ sci-mathematics/cgal
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4[-egl]
+ dev-qt/qtopengl:4[-egl]
+ dev-cpp/eigen:3
+ dev-libs/glib:2
+ dev-libs/gmp:0=
+ dev-libs/mpfr:0=
+ dev-libs/boost:=
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ media-libs/glew:*
+ media-libs/harfbuzz
+ x11-libs/qscintilla:=[qt4(-)]
+ emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+ #Use our CFLAGS (specifically don't force x86)
+ sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro || die
+ sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+
+ eapply_user
+}
+
+src_configure() {
+ eqmake4 "${PN}.pro"
+}
+
+src_compile() {
+ default
+
+ if use emacs ; then
+ elisp-compile contrib/*.el
+ fi
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ elisp-install ${PN} contrib/*.el contrib/*.elc
+ fi
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
@ 2017-10-21 21:24 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2017-10-21 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 82b27387e7847268227a680fe402f63fd4b97113
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 21:14:15 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 21:24:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82b27387
media-gfx/openscad: Switch to Qt5, add xdg-utils
Drop unused eutils.eclass.
Thanks-to: maurerpe <junk4me46806 <AT> yahoo.com>
Gentoo-bug: 623610
Package-Manager: Portage-2.3.12, Repoman-2.3.3
.../files/openscad-2015.03_p2_uic_tr_fix.patch | 14 +++++++
...d-9999.ebuild => openscad-2015.03_p2-r3.ebuild} | 47 +++++++++++++++-------
media-gfx/openscad/openscad-9999.ebuild | 36 +++++++++++------
3 files changed, 71 insertions(+), 26 deletions(-)
diff --git a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
new file mode 100644
index 00000000000..ef0bcc421eb
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
@@ -0,0 +1,14 @@
+--- a/src/qtgettext.h 2017-03-22 00:17:29.808058905 -0400
++++ b/src/qtgettext.h 2017-03-22 00:18:55.251184835 -0400
+@@ -22,5 +22,10 @@
+ return QString::fromUtf8( _( msgid ) );
+ }
+
+-#endif
++inline QString _( const char *msgid, const char *disambiguation )
++{
++ Q_UNUSED( disambiguation );
++ return QString::fromUtf8( _( msgid ) );
++}
+
++#endif
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
similarity index 56%
copy from media-gfx/openscad/openscad-9999.ebuild
copy to media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
index 95b2d243082..a9e86a2a047 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
@@ -3,45 +3,54 @@
EAPI=6
-inherit elisp-common eutils git-r3 qmake-utils
+inherit elisp-common qmake-utils xdg-utils
+MY_PV="2015.03-2"
SITEFILE="50${PN}-gentoo.el"
DESCRIPTION="The Programmers Solid 3D CAD Modeller"
HOMEPAGE="http://www.openscad.org/"
-EGIT_REPO_URI="https://github.com/openscad/openscad.git"
+SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="emacs"
-DEPEND="media-gfx/opencsg
- sci-mathematics/cgal
- dev-qt/qtcore:4
- dev-qt/qtgui:4[-egl]
- dev-qt/qtopengl:4[-egl]
+DEPEND="
dev-cpp/eigen:3
+ dev-libs/boost:=
dev-libs/glib:2
dev-libs/gmp:0=
dev-libs/mpfr:0=
- dev-libs/boost:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ media-gfx/opencsg
media-libs/fontconfig:1.0
media-libs/freetype:2
media-libs/glew:*
media-libs/harfbuzz
- x11-libs/qscintilla:=[qt4(-)]
- emacs? ( virtual/emacs )"
+ sci-mathematics/cgal
+ >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+ emacs? ( virtual/emacs )
+"
RDEPEND="${DEPEND}"
-src_prepare() {
- sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+PATCHES=( "${FILESDIR}/${P}_uic_tr_fix.patch" )
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+src_prepare() {
default
+
+ #Use our CFLAGS (specifically don't force x86)
+ sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro || die
+ sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
}
src_configure() {
- eqmake4 "${PN}.pro"
+ eqmake5 "${PN}.pro"
}
src_compile() {
@@ -62,3 +71,13 @@ src_install() {
einstalldocs
}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 95b2d243082..781c41bb5f0 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit elisp-common eutils git-r3 qmake-utils
+inherit elisp-common git-r3 qmake-utils xdg-utils
SITEFILE="50${PN}-gentoo.el"
@@ -16,32 +16,34 @@ SLOT="0"
KEYWORDS=""
IUSE="emacs"
-DEPEND="media-gfx/opencsg
- sci-mathematics/cgal
- dev-qt/qtcore:4
- dev-qt/qtgui:4[-egl]
- dev-qt/qtopengl:4[-egl]
+DEPEND="
dev-cpp/eigen:3
+ dev-libs/boost:=
dev-libs/glib:2
dev-libs/gmp:0=
dev-libs/mpfr:0=
- dev-libs/boost:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ media-gfx/opencsg
media-libs/fontconfig:1.0
media-libs/freetype:2
media-libs/glew:*
media-libs/harfbuzz
- x11-libs/qscintilla:=[qt4(-)]
- emacs? ( virtual/emacs )"
+ sci-mathematics/cgal
+ >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+ emacs? ( virtual/emacs )
+"
RDEPEND="${DEPEND}"
src_prepare() {
- sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
default
+
+ sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
}
src_configure() {
- eqmake4 "${PN}.pro"
+ eqmake5 "${PN}.pro"
}
src_compile() {
@@ -62,3 +64,13 @@ src_install() {
einstalldocs
}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
@ 2019-05-15 18:29 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2019-05-15 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 2f39ea71ddb4d2008a1ab414493196d3c94e05b7
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Wed May 15 16:01:55 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 15 18:27:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f39ea71
media-gfx/openscad: fix boost-1.70.0 build
Fixes a build issue with >=boost-1.69
Closes: https://bugs.gentoo.org/684038
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12003
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch | 13 +++++++++++++
media-gfx/openscad/openscad-2015.03_p3-r1.ebuild | 5 ++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
new file mode 100644
index 00000000000..7684eba92e8
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc
+index 6416f29..b3753cf 100644
+--- a/src/CSGTermEvaluator.cc
++++ b/src/CSGTermEvaluator.cc
+@@ -109,7 +109,7 @@ static shared_ptr<CSGTerm> evaluate_csg_term_from_geometry(const State &state,
+ shared_ptr<const PolySet> ps = dynamic_pointer_cast<const PolySet>(geom);
+ // Since is_convex() doesn't handle non-planar faces, we need to tessellate
+ // also in the indeterminate state so we cannot just use a boolean comparison. See #1061
+- bool convex = ps->convexValue();
++ bool convex{ps->convexValue()};
+ if (ps && !convex) {
+ assert(ps->getDimension() == 3);
+ PolySet *ps_tri = new PolySet(3, ps->convexValue());
diff --git a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
index 1b34fa207c5..043c1d22a21 100644
--- a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
@@ -41,7 +41,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch"
+ "${FILESDIR}/${PN}-2015.03_p3_fix-boost-1.70.0-build.patch"
+)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
@ 2020-06-12 7:00 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2020-06-12 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 2dda35d4d5803026c5c36095d5416289c383b988
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Fri May 15 18:36:41 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 06:59:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dda35d4
media-gfx/openscad: drop old
Drop obsolete 2015.03 version.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15809
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/openscad/Manifest | 1 -
.../files/openscad-2015.03_p2_uic_tr_fix.patch | 14 ----
...penscad-2015.03_p3_fix-boost-1.70.0-build.patch | 13 ----
media-gfx/openscad/openscad-2015.03_p3-r2.ebuild | 80 ----------------------
4 files changed, 108 deletions(-)
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index fa81bd25200..fd29bf8f45b 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,2 +1 @@
-DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee
DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
diff --git a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
deleted file mode 100644
index ef0bcc421eb..00000000000
--- a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/qtgettext.h 2017-03-22 00:17:29.808058905 -0400
-+++ b/src/qtgettext.h 2017-03-22 00:18:55.251184835 -0400
-@@ -22,5 +22,10 @@
- return QString::fromUtf8( _( msgid ) );
- }
-
--#endif
-+inline QString _( const char *msgid, const char *disambiguation )
-+{
-+ Q_UNUSED( disambiguation );
-+ return QString::fromUtf8( _( msgid ) );
-+}
-
-+#endif
diff --git a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
deleted file mode 100644
index 7684eba92e8..00000000000
--- a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc
-index 6416f29..b3753cf 100644
---- a/src/CSGTermEvaluator.cc
-+++ b/src/CSGTermEvaluator.cc
-@@ -109,7 +109,7 @@ static shared_ptr<CSGTerm> evaluate_csg_term_from_geometry(const State &state,
- shared_ptr<const PolySet> ps = dynamic_pointer_cast<const PolySet>(geom);
- // Since is_convex() doesn't handle non-planar faces, we need to tessellate
- // also in the indeterminate state so we cannot just use a boolean comparison. See #1061
-- bool convex = ps->convexValue();
-+ bool convex{ps->convexValue()};
- if (ps && !convex) {
- assert(ps->getDimension() == 3);
- PolySet *ps_tri = new PolySet(3, ps->convexValue());
diff --git a/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild
deleted file mode 100644
index c8c9432ff43..00000000000
--- a/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common qmake-utils xdg
-
-# 2015.03-3
-MY_VER=$(ver_cut 1-2) # version component
-MY_REL=$(ver_cut 4) # release component, 'p' being the third component
-MY_PV=${MY_VER}-${MY_REL}
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-DEPEND="
- dev-cpp/eigen:3
- dev-libs/boost:=
- dev-libs/glib:2
- dev-libs/gmp:0=
- dev-libs/mpfr:0=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qtopengl:5
- media-gfx/opencsg
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >=media-libs/glew-2.0.0:*
- media-libs/harfbuzz
- sci-mathematics/cgal:=
- >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
- emacs? ( >=app-editors/emacs-23.1:* )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch"
- "${FILESDIR}/${PN}-2015.03_p3_fix-boost-1.70.0-build.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- default
-
- #Use our CFLAGS (specifically don't force x86)
- sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro || die
- sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-}
-
-src_configure() {
- eqmake5 "${PN}.pro"
-}
-
-src_compile() {
- default
-
- if use emacs ; then
- elisp-compile contrib/*.el
- fi
-}
-
-src_install() {
- emake install INSTALL_ROOT="${D}"
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- elisp-install ${PN} contrib/*.el contrib/*.elc
- fi
-
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
@ 2020-06-12 7:00 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2020-06-12 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 8dfc7b2d0c0cc3d01d08ec9dc7885be394334a50
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sun Apr 19 18:44:54 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 06:59:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dfc7b2d
media-gfx/openscad: Fix build with boost-1.73.0
Thanks to William T Wilson for reporting and providing patch.
Additionally OpenSCAD has an optional, but automagic dependency on
media-libs/lib3mf.
Add ccache USE flag, as it's automagically enabled whenever the ccache
binary is found in PATH.
Reported-by: William T Wilson <fluffysheap <AT> gmail.com>
Closes: https://bugs.gentoo.org/722302
Package-Manager: Portage-2.3.99-r2, Repoman-2.3.22
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...ad-2019.05-0001-Fix-build-with-boost-1.73.patch | 28 ++++++
...2-Gentoo-specific-Disable-ccache-building.patch | 35 +++++++
media-gfx/openscad/metadata.xml | 5 +
media-gfx/openscad/openscad-2019.05-r3.ebuild | 108 +++++++++++++++++++++
4 files changed, 176 insertions(+)
diff --git a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
new file mode 100644
index 00000000000..74f48b4c1ae
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
@@ -0,0 +1,28 @@
+From 47275a3d92969709e7605f23a408c5ed5aa483c9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 15 May 2020 19:09:10 +0200
+Subject: [PATCH] Fix build with boost-1.73
+
+Thanks to William T Wilson for reporting and providing the patch.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ src/import.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/import.cc b/src/import.cc
+index eef1323..08e46ff 100644
+--- a/src/import.cc
++++ b/src/import.cc
+@@ -50,7 +50,7 @@ namespace fs = boost::filesystem;
+ #include <boost/assign/std/vector.hpp>
+ using namespace boost::assign; // bring 'operator+=()' into scope
+
+-#include <boost/detail/endian.hpp>
++#include <boost/endian/arithmetic.hpp>
+ #include <cstdint>
+
+ extern PolySet * import_amf(std::string, const Location &loc);
+--
+2.26.2
+
diff --git a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
new file mode 100644
index 00000000000..1a4903828e8
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
@@ -0,0 +1,35 @@
+From 2940d8e5c74faa5dcd5279c8166064ade3da5695 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sun, 17 May 2020 21:13:44 +0200
+Subject: [PATCH] [Gentoo-specific] Disable ccache building
+
+On Gentoo we use a USE flag to determine whether to use
+ccache for building or not.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ openscad.pro | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/openscad.pro b/openscad.pro
+index 2d190dd..9c4e67b 100755
+--- a/openscad.pro
++++ b/openscad.pro
+@@ -214,10 +214,10 @@ mdi {
+ DEFINES += ENABLE_MDI
+ }
+
+-system("ccache -V >/dev/null 2>/dev/null") {
+- CONFIG += ccache
+- message("Using ccache")
+-}
++#system("ccache -V >/dev/null 2>/dev/null") {
++# CONFIG += ccache
++# message("Using ccache")
++#}
+
+ include(common.pri)
+
+--
+2.26.2
+
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 7b83ba14800..5ed7ed33c62 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -20,6 +20,11 @@
OpenSCAD is free software and available for Linux/UNIX, MS Windows and
Mac OS X.
</longdescription>
+<use>
+ <flag name="ccache">
+ Use <pkg>dev-util/ccache</pkg> to speed up rebuilds
+ </flag>
+</use>
<upstream>
<remote-id type="github">openscad/openscad</remote-id>
</upstream>
diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild
new file mode 100644
index 00000000000..73d70652513
--- /dev/null
+++ b/media-gfx/openscad/openscad-2019.05-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://www.openscad.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ccache emacs"
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${P}_fix-boost-1.72.0-build.patch"
+ "${FILESDIR}/${P}-0001-Fix-build-with-boost-1.73.patch"
+)
+
+RDEPEND="
+ dev-cpp/eigen:3
+ dev-libs/boost:=
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/gmp:0=
+ dev-libs/hidapi
+ dev-libs/libspnav
+ dev-libs/libzip:=
+ dev-libs/mpfr:0=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5[-gles2-only]
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ media-gfx/opencsg
+ media-libs/fontconfig
+ media-libs/freetype
+ >=media-libs/glew-2.0.0:0=
+ media-libs/harfbuzz:=
+ media-libs/lib3mf
+ sci-mathematics/cgal:=
+ >=x11-libs/qscintilla-2.10.3:=
+ emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/itstool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ ccache? ( dev-util/ccache )
+"
+
+src_prepare() {
+ default
+
+ # fix path prefix
+ sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+
+ # disable ccache
+ if ! use ccache; then
+ eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
+ fi
+}
+
+src_configure() {
+ eqmake5 "${PN}.pro"
+}
+
+src_compile() {
+ default
+
+ if use emacs ; then
+ elisp-compile contrib/*.el
+ fi
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ elisp-install ${PN} contrib/*.el contrib/*.elc
+ fi
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
@ 2020-12-07 8:56 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2020-12-07 8:56 UTC (permalink / raw
To: gentoo-commits
commit: 2ca77f3783cb66686e621382fe9f49a6798159f9
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Fri Nov 27 23:56:21 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Dec 7 08:56:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca77f37
media-gfx/openscad: fix issue with cgal
Fixes the issue of not building against cgal-5.1.
Also installs locales into correct dir.
Bug: https://bugs.gentoo.org/755842
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18435
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...ad-2019.05-0003-change-C-standard-to-c-14.patch | 76 ++++++++++++++
media-gfx/openscad/openscad-2019.05-r4.ebuild | 115 +++++++++++++++++++++
2 files changed, 191 insertions(+)
diff --git a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
new file mode 100644
index 00000000000..3863d5631b9
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
@@ -0,0 +1,76 @@
+From 02f9a4eca87d7713a8345b8513423d9d4a5127e0 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 27 Nov 2020 18:49:09 +0100
+Subject: [PATCH] change C++ standard to c++14
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ c++11.pri => c++std.pri | 21 ++++++++-------------
+ common.pri | 2 +-
+ 2 files changed, 9 insertions(+), 14 deletions(-)
+ rename c++11.pri => c++std.pri (74%)
+
+diff --git a/c++11.pri b/c++std.pri
+similarity index 74%
+rename from c++11.pri
+rename to c++std.pri
+index 0a2c3b6..aac656d 100644
+--- a/c++11.pri
++++ b/c++std.pri
+@@ -4,16 +4,16 @@ macx {
+ dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
+ for(dir, dirs) {
+ system(otool -L $${dir}/libboost_thread* | grep libc++ >& /dev/null ) {
+- message("Using libc++11")
++ message("Using libc++")
+ CONFIG += libc++
+ }
+ else {
+ message("Using libstdc++")
+ CONFIG += libstdc++
+- c++11 {
+- # libc++ is a requirement for using C++11
+- warning("Disabling C++11 since libstdc++ dependencies were found")
+- CONFIG -= c++11
++ c++std {
++ # libc++ is a requirement for using C++14
++ warning("Disabling C++14 since libstdc++ dependencies were found")
++ CONFIG -= c++std
+ }
+ }
+ }
+@@ -25,9 +25,9 @@ macx {
+ }
+ }
+
+-c++11 {
+- QMAKE_CXXFLAGS += -std=c++11
+- message("Using C++11")
++c++std {
++ QMAKE_CXXFLAGS += -std=c++14
++ message("Using C++14")
+
+ *clang*: {
+ # 3rd party libraries will probably violate this for a long time
+@@ -41,8 +41,3 @@ c++11 {
+ QMAKE_OBJECTIVE_CFLAGS_WARN_ON += $$CXX11_SUPPRESS_WARNINGS
+ }
+ }
+-else {
+- *clang* {
+- QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
+- }
+-}
+diff --git a/common.pri b/common.pri
+index 1110757..d1d5edc 100644
+--- a/common.pri
++++ b/common.pri
+@@ -30,4 +30,4 @@ include(win.pri)
+ include(flex.pri)
+ include(bison.pri)
+ include(opengl.pri)
+-include(c++11.pri)
++include(c++std.pri)
+--
+2.29.2
+
diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild b/media-gfx/openscad/openscad-2019.05-r4.ebuild
new file mode 100644
index 00000000000..2ac3f77c966
--- /dev/null
+++ b/media-gfx/openscad/openscad-2019.05-r4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://www.openscad.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="ccache emacs"
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${P}_fix-boost-1.72.0-build.patch"
+ "${FILESDIR}/${P}-0001-Fix-build-with-boost-1.73.patch"
+ "${FILESDIR}/${P}-0003-change-C-standard-to-c-14.patch"
+)
+
+RDEPEND="
+ dev-cpp/eigen:3
+ dev-libs/boost:=
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/gmp:0=
+ dev-libs/hidapi
+ dev-libs/libspnav
+ dev-libs/libzip:=
+ dev-libs/mpfr:0=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5[-gles2-only]
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ media-gfx/opencsg
+ media-libs/fontconfig
+ media-libs/freetype
+ >=media-libs/glew-2.0.0:0=
+ media-libs/harfbuzz:=
+ media-libs/lib3mf
+ sci-mathematics/cgal:=
+ >=x11-libs/qscintilla-2.10.3:=
+ emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/itstool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ ccache? ( dev-util/ccache )
+"
+
+src_prepare() {
+ default
+
+ # fix path prefix
+ sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+
+ # change c++ standard
+ sed -e 's/CONFIG += c++11/CONFIG += c++std/' -i openscad.pro || die
+
+ # disable ccache
+ if ! use ccache; then
+ eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
+ fi
+}
+
+src_configure() {
+ eqmake5 "${PN}.pro"
+}
+
+src_compile() {
+ default
+
+ if use emacs ; then
+ elisp-compile contrib/*.el
+ fi
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ elisp-install ${PN} contrib/*.el contrib/*.elc
+ fi
+
+ mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+ ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
@ 2021-03-07 9:03 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2021-03-07 9:03 UTC (permalink / raw
To: gentoo-commits
commit: 61ae68b49a1af31cd54436180e5116a2a5055e63
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Feb 12 22:43:30 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 09:03:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61ae68b4
media-gfx/openscad: adapt to work with lib3mf-2
Now uses cmake instead of qmake.
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../openscad-9999-0001-fix-to-find-lib3mf-2.patch | 36 ++++++++
...2-Gentoo-specific-Disable-ccache-building.patch | 35 -------
media-gfx/openscad/metadata.xml | 10 ++
media-gfx/openscad/openscad-9999.ebuild | 101 ++++++++++++++-------
4 files changed, 113 insertions(+), 69 deletions(-)
diff --git a/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
new file mode 100644
index 00000000000..0ca19d33646
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
@@ -0,0 +1,36 @@
+From 15bf93ab04e6fd61507f138bcfc6f9c770d9479b Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 11 Feb 2021 23:14:31 +0100
+Subject: [PATCH] fix to find lib3mf-2
+
+Lib3mf-2 uses lowercase name for it's pkg-config file.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ cmake/Modules/FindLib3MF.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/FindLib3MF.cmake b/cmake/Modules/FindLib3MF.cmake
+index 7a1ee285..b062c09c 100644
+--- a/cmake/Modules/FindLib3MF.cmake
++++ b/cmake/Modules/FindLib3MF.cmake
+@@ -15,14 +15,14 @@ message(STATUS "Searching for lib3mf.")
+ # We still fall back to the rest of detection code here.
+ # Travis CI Ubuntu Trusty environment has some issue with pkg-config
+ # not finding the version.
+-pkg_check_modules(LIB3MF lib3MF)
++pkg_check_modules(LIB3MF lib3mf)
+
+ # default to uppercase for 1.0 library name
+ set(LIB3MF_LIB "3MF")
+
+ # some distribution packages are missing version information for 2.0
+ if (LIB3MF_VERSION STREQUAL "" AND LIB3MF_FOUND)
+- if (EXISTS "/usr/include/lib3mf" AND EXISTS "/usr/include/lib3mf/lib3mf_implicit.hpp")
++ if (EXISTS "/usr/include/lib3mf" AND EXISTS "/usr/include/lib3mf/Bindings/Cpp/lib3mf_implicit.hpp")
+ set(LIB3MF_VERSION "2.0.0")
+ endif()
+ endif()
+--
+2.30.1
+
diff --git a/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch
deleted file mode 100644
index ca21b9322e8..00000000000
--- a/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8d6fd9c0896e513eec2da3c97cfd33a5ec09c148 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sun, 17 May 2020 21:38:45 +0200
-Subject: [PATCH] [Gentoo-specific] Disable ccache building
-
-On Gentoo we use a USE flag to determine whether to use
-ccache for building or not.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- openscad.pro | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/openscad.pro b/openscad.pro
-index cc7f3569..8fbd3a5b 100755
---- a/openscad.pro
-+++ b/openscad.pro
-@@ -208,10 +208,10 @@ mdi {
- DEFINES += ENABLE_MDI
- }
-
--system("ccache -V >/dev/null 2>/dev/null") {
-- CONFIG += ccache
-- message("Using ccache")
--}
-+#system("ccache -V >/dev/null 2>/dev/null") {
-+# CONFIG += ccache
-+# message("Using ccache")
-+#}
-
- include(common.pri)
-
---
-2.26.2
-
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 75aa20b67f1..3ccb815587c 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -24,6 +24,16 @@
<flag name="ccache">
Use <pkg>dev-util/ccache</pkg> to speed up rebuilds
</flag>
+ <flag name="gamepad">
+ Add support for gamepads through <pkg>dev-qt/qtgamepad</pkg>
+ </flag>
+ <flag name="headless">
+ Build a binary without GUI
+ </flag>
+ <flag name="spacenav">
+ Add support for space navigator devices through
+ <pkg>dev-libs/libspnav</pkg>
+ </flag>
</use>
<upstream>
<remote-id type="github">openscad/openscad</remote-id>
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index a718d9a9a8a..433200d96c2 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,49 +1,58 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit elisp-common git-r3 qmake-utils xdg
+inherit cmake elisp-common git-r3 xdg
SITEFILE="50${PN}-gentoo.el"
DESCRIPTION="The Programmers Solid 3D CAD Modeller"
HOMEPAGE="https://www.openscad.org/"
+SRC_URI=""
EGIT_REPO_URI="https://github.com/openscad/openscad.git"
-LICENSE="GPL-2"
+# Code is GPL-3+, MCAD library is LGPL-2.1
+LICENSE="GPL-3+ LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="ccache emacs"
-RESTRICT="test"
+IUSE="cairo dbus emacs gamepad headless spacenav"
+RESTRICT="test" # 32 out 1300+ tests fail
+
+REQUIRED_USE="
+ headless? ( !dbus !gamepad !spacenav )
+"
RDEPEND="
dev-cpp/eigen:3
dev-libs/boost:=
dev-libs/double-conversion:=
dev-libs/glib:2
- dev-libs/gmp:0=
- dev-libs/hidapi
- dev-libs/libspnav
+ dev-libs/libxml2
dev-libs/libzip:=
- dev-libs/mpfr:0=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
media-gfx/opencsg
media-libs/fontconfig
media-libs/freetype
- >=media-libs/glew-2.0.0:0=
+ media-libs/glew:0=
media-libs/harfbuzz:=
media-libs/lib3mf
sci-mathematics/cgal:=
- >=x11-libs/qscintilla-2.10.3:=
- emacs? ( >=app-editors/emacs-23.1:* )
+ virtual/opengl
+ cairo? ( x11-libs/cairo )
+ emacs? ( app-editors/emacs:* )
+ !headless? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5[-gles2-only]
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ x11-libs/qscintilla:=
+ dbus? ( dev-qt/qtdbus:5 )
+ gamepad? ( dev-qt/qtgamepad:5 )
+ )
+ spacenav? ( dev-libs/libspnav )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -52,27 +61,45 @@ BDEPEND="
sys-devel/flex
sys-devel/gettext
virtual/pkgconfig
- ccache? ( dev-util/ccache )
"
-src_prepare() {
- default
+DOCS=(
+ RELEASE_NOTES.md
+ doc/TODO.txt
+ doc/contributor_copyright.txt
+ doc/hacking.md
+ doc/testing.txt
+)
- # fix path prefix
- sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
- # disable ccache
- if ! use ccache; then
- eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
+src_prepare() {
+ if has_version ">=media-libs/lib3mf-2"; then
+ eapply "${FILESDIR}/${P}-0001-fix-to-find-lib3mf-2.patch"
fi
+ cmake_src_prepare
}
src_configure() {
- eqmake5 "${PN}.pro"
+ local mycmakeargs=(
+ -DCLANG_TIDY=OFF
+ -DENABLE_CAIRO=$(usex cairo)
+ -DENABLE_SPNAV=$(usex spacenav)
+ -DENABLE_TESTS=OFF
+ -DHEADLESS=$(usex headless)
+ -DUSE_CCACHE=OFF
+ )
+
+ if use !headless; then
+ mycmakeargs+=(
+ -DENABLE_GAMEPAD=$(usex gamepad)
+ -DENABLE_QTDBUS=$(usex dbus)
+ )
+ fi
+
+ cmake_src_configure
}
src_compile() {
- default
+ cmake_src_compile
if use emacs ; then
elisp-compile contrib/*.el
@@ -80,24 +107,30 @@ src_compile() {
}
src_install() {
- emake install INSTALL_ROOT="${D}"
+ DOCS+=( doc/*.pdf )
+ cmake_src_install
+
+ mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+ ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
+
+ rm -r "${ED}"/usr/share/openscad/libraries/MCAD/.{git,gitignore} || die
if use emacs; then
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
elisp-install ${PN} contrib/*.el contrib/*.elc
fi
-
- einstalldocs
}
pkg_postinst() {
use emacs && elisp-site-regen
xdg_desktop_database_update
+ xdg_icon_cache_update
xdg_mimeinfo_database_update
}
pkg_postrm() {
use emacs && elisp-site-regen
xdg_desktop_database_update
+ xdg_icon_cache_update
xdg_mimeinfo_database_update
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
@ 2021-05-04 22:02 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-05-04 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 4c017ffe1777b31221ca4243c3cf4ed729ccc6ea
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun May 2 12:21:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 4 22:00:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c017ffe
media-gfx/openscad: drop 2019.05
Security cleanup (CVE-2020-28599)
Bug: https://bugs.gentoo.org/773217
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20657
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/openscad/Manifest | 1 -
...ad-2019.05-0001-Fix-build-with-boost-1.73.patch | 28 -----
...2-Gentoo-specific-Disable-ccache-building.patch | 35 -------
...ad-2019.05-0003-change-C-standard-to-c-14.patch | 76 --------------
.../openscad-2019.05_fix-boost-1.72.0-build.patch | 27 -----
media-gfx/openscad/metadata.xml | 3 -
media-gfx/openscad/openscad-2019.05-r5.ebuild | 115 ---------------------
7 files changed, 285 deletions(-)
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 31cd206a20c..ac0202896cd 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,2 +1 @@
-DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
diff --git a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
deleted file mode 100644
index 74f48b4c1ae..00000000000
--- a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 47275a3d92969709e7605f23a408c5ed5aa483c9 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 15 May 2020 19:09:10 +0200
-Subject: [PATCH] Fix build with boost-1.73
-
-Thanks to William T Wilson for reporting and providing the patch.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- src/import.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/import.cc b/src/import.cc
-index eef1323..08e46ff 100644
---- a/src/import.cc
-+++ b/src/import.cc
-@@ -50,7 +50,7 @@ namespace fs = boost::filesystem;
- #include <boost/assign/std/vector.hpp>
- using namespace boost::assign; // bring 'operator+=()' into scope
-
--#include <boost/detail/endian.hpp>
-+#include <boost/endian/arithmetic.hpp>
- #include <cstdint>
-
- extern PolySet * import_amf(std::string, const Location &loc);
---
-2.26.2
-
diff --git a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
deleted file mode 100644
index 1a4903828e8..00000000000
--- a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2940d8e5c74faa5dcd5279c8166064ade3da5695 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sun, 17 May 2020 21:13:44 +0200
-Subject: [PATCH] [Gentoo-specific] Disable ccache building
-
-On Gentoo we use a USE flag to determine whether to use
-ccache for building or not.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- openscad.pro | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/openscad.pro b/openscad.pro
-index 2d190dd..9c4e67b 100755
---- a/openscad.pro
-+++ b/openscad.pro
-@@ -214,10 +214,10 @@ mdi {
- DEFINES += ENABLE_MDI
- }
-
--system("ccache -V >/dev/null 2>/dev/null") {
-- CONFIG += ccache
-- message("Using ccache")
--}
-+#system("ccache -V >/dev/null 2>/dev/null") {
-+# CONFIG += ccache
-+# message("Using ccache")
-+#}
-
- include(common.pri)
-
---
-2.26.2
-
diff --git a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
deleted file mode 100644
index 3863d5631b9..00000000000
--- a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 02f9a4eca87d7713a8345b8513423d9d4a5127e0 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 27 Nov 2020 18:49:09 +0100
-Subject: [PATCH] change C++ standard to c++14
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- c++11.pri => c++std.pri | 21 ++++++++-------------
- common.pri | 2 +-
- 2 files changed, 9 insertions(+), 14 deletions(-)
- rename c++11.pri => c++std.pri (74%)
-
-diff --git a/c++11.pri b/c++std.pri
-similarity index 74%
-rename from c++11.pri
-rename to c++std.pri
-index 0a2c3b6..aac656d 100644
---- a/c++11.pri
-+++ b/c++std.pri
-@@ -4,16 +4,16 @@ macx {
- dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
- for(dir, dirs) {
- system(otool -L $${dir}/libboost_thread* | grep libc++ >& /dev/null ) {
-- message("Using libc++11")
-+ message("Using libc++")
- CONFIG += libc++
- }
- else {
- message("Using libstdc++")
- CONFIG += libstdc++
-- c++11 {
-- # libc++ is a requirement for using C++11
-- warning("Disabling C++11 since libstdc++ dependencies were found")
-- CONFIG -= c++11
-+ c++std {
-+ # libc++ is a requirement for using C++14
-+ warning("Disabling C++14 since libstdc++ dependencies were found")
-+ CONFIG -= c++std
- }
- }
- }
-@@ -25,9 +25,9 @@ macx {
- }
- }
-
--c++11 {
-- QMAKE_CXXFLAGS += -std=c++11
-- message("Using C++11")
-+c++std {
-+ QMAKE_CXXFLAGS += -std=c++14
-+ message("Using C++14")
-
- *clang*: {
- # 3rd party libraries will probably violate this for a long time
-@@ -41,8 +41,3 @@ c++11 {
- QMAKE_OBJECTIVE_CFLAGS_WARN_ON += $$CXX11_SUPPRESS_WARNINGS
- }
- }
--else {
-- *clang* {
-- QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
-- }
--}
-diff --git a/common.pri b/common.pri
-index 1110757..d1d5edc 100644
---- a/common.pri
-+++ b/common.pri
-@@ -30,4 +30,4 @@ include(win.pri)
- include(flex.pri)
- include(bison.pri)
- include(opengl.pri)
--include(c++11.pri)
-+include(c++std.pri)
---
-2.29.2
-
diff --git a/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch b/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch
deleted file mode 100644
index 28d3285a737..00000000000
--- a/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Fri, 25 Oct 2019 15:10:26 +0000
-Subject: [PATCH] Add missing header bootlegged by Boost < 1.72
-
-src/parser.y:76:6: error: no template named 'stack' in namespace 'std'
-std::stack<LocalScope *> scope_stack;
-~~~~~^
----
- src/parser.y | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/parser.y b/src/parser.y
-index 7f4fd56c..4c77c989 100644
---- a/src/parser.y
-+++ b/src/parser.y
-@@ -46,6 +46,7 @@
- #include "printutils.h"
- #include "memory.h"
- #include <sstream>
-+#include <stack>
- #include <boost/filesystem.hpp>
- #include "boost-utils.h"
- #include "feature.h"
---
-2.24.1
-
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 56612a76fb9..9070d4a92fd 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -21,9 +21,6 @@
Mac OS X.
</longdescription>
<use>
- <flag name="ccache">
- Use <pkg>dev-util/ccache</pkg> to speed up rebuilds
- </flag>
<flag name="gamepad">
Add support for gamepads through <pkg>dev-qt/qtgamepad</pkg>
</flag>
diff --git a/media-gfx/openscad/openscad-2019.05-r5.ebuild b/media-gfx/openscad/openscad-2019.05-r5.ebuild
deleted file mode 100644
index 66fb9b68a87..00000000000
--- a/media-gfx/openscad/openscad-2019.05-r5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="ccache emacs"
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${P}_fix-boost-1.72.0-build.patch"
- "${FILESDIR}/${P}-0001-Fix-build-with-boost-1.73.patch"
- "${FILESDIR}/${P}-0003-change-C-standard-to-c-14.patch"
-)
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-libs/boost:=
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/gmp:0=
- dev-libs/hidapi
- dev-libs/libspnav
- dev-libs/libzip:=
- dev-libs/mpfr:0=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-gfx/opencsg
- media-libs/fontconfig
- media-libs/freetype
- >=media-libs/glew-2.0.0:0=
- media-libs/harfbuzz:=
- <media-libs/lib3mf-2
- sci-mathematics/cgal:=
- >=x11-libs/qscintilla-2.10.3:=
- emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/itstool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- ccache? ( dev-util/ccache )
-"
-
-src_prepare() {
- default
-
- # fix path prefix
- sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
- # change c++ standard
- sed -e 's/CONFIG += c++11/CONFIG += c++std/' -i openscad.pro || die
-
- # disable ccache
- if ! use ccache; then
- eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
- fi
-}
-
-src_configure() {
- eqmake5 "${PN}.pro"
-}
-
-src_compile() {
- default
-
- if use emacs ; then
- elisp-compile contrib/*.el
- fi
-}
-
-src_install() {
- emake install INSTALL_ROOT="${D}"
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- elisp-install ${PN} contrib/*.el contrib/*.elc
- fi
-
- mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
- ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
-
- einstalldocs
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
@ 2022-04-15 6:18 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2022-04-15 6:18 UTC (permalink / raw
To: gentoo-commits
commit: 0d52105b62053748216dc2975f55d6764ae08013
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Thu Mar 24 17:02:30 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 06:18:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d52105b
media-gfx/openscad: drop outdated patch for 9999
Closes: https://bugs.gentoo.org/832944
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24929
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...-config-name-and-include-directory-search.patch | 31 ----------------------
media-gfx/openscad/openscad-9999.ebuild | 5 ++--
2 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch b/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch
deleted file mode 100644
index a448deec37da..000000000000
--- a/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2483ee56960c99c35036273fc9fc2877eac772fc Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 20 Oct 2021 19:46:08 +0200
-Subject: [PATCH] fix pkg-config name and include directory search
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- cmake/Modules/FindLib3MF.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/FindLib3MF.cmake b/cmake/Modules/FindLib3MF.cmake
-index 44858364..ad2f01ca 100644
---- a/cmake/Modules/FindLib3MF.cmake
-+++ b/cmake/Modules/FindLib3MF.cmake
-@@ -14,11 +14,11 @@
- # Travis CI Ubuntu Trusty environment has some issue with pkg-config
- # not finding the version.
- find_package(PkgConfig REQUIRED QUIET)
--pkg_check_modules(PC_LIB3MF lib3MF)
-+pkg_check_modules(PC_LIB3MF lib3mf)
- set(LIB3MF_VERSION ${PC_LIB3MF_VERSION})
-
- find_path(LIB3MF_INCLUDE_DIRS
-- NAMES Model/COM/NMR_DLLInterfaces.h
-+ NAMES lib3mf_implicit.hpp
- HINTS $ENV{LIB3MF_INCLUDEDIR}
- ${PC_LIB3MF_INCLUDEDIR}
- ${PC_LIB3MF_INCLUDE_DIRS}
---
-2.33.1
-
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index f7e74169b9ec..996bf04653fb 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -47,6 +47,7 @@ RDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
+ dev-qt/qtsvg:5
dev-qt/qtwidgets:5
x11-libs/qscintilla:=
dbus? ( dev-qt/qtdbus:5 )
@@ -71,8 +72,6 @@ DOCS=(
doc/testing.txt
)
-PATCHES=( "${FILESDIR}"/${P}-fix-pkg-config-name-and-include-directory-search.patch )
-
src_configure() {
local mycmakeargs=(
-DCLANG_TIDY=OFF
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
@ 2022-07-03 11:51 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2022-07-03 11:51 UTC (permalink / raw
To: gentoo-commits
commit: e89baa8837fb77c1b0bcabb611e1cd7a03468af9
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Jun 13 06:06:49 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 11:51:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89baa88
media-gfx/openscad: fix build against >=cgal-5.4.1
Also address two CVE issues, CVE-2022-0496 and CVE-2022-0497
Fix double quoting of output file parameter for ghostscript
Closes: https://bugs.gentoo.org/851189
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25870
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
| 36 +++++++
...96-Out-of-bounds-memory-access-in-DXF-loa.patch | 74 ++++++++++++++
| 25 +++++
...ailure-with-generic_print_polyhedron-on-C.patch | 42 ++++++++
...1.01-Fix-build-issue-with-overloaded-join.patch | 60 +++++++++++
...le-quoting-of-the-output-file-parameter-f.patch | 20 ++++
media-gfx/openscad/openscad-2021.01-r4.ebuild | 112 +++++++++++++++++++++
7 files changed, 369 insertions(+)
--git a/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch b/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
new file mode 100644
index 000000000000..5fea4998683d
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/851189
+From https://github.com/openscad/openscad/commit/abfebc651343909b534ef337aacc7604c99cf0ea Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul@gmx.de>
+Date: Wed, 2 Feb 2022 02:30:59 +0100
+Subject: [PATCH 09/11] CGAL build fix, v5.4 renames projection traits header
+ files and classes.
+
+--- a/src/cgalutils-tess.cc
++++ b/src/cgalutils-tess.cc
+@@ -6,10 +6,12 @@
+ #pragma push_macro("NDEBUG")
+ #undef NDEBUG
+ #include <CGAL/Constrained_Delaunay_triangulation_2.h>
+-#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
+- #include <CGAL/Triangulation_2_projection_traits_3.h>
++#if CGAL_VERSION_NR < 1050401000
++#include <CGAL/Triangulation_2_projection_traits_3.h>
++typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
+ #else
+- #include <CGAL/Triangulation_2_filtered_projection_traits_3.h>
++#include <CGAL/Projection_traits_3.h>
++typedef CGAL::Filtered_projection_traits_3<K> Projection;
+ #endif
+ #include <CGAL/Triangulation_face_base_with_info_2.h>
+ #pragma pop_macro("NDEBUG")
+@@ -19,7 +21,6 @@ struct FaceInfo {
+ bool in_domain() { return nesting_level%2 == 1; }
+ };
+
+-typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
+ typedef CGAL::Triangulation_face_base_with_info_2<FaceInfo, K> Fbb;
+ typedef CGAL::Triangulation_data_structure_2<
+ CGAL::Triangulation_vertex_base_2<Projection>,
+--
+2.35.1
+
diff --git a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
new file mode 100644
index 000000000000..6c0a9558e3fb
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
@@ -0,0 +1,74 @@
+From https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41 Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul@gmx.de>
+Date: Sat, 5 Feb 2022 18:38:31 +0100
+Subject: [PATCH 01/11] CVE-2022-0496 Out-of-bounds memory access in DXF
+ loader.
+
+Public issue:
+https://github.com/openscad/openscad/issues/4037
+
+Fix in master branch:
+https://github.com/openscad/openscad/pull/4090
+--- a/src/dxfdata.cc
++++ b/src/dxfdata.cc
+@@ -441,6 +441,11 @@ DxfData::DxfData(double fn, double fs, double fa,
+ auto lv = grid.data(this->points[lines[idx].idx[j]][0], this->points[lines[idx].idx[j]][1]);
+ for (size_t ki = 0; ki < lv.size(); ++ki) {
+ int k = lv.at(ki);
++ if (k < 0 || k >= lines.size()) {
++ LOG(message_group::Warning,Location::NONE,"",
++ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
++ continue;
++ }
+ if (k == idx || lines[k].disabled) continue;
+ goto next_open_path_j;
+ }
+@@ -466,13 +471,20 @@ DxfData::DxfData(double fn, double fs, double fa,
+ auto lv = grid.data(ref_point[0], ref_point[1]);
+ for (size_t ki = 0; ki < lv.size(); ++ki) {
+ int k = lv.at(ki);
++ if (k < 0 || k >= lines.size()) {
++ LOG(message_group::Warning,Location::NONE,"",
++ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
++ continue;
++ }
+ if (lines[k].disabled) continue;
+- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
++ auto idk0 = lines[k].idx[0]; // make it easier to read and debug
++ auto idk1 = lines[k].idx[1];
++ if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) {
+ current_line = k;
+ current_point = 0;
+ goto found_next_line_in_open_path;
+ }
+- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) {
++ if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) {
+ current_line = k;
+ current_point = 1;
+ goto found_next_line_in_open_path;
+@@ -501,13 +513,20 @@ DxfData::DxfData(double fn, double fs, double fa,
+ auto lv = grid.data(ref_point[0], ref_point[1]);
+ for (size_t ki = 0; ki < lv.size(); ++ki) {
+ int k = lv.at(ki);
++ if (k < 0 || k >= lines.size()) {
++ LOG(message_group::Warning,Location::NONE,"",
++ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
++ continue;
++ }
+ if (lines[k].disabled) continue;
+- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
++ auto idk0 = lines[k].idx[0]; // make it easier to read and debug
++ auto idk1 = lines[k].idx[1];
++ if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) {
+ current_line = k;
+ current_point = 0;
+ goto found_next_line_in_closed_path;
+ }
+- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) {
++ if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) {
+ current_line = k;
+ current_point = 1;
+ goto found_next_line_in_closed_path;
+--
+2.35.1
+
--git a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
new file mode 100644
index 000000000000..39ef72406f47
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
@@ -0,0 +1,25 @@
+From https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul@gmx.de>
+Date: Sat, 5 Feb 2022 18:45:29 +0100
+Subject: [PATCH 02/11] CVE-2022-0497 Out-of-bounds memory access in comment
+ parser.
+
+Public issue:
+https://github.com/openscad/openscad/issues/4043
+
+Fix in master branch:
+https://github.com/openscad/openscad/pull/4044
+--- a/src/comment.cpp
++++ b/src/comment.cpp
+@@ -92,7 +92,7 @@ static std::string getComment(const std::string &fulltext, int line)
+ }
+
+ int end = start + 1;
+- while (fulltext[end] != '\n') end++;
++ while (end < fulltext.size() && fulltext[end] != '\n') end++;
+
+ std::string comment = fulltext.substr(start, end - start);
+
+--
+2.35.1
+
diff --git a/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch b/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
new file mode 100644
index 000000000000..f09954bf01be
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
@@ -0,0 +1,42 @@
+https://bugs.gentoo.org/851189
+From https://github.com/openscad/openscad/commit/9aa0d7e9f2914fe5f547bdde69202161d1c6064d Mon Sep 17 00:00:00 2001
+From: Jordan Brown <github@jordan.maileater.net>
+Date: Sun, 18 Jul 2021 21:01:46 -0700
+Subject: [PATCH 05/11] Fix build failure with "generic_print_polyhedron" on
+ CGAL-5.3.
+
+--- a/src/cgalutils-polyhedron.cc
++++ b/src/cgalutils-polyhedron.cc
+@@ -337,19 +337,6 @@ namespace CGALUtils {
+ }
+ };
+
+- template <typename Polyhedron>
+- std::string printPolyhedron(const Polyhedron &p) {
+- std::ostringstream sstream;
+- sstream.precision(20);
+-
+- Polyhedron_writer writer;
+- generic_print_polyhedron(sstream, p, writer);
+-
+- return sstream.str();
+- }
+-
+- template std::string printPolyhedron(const CGAL_Polyhedron &p);
+-
+ }; // namespace CGALUtils
+
+ #endif /* ENABLE_CGAL */
+--- a/src/cgalutils.h
++++ b/src/cgalutils.h
+@@ -45,7 +45,6 @@ namespace CGALUtils {
+ bool is_approximately_convex(const PolySet &ps);
+ Geometry const* applyMinkowski(const Geometry::Geometries &children);
+
+- template <typename Polyhedron> std::string printPolyhedron(const Polyhedron &p);
+ template <typename Polyhedron> bool createPolySetFromPolyhedron(const Polyhedron &p, PolySet &ps);
+ template <typename Polyhedron> bool createPolyhedronFromPolySet(const PolySet &ps, Polyhedron &p);
+ template <class Polyhedron_A, class Polyhedron_B>
+--
+2.35.1
+
diff --git a/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch b/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch
new file mode 100644
index 000000000000..7a70b183d447
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/851189
+From https://github.com/openscad/openscad/commit/08bf69b4115c989fc5671254e0d05735d01bcca5 Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul@gmx.de>
+Date: Wed, 2 Feb 2022 00:50:43 +0100
+Subject: [PATCH 10/11] Fix build issue with overloaded join().
+
+--- a/src/openscad.cc
++++ b/src/openscad.cc
+@@ -65,7 +65,6 @@
+ #include <chrono>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/algorithm/string/split.hpp>
+-#include <boost/algorithm/string/join.hpp>
+ #include <boost/range/adaptor/transformed.hpp>
+ #include <boost/program_options.hpp>
+ #include <boost/filesystem.hpp>
+@@ -307,7 +306,7 @@ void set_render_color_scheme(const std::string color_scheme, const bool exit_if_
+ }
+
+ if (exit_if_not_found) {
+- LOG(message_group::None,Location::NONE,"",(boost::join(ColorMap::inst()->colorSchemeNames(), "\n")));
++ LOG(message_group::None,Location::NONE,"",(boost::algorithm::join(ColorMap::inst()->colorSchemeNames(), "\n")));
+
+ exit(1);
+ } else {
+@@ -885,7 +884,7 @@ struct CommaSeparatedVector
+ };
+
+ template <class Seq, typename ToString>
+-std::string join(const Seq &seq, const std::string &sep, const ToString &toString)
++std::string str_join(const Seq &seq, const std::string &sep, const ToString &toString)
+ {
+ return boost::algorithm::join(boost::adaptors::transform(seq, toString), sep);
+ }
+@@ -947,7 +946,7 @@ int main(int argc, char **argv)
+ ("P,P", po::value<string>(), "customizer parameter set")
+ #ifdef ENABLE_EXPERIMENTAL
+ ("enable", po::value<vector<string>>(), ("enable experimental features: " +
+- join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
++ str_join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
+ [](const Feature *feature) {
+ return feature->get_name();
+ }) +
+@@ -964,11 +963,11 @@ int main(int argc, char **argv)
+ ("render", po::value<string>()->implicit_value(""), "for full geometry evaluation when exporting png")
+ ("preview", po::value<string>()->implicit_value(""), "[=throwntogether] -for ThrownTogether preview png")
+ ("animate", po::value<unsigned>(), "export N animated frames")
+- ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::join(viewOptions.names(), " | ")).c_str())
++ ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::algorithm::join(viewOptions.names(), " | ")).c_str())
+ ("projection", po::value<string>(), "=(o)rtho or (p)erspective when exporting png")
+ ("csglimit", po::value<unsigned int>(), "=n -stop rendering at n CSG elements when exporting png")
+ ("colorscheme", po::value<string>(), ("=colorscheme: " +
+- join(ColorMap::inst()->colorSchemeNames(), " | ",
++ str_join(ColorMap::inst()->colorSchemeNames(), " | ",
+ [](const std::string& colorScheme) {
+ return (colorScheme == ColorMap::inst()->defaultColorSchemeName() ? "*" : "") + colorScheme;
+ }) +
+--
+2.35.1
+
diff --git a/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch b/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch
new file mode 100644
index 000000000000..20167b910ee4
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch
@@ -0,0 +1,20 @@
+From https://github.com/openscad/openscad/commit/45a5e3bdd6c8071cb50b9c3f2b14a62554aafc4a Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul@gmx.de>
+Date: Thu, 14 Apr 2022 16:07:04 +0200
+Subject: [PATCH 11/11] Remove double quoting of the output file parameter for
+ ghostscript.
+
+--- a/tests/export_pngtest.py
++++ b/tests/export_pngtest.py
+@@ -82,7 +82,7 @@ result = subprocess.call(export_cmd, env = fontenv)
+ if result != 0:
+ failquit('OpenSCAD failed with return code ' + str(result))
+
+-convert_cmd = gs_cmd + ["-sOutputFile=\"" + pngfile + "\"", exportfile]
++convert_cmd = gs_cmd + ["-sOutputFile=" + pngfile, exportfile]
+ print('Running Converter:', ' '.join(convert_cmd), file=sys.stderr)
+ result = subprocess.call(convert_cmd)
+ if result != 0:
+--
+2.35.1
+
diff --git a/media-gfx/openscad/openscad-2021.01-r4.ebuild b/media-gfx/openscad/openscad-2021.01-r4.ebuild
new file mode 100644
index 000000000000..9b67272f4c26
--- /dev/null
+++ b/media-gfx/openscad/openscad-2021.01-r4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://www.openscad.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="emacs"
+# tests are not fully working and need cmake which isn't yet
+# officially supported.
+RESTRICT="test"
+
+RDEPEND="
+ dev-cpp/eigen:3
+ dev-libs/boost:=
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/gmp:0=
+ dev-libs/hidapi
+ dev-libs/libspnav
+ dev-libs/libxml2
+ dev-libs/libzip:=
+ dev-libs/mpfr:0=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5[-gles2-only]
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ media-gfx/opencsg:=
+ media-libs/fontconfig
+ media-libs/freetype
+ >=media-libs/glew-2.0.0:0=
+ media-libs/harfbuzz:=
+ media-libs/lib3mf
+ sci-mathematics/cgal:=
+ x11-libs/cairo
+ >=x11-libs/qscintilla-2.10.3:=
+ emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/itstool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch
+ "${FILESDIR}"/${P}-0002-fix-to-find-lib3mf-2.patch
+ "${FILESDIR}"/${P}-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
+ "${FILESDIR}"/${P}-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
+ "${FILESDIR}"/${P}-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
+ "${FILESDIR}"/${P}-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
+ "${FILESDIR}"/${P}-Fix-build-issue-with-overloaded-join.patch
+ "${FILESDIR}"/${P}-Remove-double-quoting-of-the-output-file-parameter-f.patch
+)
+
+src_configure() {
+ if has ccache ${FEATURES}; then
+ eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
+ else
+ eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro"
+ fi
+}
+
+src_compile() {
+ default
+
+ if use emacs ; then
+ elisp-compile contrib/*.el
+ fi
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ elisp-install ${PN} contrib/*.el contrib/*.elc
+ fi
+
+ mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+ ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
@ 2025-01-14 16:20 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2025-01-14 16:20 UTC (permalink / raw
To: gentoo-commits
commit: 41dfe556d7db6a4e677d63f5bf9e47f7a380a9e5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 22:18:47 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 15:48:11 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dfe556
media-gfx/openscad: drop 2021.01-r5
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/openscad/Manifest | 1 -
...1-Gentoo-specific-Disable-ccache-building.patch | 32 ------
...penscad-2021.01-0002-fix-to-find-lib3mf-2.patch | 43 --------
| 36 -------
...96-Out-of-bounds-memory-access-in-DXF-loa.patch | 74 -------------
| 25 -----
...ailure-with-generic_print_polyhedron-on-C.patch | 42 --------
...1.01-Fix-build-issue-with-overloaded-join.patch | 60 -----------
...le-quoting-of-the-output-file-parameter-f.patch | 20 ----
.../files/openscad-2021.01-boost-1.85.patch | 12 ---
media-gfx/openscad/openscad-2021.01-r5.ebuild | 118 ---------------------
11 files changed, 463 deletions(-)
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 03d32353cffc..1f822d2c1cc8 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,4 +1,3 @@
-DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
DIST openscad-2024.12.30_pre.tar.gz 25338952 BLAKE2B 41baa7f5df30e46611a2ef59dc0aa05ccb85644dddfb979224b5b026f1b9338285eecd50e2078543163621c89fbc81e97b7593b641a223b48ca02029962f8076 SHA512 e63ac792c16852c1bbdf06a3cb044b453e05c20a95158adddbc09239bcf228fd113a6e33f83d5580e615ecab3cdab8436da9e21d2ab3c3f8846f66219218713b
DIST openscad-20241114.tar.gz 25288312 BLAKE2B 0c1a9b4b15c12f4b3b600e81cdb5eeddb34887c83e2ae67735d7221b6660730dc5e7f97f80b84d187772adfa20d15e20f0cded1b4937e26305434847bbf2af27 SHA512 6c66c09e4b72ec5ef200d077b58fcb7a5a9acd359551a5daebdc3e24cb2cb7ed7d607b04e5563ea6f14d9d929310c3a9194ac889f2530c2c933235271040981a
DIST openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26.tar.gz 58895 BLAKE2B e154a38e1c36873a34f7c80b8fa484e4bbcb1b0c217e15b977e6cedc9a83fd2e1518791f9a58a4f0e893c2a55947d7eaddb660d8b725eca048c30f0ea41cf14a SHA512 c6208a90f6a58ebdc0477d3e1b6be2f52e4ce976ac619a87818437cb9696b7e83285564fde757d32efaf50033d5217b55f67b6ce342250de838dd09fef334f36
diff --git a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
deleted file mode 100644
index 6de581078d27..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c138881767262b9f5c64a465a0e1e46ffcfc5899 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 28 Feb 2021 16:51:30 +0100
-Subject: [PATCH] [Gentoo specific] Disable ccache building
-
-On Gentoo, we use a USE flag to determine whether ccache
-should be used for building.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- openscad.pro | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/openscad.pro b/openscad.pro
-index b76ca76..678e08d 100755
---- a/openscad.pro
-+++ b/openscad.pro
-@@ -211,11 +211,6 @@ mdi {
- DEFINES += ENABLE_MDI
- }
-
--system("ccache -V >/dev/null 2>/dev/null") {
-- CONFIG += ccache
-- message("Using ccache")
--}
--
- include(common.pri)
-
- # mingw has to come after other items so OBJECT_DIRS will work properly
---
-2.30.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
deleted file mode 100644
index 1995bd6e0ac4..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 16847a70cf05484a668d8f79aba4ccec7e16c025 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 6 Mar 2021 22:59:17 +0100
-Subject: [PATCH] fix to find lib3mf-2
-
-The pkgconfig file for lib3mf has been renamed in case
-for lib3mf-2 versions.
-This patch uses the news names.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- features/lib3mf.prf | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/features/lib3mf.prf b/features/lib3mf.prf
-index 2c512da..47be364 100644
---- a/features/lib3mf.prf
-+++ b/features/lib3mf.prf
-@@ -15,8 +15,8 @@ isEmpty(LIB3MF_LIBPATH) {
- }
-
- isEmpty(LIB3MF_INCLUDEPATH) {
-- LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3MF")
-- LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3MF")
-+ LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3mf")
-+ LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3mf")
- !isEmpty(LIB3MF_CFLAGS) {
- ENABLE_LIB3MF=yes
- }
-@@ -25,8 +25,8 @@ isEmpty(LIB3MF_INCLUDEPATH) {
- }
-
- isEmpty(LIB3MF_LIBPATH) {
-- LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3MF")
-- LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3MF")
-+ LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3mf")
-+ LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3mf")
- !isEmpty(LIB3MF_LIBS) {
- ENABLE_LIB3MF=yes
- }
---
-2.30.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch b/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
deleted file mode 100644
index 5fea4998683d..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/851189
-From https://github.com/openscad/openscad/commit/abfebc651343909b534ef337aacc7604c99cf0ea Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Wed, 2 Feb 2022 02:30:59 +0100
-Subject: [PATCH 09/11] CGAL build fix, v5.4 renames projection traits header
- files and classes.
-
---- a/src/cgalutils-tess.cc
-+++ b/src/cgalutils-tess.cc
-@@ -6,10 +6,12 @@
- #pragma push_macro("NDEBUG")
- #undef NDEBUG
- #include <CGAL/Constrained_Delaunay_triangulation_2.h>
--#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
-- #include <CGAL/Triangulation_2_projection_traits_3.h>
-+#if CGAL_VERSION_NR < 1050401000
-+#include <CGAL/Triangulation_2_projection_traits_3.h>
-+typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
- #else
-- #include <CGAL/Triangulation_2_filtered_projection_traits_3.h>
-+#include <CGAL/Projection_traits_3.h>
-+typedef CGAL::Filtered_projection_traits_3<K> Projection;
- #endif
- #include <CGAL/Triangulation_face_base_with_info_2.h>
- #pragma pop_macro("NDEBUG")
-@@ -19,7 +21,6 @@ struct FaceInfo {
- bool in_domain() { return nesting_level%2 == 1; }
- };
-
--typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
- typedef CGAL::Triangulation_face_base_with_info_2<FaceInfo, K> Fbb;
- typedef CGAL::Triangulation_data_structure_2<
- CGAL::Triangulation_vertex_base_2<Projection>,
---
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
deleted file mode 100644
index 6c0a9558e3fb..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41 Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Sat, 5 Feb 2022 18:38:31 +0100
-Subject: [PATCH 01/11] CVE-2022-0496 Out-of-bounds memory access in DXF
- loader.
-
-Public issue:
-https://github.com/openscad/openscad/issues/4037
-
-Fix in master branch:
-https://github.com/openscad/openscad/pull/4090
---- a/src/dxfdata.cc
-+++ b/src/dxfdata.cc
-@@ -441,6 +441,11 @@ DxfData::DxfData(double fn, double fs, double fa,
- auto lv = grid.data(this->points[lines[idx].idx[j]][0], this->points[lines[idx].idx[j]][1]);
- for (size_t ki = 0; ki < lv.size(); ++ki) {
- int k = lv.at(ki);
-+ if (k < 0 || k >= lines.size()) {
-+ LOG(message_group::Warning,Location::NONE,"",
-+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
-+ continue;
-+ }
- if (k == idx || lines[k].disabled) continue;
- goto next_open_path_j;
- }
-@@ -466,13 +471,20 @@ DxfData::DxfData(double fn, double fs, double fa,
- auto lv = grid.data(ref_point[0], ref_point[1]);
- for (size_t ki = 0; ki < lv.size(); ++ki) {
- int k = lv.at(ki);
-+ if (k < 0 || k >= lines.size()) {
-+ LOG(message_group::Warning,Location::NONE,"",
-+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
-+ continue;
-+ }
- if (lines[k].disabled) continue;
-- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
-+ auto idk0 = lines[k].idx[0]; // make it easier to read and debug
-+ auto idk1 = lines[k].idx[1];
-+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) {
- current_line = k;
- current_point = 0;
- goto found_next_line_in_open_path;
- }
-- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) {
-+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) {
- current_line = k;
- current_point = 1;
- goto found_next_line_in_open_path;
-@@ -501,13 +513,20 @@ DxfData::DxfData(double fn, double fs, double fa,
- auto lv = grid.data(ref_point[0], ref_point[1]);
- for (size_t ki = 0; ki < lv.size(); ++ki) {
- int k = lv.at(ki);
-+ if (k < 0 || k >= lines.size()) {
-+ LOG(message_group::Warning,Location::NONE,"",
-+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
-+ continue;
-+ }
- if (lines[k].disabled) continue;
-- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
-+ auto idk0 = lines[k].idx[0]; // make it easier to read and debug
-+ auto idk1 = lines[k].idx[1];
-+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) {
- current_line = k;
- current_point = 0;
- goto found_next_line_in_closed_path;
- }
-- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) {
-+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) {
- current_line = k;
- current_point = 1;
- goto found_next_line_in_closed_path;
---
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
deleted file mode 100644
index 39ef72406f47..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Sat, 5 Feb 2022 18:45:29 +0100
-Subject: [PATCH 02/11] CVE-2022-0497 Out-of-bounds memory access in comment
- parser.
-
-Public issue:
-https://github.com/openscad/openscad/issues/4043
-
-Fix in master branch:
-https://github.com/openscad/openscad/pull/4044
---- a/src/comment.cpp
-+++ b/src/comment.cpp
-@@ -92,7 +92,7 @@ static std::string getComment(const std::string &fulltext, int line)
- }
-
- int end = start + 1;
-- while (fulltext[end] != '\n') end++;
-+ while (end < fulltext.size() && fulltext[end] != '\n') end++;
-
- std::string comment = fulltext.substr(start, end - start);
-
---
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch b/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
deleted file mode 100644
index f09954bf01be..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/851189
-From https://github.com/openscad/openscad/commit/9aa0d7e9f2914fe5f547bdde69202161d1c6064d Mon Sep 17 00:00:00 2001
-From: Jordan Brown <github@jordan.maileater.net>
-Date: Sun, 18 Jul 2021 21:01:46 -0700
-Subject: [PATCH 05/11] Fix build failure with "generic_print_polyhedron" on
- CGAL-5.3.
-
---- a/src/cgalutils-polyhedron.cc
-+++ b/src/cgalutils-polyhedron.cc
-@@ -337,19 +337,6 @@ namespace CGALUtils {
- }
- };
-
-- template <typename Polyhedron>
-- std::string printPolyhedron(const Polyhedron &p) {
-- std::ostringstream sstream;
-- sstream.precision(20);
--
-- Polyhedron_writer writer;
-- generic_print_polyhedron(sstream, p, writer);
--
-- return sstream.str();
-- }
--
-- template std::string printPolyhedron(const CGAL_Polyhedron &p);
--
- }; // namespace CGALUtils
-
- #endif /* ENABLE_CGAL */
---- a/src/cgalutils.h
-+++ b/src/cgalutils.h
-@@ -45,7 +45,6 @@ namespace CGALUtils {
- bool is_approximately_convex(const PolySet &ps);
- Geometry const* applyMinkowski(const Geometry::Geometries &children);
-
-- template <typename Polyhedron> std::string printPolyhedron(const Polyhedron &p);
- template <typename Polyhedron> bool createPolySetFromPolyhedron(const Polyhedron &p, PolySet &ps);
- template <typename Polyhedron> bool createPolyhedronFromPolySet(const PolySet &ps, Polyhedron &p);
- template <class Polyhedron_A, class Polyhedron_B>
---
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch b/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch
deleted file mode 100644
index 7a70b183d447..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/851189
-From https://github.com/openscad/openscad/commit/08bf69b4115c989fc5671254e0d05735d01bcca5 Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Wed, 2 Feb 2022 00:50:43 +0100
-Subject: [PATCH 10/11] Fix build issue with overloaded join().
-
---- a/src/openscad.cc
-+++ b/src/openscad.cc
-@@ -65,7 +65,6 @@
- #include <chrono>
- #include <boost/algorithm/string.hpp>
- #include <boost/algorithm/string/split.hpp>
--#include <boost/algorithm/string/join.hpp>
- #include <boost/range/adaptor/transformed.hpp>
- #include <boost/program_options.hpp>
- #include <boost/filesystem.hpp>
-@@ -307,7 +306,7 @@ void set_render_color_scheme(const std::string color_scheme, const bool exit_if_
- }
-
- if (exit_if_not_found) {
-- LOG(message_group::None,Location::NONE,"",(boost::join(ColorMap::inst()->colorSchemeNames(), "\n")));
-+ LOG(message_group::None,Location::NONE,"",(boost::algorithm::join(ColorMap::inst()->colorSchemeNames(), "\n")));
-
- exit(1);
- } else {
-@@ -885,7 +884,7 @@ struct CommaSeparatedVector
- };
-
- template <class Seq, typename ToString>
--std::string join(const Seq &seq, const std::string &sep, const ToString &toString)
-+std::string str_join(const Seq &seq, const std::string &sep, const ToString &toString)
- {
- return boost::algorithm::join(boost::adaptors::transform(seq, toString), sep);
- }
-@@ -947,7 +946,7 @@ int main(int argc, char **argv)
- ("P,P", po::value<string>(), "customizer parameter set")
- #ifdef ENABLE_EXPERIMENTAL
- ("enable", po::value<vector<string>>(), ("enable experimental features: " +
-- join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
-+ str_join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
- [](const Feature *feature) {
- return feature->get_name();
- }) +
-@@ -964,11 +963,11 @@ int main(int argc, char **argv)
- ("render", po::value<string>()->implicit_value(""), "for full geometry evaluation when exporting png")
- ("preview", po::value<string>()->implicit_value(""), "[=throwntogether] -for ThrownTogether preview png")
- ("animate", po::value<unsigned>(), "export N animated frames")
-- ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::join(viewOptions.names(), " | ")).c_str())
-+ ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::algorithm::join(viewOptions.names(), " | ")).c_str())
- ("projection", po::value<string>(), "=(o)rtho or (p)erspective when exporting png")
- ("csglimit", po::value<unsigned int>(), "=n -stop rendering at n CSG elements when exporting png")
- ("colorscheme", po::value<string>(), ("=colorscheme: " +
-- join(ColorMap::inst()->colorSchemeNames(), " | ",
-+ str_join(ColorMap::inst()->colorSchemeNames(), " | ",
- [](const std::string& colorScheme) {
- return (colorScheme == ColorMap::inst()->defaultColorSchemeName() ? "*" : "") + colorScheme;
- }) +
---
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch b/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch
deleted file mode 100644
index 20167b910ee4..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From https://github.com/openscad/openscad/commit/45a5e3bdd6c8071cb50b9c3f2b14a62554aafc4a Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Thu, 14 Apr 2022 16:07:04 +0200
-Subject: [PATCH 11/11] Remove double quoting of the output file parameter for
- ghostscript.
-
---- a/tests/export_pngtest.py
-+++ b/tests/export_pngtest.py
-@@ -82,7 +82,7 @@ result = subprocess.call(export_cmd, env = fontenv)
- if result != 0:
- failquit('OpenSCAD failed with return code ' + str(result))
-
--convert_cmd = gs_cmd + ["-sOutputFile=\"" + pngfile + "\"", exportfile]
-+convert_cmd = gs_cmd + ["-sOutputFile=" + pngfile, exportfile]
- print('Running Converter:', ' '.join(convert_cmd), file=sys.stderr)
- result = subprocess.call(convert_cmd)
- if result != 0:
---
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch b/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch
deleted file mode 100644
index e3370f32fc38..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff '--color=auto' -ur openscad-2021.01-orig/src/FileModule.cc openscad-2021.01/src/FileModule.cc
---- openscad-2021.01-orig/src/FileModule.cc 2021-01-31 21:17:41.000000000 +0100
-+++ openscad-2021.01/src/FileModule.cc 2024-05-20 07:50:31.746487490 +0200
-@@ -65,7 +65,7 @@
- auto ext = fs::path(path).extension().generic_string();
-
- if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) {
-- if (fs::is_regular(path)) {
-+ if (fs::is_regular_file(path)) {
- FontCache::instance()->register_font_file(path);
- } else {
- LOG(message_group::Error,Location::NONE,"","Can't read font with path '%1$s'",path);
diff --git a/media-gfx/openscad/openscad-2021.01-r5.ebuild b/media-gfx/openscad/openscad-2021.01-r5.ebuild
deleted file mode 100644
index 3e4af4844ba7..000000000000
--- a/media-gfx/openscad/openscad-2021.01-r5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common flag-o-matic qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-IUSE="emacs"
-# tests are not fully working and need cmake which isn't yet
-# officially supported.
-RESTRICT="test"
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-libs/boost:=
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/gmp:0=
- dev-libs/hidapi
- dev-libs/libspnav
- dev-libs/libxml2
- dev-libs/libzip:=
- dev-libs/mpfr:0=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-gfx/opencsg:=
- media-libs/fontconfig
- media-libs/freetype
- >=media-libs/glew-2.0.0:0=
- media-libs/harfbuzz:=
- media-libs/lib3mf
- sci-mathematics/cgal:=
- x11-libs/cairo
- >=x11-libs/qscintilla-2.10.3:=[qt5(+)]
- emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/itstool
- app-alternatives/yacc
- app-alternatives/lex
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch
- "${FILESDIR}"/${P}-0002-fix-to-find-lib3mf-2.patch
- "${FILESDIR}"/${P}-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
- "${FILESDIR}"/${P}-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
- "${FILESDIR}"/${P}-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
- "${FILESDIR}"/${P}-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
- "${FILESDIR}"/${P}-Fix-build-issue-with-overloaded-join.patch
- "${FILESDIR}"/${P}-Remove-double-quoting-of-the-output-file-parameter-f.patch
- "${FILESDIR}"/${P}-boost-1.85.patch
-)
-
-src_configure() {
- # -Werror=odr
- # https://github.com/openscad/openscad/issues/5239
- filter-lto
-
- if has ccache ${FEATURES}; then
- eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
- else
- eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro"
- fi
-}
-
-src_compile() {
- # We have random parallel build issues, bug #856430
- emake -j1
-
- if use emacs ; then
- elisp-compile contrib/*.el
- fi
-}
-
-src_install() {
- emake install INSTALL_ROOT="${D}"
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- elisp-install ${PN} contrib/*.el contrib/*.elc
- fi
-
- mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
- ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
-
- einstalldocs
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2025-01-14 16:20 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-21 21:24 [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-01-14 16:20 Andreas Sturmlechner
2022-07-03 11:51 Joonas Niilola
2022-04-15 6:18 Joonas Niilola
2021-05-04 22:02 Sam James
2021-03-07 9:03 Joonas Niilola
2020-12-07 8:56 Joonas Niilola
2020-06-12 7:00 Joonas Niilola
2020-06-12 7:00 Joonas Niilola
2019-05-15 18:29 Andreas Sturmlechner
2017-05-14 12:49 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox