diff options
Diffstat (limited to 'media-gfx/openscad')
| -rw-r--r-- | media-gfx/openscad/Manifest | 7 | ||||
| -rw-r--r-- | media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch | 27 | ||||
| -rw-r--r-- | media-gfx/openscad/openscad-2015.03_p3-r1.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/openscad/openscad-2019.05-r1.ebuild | 6 | ||||
| -rw-r--r-- | media-gfx/openscad/openscad-9999.ebuild | 2 |
5 files changed, 38 insertions, 6 deletions
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index bcadae76a985..17da9c1797b7 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -1,9 +1,10 @@ AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e AUX openscad-2015.03_p2_uic_tr_fix.patch 345 BLAKE2B 46f19ba25f9a19b2b6841493877d14a0c6c3c8dcf7d8e5ec65d4d0d8fc5c79b15467b71dd29bfeb38decd4f100d06e9fe185c1670f336672998ef02e9e59794c SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2 AUX openscad-2015.03_p3_fix-boost-1.70.0-build.patch 697 BLAKE2B 093b04177e9222e6b41cae806bd8feedf1135ffe26f966f291accb1f72e1683cab4b7339827c8720873e6d45475faabb680a3e5b40dee9e4d03f356cc49888b7 SHA512 4640dac7ee1c8dc8078c33141c08948ec45144275db84c07a079d624210516ed4795d7ff0cbea4842aac9342e07fa0ec6ad938d0fd637a2f1bee2e1055e6baf4 +AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13 -EBUILD openscad-2015.03_p3-r1.ebuild 1614 BLAKE2B 6893c841c57595f2139d339c29ec5a47fc3ccedeee1ddd33b7d47c295ef01ba75383918c48c4821bcd520b0e072eb73492f7e6d5cbea4a0755ccc2d5ba688431 SHA512 ab06488d537004e0aff0668e688078fa98820ed9948c1a3ff11a6c20685cee1d28d743d1b2cb6a1f8f97ea35c84e5064a11157da31d437f604b9a92326b52fa7 -EBUILD openscad-2019.05-r1.ebuild 1502 BLAKE2B f2d24980b60eb0ff80afee53f155e63f6176be6266c3ac6b7cbef0ffe987ef611d171bc8a3bde00c36a80960b722144223f6fa68317ad775989137f4539a6b9e SHA512 f1648de37ad19410fde1c022568db35ff6bb737c51e79f445232390e4156dce81e2d4b82c03ec47a9f44d381afa6ef7ed822cb945ea9dc93e2d0e3f908bca9cc -EBUILD openscad-9999.ebuild 1365 BLAKE2B 2d00f343fd981e771b5215146d26017949dfa2c29f358a5430ce353a5bfc11e481b04b270e89a7f5717c1a535d3c93ae5b794fd2cad5834f86294927708ec3ca SHA512 d3dc21a02a29fca95aa8df5e8b650eae61f31b3fd1ab61a0dbe4c303b974f5bd27a75f92b873b3f4c0e56699afbf37ee0bf53f44fc62c59c099e1caf9cf84977 +EBUILD openscad-2015.03_p3-r1.ebuild 1627 BLAKE2B 25102ebeffe72b17181f8706aad5dbc2e53ebedcd367887bf69d042a13f9885d847c2770eaf09c785c6ee2108c978c76b624b06518f676e673a7f9ba38f1b707 SHA512 a6a44733e27fe93a96e059a8b097ba6eb9508dfe8688c97c9676f4ed55d80873c11fcbd0408ffd2998aaf647a2b5f2c0f5f9e73cf28062884322e872ca7acf2a +EBUILD openscad-2019.05-r1.ebuild 1586 BLAKE2B 7424f651a851407daf4d3ccca76b8fb174a317322dcd098b5e2151a383f6648ee0970b154c0b39a2b77d5b354beafc645e59bc2d76f52ce44d19561f9e99c8f8 SHA512 b829c91e60e8db36b1b170e425c6bca20a8340955d294f95b641ca1b86e1d74476fbdd6f97a23844e7b10a383eea18669f92eb0e258b55252002f3f0468bad9e +EBUILD openscad-9999.ebuild 1378 BLAKE2B 6cbdc07111b125e2ee482a284c97614a9c84071aae288d53a3f5adac8abfb255e0d4734835f00950106de760eccc84baee799f5d6517fcbd6e57ad8cd8b44f1a SHA512 dda6d1407515217996692655c7d3d8fa26472b30795e5003c58cfb9eea1eec6f32040c3e819a2a392c612e18b5cd32c2a2d49dedee23a34dd59f4ac5e51ff2ad MISC metadata.xml 1025 BLAKE2B f1d33e8f6f5f045c0993882d461e9bd8457fc33ee5c32b115540abe18e66b8020ae2ba0f6a593b3e7feb3e48c1d85554bb8340ee0606541964770a40dafc76b6 SHA512 951f3c8d8f68fa60d56f2c01014ab757fc4a72a7d1c98518c3d4c80db55878740a8c267b87e734cc29284fe2bd05e0b54a13c0b09eb9fd8f10fb67a051b687be 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 000000000000..28d3285a7375 --- /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-2015.03_p3-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild index 043c1d22a21c..7ce8b1f70da2 100644 --- a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild +++ b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild @@ -37,7 +37,7 @@ DEPEND=" media-libs/harfbuzz sci-mathematics/cgal:= >=x11-libs/qscintilla-2.9.4:=[qt5(+)] - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) " RDEPEND="${DEPEND}" diff --git a/media-gfx/openscad/openscad-2019.05-r1.ebuild b/media-gfx/openscad/openscad-2019.05-r1.ebuild index 8991b255f4ca..dfdb27dfe668 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 @@ -42,7 +46,7 @@ RDEPEND=" media-libs/harfbuzz:= sci-mathematics/cgal:= >=x11-libs/qscintilla-2.10.3:= - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) " DEPEND="${RDEPEND}" BDEPEND=" diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild index e885fba11965..3af31a6a7176 100644 --- a/media-gfx/openscad/openscad-9999.ebuild +++ b/media-gfx/openscad/openscad-9999.ebuild @@ -36,7 +36,7 @@ DEPEND=" media-libs/harfbuzz sci-mathematics/cgal:= >=x11-libs/qscintilla-2.9.4:=[qt5(+)] - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) " RDEPEND="${DEPEND}" |