diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest deleted file mode 100644 index 6f9c69a..0000000 --- a/dev-python/pivy/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX pivy-0.6.4-find-SoQt.patch 925 BLAKE2B fe3224f5aa0286204e81352b0e6c331654eb15fc509a219a4924cedafebda305182882c2de51aef504ae9a0432beeb4a67c5f80aafc24dab7a40c3a3d37c34dd SHA512 02a9c530759901488073bfa69c7a97d3814d4daa94f4724158ce037e208016f2fd025ac5020717ed80e5f561721d5be6967f0f44521738248f492fd11b7044f8 -DIST pivy-0.6.5.tar.gz 6614159 BLAKE2B 2652feb26137b2deda8b76083d3bd9018303ca0a0236ea97e83e9ff24ddeda30462a25ac1b20b0d3e718fc9f83ae5ebf7116a5c0d94debcc5b6d729792230655 SHA512 6cf0b1ac348336609f42f6a72df7ffdc3e1042a4f8fc6e2b725ca38f09476c70bafa14c1f083d1badeb5b37b974a0fbf5806ea71d44d734b9ab9b125ce7f8695 -EBUILD pivy-0.6.5.ebuild 849 BLAKE2B e4810cb878a37970a90bb429a4acdbf7d477595cea64d9a07ff42d476ce7aa2e477d4ec12e90b43518da3ab0e60702c465fb9643357ebe2422c29b99c0c50fa5 SHA512 4cba876e005d55af39e9312da2b39b3ba47d6722af166fbbffc9a55e082942d82485f5b36841ea72a2eb9ce9aa0fe9da02dacbbc0392dd502747d0f0aff7824e -MISC metadata.xml 599 BLAKE2B 61e2a32a73083f86b7bef1627a87b64078ff9b1ed5b8768f57c2137b2fea7fd3041303884c6e703c86fc3cbb6454c32280fc00cf5439f2c68a273f0d44bb26d0 SHA512 8da0bc61fa08f32764b17147c413f6a468e19ed466e2f8092aa648f452e7883531163aeccf0effdf53bbe5899b172d51f0cecaddc26fc5355c7d4236549e88c0 diff --git a/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch b/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch deleted file mode 100644 index 4d8a6fd..0000000 --- a/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1c9ffef4d85327fe517bdcf7e11c339a4862ba2e Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Wed, 12 Jun 2019 21:21:34 +0200 -Subject: [PATCH] CMakeLists.txt: remove NONE keyword for languages from - project definition. This solves a bug where SoQt is not found on Gentoo - systems (see https://github.com/waebbl/waebbl-gentoo/issues/42) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Thanks to QÍN Yuhào for coming up with this fix. - -Suggested-by: QÍN Yuhào -Signed-off-by: Bernd Waibel ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 76d0d06..48bd3c0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --project(pivy_cmake_setup NONE) -+project(pivy_cmake_setup) - cmake_minimum_required(VERSION 3.5) - - --- -2.21.0 - diff --git a/dev-python/pivy/metadata.xml b/dev-python/pivy/metadata.xml deleted file mode 100644 index ec11d49..0000000 --- a/dev-python/pivy/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - fordfrog@gentoo.org - Miroslav Šulc - - - waebbl@gmail.com - Bernd Waibel - - - - Use media-libs/quarter for GUI bindings - - - Use media-libs/SoQt for GUI bindings - - - - coin3d/quarter - - diff --git a/dev-python/pivy/pivy-0.6.5.ebuild b/dev-python/pivy/pivy-0.6.5.ebuild deleted file mode 100644 index cb0e7f4..0000000 --- a/dev-python/pivy/pivy-0.6.5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 - -DESCRIPTION="Coin3D bindings for Python" -HOMEPAGE="https://github.com/coin3d/pivy" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - PIVY_REPO_URI="https://github.com/coin3d/pivy.git" -else - SRC_URI="https://github.com/coin3d/pivy/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="ISC" -SLOT="0" -IUSE="+quarter soqt" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( quarter soqt ) -" - -RDEPEND=" - >=media-libs/coin-4.0.0 - quarter? ( media-libs/quarter ) - soqt? ( >=media-libs/SoQt-1.6.0 ) -" -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/swig" - -PATCHES=( "${FILESDIR}/${PN}-0.6.4-find-SoQt.patch" ) - -DOCS=( AUTHORS HACKING NEWS README.md THANKS ) diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest new file mode 100644 index 0000000..586c3c0 --- /dev/null +++ b/games-strategy/freecol/Manifest @@ -0,0 +1,6 @@ +AUX commons-cli-1.3.patch 791 BLAKE2B 3fde34112ae8fba464a1dc9d282fce6a7eddb37c802861588005c44e3b5f1cf22d9b2495553954ab47681fa016c1c7cb9ff5b0887e48e67381d1d73a7ec58ea6 SHA512 eb2e1eeb5fe02d8d8601b1577847195f2b5a83ba875d70010f33ef8fe1fe57706e01a84ee442cd43bcbb72dc22d79a8e6de832be0e23742dae23e8e38bf6aa48 +AUX freecol-0.11.6-gentoo.patch 923 BLAKE2B f1e8632a75a3a9e4c1b2433eefdf50dc6b437da7052b2531e1a8d67fac1887a4ebad888795a9e96567ce4e5faaf5a2bc643b93f72cf72165de1b4e4146aed4d2 SHA512 85a1a7f9ac9031e61e57bbe88a292716d0249109308a6da0ef60f2e0ea547674f0d379b1f516980bfde567e2d8a2c518eef873fe40159af772b950791bec7bdf +AUX freecol-1.0.0-gentoo.patch 922 BLAKE2B 867120d64f571c98bbac878b012dbdc7d37126b7e63a0c41e47bcb76bae2d6ab3c6181049f9fde961812c4bf57ce2a97c4c13d91d2b5058da2ff953932ccd7b2 SHA512 7a0760d8a5f04956932f9a4480875ebf2ac81eeffc6aafb12ba54e8c0230083959b4953d331d2b54716235cb7ea34106724ee8fc7f1839f48cc6b665581af59e +DIST freecol-1.0.0-src.zip 159875314 BLAKE2B 6153be9553ded4c2a1f9635d67e48165d07b5d1634f26a44d2f01195e1610d6cb525ffa60368f3225cdf62ffd7751242942fd86b5735455e7396deca68d8350d SHA512 68b313b42fc38e6ea95a4a04ca5af534c4487709fb036018d6d09f6de3455325031ad1fd0ae4c6415cbbeebd3f181e598a2602ad7be6cca9150ad9523b8bb3c2 +EBUILD freecol-1.0.0.ebuild 1146 BLAKE2B 0872566f2cd3cdef71c15f3b4c6479317a4bddf5bfb53ea6c825a159e0a2a39cc8bf2418f862adc0d159d426ae67401d1f4074c0cd5471ec68880c3f831a5353 SHA512 30a7cf836501ef971cfe9110cb96edb8c1662487afe285da2cb601196027d79b786ccfa9e550869cde034dc6065ff2ffc96c66f99723466d79f6f419f6d87602 +MISC metadata.xml 331 BLAKE2B 0fb24fdd71c8c9a1bbaf56edf8f996eb05f35dc0783a38a77aa2cba930d3054c88a6002e79825baf273062dcc8ade2b9e01bd62850a46e980c1170ed96b1b1d6 SHA512 a4afba79448310d83eb3e5d91bfcf7b03ab1a7f77069478b8ff44ed3b07c79ffc7d83aa1d9d715294bdb5ee661c22736f0fe9414511ab9894fb93ecfed79c0a0 diff --git a/games-strategy/freecol/files/commons-cli-1.3.patch b/games-strategy/freecol/files/commons-cli-1.3.patch new file mode 100644 index 0000000..84fc6e5 --- /dev/null +++ b/games-strategy/freecol/files/commons-cli-1.3.patch @@ -0,0 +1,22 @@ +From: Markus Koschany +Date: Sun, 20 Dec 2015 18:49:11 +0100 +Subject: commons-cli 1.3 + +Forwarded: not-needed +--- + src/net/sf/freecol/FreeCol.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java +index d05ae3d..99b9cdc 100644 +--- a/src/net/sf/freecol/FreeCol.java ++++ b/src/net/sf/freecol/FreeCol.java +@@ -426,7 +426,7 @@ public final class FreeCol { + private static void handleArgs(String[] args) { + Options options = new Options(); + final String help = Messages.message("cli.help"); +- final File dummy = new File("dummy"); ++ final Class dummy = null; + final String argDirectory = Messages.message("cli.arg.directory"); + + // Help options. diff --git a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch new file mode 100644 index 0000000..770279b --- /dev/null +++ b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch @@ -0,0 +1,18 @@ +diff -Naur a/build.xml b/build.xml +--- a/build.xml 2015-10-17 07:54:48.000000000 +0100 ++++ b/build.xml 2019-04-13 21:51:21.679100596 +0100 +@@ -162,14 +162,9 @@ + + +- +- +- + + + +- + + + diff --git a/games-strategy/freecol/files/freecol-1.0.0-gentoo.patch b/games-strategy/freecol/files/freecol-1.0.0-gentoo.patch new file mode 100644 index 0000000..337a315 --- /dev/null +++ b/games-strategy/freecol/files/freecol-1.0.0-gentoo.patch @@ -0,0 +1,18 @@ +diff -Naur a/build.xml b/build.xml +--- a/build.xml 2023-01-11 19:07:38.804495414 +0300 ++++ a/build.xml 2023-01-11 19:09:26.239496868 +0300 +@@ -165,14 +165,9 @@ + + +- +- +- + + + +- + + + diff --git a/games-strategy/freecol/freecol-1.0.0.ebuild b/games-strategy/freecol/freecol-1.0.0.ebuild new file mode 100644 index 0000000..fbcbdff --- /dev/null +++ b/games-strategy/freecol/freecol-1.0.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop java-pkg-2 java-ant-2 + +DESCRIPTION="An open source clone of the game Colonization" +HOMEPAGE="http://www.freecol.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip" +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# Rightly or wrongly, jogg and jorbis are bundled within Cortado but we +# don't have packages for them anyway. + +CP_DEPEND=" + dev-java/commons-cli:1 + dev-java/cortado:0 + dev-java/miglayout:0 +" + +DEPEND=">=virtual/jdk-1.8 + app-arch/unzip + ${CP_DEPEND}" + +RDEPEND=">=virtual/jre-1.8 + ${CP_DEPEND}" + +S="${WORKDIR}/${PN}" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) + + +JAVA_ANT_REWRITE_CLASSPATH=true +EANT_BUILD_TARGET=package + +src_prepare() { + default + rm -v jars/* || die + java-pkg-2_src_prepare +} + +src_install() { + local datadir=/usr/share/${PN} + + java-pkg_dojar FreeCol.jar + java-pkg_dolauncher ${PN} \ + --pwd ${datadir} \ + --main net.sf.freecol.FreeCol \ + --java_args -Xmx2000M + + insinto ${datadir} + doins -r data schema + + doicon data/${PN}.png + make_desktop_entry ${PN} FreeCol + + dodoc README +} + diff --git a/games-strategy/freecol/metadata.xml b/games-strategy/freecol/metadata.xml new file mode 100644 index 0000000..30c9c8e --- /dev/null +++ b/games-strategy/freecol/metadata.xml @@ -0,0 +1,11 @@ + + + + + games@gentoo.org + Gentoo Games Project + + + freecol + + diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest deleted file mode 100644 index 67129e2..0000000 --- a/media-gfx/freecad/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -AUX freecad-0.18.5-0001-Fix-coin-related-variables-to-use-new-naming-from-4.0.0.patch 15257 BLAKE2B c27971105462b9015265bcc2c2e368f2f9473ae8c27cae51605955dd093a199cbe4184163a3bc918899cbbbcf9bf392c3ea25ddbaedf424c20408103301eb5f9 SHA512 224ab01943fc4ab3662a9fa5d4fb6fed20a1866c0df9368033fdd70b47a96bc21163a6b2cb1f23b07b0ecd8f586e5f45b0ec8ad353c1a20bf45c925e90f68f13 -AUX freecad-0.18.5-0001-fix-std-namespace-issue-with-endl.patch 697 BLAKE2B 3dcc92915fc4ea936f3ca246d7bbc02e43abd137ac04018bfa53d91c1c057f69f7974aa736d55f56d06b5311beda051478e6cb1330b1732c111250636cfa1daa SHA512 834edcd5ab704dc12f3db86f0fd18d5b960d796b8b4e3b66fd2156cb1b6a1d9f4398dbae573affbbc424cfd0c49d25fcb5e8968cbf98ee63acbcad350f738e24 -AUX freecad-0.18.5-0002-Fix-PySide-related-checks.patch 1865 BLAKE2B 570fcc8dd63f0e0900a777eec637e603a1f7d0f8bbe9c47ccd8cde136315621412e8cba9cc43095ef9deac17cd4db7c9b63fd5d1eb4ba21fd3f30dfbf6756d99 SHA512 6d1ba6774b0d225aa4fafd8dfe8a3c9a3a0964864257750dcd6be72ce3ee846381497876c57435773028ef85a052611c2179329f3d812ccad26419e901dd448a -AUX freecad-0.18.5-0005-Fix-a-Qt-related-crash-with-draft-workbench.patch 3863 BLAKE2B 9ae485890bf3527436938c2b9149a2786942aeb1e94c48bb0fbf8af2d25a064e33b72dcce039916140502118b0462e4d7141bb57115546bc60d5f3e22170de06 SHA512 61640e3697aafbd87afc3178cea52d5909603d814751ee6a457f5170b3eaf1d85f6b9d47d09457c26a975de59a3a4615fe839618459caba1b00fc149ac8a4f99 -AUX freecad-0.18.5-0006-add-missing-include-statements.patch 1147 BLAKE2B c6d6bcd7e983c4b2f754102e13375a11ca489f66d75bbee53257e4d05a911532b764fbf38f02ee07e9bff3e9bda22696cbda58dc0e7434cdd6cefe192be1856b SHA512 689907c1c982914c023646d2316388e991eaaa665be360bbb9c0665b89ef18ce1d6eb08a58abd0ba42d8f4ed3f6dc6c9d66fda8ea8c6fac5f76e56faae3ccf1d -AUX freecad-0.18.5-0007-fix-boost-placeholders-problem.patch 1284 BLAKE2B e06a65e957b33014f41011db35da10273f0cd6b8edababd6e22c62fdae7f6f5ebc7612d5e4f3bf69cdcadbd6320d5d3f647ee410929521a5d0b3194bb580db06 SHA512 d2e7c6c337c86d386903e7c455ebc40615bedec25f4abfb5c82eecf47ac0f1fada4769768e3db45d06ea5fff5054d3d78cf1aba82c2ae0bfb80ac830699efc47 -AUX freecad-0.18.5-0008-Update-swigpyrun.in-for-Python-3.8.patch 1031 BLAKE2B c2daf42bd48e2744a2400fc142db1de76235d0d12e30f7ef1d83c4616112aafa7ad6648af1379a5b6343fcac6afb3ee315ad7c508b01a5abc83ba0b82dece13c SHA512 c68da6983b34db37e050aca812e56ab21c857a811b728143edcac3beb20b8cdc9a5f65653635ef7332f112d4066137704eef6d62b83aaa1c1500b3119ef0fe2a -AUX freecad-0.18.5-0009-Python-skip-ci-tp_print-slot-has-been-replaced.patch 6849 BLAKE2B 30a64ffb7aae2d37887e05c9b54dbd854634c742ab0752004b37b2d222ba231a1a4bea4dcbd55eb2404a18954aa2e0cadaf608894182e97d2df1c7aa193d9ed2 SHA512 dc5cd4c25822f99ee49ddb8288f025c16a444b4e239e54b2b3c9bc4ebc97534ca72fca0df9ba2b48e880375675b2d2197c98bfadd9e5e5db7014a8581b126679 -AUX freecad-0.18.5-0010-Porting-Py3.8.patch 2234 BLAKE2B a69eb420fdb585e61954d2b1de80f48e84f4dfcedec23dfab73974bfb86eb7ef95a7e7dd91ad87fff6a7d6c3b9102deefff4ea8e0e3882840d45e92167dc94e7 SHA512 3cfb71117dde7deec2ddd4ec169f13c4af43f1107160f79d82b6d32af26e30a2ae1b124d5e21b7506106de88ff14595b75325147a61eb5a7a99a759d13fefb53 -AUX freecad.sharedmimeinfo 312 BLAKE2B 731f28f904bebac03c8a64778d5e36f9b26fa33c347fa0b67113752aea12568f5a19968e730a53da89a7c7d08db6f8d80f11ab30d011e6b4db973c8549f710bd SHA512 bb55cad8387032af0e06ce7f1b4cab4354a34a915b9f550de25e05bf24d4161d9ea152d5692d65df4b362622f76a11d78894deaf7fee60c7a3fc0bfec38fa10c -DIST freecad-0.18.5.Quick.Reference.Guide.7z 5532469 BLAKE2B e75f9db39b978feb0f1a14e503a99bb39c97332391dfc755916807286e13485dcb580f3ddc4a7fea0bf42c7b3006a81bef51d6df2fb129302c17820cc5f7c4d9 SHA512 2a2e74826573ca061a98c92e7b7aa9f64fc3f57670d6a73ea24846b312c9bb16b298a0733039143cab2fa149bc00fcf16ac39b69e976368d2fbee6daa139466f -DIST freecad-0.18.5.tar.gz 219762319 BLAKE2B 26b061ae2aeeb776f4ad084eb973e09b73bc2887f11c07b46e9b0a4b9a2bbe7dfd2890780164cbd756dc50f6a11fbec9dcfa951509346aac16e7bc91560e0b28 SHA512 61717d96bcb39fdf266b71e1648c8da31f81a35f14c85697cf23cae4558ccaaf1e8e88af40572916d9db3c51642e81a2eda87c111c1b8d9c69d38f368f5c4bb6 -EBUILD freecad-0.18.5.ebuild 10425 BLAKE2B 84eb46d5089a30ca5f925ab496a50cdeb16cf37f7b896064576845d9ec1269f486adc454b78b73d760b083cd58efd8d41c3e5b064272886f420f39d63a5078b5 SHA512 06fdd9c4a7b9d1a925dfa3e5aba699b156f53a3672734efb1495220aa5d5a1f488c4238561f701d84413ad45b11208665a4b63ddc365e4e78490b8df98389d86 -MISC metadata.xml 5008 BLAKE2B 4e492be2cd112f1ebe6671a0d66e4b9976ce3398ef62f704e8aefc2655fe7bfa701ff6ad0193c1a1d2acf4285dae34c79867ded5ab2d8fe226dd2ecc4490feb7 SHA512 fbad6591b6866c8b444b64603dd2c52db3b3c3423290c9c9933ff7001f578d33d7bfea9dda170865c588b13a4a5567f316ef56912f6693b01b93bfc86aa3ca98 diff --git a/media-gfx/freecad/files/freecad-0.18.5-0001-Fix-coin-related-variables-to-use-new-naming-from-4.0.0.patch b/media-gfx/freecad/files/freecad-0.18.5-0001-Fix-coin-related-variables-to-use-new-naming-from-4.0.0.patch deleted file mode 100644 index 6064643..0000000 --- a/media-gfx/freecad/files/freecad-0.18.5-0001-Fix-coin-related-variables-to-use-new-naming-from-4.0.0.patch +++ /dev/null @@ -1,429 +0,0 @@ -From 965fe24e54470488c858bb1c44e03763fa1b5ba6 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Mon, 27 Jan 2020 20:41:45 +0100 -Subject: [PATCH] Fix coin related variables to use new naming from 4.0.0 - -Signed-off-by: Bernd Waibel ---- - CMakeLists.txt | 6 +++--- - src/Doc/CMakeLists.txt | 2 +- - src/Gui/CMakeLists.txt | 6 +++--- - src/Main/CMakeLists.txt | 2 +- - src/Mod/Assembly/Gui/CMakeLists.txt | 2 +- - src/Mod/Cam/Gui/CMakeLists.txt | 2 +- - src/Mod/Drawing/Gui/CMakeLists.txt | 2 +- - src/Mod/Fem/Gui/CMakeLists.txt | 2 +- - src/Mod/Image/Gui/CMakeLists.txt | 2 +- - src/Mod/Import/Gui/CMakeLists.txt | 2 +- - src/Mod/Inspection/Gui/CMakeLists.txt | 2 +- - src/Mod/Mesh/Gui/CMakeLists.txt | 2 +- - src/Mod/MeshPart/Gui/CMakeLists.txt | 2 +- - src/Mod/Part/Gui/CMakeLists.txt | 2 +- - src/Mod/PartDesign/Gui/CMakeLists.txt | 2 +- - src/Mod/Path/Gui/CMakeLists.txt | 2 +- - src/Mod/Points/Gui/CMakeLists.txt | 2 +- - src/Mod/Raytracing/Gui/CMakeLists.txt | 2 +- - src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 2 +- - src/Mod/Robot/Gui/CMakeLists.txt | 2 +- - src/Mod/Sandbox/Gui/CMakeLists.txt | 2 +- - src/Mod/Sketcher/Gui/CMakeLists.txt | 2 +- - src/Mod/Spreadsheet/Gui/CMakeLists.txt | 2 +- - src/Mod/Start/Gui/CMakeLists.txt | 2 +- - src/Mod/Surface/Gui/CMakeLists.txt | 2 +- - src/Mod/TechDraw/Gui/CMakeLists.txt | 2 +- - src/Mod/Web/Gui/CMakeLists.txt | 2 +- - src/Tools/_TEMPLATE_/Gui/CMakeLists.txt | 2 +- - 28 files changed, 32 insertions(+), 32 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fe55662..89f9a58 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -935,12 +935,12 @@ endif() - - # -------------------------------- Coin3D -------------------------------- - -- find_package(Coin3D REQUIRED) -- if(NOT COIN3D_FOUND) -+ find_package(Coin REQUIRED) -+ if(NOT Coin_FOUND) - MESSAGE(FATAL_ERROR "=================\n" - "Coin3D not found.\n" - "=================\n") -- endif(NOT COIN3D_FOUND) -+ endif(NOT Coin_FOUND) - - # ------------------------------ Spaceball ------------------------------- - -diff --git a/src/Doc/CMakeLists.txt b/src/Doc/CMakeLists.txt -index 5b15d12..fbfcd26 100644 ---- a/src/Doc/CMakeLists.txt -+++ b/src/Doc/CMakeLists.txt -@@ -52,7 +52,7 @@ if(DOXYGEN_FOUND) - - # directory order seems important for correct macro expansion - # (files containing macros definitions must be parsed before the files using them) -- SET(DOXYGEN_SOURCE_DIR ${COIN3D_INCLUDE_DIRS}/Inventor/fields/SoSubField.h -+ SET(DOXYGEN_SOURCE_DIR ${Coin_INCLUDE_DIR}/Inventor/fields/SoSubField.h - ${CMAKE_SOURCE_DIR}/src/CXX - ${CMAKE_SOURCE_DIR}/src/zipios++ - ${CMAKE_SOURCE_DIR}/src/3rdParty -diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt -index 3bd96e0..be1651c 100644 ---- a/src/Gui/CMakeLists.txt -+++ b/src/Gui/CMakeLists.txt -@@ -40,7 +40,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR}/DAGView - ${Boost_INCLUDE_DIRS} - ${EIGEN3_INCLUDE_DIR} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} -@@ -56,7 +56,7 @@ endif(MSVC) - if(MSVC) - set(FreeCADGui_LIBS - FreeCADApp -- ${COIN3D_LIBRARIES} -+ ${Coin_LIBRARIES} - ${OPENGL_gl_LIBRARY} - ) - -@@ -69,7 +69,7 @@ if(MSVC) - else(MSVC) - set(FreeCADGui_LIBS - FreeCADApp -- ${COIN3D_LIBRARIES} -+ ${Coin_LIBRARIES} - ${Boost_LIBRARIES} - ${OPENGL_gl_LIBRARY} - ${3DCONNEXION_LINKFLAGS} -diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt -index bebbc5e..9d5231e 100644 ---- a/src/Main/CMakeLists.txt -+++ b/src/Main/CMakeLists.txt -@@ -4,7 +4,7 @@ - if(BUILD_GUI) - include_directories( - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${QT_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} -diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt -index 4f6ee3f..4d24b79 100644 ---- a/src/Mod/Assembly/Gui/CMakeLists.txt -+++ b/src/Mod/Assembly/Gui/CMakeLists.txt -@@ -14,7 +14,7 @@ include_directories( - ${OCC_INCLUDE_DIR} - ${QT_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${XercesC_INCLUDE_DIRS} - ${EIGEN3_INCLUDE_DIR} - ) -diff --git a/src/Mod/Cam/Gui/CMakeLists.txt b/src/Mod/Cam/Gui/CMakeLists.txt -index 3fd0678..67ff3f9 100644 ---- a/src/Mod/Cam/Gui/CMakeLists.txt -+++ b/src/Mod/Cam/Gui/CMakeLists.txt -@@ -8,7 +8,7 @@ include_directories( - ${CMAKE_BINARY_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIR} -+ ${Coin_INCLUDE_DIR} - ${OCC_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} - ${QT_INCLUDE_DIR} -diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt -index 2b5c83a..cb518f7 100644 ---- a/src/Mod/Drawing/Gui/CMakeLists.txt -+++ b/src/Mod/Drawing/Gui/CMakeLists.txt -@@ -9,7 +9,7 @@ include_directories( - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${OCC_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} -diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt -index 135dcbe..23fae19 100755 ---- a/src/Mod/Fem/Gui/CMakeLists.txt -+++ b/src/Mod/Fem/Gui/CMakeLists.txt -@@ -15,7 +15,7 @@ include_directories( - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${OCC_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} -diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt -index 5fd7895..2dad22e 100644 ---- a/src/Mod/Image/Gui/CMakeLists.txt -+++ b/src/Mod/Image/Gui/CMakeLists.txt -@@ -7,7 +7,7 @@ endif(OPENCV2_FOUND) - include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${OPENCV2_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} -diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt -index 101c7fa..ddc63de 100644 ---- a/src/Mod/Import/Gui/CMakeLists.txt -+++ b/src/Mod/Import/Gui/CMakeLists.txt -@@ -10,7 +10,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} - ${OCC_INCLUDE_DIR} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} -diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt -index bb1d7f4..ec7913b 100644 ---- a/src/Mod/Inspection/Gui/CMakeLists.txt -+++ b/src/Mod/Inspection/Gui/CMakeLists.txt -@@ -2,7 +2,7 @@ include_directories( - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} -diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt -index f5cd376..fe7f6e0 100644 ---- a/src/Mod/Mesh/Gui/CMakeLists.txt -+++ b/src/Mod/Mesh/Gui/CMakeLists.txt -@@ -1,7 +1,7 @@ - include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} - ${XercesC_INCLUDE_DIRS} -diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt -index b757744..015ec9d 100644 ---- a/src/Mod/MeshPart/Gui/CMakeLists.txt -+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt -@@ -18,7 +18,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} - ${OCC_INCLUDE_DIR} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} -diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt -index 0312b08..6c1253b 100644 ---- a/src/Mod/Part/Gui/CMakeLists.txt -+++ b/src/Mod/Part/Gui/CMakeLists.txt -@@ -10,7 +10,7 @@ include_directories( - ${CMAKE_BINARY_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${OCC_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} -diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt -index 7896940..f743045 100644 ---- a/src/Mod/PartDesign/Gui/CMakeLists.txt -+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt -@@ -10,7 +10,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} - ${OCC_INCLUDE_DIR} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} -diff --git a/src/Mod/Path/Gui/CMakeLists.txt b/src/Mod/Path/Gui/CMakeLists.txt -index 21d007e..d80075f 100644 ---- a/src/Mod/Path/Gui/CMakeLists.txt -+++ b/src/Mod/Path/Gui/CMakeLists.txt -@@ -9,7 +9,7 @@ include_directories( - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${OCC_INCLUDE_DIR} - ${EIGEN3_INCLUDE_DIR} -diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt -index 8d37fc2..0a35ca4 100644 ---- a/src/Mod/Points/Gui/CMakeLists.txt -+++ b/src/Mod/Points/Gui/CMakeLists.txt -@@ -1,7 +1,7 @@ - include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${EIGEN3_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} -diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt -index 7e6c95d..f20fb39 100644 ---- a/src/Mod/Raytracing/Gui/CMakeLists.txt -+++ b/src/Mod/Raytracing/Gui/CMakeLists.txt -@@ -10,7 +10,7 @@ include_directories( - ${CMAKE_BINARY_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${OCC_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} -diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt -index a8c9948..1fd379c 100644 ---- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt -+++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt -@@ -10,7 +10,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} - ${OCC_INCLUDE_DIR} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} - ${XercesC_INCLUDE_DIRS} -diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt -index 7aea7b2..2411f5c 100644 ---- a/src/Mod/Robot/Gui/CMakeLists.txt -+++ b/src/Mod/Robot/Gui/CMakeLists.txt -@@ -11,7 +11,7 @@ include_directories( - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${OCC_INCLUDE_DIR} - ${EIGEN3_INCLUDE_DIR} -diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt -index 67431d3..3ea74d8 100644 ---- a/src/Mod/Sandbox/Gui/CMakeLists.txt -+++ b/src/Mod/Sandbox/Gui/CMakeLists.txt -@@ -8,7 +8,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/src/Gui - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${OCC_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} -diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt -index 6196a1a..af05e1f 100644 ---- a/src/Mod/Sketcher/Gui/CMakeLists.txt -+++ b/src/Mod/Sketcher/Gui/CMakeLists.txt -@@ -11,7 +11,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} - ${OCC_INCLUDE_DIR} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} - ${XercesC_INCLUDE_DIRS} -diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt -index 5c6b856..c4803c8 100644 ---- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt -+++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt -@@ -2,7 +2,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} -diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt -index 79a8d34..e56ae5c 100644 ---- a/src/Mod/Start/Gui/CMakeLists.txt -+++ b/src/Mod/Start/Gui/CMakeLists.txt -@@ -1,7 +1,7 @@ - include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} -diff --git a/src/Mod/Surface/Gui/CMakeLists.txt b/src/Mod/Surface/Gui/CMakeLists.txt -index 87b1579..3c1aa17 100644 ---- a/src/Mod/Surface/Gui/CMakeLists.txt -+++ b/src/Mod/Surface/Gui/CMakeLists.txt -@@ -10,7 +10,7 @@ include_directories( - ${CMAKE_BINARY_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${OCC_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} -diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt -index d6d54b3..b5a2d34 100644 ---- a/src/Mod/TechDraw/Gui/CMakeLists.txt -+++ b/src/Mod/TechDraw/Gui/CMakeLists.txt -@@ -9,7 +9,7 @@ include_directories( - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${OCC_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} -diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt -index 963acbd..504e631 100644 ---- a/src/Mod/Web/Gui/CMakeLists.txt -+++ b/src/Mod/Web/Gui/CMakeLists.txt -@@ -1,7 +1,7 @@ - include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} -diff --git a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt -index 910c33c..69e551f 100644 ---- a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt -+++ b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt -@@ -3,7 +3,7 @@ include_directories( - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR} - ${Boost_INCLUDE_DIRS} -- ${COIN3D_INCLUDE_DIRS} -+ ${Coin_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} --- -2.25.0 - diff --git a/media-gfx/freecad/files/freecad-0.18.5-0001-fix-std-namespace-issue-with-endl.patch b/media-gfx/freecad/files/freecad-0.18.5-0001-fix-std-namespace-issue-with-endl.patch deleted file mode 100644 index dd5deaf..0000000 --- a/media-gfx/freecad/files/freecad-0.18.5-0001-fix-std-namespace-issue-with-endl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d56c5b463bc34f23b806f6c97e4c330e5f26e7fc Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Tue, 8 Dec 2020 07:33:59 +0100 -Subject: [PATCH] fix std namespace issue with endl - -Signed-off-by: Bernd Waibel ---- - src/Mod/Raytracing/App/RayFeature.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Mod/Raytracing/App/RayFeature.cpp b/src/Mod/Raytracing/App/RayFeature.cpp -index cdd2cb6..235a986 100644 ---- a/src/Mod/Raytracing/App/RayFeature.cpp -+++ b/src/Mod/Raytracing/App/RayFeature.cpp -@@ -36,6 +36,7 @@ - - - using namespace Raytracing; -+using namespace std; - - PROPERTY_SOURCE(Raytracing::RayFeature, Raytracing::RaySegment) - --- -2.29.2 - diff --git a/media-gfx/freecad/files/freecad-0.18.5-0002-Fix-PySide-related-checks.patch b/media-gfx/freecad/files/freecad-0.18.5-0002-Fix-PySide-related-checks.patch deleted file mode 100644 index ca297d4..0000000 --- a/media-gfx/freecad/files/freecad-0.18.5-0002-Fix-PySide-related-checks.patch +++ /dev/null @@ -1,47 +0,0 @@ -From fc5e202f585a0b4a11f8e4981895cf3fb3b8dd35 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Mon, 27 Jan 2020 22:39:31 +0100 -Subject: [PATCH] Fix PySide related checks - -Signed-off-by: Bernd Waibel ---- - CMakeLists.txt | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 89f9a58..311fd3f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -989,6 +989,14 @@ endif() - endif() - endif() - -+ if(NOT SHIBOKEN_INCLUDE_DIR AND TARGET Shiboken2::libshiboken) -+ get_property(SHIBOKEN_INCLUDE_DIR TARGET Shiboken2::libshiboken PROPERTY INTERFACE_INCLUDE_DIRECTORIES) -+ endif(NOT SHIBOKEN_INCLUDE_DIR AND TARGET Shiboken2::libshiboken) -+ -+ if(NOT SHIBOKEN_LIBRARY AND TARGET Shiboken2::libshiboken) -+ get_property(SHIBOKEN_LIBRARY TARGET Shiboken2::libshiboken PROPERTY IMPORTED_SONAME_GENTOO) -+ endif(NOT SHIBOKEN_LIBRARY AND TARGET Shiboken2::libshiboken) -+ - if(NOT SHIBOKEN_INCLUDE_DIR) - MESSAGE("====================\n" - "shiboken2 not found.\n" -@@ -996,6 +1004,14 @@ endif() - endif(NOT SHIBOKEN_INCLUDE_DIR) - - find_package(PySide2 QUIET)# REQUIRED -+ if(NOT PYSIDE_INCLUDE_DIR AND TARGET PySide2::pyside2) -+ get_property(PYSIDE_INCLUDE_DIR TARGET PySide2::pyside2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES) -+ endif(NOT PYSIDE_INCLUDE_DIR AND TARGET PySide2::pyside2) -+ -+ if(NOT PYSIDE_LIBRARY AND TARGET PySide2::pyside2) -+ get_property(PYSIDE_LIBRARY TARGET PySide2::pyside2 PROPERTY IMPORTED_SONAME_GENTOO) -+ endif(NOT PYSIDE_LIBRARY AND TARGET PySide2::pyside2) -+ - if(NOT PYSIDE_INCLUDE_DIR) - MESSAGE("==================\n" - "PySide2 not found.\n" --- -2.25.0 - diff --git a/media-gfx/freecad/files/freecad-0.18.5-0005-Fix-a-Qt-related-crash-with-draft-workbench.patch b/media-gfx/freecad/files/freecad-0.18.5-0005-Fix-a-Qt-related-crash-with-draft-workbench.patch deleted file mode 100644 index ccab736..0000000 --- a/media-gfx/freecad/files/freecad-0.18.5-0005-Fix-a-Qt-related-crash-with-draft-workbench.patch +++ /dev/null @@ -1,87 +0,0 @@ -From e8d7059d70b117c3613ccb387b852ce27d955e42 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Wed, 25 Mar 2020 22:21:43 +0100 -Subject: [PATCH] Fix a Qt related crash with draft workbench. - -The patch fixes a crash with the draft workbench and -Qt >= 5.14 and PySide >= 5.14 which has changed how -uic and rcc works and has the pyside uic/rcc modules -integrated into core Qt. - -Bug: https://github.com/waebbl/waebbl-gentoo/issues/218 - -Signed-off-by: Bernd Waibel ---- - cMake/FindPySide2Tools.cmake | 28 ++++++++++++++++++++++------ - 1 file changed, 22 insertions(+), 6 deletions(-) - -diff --git a/cMake/FindPySide2Tools.cmake b/cMake/FindPySide2Tools.cmake -index 9c97514..8fbd302 100644 ---- a/cMake/FindPySide2Tools.cmake -+++ b/cMake/FindPySide2Tools.cmake -@@ -20,8 +20,24 @@ if(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(PYSIDE_BIN_DIR ${PYTHON_BIN_DIR}) - endif(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - --FIND_PROGRAM(PYSIDE2UICBINARY NAMES python2-pyside2-uic pyside2-uic pyside2-uic-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR}) --FIND_PROGRAM(PYSIDE2RCCBINARY NAMES pyside2-rcc pyside2-rcc-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR}) -+# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc, with '-g python' option -+# We test Qt5Core version to act accordingly -+ -+FIND_PACKAGE(Qt5Core) -+ -+IF(Qt5Core_VERSION VERSION_LESS 5.14) -+ # Legacy (< 5.14) -+ FIND_PROGRAM(PYSIDE2UICBINARY NAMES python2-pyside2-uic pyside2-uic pyside2-uic-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR}) -+ FIND_PROGRAM(PYSIDE2RCCBINARY NAMES pyside2-rcc pyside2-rcc-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR}) -+ set(UICOPTIONS "") -+ set(RCCOPTIONS "") -+ELSE(Qt5Core_VERSION VERSION_LESS 5.14) -+ # New (>= 5.14) -+ FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic) -+ set(UICOPTIONS "--generator=python") -+ FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc) -+ set(RCCOPTIONS "--generator=python" "--compress-algo=zlib" "--compress=1") -+ENDIF(Qt5Core_VERSION VERSION_LESS 5.14) - - MACRO(PYSIDE_WRAP_UI outfiles) - FOREACH(it ${ARGN}) -@@ -33,7 +49,7 @@ MACRO(PYSIDE_WRAP_UI outfiles) - #) - if(WIN32 OR APPLE) - ADD_CUSTOM_COMMAND(OUTPUT ${outfile} -- COMMAND ${PYSIDE2UICBINARY} ${infile} -o ${outfile} -+ COMMAND ${PYSIDE2UICBINARY} ${UICOPTIONS} ${infile} -o ${outfile} - MAIN_DEPENDENCY ${infile} - ) - else() -@@ -41,7 +57,7 @@ MACRO(PYSIDE_WRAP_UI outfiles) - # pyside2-uic generates in comments at beginning., which is why - # we follow the tool command with in-place sed. - ADD_CUSTOM_COMMAND(OUTPUT ${outfile} -- COMMAND "${PYSIDE2UICBINARY}" "${infile}" -o "${outfile}" -+ COMMAND "${PYSIDE2UICBINARY}" ${UICOPTIONS} "${infile}" -o "${outfile}" - COMMAND sed -i "/^# /d" "${outfile}" - MAIN_DEPENDENCY "${infile}" - ) -@@ -60,7 +76,7 @@ MACRO(PYSIDE_WRAP_RC outfiles) - #) - if(WIN32 OR APPLE) - ADD_CUSTOM_COMMAND(OUTPUT ${outfile} -- COMMAND ${PYSIDE2RCCBINARY} ${infile} -o ${outfile} -+ COMMAND ${PYSIDE2RCCBINARY} ${RCCOPTIONS} ${infile} -o ${outfile} - MAIN_DEPENDENCY ${infile} - ) - else() -@@ -68,7 +84,7 @@ MACRO(PYSIDE_WRAP_RC outfiles) - # pyside-rcc generates in comments at beginning, which is why - # we follow the tool command with in-place sed. - ADD_CUSTOM_COMMAND(OUTPUT "${outfile}" -- COMMAND "${PYSIDE2RCCBINARY}" "${infile}" ${PY_ATTRIBUTE} -o "${outfile}" -+ COMMAND "${PYSIDE2RCCBINARY}" ${RCCOPTIONS} "${infile}" ${PY_ATTRIBUTE} -o "${outfile}" - COMMAND sed -i "/^# /d" "${outfile}" - MAIN_DEPENDENCY "${infile}" - ) --- -2.26.0 - diff --git a/media-gfx/freecad/files/freecad-0.18.5-0006-add-missing-include-statements.patch b/media-gfx/freecad/files/freecad-0.18.5-0006-add-missing-include-statements.patch deleted file mode 100644 index 92d6d9f..0000000 --- a/media-gfx/freecad/files/freecad-0.18.5-0006-add-missing-include-statements.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2c52a1be4bd8f294bbcd96f99b0b5f84be68b917 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Tue, 2 Jun 2020 08:55:43 +0200 -Subject: [PATCH] add missing include statements - -Signed-off-by: Bernd Waibel ---- - src/Mod/Image/Gui/OpenGLImageBox.cpp | 1 + - src/Mod/Sandbox/Gui/Command.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/Mod/Image/Gui/OpenGLImageBox.cpp b/src/Mod/Image/Gui/OpenGLImageBox.cpp -index 404a1a1..bb22ae0 100644 ---- a/src/Mod/Image/Gui/OpenGLImageBox.cpp -+++ b/src/Mod/Image/Gui/OpenGLImageBox.cpp -@@ -26,6 +26,7 @@ - # include - # include - # include -+# include - #endif - - #if defined(__MINGW32__) -diff --git a/src/Mod/Sandbox/Gui/Command.cpp b/src/Mod/Sandbox/Gui/Command.cpp -index 67db11a..5bf8813 100644 ---- a/src/Mod/Sandbox/Gui/Command.cpp -+++ b/src/Mod/Sandbox/Gui/Command.cpp -@@ -45,6 +45,7 @@ - # include - # include - # include -+# include - # include - # include - # include --- -2.26.2 - diff --git a/media-gfx/freecad/files/freecad-0.18.5-0007-fix-boost-placeholders-problem.patch b/media-gfx/freecad/files/freecad-0.18.5-0007-fix-boost-placeholders-problem.patch deleted file mode 100644 index cc4649f..0000000 --- a/media-gfx/freecad/files/freecad-0.18.5-0007-fix-boost-placeholders-problem.patch +++ /dev/null @@ -1,42 +0,0 @@ -From db67488227119b93f7a4170bdf1aeec244b2e6fc Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Wed, 9 Sep 2020 07:35:41 +0200 -Subject: [PATCH] fix boost placeholders problem - -Thanks to Huang Rui for reporting the issue and providing a fix. - -Reported-by: Huang Rui -Closes: https://github.com/waebbl/waebbl-gentoo/issues/250 -Signed-off-by: Bernd Waibel ---- - src/Gui/DAGView/DAGView.cpp | 1 + - src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/Gui/DAGView/DAGView.cpp b/src/Gui/DAGView/DAGView.cpp -index 501a424..229d32c 100644 ---- a/src/Gui/DAGView/DAGView.cpp -+++ b/src/Gui/DAGView/DAGView.cpp -@@ -37,6 +37,7 @@ - #include "DAGModel.h" - #include "DAGView.h" - -+using namespace boost::placeholders; - using namespace Gui; - using namespace DAG; - -diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp -index 8b0e884..4e0c8ea 100644 ---- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp -+++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp -@@ -38,6 +38,7 @@ - - #include "ViewProviderSketch.h" - -+using namespace boost::placeholders; - using namespace SketcherGui; - using namespace Gui::TaskView; - --- -2.28.0 - diff --git a/media-gfx/freecad/files/freecad-0.18.5-0008-Update-swigpyrun.in-for-Python-3.8.patch b/media-gfx/freecad/files/freecad-0.18.5-0008-Update-swigpyrun.in-for-Python-3.8.patch deleted file mode 100644 index 3f8f3ff..0000000 --- a/media-gfx/freecad/files/freecad-0.18.5-0008-Update-swigpyrun.in-for-Python-3.8.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6eacb17b3e03d20039b85c9daebab9e44386d6bf Mon Sep 17 00:00:00 2001 -From: Richard -Date: Thu, 17 Oct 2019 11:20:10 -0500 -Subject: [PATCH] Update swigpyrun.in for Python 3.8 - -In Python 3.8 some functions related to thread state were intentionally made private. - -This fix (specific to FreeCAD) was suggested here: - -https://bugs.python.org/issue35886 ---- - src/Base/swigpyrun.inl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Base/swigpyrun.inl b/src/Base/swigpyrun.inl -index 0eedaaa87..65bba62db 100644 ---- a/src/Base/swigpyrun.inl -+++ b/src/Base/swigpyrun.inl -@@ -72,7 +72,7 @@ void cleanupSWIG_T(const char* TypeName) - - PyObject *module, *dict; - PyInterpreterState *interp = PyThreadState_GET()->interp; -- PyObject *modules = interp->modules; -+ PyObject *modules = PyImport_GetModuleDict(); - module = PyDict_GetItemString(modules, "__builtin__"); - if (module != NULL && PyModule_Check(module)) { - dict = PyModule_GetDict(module); --- -2.29.2 - diff --git a/media-gfx/freecad/files/freecad-0.18.5-0009-Python-skip-ci-tp_print-slot-has-been-replaced.patch b/media-gfx/freecad/files/freecad-0.18.5-0009-Python-skip-ci-tp_print-slot-has-been-replaced.patch deleted file mode 100644 index ddebf93..0000000 --- a/media-gfx/freecad/files/freecad-0.18.5-0009-Python-skip-ci-tp_print-slot-has-been-replaced.patch +++ /dev/null @@ -1,188 +0,0 @@ -From ae641dc5278efafa22b168fc196875558b92e436 Mon Sep 17 00:00:00 2001 -From: wmayer -Date: Sun, 7 Jun 2020 12:53:47 +0200 -Subject: [PATCH] Python: [skip ci] tp_print slot has been replaced with - tp_vectorcall_offset in Py3.8 - ---- - src/Base/swigpyrun_1.3.25.h | 8 ++++++++ - src/Base/swigpyrun_1.3.33.h | 8 ++++++++ - src/Base/swigpyrun_1.3.36.h | 9 +++++++++ - src/Base/swigpyrun_1.3.38.h | 8 ++++++++ - src/Base/swigpyrun_1.3.40.h | 12 ++++++++++-- - src/CXX/Python3/cxx_extensions.cxx | 6 ++++++ - 6 files changed, 49 insertions(+), 2 deletions(-) - -diff --git a/src/Base/swigpyrun_1.3.25.h b/src/Base/swigpyrun_1.3.25.h -index 91717210b..9ebadbc83 100644 ---- a/src/Base/swigpyrun_1.3.25.h -+++ b/src/Base/swigpyrun_1.3.25.h -@@ -699,7 +699,11 @@ PySwigObject_type(void) { - 0, /*tp_itemsize*/ - /* methods */ - (destructor)PySwigObject_dealloc, /*tp_dealloc*/ -+#if PY_VERSION_HEX < 0x03080000 - (printfunc)PySwigObject_print, /*tp_print*/ -+#else -+ 0, /*tp_vectorcall_offset*/ -+#endif - (getattrfunc)0, /*tp_getattr*/ - (setattrfunc)0, /*tp_setattr*/ - (cmpfunc)PySwigObject_compare, /*tp_compare*/ -@@ -859,7 +863,11 @@ PySwigPacked_type(void) { - 0, /*tp_itemsize*/ - /* methods */ - (destructor)PySwigPacked_dealloc, /*tp_dealloc*/ -+#if PY_VERSION_HEX < 0x03080000 - (printfunc)PySwigPacked_print, /*tp_print*/ -+#else -+ 0, /*tp_vectorcall_offset*/ -+#endif - (getattrfunc)0, /*tp_getattr*/ - (setattrfunc)0, /*tp_setattr*/ - (cmpfunc)PySwigPacked_compare, /*tp_compare*/ -diff --git a/src/Base/swigpyrun_1.3.33.h b/src/Base/swigpyrun_1.3.33.h -index f83ac1e89..afd5a8c50 100644 ---- a/src/Base/swigpyrun_1.3.33.h -+++ b/src/Base/swigpyrun_1.3.33.h -@@ -1620,7 +1620,11 @@ _PySwigObject_type(void) { - sizeof(PySwigObject), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)PySwigObject_dealloc, /* tp_dealloc */ -+#if PY_VERSION_HEX < 0x03080000 - (printfunc)PySwigObject_print, /* tp_print */ -+#else -+ 0, /*tp_vectorcall_offset*/ -+#endif - #if PY_VERSION_HEX < 0x02020000 - (getattrfunc)PySwigObject_getattr, /* tp_getattr */ - #else -@@ -1790,7 +1794,11 @@ _PySwigPacked_type(void) { - sizeof(PySwigPacked), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)PySwigPacked_dealloc, /* tp_dealloc */ -+#if PY_VERSION_HEX < 0x03080000 - (printfunc)PySwigPacked_print, /* tp_print */ -+#else -+ 0, /*tp_vectorcall_offset*/ -+#endif - (getattrfunc)0, /* tp_getattr */ - (setattrfunc)0, /* tp_setattr */ - (cmpfunc)PySwigPacked_compare, /* tp_compare */ -diff --git a/src/Base/swigpyrun_1.3.36.h b/src/Base/swigpyrun_1.3.36.h -index 02c58ad8a..12ad41e12 100644 ---- a/src/Base/swigpyrun_1.3.36.h -+++ b/src/Base/swigpyrun_1.3.36.h -@@ -1628,7 +1628,12 @@ _PySwigObject_type(void) { - sizeof(PySwigObject), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)PySwigObject_dealloc, /* tp_dealloc */ -+#if PY_VERSION_HEX < 0x03080000 - (printfunc)PySwigObject_print, /* tp_print */ -+#else -+ 0, /*tp_vectorcall_offset*/ -+#endif -+ - #if PY_VERSION_HEX < 0x02020000 - (getattrfunc)PySwigObject_getattr, /* tp_getattr */ - #else -@@ -1798,7 +1803,11 @@ _PySwigPacked_type(void) { - sizeof(PySwigPacked), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)PySwigPacked_dealloc, /* tp_dealloc */ -+#if PY_VERSION_HEX < 0x03080000 - (printfunc)PySwigPacked_print, /* tp_print */ -+#else -+ 0, /*tp_vectorcall_offset*/ -+#endif - (getattrfunc)0, /* tp_getattr */ - (setattrfunc)0, /* tp_setattr */ - (cmpfunc)PySwigPacked_compare, /* tp_compare */ -diff --git a/src/Base/swigpyrun_1.3.38.h b/src/Base/swigpyrun_1.3.38.h -index dae058c20..7cacc1579 100644 ---- a/src/Base/swigpyrun_1.3.38.h -+++ b/src/Base/swigpyrun_1.3.38.h -@@ -1741,7 +1741,11 @@ _PySwigObject_type(void) { - sizeof(SwigPyObject), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)SwigPyObject_dealloc, /* tp_dealloc */ -+#if PY_VERSION_HEX < 0x03080000 - (printfunc)SwigPyObject_print, /* tp_print */ -+#else -+ 0, /*tp_vectorcall_offset*/ -+#endif - #if PY_VERSION_HEX < 0x02020000 - (getattrfunc)SwigPyObject_getattr, /* tp_getattr */ - #else -@@ -1919,7 +1923,11 @@ _PySwigPacked_type(void) { - sizeof(SwigPyPacked), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)SwigPyPacked_dealloc, /* tp_dealloc */ -+#if PY_VERSION_HEX < 0x03080000 - (printfunc)SwigPyPacked_print, /* tp_print */ -+#else -+ 0, /*tp_vectorcall_offset*/ -+#endif - (getattrfunc)0, /* tp_getattr */ - (setattrfunc)0, /* tp_setattr */ - (cmpfunc)SwigPyPacked_compare, /* tp_compare */ -diff --git a/src/Base/swigpyrun_1.3.40.h b/src/Base/swigpyrun_1.3.40.h -index 136ba809f..400db8b47 100644 ---- a/src/Base/swigpyrun_1.3.40.h -+++ b/src/Base/swigpyrun_1.3.40.h -@@ -1766,7 +1766,11 @@ _PySwigObject_type(void) { - sizeof(SwigPyObject), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)SwigPyObject_dealloc, /* tp_dealloc */ -+#if PY_VERSION_HEX < 0x03080000 - (printfunc)SwigPyObject_print, /* tp_print */ -+#else -+ 0, /*tp_vectorcall_offset*/ -+#endif - #if PY_VERSION_HEX < 0x02020000 - (getattrfunc)SwigPyObject_getattr, /* tp_getattr */ - #else -@@ -1947,8 +1951,12 @@ _PySwigPacked_type(void) { - (char *)"SwigPyPacked", /* tp_name */ - sizeof(SwigPyPacked), /* tp_basicsize */ - 0, /* tp_itemsize */ -- (destructor)SwigPyPacked_dealloc, /* tp_dealloc */ -- (printfunc)SwigPyPacked_print, /* tp_print */ -+ (destructor)SwigPyPacked_dealloc, /* tp_dealloc */ -+#if PY_VERSION_HEX < 0x03080000 -+ (printfunc)SwigPyPacked_print, /* tp_print */ -+#else -+ 0, /*tp_vectorcall_offset*/ -+#endif - (getattrfunc)0, /* tp_getattr */ - (setattrfunc)0, /* tp_setattr */ - #if PY_VERSION_HEX>=0x03000000 -diff --git a/src/CXX/Python3/cxx_extensions.cxx b/src/CXX/Python3/cxx_extensions.cxx -index fb3da455f..9ff94612f 100644 ---- a/src/CXX/Python3/cxx_extensions.cxx -+++ b/src/CXX/Python3/cxx_extensions.cxx -@@ -381,7 +381,11 @@ PythonType::PythonType( size_t basic_size, int itemsize, const char *default_nam - - // Methods to implement standard operations - table->tp_dealloc = (destructor)standard_dealloc; -+#if PY_VERSION_HEX < 0x03080000 - table->tp_print = 0; -+#else -+ table->tp_vectorcall_offset = 0; -+#endif - table->tp_getattr = 0; - table->tp_setattr = 0; - table->tp_repr = 0; -@@ -524,7 +528,9 @@ PythonType &PythonType::supportClass() - #ifdef PYCXX_PYTHON_2TO3 - PythonType &PythonType::supportPrint() - { -+#if PY_VERSION_HEX < 0x03080000 - table->tp_print = print_handler; -+#endif - return *this; - } - #endif --- -2.29.2 - diff --git a/media-gfx/freecad/files/freecad-0.18.5-0010-Porting-Py3.8.patch b/media-gfx/freecad/files/freecad-0.18.5-0010-Porting-Py3.8.patch deleted file mode 100644 index 952701d..0000000 --- a/media-gfx/freecad/files/freecad-0.18.5-0010-Porting-Py3.8.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/src/CXX/Python3/Objects.hxx b/src/CXX/Python3/Objects.hxx -index 490978ec8..e5b341a01 100644 ---- a/src/CXX/Python3/Objects.hxx -+++ b/src/CXX/Python3/Objects.hxx -@@ -3233,8 +3256,7 @@ namespace Py - inline Object Object::callMemberFunction( const std::string &function_name ) const - { - Callable target( getAttr( function_name ) ); -- Tuple args( (sequence_index_type)0 ); -- return target.apply( args ); -+ return target.apply(); - } - - inline Object Object::callMemberFunction( const std::string &function_name, const Tuple &args ) const -diff --git a/src/CXX/Python3/cxx_extensions.cxx b/src/CXX/Python3/cxx_extensions.cxx -index 9ff94612f..d4e597f5e 100644 ---- a/src/CXX/Python3/cxx_extensions.cxx -+++ b/src/CXX/Python3/cxx_extensions.cxx -@@ -222,7 +222,7 @@ extern "C" - // All the following functions redirect the call from Python - // onto the matching virtual function in PythonExtensionBase - // --#ifdef PYCXX_PYTHON_2TO3 -+#if defined( PYCXX_PYTHON_2TO3 ) && !defined( Py_LIMITED_API ) && PY_MINOR_VERSION <= 7 - static int print_handler( PyObject *, FILE *, int ); - #endif - static PyObject *getattr_handler( PyObject *, char * ); -@@ -622,7 +622,7 @@ PythonExtensionBase *getPythonExtensionBase( PyObject *self ) - } - } - --#ifdef PYCXX_PYTHON_2TO3 -+#if defined( PYCXX_PYTHON_2TO3 ) && !defined( Py_LIMITED_API ) && PY_MINOR_VERSION <= 7 - extern "C" int print_handler( PyObject *self, FILE *fp, int flags ) - { - try -diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp -index 6bbee793b..b4143b152 100644 ---- a/src/Mod/Part/App/AppPartPy.cpp -+++ b/src/Mod/Part/App/AppPartPy.cpp -@@ -1841,11 +1841,11 @@ private: - if (!p) { - throw Py::TypeError("** makeWireString can't convert PyString."); - } -- pysize = PyUnicode_GetSize(p); -+ pysize = PyUnicode_GetLength(p); - unichars = PyUnicode_AS_UNICODE(p); - } - else if (PyUnicode_Check(intext)) { -- pysize = PyUnicode_GetSize(intext); -+ pysize = PyUnicode_GetLength(intext); - unichars = PyUnicode_AS_UNICODE(intext); - } - else { --- -2.29.2 - diff --git a/media-gfx/freecad/files/freecad.sharedmimeinfo b/media-gfx/freecad/files/freecad.sharedmimeinfo deleted file mode 100644 index 6d5e93e..0000000 --- a/media-gfx/freecad/files/freecad.sharedmimeinfo +++ /dev/null @@ -1,8 +0,0 @@ - - - - - FreeCAD document files - - - diff --git a/media-gfx/freecad/freecad-0.18.5.ebuild b/media-gfx/freecad/freecad-0.18.5.ebuild deleted file mode 100644 index 6ddf238..0000000 --- a/media-gfx/freecad/freecad-0.18.5.ebuild +++ /dev/null @@ -1,319 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# This is in currently WIP! It should work though. - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit check-reqs cmake desktop python-single-r1 xdg - -DESCRIPTION="QT based Computer Aided Design application" -HOMEPAGE="https://www.freecadweb.org/" - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git" - KEYWORDS="" -else - MY_PV=$(ver_cut 1-2) - MY_PV=$(ver_rs 1 '_' ${MY_PV}) - SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz - doc? ( https://github.com/FreeCAD/FreeCAD/releases/download/0.18.1/FreeCAD.${MY_PV}.Quick.Reference.Guide.7z -> ${P}.Quick.Reference.Guide.7z )" - KEYWORDS="~amd64" -fi - -# code is licensed LGPL-2 -# examples are licensed CC-BY-SA (without note of specific version) -LICENSE="LGPL-2 CC-BY-SA-4.0" -SLOT="0" - -# FIXME: -# vr: needs a rift package: does this make sense? Currently they don't have -# support for linux. The last linux package dates back to 2015! -# smesh: needs a salome-platform package -# zipio++: FreeCAD uses quite outdated zipio and doesn't compile against. -# new versions. Ebuild is available in overlay. -# Possible candidates for mpi: hdf5 libmed vtk flann (netcdf, simage) - -IUSE="debug doc mpi netgen pcl" - -FREECAD_EXPERIMENTAL_MODULES="assembly plot ship" -#FREECAD_DEBUG_MODULES="sandbox template" -FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf - image inspection material mesh openscad - part-design path points raytracing robot - show spreadsheet surface techdraw tux" -FREECAD_DISABLED_MODULES="vr" -FREECAD_ALL_MODULES="${FREECAD_STABLE_MODULES} - ${FREECAD_EXPERIMENTAL_MODULES} ${FREECAD_DISABLED_MODULES}" - -for module in ${FREECAD_STABLE_MODULES}; do - IUSE="${IUSE} +${module}" -done -for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} -${module}" -done -unset module - -# Eigen is needed by sketcher which we enable by default, so remove USE flag and -# unconditionally depend on it -# netgen? ( >=sci-mathematics/netgen-6.2.1810[mpi?,python,opencascade,${PYTHON_SINGLE_USEDEP}] ) -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/eigen-3.3.1:3 - dev-libs/OpenNI2[opengl(+)] - dev-libs/libspnav[X] - dev-libs/xerces-c - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - >=media-libs/coin-4.0.0[draggers(+),manipulators(+),nodekits(+),simage(+),vrml97(+)] - media-libs/freetype - media-libs/qhull - sci-libs/flann[mpi?,openmp] - >=sci-libs/med-4.0.0-r1[mpi(+)?,python,${PYTHON_SINGLE_USEDEP}] - sci-libs/orocos_kdl:= - >=sci-libs/opencascade-7.3.0:*[vtk(+)] - sys-libs/zlib - virtual/glu - virtual/libusb:1 - virtual/opengl - fem? ( >=sci-libs/vtk-6.1.0-r4[boost,mpi?,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] ) - mesh? ( sci-libs/hdf5:=[fortran,mpi?,zlib] ) - mpi? ( virtual/mpi[cxx,fortran,threads] ) - openscad? ( media-gfx/openscad ) - pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) - $(python_gen_cond_dep ' - !dev-python/pyside:2[gui,svg,${PYTHON_MULTI_USEDEP}] - !dev-python/shiboken:2[${PYTHON_MULTI_USEDEP}] - dev-libs/boost:=[mpi?,python,threads,${PYTHON_MULTI_USEDEP}] - dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}] - dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}] - dev-python/shiboken2[${PYTHON_MULTI_USEDEP}] - addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] ) - mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] ) - ') -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/swig - doc? ( app-arch/p7zip ) - $(python_gen_cond_dep ' - !dev-python/pyside-tools:2[${PYTHON_MULTI_USEDEP}] - dev-python/pyside2-tools[${PYTHON_MULTI_USEDEP}] - ') -" - -# To get required dependencies: 'grep REQUIRES_MODS CMakeLists.txt' -# We set the following requirements by default: -# draft, import, part, qt5, sketcher, start, web. -# -# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh -# Fem actually needs smesh, but as long as we don't have a smesh package, we enable -# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't -# reflected by the REQUIRES_MODS macro, but at CMakeLists.txt:308. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - arch? ( mesh ) - debug? ( mesh ) - drawing? ( spreadsheet ) - fem? ( mesh ) - inspection? ( mesh points ) - netgen? ( fem ) - openscad? ( mesh ) - path? ( robot ) - ship? ( image plot ) - techdraw? ( spreadsheet drawing ) -" - -CMAKE_BUILD_TYPE=Release - -DOCS=( README.md ChangeLog.txt ) - -PATCHES=( - "${FILESDIR}/${P}-0001-Fix-coin-related-variables-to-use-new-naming-from-4.0.0.patch" - "${FILESDIR}/${P}-0001-fix-std-namespace-issue-with-endl.patch" - "${FILESDIR}/${P}-0002-Fix-PySide-related-checks.patch" - "${FILESDIR}/${P}-0005-Fix-a-Qt-related-crash-with-draft-workbench.patch" - "${FILESDIR}/${P}-0006-add-missing-include-statements.patch" - "${FILESDIR}/${P}-0007-fix-boost-placeholders-problem.patch" - "${FILESDIR}/${P}-0008-Update-swigpyrun.in-for-Python-3.8.patch" - "${FILESDIR}/${P}-0009-Python-skip-ci-tp_print-slot-has-been-replaced.patch" - "${FILESDIR}/${P}-0010-Porting-Py3.8.patch" -) - -CHECKREQS_DISK_BUILD="6G" - -[[ ${PV} == *9999 ]] && S="${WORKDIR}/freecad-${PV}" || S="${WORKDIR}/FreeCAD-${PV}" - -pkg_setup() { - check-reqs_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - # the upstream provided file doesn't find coin, but cmake ships - # a working one, so we use this. - rm -f "${S}/cMake/FindCoin3D.cmake" - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_ADDONMGR=$(usex addonmgr) - -DBUILD_ARCH=$(usex arch) - -DBUILD_ASSEMBLY=$(usex assembly) - -DBUILD_COMPLETE=OFF # deprecated - -DBUILD_DRAFT=ON # basic workspace, enable it by default - -DBUILD_DRAWING=$(usex drawing) - -DBUILD_FEM=$(usex fem) - -DBUILD_FEM_NETGEN=$(usex netgen) - -DBUILD_FLAT_MESH=$(usex mesh) - -DBUILD_FREETYPE=ON # automagic dep - -DBUILD_GUI=ON - -DBUILD_IDF=$(usex idf) - -DBUILD_IMAGE=$(usex image) - -DBUILD_IMPORT=ON # import module for various file formats - -DBUILD_INSPECTION=$(usex inspection) - -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there - -DBUILD_MATERIAL=$(usex material) - -DBUILD_MESH=$(usex mesh) - -DBUILD_MESH_PART=$(usex mesh) - -DBUILD_OPENSCAD=$(usex openscad) - -DBUILD_PART=ON # basic workspace, enable it by default - -DBUILD_PART_DESIGN=$(usex part-design) - -DBUILD_PATH=$(usex path) - -DBUILD_PLOT=OFF # conflicts with possible external workbench - -DBUILD_POINTS=$(usex points) - -DBUILD_QT5=ON # OFF means to use Qt4 - -DBUILD_RAYTRACING=$(usex raytracing) - -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox - -DBUILD_ROBOT=$(usex robot) - -DBUILD_SHIP=$(usex ship) - -DBUILD_SHOW=$(usex show) - -DBUILD_SKETCHER=ON # needed by draft workspace - -DBUILD_SMESH=$(usex mesh) - -DBUILD_SPREADSHEET=$(usex spreadsheet) - -DBUILD_START=ON # basic workspace, enable it by default - -DBUILD_SURFACE=$(usex surface) - -DBUILD_TECHDRAW=$(usex techdraw) - -DBUILD_TUX=$(usex tux) - -DBUILD_VR=OFF - -DBUILD_WEB=ON # needed by start workspace - -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} - -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} - -DFREECAD_USE_EXTERNAL_SMESH=OFF - -DFREECAD_USE_EXTERNAL_KDL=ON - -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in gentoo tree - -DFREECAD_USE_FREETYPE=ON - -DFREECAD_USE_PCL=$(usex pcl) - -DFREECAD_USE_PYBIND11=$(usex mesh) - # opencascade sets CASROOT in /etc/env.d/51opencascade - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}/$(get_libdir)" - -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo - -DPYSIDE2RCCBINARY="${EPREFIX}/usr/bin/rcc" - -DPYSIDE2UICBINARY="${EPREFIX}/usr/bin/uic" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" # to use correct python for shiboken - ) - - if use debug; then - mycmakeargs+=( - -DBUILD_SANDBOX=$(usex mesh) # sandbox needs mesh support - -DBUILD_TEMPLATE=ON - -DBUILD_TEST=ON - ) - else - mycmakeargs+=( - -DBUILD_SANDBOX=OFF - -DBUILD_TEMPLATE=OFF - -DBUILD_TEST=OFF - ) - fi - -# NOTE: using mpi wrappers currently produces insecure runpaths in smesh -# libraries. - if use mpi; then - mycmakeargs+=( - -DOPENMPI_INCLUDE_DIRS=/usr/include/ - ) - export CC=mpicc - export CXX=mpicxx - export FC=mpif77 - export F77=mpif77 - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad - dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd - - make_desktop_entry freecad "FreeCAD" "" "" "MimeType=application/x-extension-fcstd;" - - # install mimetype for FreeCAD files - insinto /usr/share/mime/packages - newins "${FILESDIR}"/${PN}.sharedmimeinfo "${PN}.xml" - - insinto /usr/share/pixmaps - newins "${S}"/src/Gui/Icons/${PN}.xpm "${PN}.xpm" - - # install icons to correct place rather than /usr/share/freecad - local size - for size in 16 32 48 64; do - newicon -s ${size} "${S}"/src/Gui/Icons/${PN}-icon-${size}.png ${PN}.png - done - doicon -s scalable "${S}"/src/Gui/Icons/${PN}.svg - newicon -s 64 -c mimetypes "${S}"/src/Gui/Icons/${PN}-doc.png application-x-extension-fcstd.png - - rm "${ED}"/usr/share/${PN}/data/${PN}-{doc,icon-{16,32,48,64}}.png || die - rm "${ED}"/usr/share/${PN}/data/${PN}.svg || die - rm "${ED}"/usr/share/${PN}/data/${PN}.xpm || die - - if use doc; then - [[ ${PV} == *9999 ]] && einfo "Docs are not downloaded for ${PV}" \ - || (cp -r "${WORKDIR}/FreeCAD 0_18 Quick Reference Guide" "${ED}/usr/share/doc/${PF}" || die) - fi - - python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - - if use plot; then - einfo "Note: You are enabling the 'plot' USE flag." - einfo "This conflicts with the plot workbench which you can load" - einfo "via the addon manager! You can only install one of those." - fi - - if use ship; then - einfo "Note: You are enabling the 'ship' USE flag." - einfo "This conflicts with the ship workbench which you can load" - einfo "via the addon manager! You can only install one of those." - fi -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml deleted file mode 100644 index 3acfc09..0000000 --- a/media-gfx/freecad/metadata.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - waebbl@gmail.com - Bernd Waibel - - - - Build the addon manager module for automatic handling of 3rd - party addons - - - Build the architecture workbench for working with architectural - elements - - - Build the assembly module - - - Build the drawing module and workbench to display 3D work on a - 2D sheet - - - Build the FEM module and workbench which provides Finite Element - Analysis (FEA) workflows - - - Build the IDF module to provide file exchange capabilities with - IDF files - - - Build the image module and workbench for working with bitmap - images - - - Build the inspection workbench which gives you specific tools - for examination of shapes (experimental) - - - Build the material module and workbench to work with materials - - - Build the mesh module and workbench to work with triangulated - meshes - - - Support sci-mathematics/netgen with the FEM workbench - - - Build the OpenSCAD module for interoperability with OpenSCAD - and repairing Constructive Solid Geometry (CSG) history - - - Build the part design module and workbench for build part shapes - from sketches - - - Build the path module and workbench to procude G-Code instructions - for CNC - - - Use external sci-libs/pcl for point clouds support. - - - Build the internal plot workbench. NOTE: This conflicts with the - external plot workbench, which you can add via the Addon Manager! - - - Build the points module and workbench for working with point clouds - - - Build the raytracing module and workbench for raytracing and rendering - - - Build the robot module and workbench for studying robot movements - - - Build the ship module and workbench which works over ship entities, - that must be created on top of provided geometry. NOTE: This conflicts - with the external ship workbench, which you can add via the Addon Manager! - - - Build the show module, a helper module for visibility automation - - - Build the spreadsheet module and workbench to create and manipulate - spreadsheet data - - - Build the surface module and workbench - - - - Build the techdraw module and workbench, a more advanced and - feature-rich successor of the drawing workbench - - - Build the Tux module - - - - https://www.freecadweb.org/tracker/ - FreeCAD/FreeCAD - https://www.freecadweb.org/wiki/MainPage - - - diff --git a/media-libs/openusd/Manifest b/media-libs/openusd/Manifest deleted file mode 100644 index 02a786f..0000000 --- a/media-libs/openusd/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX install.diff 3424 BLAKE2B 1c49ff2be58e673c2e5ba3536d52ad75f2980e2acb15989cac214f2a77f9a5c396ed60440db726c509ad25a054e883f112acf9069bda30cf660616b1e3333faa SHA512 879a1ca8207c71a1917cb6025870838f75a896aab917e00bc4a5b4f97e7b4a8739896a06340eca58863ec0e29595c421f50462f76e3f2e6d30825424e208147b -AUX lib64.patch 5237 BLAKE2B 0f279488769e003263e9946c069f8e6dd3e1eb0185bbc00d0beba87d13396275111d72c5eaaaff8b68e4270ffd321a2b0e1316719e0557d59abcd5a4f1ba001b SHA512 3fb7d87c86c9ee31077641215777380625caa0030b04fd6a68c93d547cc7cf6680a7b43517ec5dc37bc3f2d9bee9845cd9e15dd82ae1f9326d8dc4c1d3df021a -AUX packageUtils.cpp.patch 333 BLAKE2B ad1965bdacda918fb12bbdf09ba16ef6c9c4bda762c9d364e344778f4c0fdee005410f0de6734c828508440f48506c08974ea778161f9697603fb32a6fcbf016 SHA512 3a9659ae9418cd93d70007b904b55ce2beb03f712bacb3698b05eab0aff9bffa3e1d0961833a3d0c3111b6e8727b273ef3740a93f4218d159655dc65eca7effe -AUX usd.diff 5409 BLAKE2B 0fad57ab60ccc67538dc6529651cc13805b414e979be75f32d024f300341e71800a51d409ab8f72f49ba92646d22b0f1446d2aac8b6c380016983cf1bd7739ef SHA512 118f70a8eb9432718219033ae66150a9015a359bafe1b8e04d2a0cb8c560ca741a9eb008306e8cc8777c8b3d1f2d0fdd5df9d96226f8f7fa49166d2f40ca4c2f -EBUILD openusd-9999-r1.ebuild 3091 BLAKE2B cf944d36664c77daace0bd2a6b4e1bb1e9f4bf89ddde518fa52a7acdae03e22837af415357e93e4f4bf4f9830c383da8de5c3ed3bed39f6bea3c548b1646dbbc SHA512 a57fce98fb366739c1f60afe9f4cf5ba9ad20a9dc3f339d236201df3a0ca023e83edffaa6e9a7364ece0077b3a7df1adae98018fa6cf71765019e4a28cf26ff2 -MISC metadata.xml 211 BLAKE2B 8bad0c1d704eeee043f3f0682869591c0ed450688b030f11ff262f8300a63943c57b83a7efb950817a26e871ef5645b3089ab5d9b42e669224522e788e8628a0 SHA512 ed9a37ec6eee220115e8ea6c951da7f13430a8bbf086ad2b42efdec56ed217ae68f2f17f301dccdbede7dbed937fb8141aac1389e79639ce5c394b09359995eb diff --git a/media-libs/openusd/files/install.diff b/media-libs/openusd/files/install.diff deleted file mode 100644 index c671723..0000000 --- a/media-libs/openusd/files/install.diff +++ /dev/null @@ -1,86 +0,0 @@ ---- a/cmake/macros/Public.cmake 2020-04-20 08:15:12.647935655 +0300 -+++ b/cmake/macros/Public.cmake 2020-04-20 08:20:55.517936523 +0300 -@@ -431,7 +431,7 @@ - # Find libraries under the install prefix, which has the core USD - # libraries. - _pxr_init_rpath(rpath "tests/lib") -- _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib") -+ _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib64") - _pxr_install_rpath(rpath ${LIBRARY_NAME}) - - if (NOT bt_SOURCE_DIR) -@@ -511,7 +511,7 @@ - # Find libraries under the install prefix, which has the core USD - # libraries. - _pxr_init_rpath(rpath "tests") -- _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib") -+ _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib64") - _pxr_install_rpath(rpath ${TEST_NAME}) - - # XXX -- We shouldn't have to install to run tests. -@@ -698,13 +698,13 @@ - set(_plugSearchPathEnvName ${PXR_OVERRIDE_PLUGINPATH_NAME}) - endif() - -- set(testWrapperCmd ${testWrapperCmd} --env-var=${_plugSearchPathEnvName}=${CMAKE_INSTALL_PREFIX}/lib/usd) -+ set(testWrapperCmd ${testWrapperCmd} --env-var=${_plugSearchPathEnvName}=${CMAKE_INSTALL_PREFIX}/lib64/usd) - endif() - - # Ensure that Python imports the Python files built by this build. - # On Windows convert backslash to slash and don't change semicolons - # to colons. -- set(_testPythonPath "${CMAKE_INSTALL_PREFIX}/lib/python;$ENV{PYTHONPATH}") -+ set(_testPythonPath "${CMAKE_INSTALL_PREFIX}/lib64/python;$ENV{PYTHONPATH}") - if(WIN32) - string(REGEX REPLACE "\\\\" "/" _testPythonPath "${_testPythonPath}") - else() -@@ -746,7 +746,7 @@ - foreach(dirName ${PXR_EXTRA_PLUGINS}) - file(RELATIVE_PATH - relDirName -- "${CMAKE_INSTALL_PREFIX}/lib/usd" -+ "${CMAKE_INSTALL_PREFIX}/lib64/usd" - "${CMAKE_INSTALL_PREFIX}/${dirName}" - ) - set(extraIncludes "${extraIncludes},\n \"${relDirName}/\"") -@@ -757,7 +757,7 @@ - "${plugInfoContents}") - install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/plugins_plugInfo.json" -- DESTINATION lib/usd -+ DESTINATION lib64/usd - RENAME "plugInfo.json" - ) - -@@ -766,7 +766,7 @@ - "${plugInfoContents}") - install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/usd_plugInfo.json" -- DESTINATION plugin/usd -+ DESTINATION share/usd/plugin/usd - RENAME "plugInfo.json" - ) - endfunction() # pxr_setup_plugins -@@ -977,8 +977,8 @@ - ) - - _pxr_init_rpath(rpath "${libInstallPrefix}") -- _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/${PXR_INSTALL_SUBDIR}/lib") -- _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib") -+ _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/${PXR_INSTALL_SUBDIR}/lib64") -+ _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib64") - _pxr_install_rpath(rpath usd_ms) - endif() - ---- a/pxr/CMakeLists.txt 2020-04-19 19:52:44.560882678 +0300 -+++ b/pxr/CMakeLists.txt 2020-04-19 20:06:38.077552324 +0300 -@@ -18,7 +18,7 @@ - "${PROJECT_BINARY_DIR}/pxrConfig.cmake" @ONLY) - install(FILES - "${PROJECT_BINARY_DIR}/pxrConfig.cmake" -- DESTINATION "${CMAKE_INSTALL_PREFIX}" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/usd/" - ) - - if (NOT PXR_BUILD_MONOLITHIC) - diff --git a/media-libs/openusd/files/lib64.patch b/media-libs/openusd/files/lib64.patch deleted file mode 100644 index 300a7f8..0000000 --- a/media-libs/openusd/files/lib64.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- a/cmake/macros/Public.cmake 2020-11-14 00:30:42.241274460 +0300 -+++ b/cmake/macros/Public.cmake 2020-11-14 00:33:28.117941719 +0300 -@@ -409,7 +409,7 @@ - RENAME - __init__.py - DESTINATION -- tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME} -+ tests/${tm_INSTALL_PREFIX}/lib64/python/${MODULE_NAME} - ) - endif() - if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${plugInfoFile}") -@@ -419,7 +419,7 @@ - RENAME - plugInfo.json - DESTINATION -- tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME} -+ tests/${tm_INSTALL_PREFIX}/lib64/python/${MODULE_NAME} - ) - endif() - endfunction() # pxr_create_test_module -@@ -458,7 +458,7 @@ - # Find libraries under the install prefix, which has the core USD - # libraries. - _pxr_init_rpath(rpath "tests/lib") -- _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib") -+ _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib64") - _pxr_install_rpath(rpath ${LIBRARY_NAME}) - - if (NOT bt_SOURCE_DIR) -@@ -471,7 +471,7 @@ - set(TEST_PLUG_INFO_ROOT "..") - set(LIBRARY_FILE "${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}") - -- set(testPlugInfoLibDir "tests/${bt_INSTALL_PREFIX}/lib/${LIBRARY_NAME}") -+ set(testPlugInfoLibDir "tests/${bt_INSTALL_PREFIX}/lib64/${LIBRARY_NAME}") - set(testPlugInfoResourceDir "${testPlugInfoLibDir}/${TEST_PLUG_INFO_RESOURCE_PATH}") - set(testPlugInfoPath "${CMAKE_BINARY_DIR}/${testPlugInfoResourceDir}/plugInfo.json") - -@@ -546,7 +546,7 @@ - # Find libraries under the install prefix, which has the core USD - # libraries. - _pxr_init_rpath(rpath "tests") -- _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib") -+ _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib64") - _pxr_install_rpath(rpath ${TEST_NAME}) - - # XXX -- We shouldn't have to install to run tests. -@@ -752,13 +752,13 @@ - # we set the PXR_PLUGINPATH_NAME env var to point to the "lib/usd" - # directory where these files are installed. - if (NOT TARGET shared_libs) -- set(testWrapperCmd ${testWrapperCmd} --env-var=${PXR_PLUGINPATH_NAME}=${CMAKE_INSTALL_PREFIX}/lib/usd) -+ set(testWrapperCmd ${testWrapperCmd} --env-var=${PXR_PLUGINPATH_NAME}=${CMAKE_INSTALL_PREFIX}/lib64/usd) - endif() - - # Ensure that Python imports the Python files built by this build. - # On Windows convert backslash to slash and don't change semicolons - # to colons. -- set(_testPythonPath "${CMAKE_INSTALL_PREFIX}/lib/python;$ENV{PYTHONPATH}") -+ set(_testPythonPath "${CMAKE_INSTALL_PREFIX}/lib64/python;$ENV{PYTHONPATH}") - if(WIN32) - string(REGEX REPLACE "\\\\" "/" _testPythonPath "${_testPythonPath}") - else() -@@ -800,7 +800,7 @@ - foreach(dirName ${PXR_EXTRA_PLUGINS}) - file(RELATIVE_PATH - relDirName -- "${CMAKE_INSTALL_PREFIX}/lib/usd" -+ "${CMAKE_INSTALL_PREFIX}/lib64/usd" - "${CMAKE_INSTALL_PREFIX}/${dirName}" - ) - set(extraIncludes "${extraIncludes},\n \"${relDirName}/\"") -@@ -1012,7 +1012,7 @@ - - _pxr_init_rpath(rpath "${libInstallPrefix}") - _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/${PXR_INSTALL_SUBDIR}/lib") -- _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib") -+ _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib64") - _pxr_install_rpath(rpath usd_ms) - endif() - ---- a/cmake/macros/Private.cmake 2020-11-14 00:40:50.921276632 +0300 -+++ b/cmake/macros/Private.cmake 2020-11-14 00:42:09.227943579 +0300 -@@ -947,7 +947,7 @@ - _pxr_init_rpath(rpath "${libInstallPrefix}") - _pxr_add_rpath(rpath - "${CMAKE_INSTALL_PREFIX}/${args_WRAPPED_LIB_INSTALL_PREFIX}") -- _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib") -+ _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib64") - _pxr_install_rpath(rpath ${LIBRARY_NAME}) - - _get_folder("_python" folder) -@@ -1286,7 +1286,7 @@ - # the latter for core USD libraries. - _pxr_init_rpath(rpath "${libInstallPrefix}") - _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/${PXR_INSTALL_SUBDIR}/lib") -- _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib") -+ _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib64") - _pxr_install_rpath(rpath ${NAME}) - - # ---- a/cmake/defaults/ProjectDefaults.cmake 2020-11-14 00:42:41.134610359 +0300 -+++ b/cmake/defaults/ProjectDefaults.cmake 2020-11-14 00:43:42.834610577 +0300 -@@ -26,8 +26,8 @@ - set(CMAKE_MACOSX_RPATH ON) - set(CMAKE_SKIP_BUILD_RPATH FALSE) - set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -- set(CMAKE_DYLIB_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "install_name path for dylib.") -- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) -+ set(CMAKE_DYLIB_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib64" CACHE STRING "install_name path for dylib.") -+ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib64" isSystemDir) - message(WARNING "Building USD on Mac OSX is currently experimental.") - elseif(WIN32) - # Windows specific set up diff --git a/media-libs/openusd/files/packageUtils.cpp.patch b/media-libs/openusd/files/packageUtils.cpp.patch deleted file mode 100644 index 965141f..0000000 --- a/media-libs/openusd/files/packageUtils.cpp.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/pxr/usd/lib/ar/packageUtils.cpp 2020-06-06 19:11:10.346277961 +0300 -+++ b/pxr/usd/lib/ar/packageUtils.cpp 2020-06-07 06:56:35.563703755 +0300 -@@ -22,6 +22,7 @@ - // language governing permissions and limitations under the Apache License. - // - -+#include "algorithm" - #include "pxr/pxr.h" - #include "pxr/usd/ar/packageUtils.h" - diff --git a/media-libs/openusd/files/usd.diff b/media-libs/openusd/files/usd.diff deleted file mode 100644 index cc532e9..0000000 --- a/media-libs/openusd/files/usd.diff +++ /dev/null @@ -1,139 +0,0 @@ -diff -x .git -ur a/cmake/defaults/Options.cmake b/cmake/defaults/Options.cmake ---- a/cmake/defaults/Options.cmake 2019-10-24 22:39:53.000000000 +0200 -+++ b/cmake/defaults/Options.cmake 2019-11-28 13:00:33.197957712 +0100 -@@ -25,6 +25,7 @@ - option(PXR_VALIDATE_GENERATED_CODE "Validate script generated code" OFF) - option(PXR_HEADLESS_TEST_MODE "Disallow GUI based tests, useful for running under headless CI systems." OFF) - option(PXR_BUILD_TESTS "Build tests" ON) -+option(PXR_BUILD_USD_TOOLS "Build commandline tools" ON) - option(PXR_BUILD_IMAGING "Build imaging components" ON) - option(PXR_BUILD_EMBREE_PLUGIN "Build embree imaging plugin" OFF) - option(PXR_BUILD_OPENIMAGEIO_PLUGIN "Build OpenImageIO plugin" OFF) -diff -x .git -ur a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake ---- a/cmake/defaults/Packages.cmake 2019-10-24 22:39:53.000000000 +0200 -+++ b/cmake/defaults/Packages.cmake 2019-11-28 13:00:33.185957483 +0100 -@@ -64,7 +64,7 @@ - endif() - - # --TBB --find_package(TBB REQUIRED COMPONENTS tbb) -+find_package(TBB) - add_definitions(${TBB_DEFINITIONS}) - - # --math -diff -x .git -ur a/pxr/base/lib/plug/initConfig.cpp b/pxr/base/lib/plug/initConfig.cpp ---- a/pxr/base/lib/plug/initConfig.cpp 2019-10-24 22:39:53.000000000 +0200 -+++ b/pxr/base/lib/plug/initConfig.cpp 2019-12-11 11:00:37.643323127 +0100 -@@ -69,8 +69,38 @@ - - ARCH_CONSTRUCTOR(Plug_InitConfig, 2, void) - { -+ /* The contents of this constructor have been moved to usd_initialise_plugin_path(...) */ -+} -+ -+}; // end of anonymous namespace -+ -+/** -+ * The contents of this function used to be in the static constructor Plug_InitConfig. -+ * This static constructor made it impossible for Blender to pass a path to the USD -+ * library at runtime, as the constructor would run before Blender's main() function. -+ * -+ * This function is wrapped in a C function of the same name (defined below), -+ * so that it can be called from Blender's main() function. -+ * -+ * The datafiles_usd_path path is used to point to the USD plugin path when Blender -+ * has been installed. The fallback_usd_path path should point to the build-time -+ * location of the USD plugin files so that Blender can be run on a development machine -+ * without requiring an installation step. -+ */ -+void -+usd_initialise_plugin_path(const char *datafiles_usd_path) -+{ - std::vector result; - -+ // Add Blender-specific paths. They MUST end in a slash, or symlinks will not be treated as directory. -+ if (datafiles_usd_path != NULL && datafiles_usd_path[0] != '\0') { -+ std::string datafiles_usd_path_str(datafiles_usd_path); -+ if (datafiles_usd_path_str.back() != '/') { -+ datafiles_usd_path_str += "/"; -+ } -+ result.push_back(datafiles_usd_path_str); -+ } -+ - // Determine the absolute path to the Plug shared library. - // Any relative paths specified in the plugin search path will be - // anchored to this directory, to allow for relocatability. -@@ -94,9 +124,24 @@ - _AppendPathList(&result, installLocation, sharedLibPath); - #endif // PXR_INSTALL_LOCATION - -- Plug_SetPaths(result); --} -+ if (!TfGetenv("PXR_PATH_DEBUG").empty()) { -+ printf("USD Plugin paths: (%zu in total):\n", result.size()); -+ for(const std::string &path : result) { -+ printf(" %s\n", path.c_str()); -+ } -+ } - -+ Plug_SetPaths(result); - } - - PXR_NAMESPACE_CLOSE_SCOPE -+ -+/* Workaround to make it possible to pass a path at runtime to USD. */ -+extern "C" { -+void -+usd_initialise_plugin_path( -+ const char *datafiles_usd_path) -+{ -+ PXR_NS::usd_initialise_plugin_path(datafiles_usd_path); -+} -+} -diff -x .git -ur a/pxr/usd/CMakeLists.txt b/pxr/usd/CMakeLists.txt ---- a/pxr/usd/CMakeLists.txt 2019-10-24 22:39:53.000000000 +0200 -+++ b/pxr/usd/CMakeLists.txt 2019-11-28 13:00:33.197957712 +0100 -@@ -1,6 +1,5 @@ - set(DIRS - lib -- bin - plugin - ) - -@@ -8,3 +7,8 @@ - add_subdirectory(${d}) - endforeach() - -+if (PXR_BUILD_USD_TOOLS) -+ add_subdirectory(bin) -+else() -+ message(STATUS "Skipping commandline tools because PXR_BUILD_USD_TOOLS=OFF") -+endif() -diff -Naur b_orig/pxr/base/lib/tf/preprocessorUtils.h b/pxr/base/lib/tf/preprocessorUtils.h ---- b_orig/pxr/base/lib/tf/preprocessorUtils.h 2019-10-24 14:39:53 -0600 -+++ b/pxr/base/lib/tf/preprocessorUtils.h 2020-01-14 09:30:18 -0700 -@@ -189,7 +189,7 @@ - /// Exapnds to 1 if the argument is a tuple, and 0 otherwise. - /// \ingroup group_tf_Preprocessor - /// \hideinitializer --#if defined(ARCH_OS_WINDOWS) -+#if defined(ARCH_COMPILER_MSVC) - #define TF_PP_IS_TUPLE(sequence) \ - BOOST_VMD_IS_TUPLE(sequence) - #else -diff -Naur b_base/cmake/macros/Public.cmake b/cmake/macros/Public.cmake ---- b_base/cmake/macros/Public.cmake 2019-10-24 14:39:53 -0600 -+++ b/cmake/macros/Public.cmake 2020-01-11 13:33:29 -0700 -@@ -996,6 +996,12 @@ - foreach(lib ${PXR_OBJECT_LIBS}) - string(TOUPPER ${lib} uppercaseName) - list(APPEND exports "${uppercaseName}_EXPORTS=1") -+ # When building for blender, we do NOT want to export all symbols on windows. -+ # This is a dirty hack, but USD makes it impossible to do the right thing -+ # with the default options exposed. -+ if (WIN32) -+ list(APPEND exports "PXR_STATIC=1") -+ endif() - endforeach() - foreach(lib ${PXR_OBJECT_LIBS}) - set(objects "${objects};\$") diff --git a/media-libs/openusd/metadata.xml b/media-libs/openusd/metadata.xml deleted file mode 100644 index 16cf5f1..0000000 --- a/media-libs/openusd/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - brothermechanic@gmail.com - - diff --git a/media-libs/openusd/openusd-9999-r1.ebuild b/media-libs/openusd/openusd-9999-r1.ebuild deleted file mode 100644 index 6ead42e..0000000 --- a/media-libs/openusd/openusd-9999-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2020 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit git-r3 cmake python-single-r1 flag-o-matic - -DESCRIPTION="Universal Scene Description" -HOMEPAGE="http://www.openusd.org" -EGIT_REPO_URI="https://github.com/PixarAnimationStudios/USD.git" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="alembic -doc +draco embree -imaging openimageio opencolorio -test -tools -hdf5 openvdb osl -ptex +jemalloc +python usdview opengl openexr opensubdiv monolithic" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - openimageio? ( imaging ) - opencolorio? ( imaging ) - opengl? ( imaging ) - opensubdiv? ( imaging ) - ptex? ( imaging ) - openvdb? ( imaging ) - embree? ( imaging ) - usdview? ( python opengl ) - hdf5? ( alembic ) - alembic? ( openexr ) - test? ( python ) -" - -RDEPEND=" - dev-cpp/tbb - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_MULTI_USEDEP}] - usdview? ( - dev-python/pyside2[${PYTHON_MULTI_USEDEP}] - opengl? ( dev-python/pyopengl[${PYTHON_MULTI_USEDEP}] ) - ) - ') - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.3 ) - opengl? ( >=media-libs/glew-2.0.0 ) - openexr? ( media-libs/openexr ) - openimageio? ( media-libs/openimageio:= ) - opencolorio? ( media-libs/opencolorio ) - osl? ( media-libs/osl ) - ptex? ( media-libs/ptex ) - openvdb? ( media-gfx/openvdb ) - doc? ( app-doc/doxygen[dot] ) - embree? ( media-libs/embree ) - alembic? ( media-gfx/alembic ) - hdf5? ( - media-gfx/alembic[hdf5] - sci-libs/hdf5[hl] - ) - draco? ( media-libs/draco ) - jemalloc? ( dev-libs/jemalloc ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -CMAKE_BUILD_TYPE=Release - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - default - local mycmakeargs=() - if use jemalloc; then - mycmakeargs+=( - -DPXR_MALLOC_LIBRARY:path=/usr/lib64/libjemalloc.so - ) - fi - mycmakeargs+=( - -DBUILD_SHARED_LIBS=ON - -DCMAKE_INSTALL_PREFIX=/usr/local - -DPXR_INSTALL_LOCATION=/usr/share/openusd - -DPXR_BUILD_ALEMBIC_PLUGIN=$(usex alembic) - -DPXR_BUILD_DOCUMENTATION=$(usex doc) - -DPXR_BUILD_DRACO_PLUGIN=$(usex draco) - -DPXR_BUILD_EMBREE_PLUGIN=$(usex embree) - -DPXR_BUILD_EXAMPLES=$(usex test) - -DPXR_BUILD_IMAGING=$(usex imaging) - -DPXR_BUILD_MATERIALX_PLUGIN=OFF - -DPXR_BUILD_MONOLITHIC=$(usex monolithic) - -DPXR_BUILD_OPENCOLORIO_PLUGIN=$(usex opencolorio) - -DPXR_BUILD_OPENIMAGEIO_PLUGIN=$(usex openimageio) - -DPXR_BUILD_PRMAN_PLUGIN=OFF - -DPXR_BUILD_TESTS=$(usex test) - -DPXR_BUILD_TUTORIALS=$(usex test) - -DPXR_BUILD_USDVIEW=$(usex usdview) - -DPXR_BUILD_USD_IMAGING=$(usex imaging) - -DPXR_BUILD_USD_TOOLS=$(usex tools) - -DPXR_ENABLE_GL_SUPPORT=$(usex opengl) - -DPXR_ENABLE_HDF5_SUPPORT=$(usex hdf5) - -DPXR_ENABLE_OPENVDB_SUPPORT=$(usex openvdb) - -DPXR_ENABLE_OSL_SUPPORT=$(usex osl) - -DPXR_ENABLE_PTEX_SUPPORT=$(usex ptex) - -DPXR_ENABLE_PYTHON_SUPPORT=$(usex python) - -DPXR_USE_PYTHON_3=$(usex python) - -DPXR_PYTHON_SHEBANG="${PYTHON}" - -DPXR_SET_INTERNAL_NAMESPACE=usdBlender - -DCMAKE_DEBUG_POSTFIX=_d - ) - cmake_src_configure -}