diff options
Diffstat (limited to 'media-gfx/openscad')
9 files changed, 5 insertions, 297 deletions
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index 5e9706cb7b28..88502b2c9cb5 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -1,14 +1,8 @@ AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e -AUX openscad-2019.05-0001-Fix-build-with-boost-1.73.patch 827 BLAKE2B 3450919d7c92e20fccbe61174dcfb56c96930e43a75baa1632bcb706c3c61d2c77bf290098337a6b6cfcdd7f97f47419c62d8153081b3d5951935be07ab34b1b SHA512 8cea77da618ba6a258357640fc1ab479cc3b10a42ce9b2d0f70dbafde959de68a889b6234143b6f43a3b15c8abc0765e658f5cc81cc22572f9a228f089c0eb23 -AUX openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch 820 BLAKE2B abfa2f4067dca1bdd2a1169cb3d9e1b4a804fa27bf8ec3a6a98106861713a3273f401a4e51c2fb8afab397b6326960609ae2700d0755b3b819ede749bc202b5e SHA512 87031a2f1b132434b349ead74e1e6d247f51ed48b0f2f8970dc99d9c47a441022ea169728302f680142325888433f07f4888a52727b31fda8e26e28d8b5d2100 -AUX openscad-2019.05-0003-change-C-standard-to-c-14.patch 1961 BLAKE2B faa9a935b50b5ae05d79658c236e7662626624cb752637e3643105a8558ff0135435543c2fe0080aaecc702240f7c48ae516b17d7ce20dfda0f98923eb30e8b6 SHA512 aa64ed7eca1c49ffd7e6d0a67206033ea360e6fb3d8ef31a02617393624f6f0eb6021ab5d3b8f6ce147559e49575f99745d7ed6e566c0eb3376af00bc188f5d8 -AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c AUX openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch 790 BLAKE2B b08a024f81a29d7fb4e0860977b814d2ec6ce6dcbf8ab87655f5d36f51ea3bbce6559369363c33ca7593cbc3284de920f71be3c38e3ab7b5efa83d3466132b79 SHA512 2af887d7b085c49203e72ad41cb5c0e32b772a8abd35843485434cb11b263ba8a727a0ebc34c7138bff1e6852245f2bdaf7d91711184a5f16ed22603578a0892 AUX openscad-2021.01-0002-fix-to-find-lib3mf-2.patch 1396 BLAKE2B a43872dd83427f28a48528fbac534924796db769bd0213ba1b6fca41a65c766aa3355aa9ee3f7d68dcbbf3d578cee984f2ad61f599fdf9551ef55724f460f4db SHA512 ffbf402976054c1e7294a0d661e0648bdb359cf57e676d818cf1140644b7a0d0943f5adf1d2f511ad17ca45a35e31785aae584dc7607f13bfc9d94795fc3812b AUX openscad-9999-0001-fix-to-find-lib3mf-2.patch 1317 BLAKE2B f8e42492d2a85fc8ac3c9c6dd985c786051e2e398c875bfff2796229d269947ed7a00306511f02881d15ceb4cad6e45e7cacb43950e25311a8f8a5be0ac89dd2 SHA512 71ef3b68183175796c1bda50e9a65da9770d0fb1fcd6b6ce60e52efede2e11322e487cf363b8af6418bd7e59ddb5add5abfde5c84d09feca7ddca0c84672f017 -DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128 -EBUILD openscad-2019.05-r5.ebuild 2370 BLAKE2B c467ccc9cc544545b780d915611f04e5db32bbd6eb106d140c45400bdc9979ee55459e1fcce1286c3b95b9b043b001fdbb40af24ad97684c1693f4cc7a7fbc46 SHA512 9b525433b12e4d125cb568032fca3d1b8a7ab699b4887e7b84172776973d965861046c6b1fa7c19439118220bd0cb585bf5f6ae81f51700cbe7d8c6aacab7b11 -EBUILD openscad-2021.01.ebuild 2312 BLAKE2B 6c577a43dcbe50d9926ef18e326f94e470954b7f5a77403153d4c01a6b04d17723e8130099774556c2810dc31709a2ec677a43f15167974e5747dd920b936592 SHA512 c7501773b7c73f42f80e4c32a9ac0e9b1bbccca80252da6762b887173bf8d118e6d9d22c46b43ebcb30fb6b32ce0c045113f99dc2f437d68ac141d03daa411fb -EBUILD openscad-9999.ebuild 2711 BLAKE2B 8ffeccfc4b473f47f7d787ec8c942d91b483aa9ee73e104a40c117c5bd35304c810b397f46438c879e416739b8586c35ba5af76f6c4fea92e37fdaef47294aac SHA512 c74b01903711779da96d591b11ef346279b3f8958c96d2c71b17fc65094e42a3b1e684666cd30883d5ea5ec6dd50bea59550911f9a1460cb399f9ec101b3a8f4 -MISC metadata.xml 1432 BLAKE2B a3521113144173687a24d729db70bbdbfeaf312889ba7461b8440501992da1d457676fbf1cb233cda5affdc024ca932b891e5751785d100fcc0af4ee1da8521f SHA512 ea8b7a46e3de907858841b305e3c6815da5a0a77bd11499beac33de70cf11af72b1332225fa762a85626b6463a7e0a46b35b4140d23a3d25d8c6c60cd90d5b79 +EBUILD openscad-2021.01.ebuild 2318 BLAKE2B 7d474960f76029b745bbcb26e6e4a6f2511f364bf10c85bcab9cf9ef4fc7bdc4b97402a602b59682e612af3cdb080e79abe24d06431c0a30c55c62daca9bbfaa SHA512 31a5481da0a65d589b0d4bbd41d76b77affcc2d1cf83fb1de91ea4766ac9ce74ba8a40e12ec7abadc823a7f30e51a93ac8b0871358adace7e9020003424a4a98 +EBUILD openscad-9999.ebuild 2637 BLAKE2B cb11bb884071eda0a6ab6106562bc5b5f8f5fe497cf6aa8f0bae6b78ebdee4c0f1ead216f8bdb0b6808f937cac7a4eedc0af3db427e44d9200d06570494416aa SHA512 4e03ffe8b4bc5e6a7ca57e3f373494852fceb62397bbb5bbdf3ad7aea8feda08345ec2f2b3735e730952da5e15d660035b006b82d5dda22f50aad8d88f14f31e +MISC metadata.xml 1347 BLAKE2B ff4a9e5a58a41dcdf9337001ae92b2c7f407d96a2b7a84d48588e806215ca107d8b817a64005eeb7b082b82173377efc4f053e9ed6c5a9da5b76f11bcc7d21d8 SHA512 21cd16257f53c5de698bf33acc9bd78044898a74c3dbc5f32487794d0edb396eb99f30b2d7ad736bab7c4c24ff377351d4dfdf0d5b9296c52178f1461eba83ae 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 74f48b4c1aed..000000000000 --- 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 1a4903828e80..000000000000 --- 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 3863d5631b9a..000000000000 --- 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 28d3285a7375..000000000000 --- 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 56612a76fb96..9070d4a92fd9 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 66fb9b68a87a..000000000000 --- 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 -} diff --git a/media-gfx/openscad/openscad-2021.01.ebuild b/media-gfx/openscad/openscad-2021.01.ebuild index 3302af494194..31831701d921 100644 --- a/media-gfx/openscad/openscad-2021.01.ebuild +++ b/media-gfx/openscad/openscad-2021.01.ebuild @@ -69,9 +69,9 @@ src_prepare() { src_configure() { if has ccache ${FEATURES}; then - eqmake5 "PREFIX = ${EROOT}/usr" "CONFIG += ccache" "${PN}.pro" + eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro" else - eqmake5 "PREFIX = ${EROOT}/usr" "${PN}.pro" + eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro" fi } diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild index 433200d96c25..c4a9b06dc70f 100644 --- a/media-gfx/openscad/openscad-9999.ebuild +++ b/media-gfx/openscad/openscad-9999.ebuild @@ -113,8 +113,6 @@ 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 |