* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/files/, media-gfx/openscad/
@ 2019-12-20 5:45 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2019-12-20 5:45 UTC (permalink / raw
To: gentoo-commits
commit: bca5d279dd1a2ceff9b672d81793aacb614adbf9
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Tue Dec 17 17:39:22 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 05:34:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bca5d279
media-gfx/openscad: fix compilation with boost-1.72
Patch originates from upstream commit which is staged for release
https://github.com/openscad/openscad/pull/3105
Closes: https://bugs.gentoo.org/703022
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Closes: https://github.com/gentoo/gentoo/pull/14028
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../openscad-2019.05_fix-boost-1.72.0-build.patch | 27 ++++++++++++++++++++++
media-gfx/openscad/openscad-2019.05-r1.ebuild | 4 ++++
2 files changed, 31 insertions(+)
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
new file mode 100644
index 00000000000..28d3285a737
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch
@@ -0,0 +1,27 @@
+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/openscad-2019.05-r1.ebuild b/media-gfx/openscad/openscad-2019.05-r1.ebuild
index 8991b255f4c..11211477d2d 100644
--- a/media-gfx/openscad/openscad-2019.05-r1.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r1.ebuild
@@ -16,6 +16,10 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="emacs"
+PATCHES=(
+ "${FILESDIR}/${PN}-2019.05_fix-boost-1.72.0-build.patch"
+)
+
# FIXME: add optional lib3mf
RDEPEND="
dev-cpp/eigen:3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/files/, media-gfx/openscad/
@ 2020-06-12 7:00 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2020-06-12 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 90798b37d1f8189d7130769f7936067740535721
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sun May 17 20:10:51 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=90798b37
media-gfx/openscad: backport r3 changes
Backport the changes from 2019.05-r3 to live ebuild.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...2-Gentoo-specific-Disable-ccache-building.patch | 35 +++++++++++++
media-gfx/openscad/openscad-9999.ebuild | 58 +++++++++++++++++-----
2 files changed, 81 insertions(+), 12 deletions(-)
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
new file mode 100644
index 00000000000..ca21b9322e8
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch
@@ -0,0 +1,35 @@
+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/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 6ce960b60bc..4dc6fbc2617 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -8,45 +8,67 @@ inherit elisp-common git-r3 qmake-utils xdg
SITEFILE="50${PN}-gentoo.el"
DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
+HOMEPAGE="https://www.openscad.org/"
EGIT_REPO_URI="https://github.com/openscad/openscad.git"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="emacs"
+IUSE="ccache emacs"
+RESTRICT="test"
-DEPEND="
+PATCHES=(
+ "${FILESDIR}/${PN}-2019.05-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[-gles2-only]
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
media-gfx/opencsg
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >=media-libs/glew-2.0.0:*
- media-libs/harfbuzz
+ 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.9.4:=[qt5(+)]
+ >=x11-libs/qscintilla-2.10.3:=
emacs? ( >=app-editors/emacs-23.1:* )
"
-RDEPEND="${DEPEND}"
+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
- # tries to call ccache even if it's not present otherwise
- sed -i '/CONFIG += ccache/d' ${PN}.pro || die
+ # disable ccache
+ if ! use ccache; then
+ eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
+ fi
}
src_configure() {
@@ -71,3 +93,15 @@ src_install() {
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] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/files/, media-gfx/openscad/
@ 2021-03-07 9:03 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2021-03-07 9:03 UTC (permalink / raw
To: gentoo-commits
commit: 764dd0f081d723d9593097055614cff5fb2b265a
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Mar 6 22:59:37 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=764dd0f0
media-gfx/openscad: bump to 2021.01
Bug: https://bugs.gentoo.org/773217
Closes: https://bugs.gentoo.org/769278
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19412
Signed-off-by: Joonas Niilola <juippis <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 ++++++++
media-gfx/openscad/openscad-2021.01.ebuild | 110 +++++++++++++++++++++
4 files changed, 186 insertions(+)
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index fd29bf8f45b..31cd206a20c 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1 +1,2 @@
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-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
new file mode 100644
index 00000000000..6de581078d2
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 00000000000..1995bd6e0ac
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
@@ -0,0 +1,43 @@
+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/openscad-2021.01.ebuild b/media-gfx/openscad/openscad-2021.01.ebuild
new file mode 100644
index 00000000000..5a5a5f2805d
--- /dev/null
+++ b/media-gfx/openscad/openscad-2021.01.ebuild
@@ -0,0 +1,110 @@
+# 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="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 )
+
+src_prepare() {
+ default
+ if has_version ">=media-libs/lib3mf-2"; then
+ eapply "${FILESDIR}/${P}-0002-fix-to-find-lib3mf-2.patch"
+ fi
+}
+
+src_configure() {
+ if has ccache ${FEATURES}; then
+ eqmake5 "PREFIX = ${EROOT}/usr" "CONFIG += ccache" "${PN}.pro"
+ else
+ eqmake5 "PREFIX = ${EROOT}/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] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/files/, media-gfx/openscad/
@ 2021-10-24 4:06 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-10-24 4:06 UTC (permalink / raw
To: gentoo-commits
commit: 627f06a62019f29f43fb5f542865b2274cdfc210
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Thu Oct 21 05:12:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 04:06:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=627f06a6
media-gfx/openscad: fix search for lib3mf
Reported-by: Jan Psota <jasiu <AT> belsznica.pl>
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22650
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../openscad-9999-0001-fix-to-find-lib3mf-2.patch | 36 ----------------------
...-config-name-and-include-directory-search.patch | 31 +++++++++++++++++++
media-gfx/openscad/openscad-9999.ebuild | 9 ++----
3 files changed, 33 insertions(+), 43 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
deleted file mode 100644
index 0ca19d33646..00000000000
--- a/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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-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
new file mode 100644
index 00000000000..a448deec37d
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch
@@ -0,0 +1,31 @@
+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 c4a9b06dc70..f7e74169b9e 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake elisp-common git-r3 xdg
@@ -71,12 +71,7 @@ DOCS=(
doc/testing.txt
)
-src_prepare() {
- if has_version ">=media-libs/lib3mf-2"; then
- eapply "${FILESDIR}/${P}-0001-fix-to-find-lib3mf-2.patch"
- fi
- cmake_src_prepare
-}
+PATCHES=( "${FILESDIR}"/${P}-fix-pkg-config-name-and-include-directory-search.patch )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/files/, media-gfx/openscad/
@ 2024-05-21 17:32 Miroslav Šulc
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2024-05-21 17:32 UTC (permalink / raw
To: gentoo-commits
commit: 766980c469c39f7f9604601a9d143a60ff860cc8
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 17:31:28 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 21 17:31:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766980c4
media-gfx/openscad: fixed compilation with boost 1.85
Closes: https://bugs.gentoo.org/932293
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch | 12 ++++++++++++
media-gfx/openscad/openscad-2021.01-r5.ebuild | 1 +
2 files changed, 13 insertions(+)
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
new file mode 100644
index 000000000000..e3370f32fc38
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch
@@ -0,0 +1,12 @@
+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
index 39b12ee55322..cf272f31a4f7 100644
--- a/media-gfx/openscad/openscad-2021.01-r5.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r5.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
"${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() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-05-21 17:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-12 7:00 [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/files/, media-gfx/openscad/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-05-21 17:32 Miroslav Šulc
2021-10-24 4:06 Sam James
2021-03-07 9:03 Joonas Niilola
2019-12-20 5:45 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox