diff options
Diffstat (limited to 'media-gfx/curaengine')
-rw-r--r-- | media-gfx/curaengine/Manifest | 19 | ||||
-rw-r--r-- | media-gfx/curaengine/curaengine-0.15.04.6.ebuild | 49 | ||||
-rw-r--r-- | media-gfx/curaengine/curaengine-2.1.0_beta.ebuild | 41 | ||||
-rw-r--r-- | media-gfx/curaengine/curaengine-2.3.1-r1.ebuild | 45 | ||||
-rw-r--r-- | media-gfx/curaengine/curaengine-2.3.1-r2.ebuild | 47 | ||||
-rw-r--r-- | media-gfx/curaengine/curaengine-2.6.0-r1.ebuild | 44 | ||||
-rw-r--r-- | media-gfx/curaengine/curaengine-2.6.0.ebuild | 41 | ||||
-rw-r--r-- | media-gfx/curaengine/curaengine-3.3.0.ebuild (renamed from media-gfx/curaengine/curaengine-2.3.1.ebuild) | 19 | ||||
-rw-r--r-- | media-gfx/curaengine/files/curaengine-0.15.04.6-cflags.patch | 27 | ||||
-rw-r--r-- | media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch | 43 | ||||
-rw-r--r-- | media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch | 13 | ||||
-rw-r--r-- | media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch | 14 | ||||
-rw-r--r-- | media-gfx/curaengine/metadata.xml | 19 |
13 files changed, 32 insertions, 389 deletions
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest index c3c9888c311b..f33d73a03703 100644 --- a/media-gfx/curaengine/Manifest +++ b/media-gfx/curaengine/Manifest @@ -1,16 +1,3 @@ -AUX curaengine-0.15.04.6-cflags.patch 750 BLAKE2B dfa1e1a0c855768387375ac3c0caa16de43a1b4009b68b4b54ca5cd5666818e863570ddebbeccf6a7c5f14dcabc1bd12c87738278cd78fa29b3409f7e85e11e6 SHA512 2109a1d1b07b97769347af7af58921b6d234c4a4bdc8ab8ab1aa0a0f3aac08b3f5e9f99fbb99001e1d505cee89fff30be40a20ba853ee6a3cdcdd98f5ad7058c -AUX curaengine-2.3.1-fix-stringtest-int-types.patch 1440 BLAKE2B 1b82117e0d13bcd2c7f480bc2b8816cae8298faa3a026b955082a14adf795e41405adc88f8f08f990fc8fd2e04e072788718f9773ba3c9040bea1395c5896135 SHA512 88e5465a5dc04726c9646672d6781f2e78bdf3ab9786bad0fb7b9cb390b611aabc663328fd2724081587d3c0c568733295c22101e2f8224e7b4df332dd4f4e6c -AUX curaengine-2.3.1-make-stringtest-64bit-safe.patch 645 BLAKE2B b36b556fb7d58ef771bbbf6f8314f61460e3bb436ec0178809992625cd96e71e006ec35995a209b46408d8c831e444f985f394fd2d90b99839509c28b79cb9de SHA512 364ae3575ff70bf6a1d2a12a3709b07b061e6c158ec3594d2ab8cb99dc059ef00036a79c2d6888ab91b001efc9004d3e26409cf7ea634561bbb4af84345f6fe3 -AUX curaengine-2.3.1-remove-gcodeplannertest.patch 370 BLAKE2B fbc5ed6858fe3e951a3eba93ecfef792d5f36e5e863793bff022a9591156c407ae4a1fff13042d9eee7dae3b4ab88b878d8a1904ad240bc7775114772d483b56 SHA512 f4a57be7e472b637635f035999d370c7bd09449f530d8f34d61c0a1fa353233b7f8c8578ebca582f5dbee8b714c7f67b09a8823da3d9360c6034acb1202c39f1 -DIST curaengine-0.15.04.6.tar.gz 107970 BLAKE2B cf72d74acbc5df4e46c066e27c36957380dee8a40301f0d489b23c0ab2f231bf4f3b7d953964fa7eb073c816a7f7aff755f25380d86bee37a61e1d0bd2ae3b68 SHA512 150e93dca08c57bc37af4c3232c0d18aed93347657d7261f89d7d8352d2774ac7a2a944c3b1efce432b507674f5e99981844823b792ec3fbe47799d2487e899d -DIST curaengine-2.1.0_beta.tar.gz 33322580 BLAKE2B dac6b108caddb006348b184465727fba311ee6b35c992db44bef1a0a129c8b5daebc8315ac1654120404a30c4a4851ee37d0c12e17886539f8f57572a26fa520 SHA512 23b1e1116fad8e75354a92b8320a228a0b7acb03bcdffa175b8b6f47af0b8af099efdc3c75f840d172fc157d432a05c741a5028f3b8da1e7fc1dd8cf158115fb -DIST curaengine-2.3.1.tar.gz 712429 BLAKE2B 9971468b9eb8aac12426a1483adf904825bc142e25010ba6ba989b94095ac92b10ad91a7fe5a486b823f9238813e986b58bb744e71209542c965cbd43486f56e SHA512 3d247048e51c7aca33b71d7d2382d673e7b4d547cb9fcbf639c9bbc801db067ea010c04a6fd4e88b87e00d9069f7a70019612148ae2b50095514b85078e71220 -DIST curaengine-2.6.0.tar.gz 828387 BLAKE2B db3db01a4c66d4a6ca7c6da1997c0a7250877568a4e93bb86393c777c368d22b73e85ad918b65d502670d2d483cb909b5fdae75b17081b04e2091d1498d9a6c8 SHA512 3991127ba3005b93f02ab72fd6c9208b153d5419145edb84f187e1fa32d03220001d8be958847360f7eaa75336ed44f3f7158cedea82d33450992145dfd0a0d9 -EBUILD curaengine-0.15.04.6.ebuild 1023 BLAKE2B a30c9939fecc1e1a58dd91f9e21137ccb9c9234da1b0bfc800698585806917cbc8cdf9e598e3dbf9be4c6d283c30b6f39849bc6821342d78ca4d20b0539892cb SHA512 21dcd8a630df89c8c89e70fc21b3509b1e7972985ba72afcc961d90990e382fe9d07d63c8013315b6afe14650e8e58134d74123e5920a019cfd0293a4192485e -EBUILD curaengine-2.1.0_beta.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f -EBUILD curaengine-2.3.1-r1.ebuild 1015 BLAKE2B 146e167fe405ce0aa4dbb77bf52899bbde55113e5248b8f6654c663628c9e8f07ce89ede7b815b5bfcaa13f2279bb8f8e6c353ef8dd172ec209bb5658af95e73 SHA512 db7d3bb6818af0d9c6121348cb6bfbc256135cb42b1677893b891d3970e20e1b0729f382ef3d7f3c5965efb86193fa8eb18d5b5f73023ca6cb35912e70da9765 -EBUILD curaengine-2.3.1-r2.ebuild 1123 BLAKE2B a63ee7dcea38d7b22009d4d27f0b9e119ea3c85fe1ab4468ba5436fba1d731866351b142d3e04174f00e165a8c64fb4ec419f5d086eb6a746d2b05e2398fd2bb SHA512 d8de8a03fa3b1b0281b5bcc40d6d37237cbe01a00348df44ea98dec7fda288085a53940c1ba8ab990e6dc3274ad26766343a7d328716c05e7291c6cdc8898f9e -EBUILD curaengine-2.3.1.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f -EBUILD curaengine-2.6.0-r1.ebuild 954 BLAKE2B a7f9f5739a50032a9f4f3aad2cf891cc2d5ac0076d1df49f72e94c354587b82690b7d6b57584990aafa54ba84ff14d75b3f02614cf61794a273412016fb2da3b SHA512 c7daaee08dc5db670f02c8fdf104f8c331ee0ec1d7db11a57ebae52e7626abd6f8ece20c6510b2a43509229dd5cd18979e80478516ce53169064bfe42eb2be70 -EBUILD curaengine-2.6.0.ebuild 883 BLAKE2B fc00d7c53904e98a422867a41a5864205d66ff7ef423564226be2eb7bd8f111c41bf8bc8e31b0e937b97305141e4e12b2e4d2bcd51b3b7ee127127d053830660 SHA512 8e29ef18e30c7c3383aabe2bfc98c3eaf2299d83a5824150baacad8a48257873705ce850a9a7cecb5f6669a9fcd15986e1411ad060137713d5253d8df670b623 -MISC metadata.xml 345 BLAKE2B 511f54aad8cd73aed32473b360cbec2147162bcd2c43eb4ebd221c17da563d90949dd0008e9bd47bc7cbd97a4ff2837da4054870a4714d8b271f5d4d6082b318 SHA512 eea1693928c47dd36f6ca76c7a7f3a5fdf6c49edd978f24be42d812b354ac6a8544036a9ae384e849d47cbe43a02ef0e1a2cbaff0f3929c344c49dc45fd49742 +DIST curaengine-3.3.0.tar.gz 935367 BLAKE2B c02fa8ac5d79f6506dad91967f46add0b22b585cfb9931d67e34a033a59ba828722782f7fcf590ef45aa645b3c5dcb92416dbb5ef321fd5bf19935b2b5f1d4e7 SHA512 14b1961c90ec8ecad6fadfb992b72a4e05f3fa6c9a7b580812f90410c655db9d5798d46aa17311c216631daae1c21f6255c6fc4a0d903a91091e0a7a63642f70 +EBUILD curaengine-3.3.0.ebuild 864 BLAKE2B 46798444b183df3a6ac8d849f21cde7eba678a0bac6469fb74eb7f65493413446ea8662b2b5de1c2938c14d60ddca660d5b7e53a3f4a5af01024c2712c67cbd1 SHA512 a8a1c307ac9575f0ffde948c8e33c1deb6f6cd0c4210a6772a7faf3d76761a16f93002238270dca8faaed413e1af8ae33774d24032fe4a67a6fcbda94a0e7c50 +MISC metadata.xml 862 BLAKE2B 233eef15a865c598451d8a6100a8dc99f4c9a4c4ae4f8692a473ad2b8de5c2bc5216052b2bbf698e98f1c7f8156512084beaebc6148b9bc333d5c09d9bfda3ba SHA512 92e4cf75b949ac201537780bc5acf295720da8a342f6d882e2ca3b36aaa5691a3df31e6cf79e44b25f88d2f1177a1b6227165cbe8b9da8762b35560927239382 diff --git a/media-gfx/curaengine/curaengine-0.15.04.6.ebuild b/media-gfx/curaengine/curaengine-0.15.04.6.ebuild deleted file mode 100644 index b375b1bffa2e..000000000000 --- a/media-gfx/curaengine/curaengine-0.15.04.6.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -MY_PV=${PV#0.} -MY_PN=CuraEngine - -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="A 3D model slicing engine for 3D printing" -HOMEPAGE="https://github.com/Ultimaker/CuraEngine" - -LICENSE="AGPL-3" -SLOT="0" -IUSE="test" - -RDEPEND="" -DEPEND="" - -S="${WORKDIR}/${MY_PN}-${MY_PV}" -PATCHES=( "${FILESDIR}"/${P}-cflags.patch ) - -src_prepare() { - tc-export CXX - default -} - -src_test() { - pushd tests 2>&- || die - einfo "Commencing test ..." - local testbin=( "${S}/build/CuraEngine" "-c" "supportAngle=60" "-c" "supportEverywhere=1" ) - local testmdl="${S}/tests/testModel.stl" - ${testbin[*]} "${testmdl}" - if [[ $? -eq 0 && -f "${testbin[0]}" && -f "${testmdl}" ]]; then - einfo "Test completed successfully." - else - ewarn "Test failed." - fi - popd 2>&- || die -} - -src_install() { - dobin build/CuraEngine - dodoc README.md -} diff --git a/media-gfx/curaengine/curaengine-2.1.0_beta.ebuild b/media-gfx/curaengine/curaengine-2.1.0_beta.ebuild deleted file mode 100644 index 10de130c3a96..000000000000 --- a/media-gfx/curaengine/curaengine-2.1.0_beta.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -MY_PN=CuraEngine -MY_PV=${PV/_beta} - -DESCRIPTION="A 3D model slicing engine for 3D printing" -HOMEPAGE="https://github.com/Ultimaker/CuraEngine" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -LICENSE="AGPL-3" -SLOT="0" -IUSE="doc test" - -RDEPEND="${PYTHON_DEPS} - dev-libs/libarcus:= - >=dev-libs/protobuf-3" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" -S="${WORKDIR}/${MY_PN}-${MY_PV}" -DOCS=( README.md ) - -src_configure() { - local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_make - if use doc; then - doxygen - mv docs/html . || die - find html -name '*.md5' -or -name '*.map' -delete || die - DOCS+=( html ) - fi -} diff --git a/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild b/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild deleted file mode 100644 index ee9efe32b82a..000000000000 --- a/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -MY_PN=CuraEngine -MY_PV=${PV/_beta} - -DESCRIPTION="A 3D model slicing engine for 3D printing" -HOMEPAGE="https://github.com/Ultimaker/CuraEngine" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -LICENSE="AGPL-3" -SLOT="0" -IUSE="doc test" - -RDEPEND="${PYTHON_DEPS} - dev-libs/libarcus:= - >=dev-libs/protobuf-3" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen - media-gfx/graphviz ) - test? ( dev-util/cppunit )" - -S="${WORKDIR}/${MY_PN}-${MY_PV}" -DOCS=( "README.md" ) -PATCHES=( "${FILESDIR}/${P}-remove-gcodeplannertest.patch" ) - -src_configure() { - local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_make - if use doc; then - doxygen || die - mv docs/html . || die - find html -name '*.md5' -or -name '*.map' -delete || die - HTML_DOCS=( html/. ) - fi -} diff --git a/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild b/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild deleted file mode 100644 index caa04ad6c138..000000000000 --- a/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -MY_PN=CuraEngine -MY_PV=${PV/_beta} - -DESCRIPTION="A 3D model slicing engine for 3D printing" -HOMEPAGE="https://github.com/Ultimaker/CuraEngine" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -LICENSE="AGPL-3" -SLOT="0" -IUSE="doc test" - -RDEPEND="${PYTHON_DEPS} - dev-libs/libarcus:= - >=dev-libs/protobuf-3" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen - media-gfx/graphviz ) - test? ( dev-util/cppunit )" - -S="${WORKDIR}/${MY_PN}-${MY_PV}" -DOCS=( "README.md" ) -PATCHES=( "${FILESDIR}/${P}-remove-gcodeplannertest.patch" - "${FILESDIR}/${P}-make-stringtest-64bit-safe.patch" - "${FILESDIR}/${P}-fix-stringtest-int-types.patch" ) - -src_configure() { - local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_make - if use doc; then - doxygen || die - mv docs/html . || die - find html -name '*.md5' -or -name '*.map' -delete || die - HTML_DOCS=( html/. ) - fi -} diff --git a/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild b/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild deleted file mode 100644 index b6dbce74a56f..000000000000 --- a/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -MY_PN=CuraEngine -MY_PV=${PV/_beta} - -DESCRIPTION="A 3D model slicing engine for 3D printing" -HOMEPAGE="https://github.com/Ultimaker/CuraEngine" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -LICENSE="AGPL-3" -SLOT="0" -IUSE="doc test" - -RDEPEND="${PYTHON_DEPS} - dev-libs/libarcus:= - >=dev-libs/protobuf-3" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen - media-gfx/graphviz ) - test? ( dev-util/cppunit )" - -S="${WORKDIR}/${MY_PN}-${MY_PV}" -DOCS=( "README.md" ) - -src_configure() { - local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_make - if use doc; then - doxygen || die - mv docs/html . || die - find html -name '*.md5' -or -name '*.map' -delete || die - HTML_DOCS=( html/. ) - fi -} diff --git a/media-gfx/curaengine/curaengine-2.6.0.ebuild b/media-gfx/curaengine/curaengine-2.6.0.ebuild deleted file mode 100644 index 814f01f58f9f..000000000000 --- a/media-gfx/curaengine/curaengine-2.6.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -MY_PN=CuraEngine -MY_PV=${PV/_beta} - -DESCRIPTION="A 3D model slicing engine for 3D printing" -HOMEPAGE="https://github.com/Ultimaker/CuraEngine" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -LICENSE="AGPL-3" -SLOT="0" -IUSE="doc test" - -RDEPEND="${PYTHON_DEPS} - dev-libs/libarcus:= - >=dev-libs/protobuf-3" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" -S="${WORKDIR}/${MY_PN}-${MY_PV}" -DOCS=( README.md ) - -src_configure() { - local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_make - if use doc; then - doxygen - mv docs/html . || die - find html -name '*.md5' -or -name '*.map' -delete || die - DOCS+=( html ) - fi -} diff --git a/media-gfx/curaengine/curaengine-2.3.1.ebuild b/media-gfx/curaengine/curaengine-3.3.0.ebuild index 10de130c3a96..2f945665c4a1 100644 --- a/media-gfx/curaengine/curaengine-2.3.1.ebuild +++ b/media-gfx/curaengine/curaengine-3.3.0.ebuild @@ -1,30 +1,31 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 inherit cmake-utils -MY_PN=CuraEngine -MY_PV=${PV/_beta} +MY_PN="CuraEngine" DESCRIPTION="A 3D model slicing engine for 3D printing" HOMEPAGE="https://github.com/Ultimaker/CuraEngine" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" +SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" +KEYWORDS="~amd64 ~x86" IUSE="doc test" RDEPEND="${PYTHON_DEPS} - dev-libs/libarcus:= - >=dev-libs/protobuf-3" + ~dev-libs/libarcus-${PV}:* + dev-libs/protobuf" DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" -S="${WORKDIR}/${MY_PN}-${MY_PV}" + DOCS=( README.md ) +S="${WORKDIR}/${MY_PN}-${PV}" + src_configure() { local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" ) cmake-utils_src_configure diff --git a/media-gfx/curaengine/files/curaengine-0.15.04.6-cflags.patch b/media-gfx/curaengine/files/curaengine-0.15.04.6-cflags.patch deleted file mode 100644 index 9807301e462c..000000000000 --- a/media-gfx/curaengine/files/curaengine-0.15.04.6-cflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/Makefile b/Makefile -index 32fa704..c426ef8 100644 ---- a/Makefile -+++ b/Makefile -@@ -18,9 +18,9 @@ endif - ifeq ($(BUILD_TYPE),PROFILE) - CFLAGS+= -pg - endif --ifeq ($(BUILD_TYPE),RELEASE) -- CFLAGS+= -O3 -fomit-frame-pointer --endif -+#ifeq ($(BUILD_TYPE),RELEASE) -+# CFLAGS+= -O3 -fomit-frame-pointer -+#endif - - LDFLAGS += -Lbuild/ -lclipper - -# By courtesy of Whissi: this enforces use of our CXXFLAGS -@@ -70,7 +70,7 @@ $(BUILD_DIR)/libclipper.a: $(LIBS_DIR)/clipper/clipper.cpp - $(CXX) $(CFLAGS) -o $(BUILD_DIR)/libclipper.a $(LIBS_DIR)/clipper/clipper.cpp - - $(EXECUTABLE): $(OBJECTS) $(BUILD_DIR)/libclipper.a -- $(CXX) $(OBJECTS) -o $@ $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ - - $(DIRS): - -@$(MKDIR_PREFIX) $(DIRS) diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch b/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch deleted file mode 100644 index e30bde4de451..000000000000 --- a/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fe45e504ace024d920fe18b4f55d6aa07b2f929b Mon Sep 17 00:00:00 2001 -From: Ghostkeeper <rubend@tutanota.com> -Date: Mon, 20 Nov 2017 10:46:09 +0100 -Subject: [PATCH] Use ints instead of int64_t to test writing ints - -Because sprintf doesn't accept anything more. ---- - tests/utils/StringTest.cpp | 4 ++-- - tests/utils/StringTest.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/utils/StringTest.cpp b/tests/utils/StringTest.cpp -index 5bd16c5d3..980d2145f 100644 ---- a/tests/utils/StringTest.cpp -+++ b/tests/utils/StringTest.cpp -@@ -71,12 +71,12 @@ void StringTest::writeInt2mmTestMax() - } - - --void StringTest::writeInt2mmAssert(int64_t in) -+void StringTest::writeInt2mmAssert(int in) - { - std::ostringstream ss; - writeInt2mm(in, ss); - std::string str = ss.str(); -- int64_t out = MM2INT(strtod(str.c_str(), nullptr)); -+ int out = MM2INT(strtod(str.c_str(), nullptr)); - - char buffer[200]; - sprintf(buffer, "The integer %d was printed as '%s' which was interpreted as %d rather than %d!", in, str.c_str(), out, in); -diff --git a/tests/utils/StringTest.h b/tests/utils/StringTest.h -index 58be00642..da1da793a 100644 ---- a/tests/utils/StringTest.h -+++ b/tests/utils/StringTest.h -@@ -68,7 +68,7 @@ class StringTest : public CppUnit::TestFixture - * - * \param in the integer to check - */ -- void writeInt2mmAssert(int64_t in); -+ void writeInt2mmAssert(int in); - }; - - } diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch b/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch deleted file mode 100644 index a9b447fe8528..000000000000 --- a/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/utils/StringTest.cpp b/tests/utils/StringTest.cpp -index aa369f3da..b1a084587 100644 ---- a/tests/utils/StringTest.cpp -+++ b/tests/utils/StringTest.cpp -@@ -79,7 +79,7 @@ void StringTest::writeInt2mmAssert(int64_t in) - int64_t out = MM2INT(strtod(str.c_str(), nullptr)); - - char buffer[200]; -- sprintf(buffer, "The integer %ld was printed as '%s' which was interpreted as %ld rather than %ld!", in, str.c_str(), out, in); -+ sprintf(buffer, "The integer %d was printed as '%s' which was interpreted as %d rather than %d!", in, str.c_str(), out, in); - CPPUNIT_ASSERT_MESSAGE(std::string(buffer), in == out); - } - diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch b/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch deleted file mode 100644 index 351cebde493f..000000000000 --- a/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 47dcd2d1..c2316d68 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -110,9 +125,6 @@ set(engine_SRCS # Except main.cpp. - ) - - # List of tests. For each test there must be a file tests/${NAME}.cpp and a file tests/${NAME}.h. --set(engine_TEST -- GCodePlannerTest --) - set(engine_TEST_INFILL - ) - set(engine_TEST_UTILS diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml index 2b689686f817..58e8297dc744 100644 --- a/media-gfx/curaengine/metadata.xml +++ b/media-gfx/curaengine/metadata.xml @@ -5,6 +5,25 @@ <email>3dprint@gentoo.org</email> <name>Gentoo 3D Printer Project</name> </maintainer> + <maintainer type="person"> + <email>alexxy@gentoo.org</email> + <name>Alexey Shvetsov</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="person"> + <email>mathy@vanvoorden.be</email> + <name>Mathy Vanvoorden</name> + </maintainer> + <maintainer type="person"> + <email>perlovka@gmail.com</email> + <name>Michael Perlov</name> + </maintainer> + <slots> + <subslots>soname major version number</subslots> + </slots> <upstream> <remote-id type="github">Ultimaker/CuraEngine</remote-id> </upstream> |