From 463397cf1e064185110fe57c568d73f99a06f5d1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 17 Feb 2021 10:35:54 +0000 Subject: gentoo resync : 17.02.2021 --- ...ndCoin3DDoc.cmake-fix-patch-for-coin-docs.patch | 26 +++++++++++++++++ ...0002-CMakeLists.txt-add-option-for-ccache.patch | 33 ++++++++++++++++++++++ ...1231-0003-Gentoo-specific-don-t-check-vcs.patch | 26 +++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch create mode 100644 media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch create mode 100644 media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch (limited to 'media-gfx/freecad/files') diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch new file mode 100644 index 000000000000..9f4131f15a3d --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch @@ -0,0 +1,26 @@ +From e08aec1344e753cd338a61c3584230741e00b23f Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Thu, 31 Dec 2020 13:26:44 +0100 +Subject: [PATCH 1/2] FindCoin3DDoc.cmake: fix patch for coin docs + +Signed-off-by: Bernd Waibel +--- + cMake/FindCoin3DDoc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cMake/FindCoin3DDoc.cmake b/cMake/FindCoin3DDoc.cmake +index c6c92f2..1af53c2 100644 +--- a/cMake/FindCoin3DDoc.cmake ++++ b/cMake/FindCoin3DDoc.cmake +@@ -22,7 +22,7 @@ IF (COIN3D_FOUND) + # Unix systems + find_path(COIN3D_DOC_PATH index.html + /usr/share/doc/libcoin80-doc/html +- /usr/share/doc/coin/html ++ /usr/share/doc/coin-4.0.0/html + /usr/share/doc/Coin/html + ) + IF( EXISTS ${COIN3D_DOC_PATH}) +-- +2.30.0 + diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch new file mode 100644 index 000000000000..26bb4421077b --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch @@ -0,0 +1,33 @@ +From bce02c4804d14ae2257ad5f5e7fae4e2baa74503 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Thu, 31 Dec 2020 13:31:47 +0100 +Subject: [PATCH 2/2] CMakeLists.txt: add option for ccache + +Signed-off-by: Bernd Waibel +--- + CMakeLists.txt | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f4dabf7..17b9fad 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,9 +8,12 @@ if (POLICY CMP0072) + cmake_policy(SET CMP0072 OLD) + endif(POLICY CMP0072) + +-find_program(CCACHE_PROGRAM ccache) #This check should occur before project() +-if(CCACHE_PROGRAM) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") ++option(FREECAD_USE_CCACHE "Use ccache to build FreeCAD" OFF) ++if(FREECAD_USE_CCACHE) ++ find_program(CCACHE_PROGRAM ccache) #This check should occur before project() ++ if(CCACHE_PROGRAM) ++ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") ++ endif() + endif() + + project(FreeCAD) +-- +2.30.0 + diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch new file mode 100644 index 000000000000..ac8d194d00ea --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch @@ -0,0 +1,26 @@ +From acc8a26b73a87ae024bce30e9f1531610b6e0e5f Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Sat, 13 Feb 2021 14:54:28 +0100 +Subject: [PATCH] [Gentoo specific] don't check vcs + +Signed-off-by: Bernd Waibel +--- + src/Tools/SubWCRev.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py +index 9795450..59938bd 100644 +--- a/src/Tools/SubWCRev.py ++++ b/src/Tools/SubWCRev.py +@@ -455,7 +455,7 @@ def main(): + if o in ("-b", "--bindir"): + bindir = a + +- vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()] ++ vcs=[UnknownControl()] + for i in vcs: + if i.extractInfo(srcdir, bindir): + # Open the template file and the version file +-- +2.30.1 + -- cgit v1.2.3