[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2024-05-07 Thread Andrew Ammerlaan 
commit: 9161542718b9840ff37f5c27b22b7c3a8e3fd214
Author: Yehoshua Pesach Wallach  gmail  com>
AuthorDate: Sun Apr  7 15:51:09 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue May  7 12:52:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91615427

media-gfx/freecad: adds upstream patch for compiling with VTK-9.3

Closes: https://bugs.gentoo.org/928879
Signed-off-by: Yehoshua Pesach Wallach  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36153
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../freecad/files/freecad-0.21.2-vtk9.3-fix.patch  | 33 ++
 media-gfx/freecad/freecad-0.21.2-r2.ebuild |  5 ++--
 media-gfx/freecad/freecad-.ebuild  |  4 +--
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch 
b/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch
new file mode 100644
index ..b41e3618f55f
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch
@@ -0,0 +1,33 @@
+# fix for compiling with VTK 9.3
+https://github.com/FreeCAD/FreeCAD/pull/11496/commits/68d380a64e033c40fcb9a6dc322d9e0178de52ee
+Bug: https://forum.freecad.org/viewtopic.php?t=82814
+patch by adrianinsaval (commited in 68d380a64e033c40fcb9a6dc322d9e0178de52ee)
+
+--- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
 b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
+@@ -39,10 +39,6 @@
+  #define SMDS_EXPORT
+ #endif
+ 
+-#ifdef VTK_HAS_MTIME_TYPE
+ #define VTK_MTIME_TYPE vtkMTimeType
+-#else
+-#define VTK_MTIME_TYPE unsigned long
+-#endif
+ 
+ #endif
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
 b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks()
+   GetLinks()->Allocate(this->GetNumberOfPoints());
+   GetLinks()->Register(this);
+ //FIXME: vtk9
++#if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0)
+   GetLinks()->BuildLinks(this);
++#else
++  GetLinks()->SetDataSet(this);
++  GetLinks()->BuildLinks();
++#endif
+   GetLinks()->Delete();
+ #else
+   this->links = smds_celllinks::new();

diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild 
b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
index 9d461dec5d65..b0f1d3fac470 100644
--- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
@@ -73,8 +73,8 @@ RDEPEND="
net-misc/curl
)
fem? (
-   !qt6? ( =media-libs/coin-4.0.0
@@ -164,6 +164,7 @@ REQUIRED_USE="
 PATCHES=(

"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
"${FILESDIR}"/${PN}-0.21.1-Gentoo-specific-don-t-check-vcs.patch
+   "${FILESDIR}"/${PN}-0.21.2-vtk9.3-fix.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md README.md )

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 76f8dae4592e..ad9a9580164b 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -74,8 +74,8 @@ RDEPEND="
net-misc/curl
)
fem? (
-   !qt6? ( =media-libs/coin-4.0.0

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/

2024-04-18 Thread Conrad Kostecki 
commit: bf464abcf4c1b867f3894abe0f5f5a17708a0987
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Apr 18 18:09:06 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Apr 18 19:31:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf464abc

media-gfx/freecad: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...-0001-Gentoo-specific-Remove-ccache-usage.patch | 23 --
 ...ad-0.19.4-Gentoo-specific-don-t-check-vcs.patch | 20 -
 ...FreeCAD-segfaults-being-run-with-paramete.patch | 22 -
 ...tgen-add-headers-to-support-recent-Netgen.patch | 93 --
 ...20.2-libE57Format-fix-compile-using-gcc13.patch | 24 --
 5 files changed, 182 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
deleted file mode 100644
index 8e875c1811f5..
--- 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 74664bf8c9142320be335ab91dca53cb1a1187a2 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Fri, 12 Mar 2021 23:55:09 +0100
-Subject: [PATCH] [Gentoo specific] Remove ccache usage
-
-Signed-off-by: Bernd Waibel 
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,11 +8,6 @@ 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}")
--endif()
--
- project(FreeCAD)
- 
- set(PACKAGE_VERSION_NAME "Vulcan")
--- 
-2.30.1
-

diff --git 
a/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch 
b/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch
deleted file mode 100644
index 62ae92392adf..
--- 
a/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 60ba533d21302b8a4c11ac06adb53b4041754b02 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Tue, 1 Mar 2022 18:22:00 +0100
-Subject: [PATCH] [Gentoo specific] don't check vcs
-
-Signed-off-by: Bernd Waibel 
 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.35.1
-

diff --git 
a/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
 
b/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
deleted file mode 100644
index 44d49ca3bf94..
--- 
a/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/FreeCAD/FreeCAD/commit/c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476
-
-From c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476 Mon Sep 17 00:00:00 2001
-From: wmayer 
-Date: Sat, 11 Feb 2023 17:47:49 +0100
-Subject: [PATCH 02/51] Fixes #8206: FreeCAD segfaults being run with
- parameters (e.g .desktop file has /usr/bin/freecad --single-instance)
-
 a/src/Base/Interpreter.cpp
-+++ b/src/Base/Interpreter.cpp
-@@ -563,7 +563,7 @@ void initInterpreter(int argc,char *argv[])
- {
- PyStatus status;
- PyConfig config;
--PyConfig_InitPythonConfig();
-+PyConfig_InitIsolatedConfig();
- 
- status = PyConfig_SetBytesArgv(, argc, argv);
- if (PyStatus_Exception(status)) {
--- 
-2.39.1
-

diff --git 
a/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
 
b/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
deleted file mode 100644
index 402c84ee4d28..
--- 
a/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://github.com/FreeCAD/FreeCAD/commit/8b056f156fd087b3df36a5223fc5ca6900649a83
-
-From 8b056f156fd087b3df36a5223fc5ca6900649a83 Mon Sep 17 00:00:00 2001
-From: Uwe 
-Date: Wed, 17 Aug 2022 12:32:02 +0200
-Subject: [PATCH 0008/1678] [Netgen] add headers to support recent Netgen
-
-- as reported here: https://forum.freecadweb.org/viewtopic.php?p=618174#p618174
-- also fix compiler warnings about unsafe bool handling
 a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
-+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
-@@ -50,7 +50,9 @@
- 
- #include 
- 
-+#include 
- #include 
-+#include 
- #include

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2023-08-09 Thread Miroslav Šulc 
commit: 92bc45e1fa8f2992404520d5b4d06c1d6752c94f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Aug  9 08:34:19 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Aug  9 08:34:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92bc45e1

media-gfx/freecad: updated ccache patch in live ebuild

Closes: https://bugs.gentoo.org/911409
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...cad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch | 11 +++
 media-gfx/freecad/freecad-.ebuild |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git 
a/media-gfx/freecad/files/freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
 
b/media-gfx/freecad/files/freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
new file mode 100644
index ..dddacfb289ef
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -16,7 +16,7 @@ else()
+ option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" 
ON)
+ endif()
+ 
+-if(FREECAD_USE_CCACHE)
++if(OFF)
+ find_program(CCACHE_PROGRAM ccache)  #This check should occur before 
project()
+ if(CCACHE_PROGRAM)
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index ce6c3efe2731..3c44e3745979 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -136,7 +136,7 @@ REQUIRED_USE="
 
 PATCHES=(
"${FILESDIR}"/${PN}--Gentoo-specific-don-t-check-vcs.patch
-   
"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+   
"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch

"${FILESDIR}"/${PN}--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
 )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2023-05-05 Thread Sam James 
commit: f6aef9a48475f4cb7f3df463687dc9e78a6d2d50
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri May  5 08:42:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  5 09:04:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6aef9a4

media-gfx/freecad: fix build with gcc-13

Closes: https://bugs.gentoo.org/905451
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30879
Signed-off-by: Sam James  gentoo.org>

 ...20.2-libE57Format-fix-compile-using-gcc13.patch | 24 ++
 media-gfx/freecad/freecad-0.20.2-r1.ebuild |  1 +
 2 files changed, 25 insertions(+)

diff --git 
a/media-gfx/freecad/files/freecad-0.20.2-libE57Format-fix-compile-using-gcc13.patch
 
b/media-gfx/freecad/files/freecad-0.20.2-libE57Format-fix-compile-using-gcc13.patch
new file mode 100644
index ..c26c8db4e867
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.20.2-libE57Format-fix-compile-using-gcc13.patch
@@ -0,0 +1,24 @@
+https://github.com/FreeCAD/FreeCAD/commit/f91ad00ed23e92c81fff2bd0073c662291efad32
+https://bugs.gentoo.org/905451
+
+From f91ad00ed23e92c81fff2bd0073c662291efad32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= 
+Date: Mon, 27 Mar 2023 11:45:20 +0200
+Subject: [PATCH 011/420] libE57Format: fix compile using gcc13
+
+Adding missing header file. Also submitted this upstream here:
+
+https://github.com/asmaloney/libE57Format/pull/243
+--- a/src/3rdParty/libE57Format/include/E57Format.h
 b/src/3rdParty/libE57Format/include/E57Format.h
+@@ -33,6 +33,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "E57Exception.h"
+-- 
+2.40.1
+

diff --git a/media-gfx/freecad/freecad-0.20.2-r1.ebuild 
b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
index 4099ed239e45..117cfb16b291 100644
--- a/media-gfx/freecad/freecad-0.20.2-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2-r1.ebuild
@@ -139,6 +139,7 @@ PATCHES=(

"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch

"${FILESDIR}"/${PN}-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch

"${FILESDIR}"/${PN}-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
+   "${FILESDIR}"/${PN}-0.20.2-libE57Format-fix-compile-using-gcc13.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2023-04-25 Thread Miroslav Šulc 
commit: 5f1ddf94909ca9733f067c26eef71965d5371314
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Apr 25 14:01:24 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr 25 14:01:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f1ddf94

media-gfx/freecad: updated patch for 

Closes: https://bugs.gentoo.org/905004
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch |  6 --
 .../freecad--Gentoo-specific-don-t-check-vcs.patch| 15 +++
 media-gfx/freecad/freecad-.ebuild |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
index c8772febdee8..8e875c1811f5 100644
--- 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+++ 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
@@ -4,12 +4,6 @@ Date: Fri, 12 Mar 2021 23:55:09 +0100
 Subject: [PATCH] [Gentoo specific] Remove ccache usage
 
 Signed-off-by: Bernd Waibel 

- CMakeLists.txt | 5 -
- 1 file changed, 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b17736..38e482a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -8,11 +8,6 @@ if (POLICY CMP0072)

diff --git 
a/media-gfx/freecad/files/freecad--Gentoo-specific-don-t-check-vcs.patch 
b/media-gfx/freecad/files/freecad--Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index ..3c8b61ab56a4
--- /dev/null
+++ b/media-gfx/freecad/files/freecad--Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,15 @@
+--- a/src/Tools/SubWCRev.py
 b/src/Tools/SubWCRev.py
+@@ -509,12 +509,6 @@ def main():
+ bindir = a
+ 
+ vcs = [
+-GitControl(),
+-DebianGitHub(),
+-BazaarControl(),
+-Subversion(),
+-MercurialControl(),
+-DebianChangelog(),
+ UnknownControl(),
+ ]
+ for i in vcs:

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index b9d1e7ae4206..47fbacf3eba4 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -136,7 +136,7 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch
+   "${FILESDIR}"/${PN}--Gentoo-specific-don-t-check-vcs.patch

"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch

"${FILESDIR}"/${PN}--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
 )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2023-02-23 Thread Andrew Ammerlaan 
commit: 14cf2836cf700e656a01d2d09b8c0aed9095262b
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Feb 14 11:07:12 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Feb 23 11:25:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14cf2836

media-gfx/freecad: enable suport for netgen for 0.20.2

Backports from live ebuild
- add py3.11 support
- better organize dependencies
- fix REQUIRED_USE for the designer plugin

Closes: https://bugs.gentoo.org/895660
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29583
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...FreeCAD-segfaults-being-run-with-paramete.patch |  22 ++
 ...tgen-add-headers-to-support-recent-Netgen.patch |  93 ++
 media-gfx/freecad/freecad-0.20.2-r1.ebuild | 324 +
 3 files changed, 439 insertions(+)

diff --git 
a/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
 
b/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
new file mode 100644
index ..44d49ca3bf94
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch
@@ -0,0 +1,22 @@
+https://github.com/FreeCAD/FreeCAD/commit/c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476
+
+From c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476 Mon Sep 17 00:00:00 2001
+From: wmayer 
+Date: Sat, 11 Feb 2023 17:47:49 +0100
+Subject: [PATCH 02/51] Fixes #8206: FreeCAD segfaults being run with
+ parameters (e.g .desktop file has /usr/bin/freecad --single-instance)
+
+--- a/src/Base/Interpreter.cpp
 b/src/Base/Interpreter.cpp
+@@ -563,7 +563,7 @@ void initInterpreter(int argc,char *argv[])
+ {
+ PyStatus status;
+ PyConfig config;
+-PyConfig_InitPythonConfig();
++PyConfig_InitIsolatedConfig();
+ 
+ status = PyConfig_SetBytesArgv(, argc, argv);
+ if (PyStatus_Exception(status)) {
+-- 
+2.39.1
+

diff --git 
a/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
 
b/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
new file mode 100644
index ..402c84ee4d28
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch
@@ -0,0 +1,93 @@
+https://github.com/FreeCAD/FreeCAD/commit/8b056f156fd087b3df36a5223fc5ca6900649a83
+
+From 8b056f156fd087b3df36a5223fc5ca6900649a83 Mon Sep 17 00:00:00 2001
+From: Uwe 
+Date: Wed, 17 Aug 2022 12:32:02 +0200
+Subject: [PATCH 0008/1678] [Netgen] add headers to support recent Netgen
+
+- as reported here: https://forum.freecadweb.org/viewtopic.php?p=618174#p618174
+- also fix compiler warnings about unsafe bool handling
+--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
 b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
+@@ -50,7 +50,9 @@
+ 
+ #include 
+ 
++#include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -66,6 +68,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #ifdef _MSC_VER
+ #pragma warning(disable : 4067)
+@@ -3027,7 +3030,7 @@ bool NETGENPlugin_Mesher::Compute()
+ }
+   }
+ }
+-if (!err && mparams.secondorder > 0)
++if (!err && mparams.secondorder)
+ {
+   try
+   {
+@@ -3302,7 +3305,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& 
aResMap)
+   // calculate total nb of segments and length of edges
+   double fullLen = 0.0;
+   int fullNbSeg = 0;
+-  int entity = mparams.secondorder > 0 ? SMDSEntity_Quad_Edge : 
SMDSEntity_Edge;
++  int entity = mparams.secondorder ? SMDSEntity_Quad_Edge : SMDSEntity_Edge;
+   TopTools_DataMapOfShapeInteger Edge2NbSeg;
+   for (TopExp_Explorer exp(_shape, TopAbs_EDGE); exp.More(); exp.Next())
+   {
+@@ -3340,7 +3343,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& 
aResMap)
+   {
+ vector& aVec = aResMap[_mesh->GetSubMesh(Edge2NbSegIt.Key())];
+ if ( aVec[ entity ] > 1 && aVec[ SMDSEntity_Node ] == 0 )
+-  aVec[SMDSEntity_Node] = mparams.secondorder > 0  ? 2*aVec[ entity ]-1 : 
aVec[ entity ]-1;
++  aVec[SMDSEntity_Node] = mparams.secondorder ? 2*aVec[ entity ]-1 : 
aVec[ entity ]-1;
+ 
+ fullNbSeg += aVec[ entity ];
+ Edge2NbSeg( Edge2NbSegIt.Key() ) = aVec[ entity ];
+@@ -3386,7 +3389,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& 
aResMap)
+ int nbNodes = tooManyElems ? hugeNb : (( nbFaces*3 - (nb1d-1)*2 ) / 6 + 1 
);
+ 
+ vector aVec(SMDSEntity_Last, 0);
+-if( mparams.secondorder > 0 ) {
++if (mparams.secondorder) {
+   int nb1d_in = (nbFaces*3 - nb1d) / 2;
+   aVec[SMDSEntity_Node] = nbNodes + nb1d_in;
+   aVec[SMDSEntity_Quad_Triangle] = nbFaces;
+@@ -3428,11 +3431,11 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& 
aResMap)
+ if ( tooManyElems ) // avoid FPE
+ {
+   aVec[SMDSEntity_Node] = hugeNb;
+-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2023-02-23 Thread Andrew Ammerlaan 
commit: 2a75bd98a3a22b79d764207b0ce16195662ece4b
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Feb 13 20:20:00 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Feb 23 11:25:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a75bd98

media-gfx/freecad: enable netgen support in live ebuild

- add py3.11 support
- better organize dependencies, add new libfmt dep
- fix REQUIRED_USE for designer plugin

Bug: https://bugs.gentoo.org/895660
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...s-src-Qt-only-build-test-for-BUILD_GUI-ON.patch | 24 
 media-gfx/freecad/freecad-.ebuild  | 70 ++
 media-gfx/freecad/metadata.xml |  3 +
 3 files changed, 72 insertions(+), 25 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
 
b/media-gfx/freecad/files/freecad--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
new file mode 100644
index ..5455c0ee2992
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad--tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
@@ -0,0 +1,24 @@
+From cb77c7d937c259224699273fee1ba5907588fa4c Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 12 Feb 2023 19:54:13 +0100
+Subject: [PATCH] tests/src/Qt: only build test for BUILD_GUI=ON
+
+Signed-off-by: Bernd Waibel 
+--- a/tests/src/Qt/CMakeLists.txt
 b/tests/src/Qt/CMakeLists.txt
+@@ -30,6 +30,7 @@ endfunction()
+ set(CMAKE_AUTOMOC ON)
+ 
+ # Qt Test
++if(BUILD_GUI)
+ include_directories(
+ ${QtGui_INCLUDE_DIRS}
+ ${QtTest_INCLUDE_DIRS}
+@@ -46,3 +47,4 @@ set (InventorBuilder_LIBS
+ SETUP_TESTS(
+ InventorBuilder
+ )
++endif()
+-- 
+2.39.1
+

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index ba5840c6b720..a006497fe1bd 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit check-reqs cmake optfeature python-single-r1 xdg
 
@@ -28,7 +28,7 @@ LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
 IUSE="debug designer +gui test"
 
-FREECAD_EXPERIMENTAL_MODULES="cloud pcl"
+FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
openscad part-design path points raytracing robot show surface
techdraw tux"
@@ -46,47 +46,54 @@ RESTRICT="!test? ( test )"
 RDEPEND="
${PYTHON_DEPS}
dev-libs/OpenNI2[opengl(+)]
+   dev-libs/boost:=
+   dev-libs/libfmt:=
dev-libs/libspnav[X]
dev-libs/xerces-c[icu]
-   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/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-   dev-qt/qtx11extras:5
dev-qt/qtxml:5
-   >=media-libs/coin-4.0.0
+   dev-qt/qtxmlpatterns:5
media-libs/freetype
media-libs/qhull:=
sci-libs/flann[openmp]
sci-libs/hdf5:=[fortran,zlib]
-   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-   sci-libs/opencascade:=[json,vtk(+)]
+   >=sci-libs/med-4.0.0-r1
+   sci-libs/opencascade:=[json,vtk]
sci-libs/orocos_kdl:=
sys-libs/zlib
-   virtual/glu
virtual/libusb:1
-   virtual/opengl
cloud? (
dev-libs/openssl:=
net-misc/curl
)
-   fem? ( 
sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+   fem? ( sci-libs/vtk:=[qt5,rendering] )
+   gui? (
+   dev-qt/designer:5
+   dev-qt/qtgui:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   >=media-libs/coin-4.0.0
+   virtual/glu
+   virtual/opengl
+   $(python_gen_cond_dep '
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+   
dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+   dev-python/shiboken2[${PYTHON_USEDEP}]
+   ')
+   )
+   netgen? ( media-gfx/netgen[opencascade] )
openscad? ( media-gfx/openscad )
-   pcl? ( sci-libs/pcl:=[opengl,openni2(+),qt5(+),vtk(+)] )
+   pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] )
$(python_gen_cond_dep '
-   dev-libs/boost:=[python,${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2022-10-31 Thread Joonas Niilola 
commit: f1fad773fe9f1280691e37c5f148a43294ca232e
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Oct 31 15:10:14 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Oct 31 15:46:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1fad773

media-gfx/freecad: drop 0.19.4-r1, 0.20-r1

Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/Manifest |   3 -
 ...6-add-boost-serialization-to-find_package.patch |  53 
 ...19.4-backport-correctly-find-PySide2Tools.patch | 106 ---
 media-gfx/freecad/freecad-0.19.4-r1.ebuild | 325 -
 media-gfx/freecad/freecad-0.20-r1.ebuild   | 309 
 media-gfx/freecad/metadata.xml |  17 --
 6 files changed, 813 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 42213fb79589..ae9dfbc8a37d 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,4 +1 @@
-DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
-DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 
6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45
 SHA512 
58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f
 DIST freecad-0.20.1.tar.gz 75545072 BLAKE2B 
be2d2970b80523b34f7400a2762f997b815a5ae90dcb6cee6e560316712ebe3ab8a64053bd73e9f50548ff076920af0304a6780c94c4f3708d30b82bbee3b5d9
 SHA512 
ab4cfab4008300b8273769b9395602261c88c19f0893dabe6498a2eac020f1fe3fbf7284928144f1d4147d8627a47d83a40a1777a298673da2e24d956006d827
-DIST freecad-0.20.tar.gz 75452957 BLAKE2B 
600baf30541dabb7cf5df22a2d0fef0972d1b9cbf7c8425b9e2fadae54a0b0a1b75bb252fa18ecbf68fa5649ce459a88c71d69e000899e4b46d5c59fe956fcd1
 SHA512 
b1d91efa873f180bf635f6006d6c4b7a33b64b630955c639fe923bb340ce8104474688e05eea151d1ac1557388947ae81618cfc8a578f14706aa07b5cdc45cda

diff --git 
a/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch
 
b/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch
deleted file mode 100644
index f9120e051919..
--- 
a/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From fc4ae2ff217c67eae39947ed6b655b8afaa83859 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Sun, 20 Jun 2021 15:38:45 +0200
-Subject: [PATCH] add boost::serialization to find_package
-
-Swaps SetupBoost() after SetupSalomeSMESH() has been called.
-SetupSalomeSMESH() looks for vtk, which searches for boost::serialization
-overriding the default libraries detected by SetupBoost().
-
-Signed-off-by: Bernd Waibel 

- CMakeLists.txt | 4 +++-
- cMake/FreeCAD_Helpers/SetupBoost.cmake | 2 +-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b17736..c241ebe 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,7 +45,6 @@ if(NOT FREECAD_LIBPACK_USE OR 
FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
- SetupPython()
- SetupPCL()
- SetupPybind11()
--SetupBoost()
- SetupXercesC()
- find_package(ZLIB REQUIRED)
- find_package(PyCXX REQUIRED)
-@@ -57,6 +56,9 @@ if(NOT FREECAD_LIBPACK_USE OR 
FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
- SetupOpenGL()
- endif(BUILD_GUI)
- SetupSalomeSMESH()
-+# needs to be called after SMESH which pulls in VTK, which only add 
boost::serialization
-+# overriding the values of SetupBoost()
-+SetupBoost()
- if (BUILD_FEM_NETGEN)
- find_package(NETGEN)
- endif(BUILD_FEM_NETGEN)
-diff --git a/cMake/FreeCAD_Helpers/SetupBoost.cmake 
b/cMake/FreeCAD_Helpers/SetupBoost.cmake
-index 76c6d64..77c415b 100644
 a/cMake/FreeCAD_Helpers/SetupBoost.cmake
-+++ b/cMake/FreeCAD_Helpers/SetupBoost.cmake
-@@ -3,7 +3,7 @@ macro(SetupBoost)
- 
- set(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS})
- 
--set (BOOST_COMPONENTS filesystem program_options regex system thread)
-+set (BOOST_COMPONENTS filesystem program_options regex serialization 
system thread)
- find_package(Boost ${BOOST_MIN_VERSION}
- COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
- 
--- 
-2.32.0
-

diff --git 
a/media-gfx/freecad/files/freecad-0.19.4-backport-correctly-find-PySide2Tools.patch
 
b/media-gfx/freecad/files/freecad-0.19.4-backport-correctly-find-PySide2Tools.patch
deleted file mode 100644
index b297727033db..
---

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2022-10-31 Thread Joonas Niilola 
commit: ae75bb2605050c62397e489d9929ddadb1dd246e
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Oct 31 15:16:09 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Oct 31 15:46:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae75bb26

media-gfx/freecad: swap patch

Swap a patch, available in two different versions to reduce number of
files in ${FILESDIR}. This patch is also used by 0.20.1.

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28051
Signed-off-by: Joonas Niilola  gentoo.org>

 ...1231-0003-Gentoo-specific-don-t-check-vcs.patch | 26 --
 media-gfx/freecad/freecad-.ebuild  |  4 +++-
 2 files changed, 3 insertions(+), 27 deletions(-)

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
deleted file mode 100644
index ac8d194d00ea..
--- 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 67ba7b4138f4..95e48c37bdac 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -120,7 +120,7 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-   
"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+   "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch

"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 )
 
@@ -138,6 +138,8 @@ src_prepare() {
# Fix desktop file
sed -e 's/Exec=FreeCAD/Exec=freecad/' -i 
src/XDGData/org.freecadweb.FreeCAD.desktop || die
 
+   find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert 
to unix line endings"
+
cmake_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2022-04-02 Thread Andreas Sturmlechner 
commit: a45e193674d314658e13674229d19703d7cbdc47
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Apr  2 12:20:35 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  2 12:57:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a45e1936

media-gfx/freecad: drop 0.19.2-r7

Drop the version instead of backporting to this version.
Use 0.19.4 instead.
See discussion on https://github.com/gentoo/gentoo/pull/24861

Bug: https://bugs.gentoo.org/836433
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/freecad/Manifest |   1 -
 ...-0004809-Security-vulnerability-in-DWG-im.patch |  59 
 ...-0001-fix-failing-test-workbench-testcase.patch |  26 --
 ...-Use-run-instead-of-Popen-to-avoid-need-f.patch |  25 --
 ...2-0002-fix-femtest-failure-with-yaml-load.patch |  26 --
 ...19.2-0003-fix-test-when-built-without-GUI.patch |  33 ---
 ...-fix-build-failure-with-opencascade-7.5.2.patch |  30 --
 media-gfx/freecad/freecad-0.19.2-r7.ebuild | 324 -
 8 files changed, 524 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 02d737572cc2..23eb9682d4ed 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,3 +1,2 @@
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
-DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 
3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf
 SHA512 
420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
 DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 
6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45
 SHA512 
58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f

diff --git 
a/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
 
b/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
deleted file mode 100644
index 2df44ff66ac8..
--- 
a/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 4006e62860c73f0943e71c7da478256a7337941d Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Mon, 31 Jan 2022 08:12:35 +0100
-Subject: [PATCH 1/2] Backport of 0004809: Security vulnerability in DWG import
- when using ODA file converter
-
-Original patch commit id 1742d7ff82af1653253c4a4183c262c9af3b26d6 by
-wmayer .
-
-Signed-off-by: Bernd Waibel 
 a/src/Mod/Draft/importDWG.py
-+++ b/src/Mod/Draft/importDWG.py
-@@ -44,8 +44,6 @@ https://knowledge.autodesk.com/support/autocad/downloads/
- # * *
- # ***
- 
--# TODO: use subprocess.popen() instead of subprocess.call()
--
- import six
- import FreeCAD
- from FreeCAD import Console as FCC
-@@ -217,15 +215,10 @@ def convertToDxf(dwgfilename):
- indir = os.path.dirname(dwgfilename)
- outdir = tempfile.mkdtemp()
- basename = os.path.basename(dwgfilename)
--cmdline = ('"%s" "%s" "%s" "ACAD2000" "DXF" "0" "1" "%s"'
--   % (teigha, indir, outdir, basename))
--FCC.PrintMessage(translate("ImportDWG", "Converting: ")
-- + cmdline + "\n")
--if six.PY2:
--if isinstance(cmdline, six.text_type):
--encoding = sys.getfilesystemencoding()
--cmdline = cmdline.encode(encoding)
--subprocess.call(cmdline, shell=True)  # os.system(cmdline)
-+cmdline = [teigha, indir, outdir, "ACAD2000", "DXF", "0", "1", 
basename]
-+FCC.PrintMessage(translate("draft", "Converting:") + " " + 
str(cmdline) + "\n")
-+proc = subprocess.Popen(cmdline)
-+proc.communicate()
- result = outdir + os.sep + os.path.splitext(basename)[0] + ".dxf"
- if os.path.exists(result):
- FCC.PrintMessage(translate("ImportDWG",
-@@ -270,10 +263,9 @@ def convertToDwg(dxffilename, dwgfilename):
- indir = os.path.dirname(dxffilename)
- outdir = os.path.dirname(dwgfilename)
- basename = os.path.basename(dxffilename)
--cmdline = ('"%s" "%s" "%s" "ACAD2000" "DWG" "0" "1" "%s"'
--   % (teigha, indir, outdir, basename))
--

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2022-03-19 Thread Sam James 
commit: 8ef65a33f8d2be7585c134664ae4b83906679719
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Jan 18 18:15:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 16:14:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef65a33

media-gfx/freecad: bump to 0.19.4

Closes: https://bugs.gentoo.org/834470
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24643
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/Manifest |   1 +
 ...ad-0.19.4-Gentoo-specific-don-t-check-vcs.patch |  20 ++
 media-gfx/freecad/freecad-0.19.4.ebuild| 323 +
 media-gfx/freecad/metadata.xml |   8 +
 4 files changed, 352 insertions(+)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index fe0489b287e6..02d737572cc2 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1,3 @@
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 
3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf
 SHA512 
420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
+DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 
6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45
 SHA512 
58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f

diff --git 
a/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch 
b/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index ..62ae92392adf
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,20 @@
+From 60ba533d21302b8a4c11ac06adb53b4041754b02 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Tue, 1 Mar 2022 18:22:00 +0100
+Subject: [PATCH] [Gentoo specific] don't check vcs
+
+Signed-off-by: Bernd Waibel 
+--- 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.35.1
+

diff --git a/media-gfx/freecad/freecad-0.19.4.ebuild 
b/media-gfx/freecad/freecad-0.19.4.ebuild
new file mode 100644
index ..cab7693eaacd
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.19.4.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit check-reqs cmake optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
+
+MY_PN=FreeCAD
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git;
+   S="${WORKDIR}/freecad-${PV}"
+else
+   MY_PV=$(ver_cut 1-2)
+   MY_PV=$(ver_rs 1 '_' ${MY_PV})
+   
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
+   
https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${PN}-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz;
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/FreeCAD-${PV}"
+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"
+IUSE="debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr drawing fem idf image inspection
+   material openscad part-design path points raytracing robot show
+   surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+   IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+   IUSE="${IUSE} ${module}"
+done
+unset module
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/OpenNI2[opengl(+)]
+   dev-libs/libspnav[X]
+   dev-libs/xerces-c[icu]
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2022-03-19 Thread Sam James 
commit: 5927fa068889aa555a1f9657e27305eb11ffae37
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Mar 18 09:12:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 16:14:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5927fa06

media-gfx/freecad: drop environment file

Setting PYTHONPATH seems no longer be needed and raises incompatibilities
with other packages.

Also, AddonManager plugin now needs webchannel and webengine support for 
pyside2,
thus the USEDEP string has been updated to include USE flags for these.

Bug: https://bugs.gentoo.org/835331
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24636
Signed-off-by: Sam James  gentoo.org>

 media-gfx/freecad/files/99freecad | 1 -
 .../freecad/{freecad-0.19.2-r6.ebuild => freecad-0.19.2-r7.ebuild}| 2 --
 media-gfx/freecad/freecad-.ebuild | 4 +---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/media-gfx/freecad/files/99freecad 
b/media-gfx/freecad/files/99freecad
deleted file mode 100644
index 81104107c22e..
--- a/media-gfx/freecad/files/99freecad
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONPATH=/usr/lib64/freecad/Ext:/usr/lib64/freecad/Mod:/usr/lib64/freecad/lib64

diff --git a/media-gfx/freecad/freecad-0.19.2-r6.ebuild 
b/media-gfx/freecad/freecad-0.19.2-r7.ebuild
similarity index 99%
rename from media-gfx/freecad/freecad-0.19.2-r6.ebuild
rename to media-gfx/freecad/freecad-0.19.2-r7.ebuild
index 931a6260baa1..aa2041fd5f01 100644
--- a/media-gfx/freecad/freecad-0.19.2-r6.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r7.ebuild
@@ -273,8 +273,6 @@ src_install() {
python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage 
"${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
# compile main package in python site-packages as well
python_optimize
-
-   doenvd "${FILESDIR}/99${PN}"
 }
 
 pkg_postinst() {

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index 97ada209ae61..377cf7cb37ba 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -87,7 +87,7 @@ RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
dev-python/pybind11[${PYTHON_USEDEP}]
-   dev-python/pyside2[gui,svg,${PYTHON_USEDEP}]
+   
dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
dev-python/shiboken2[${PYTHON_USEDEP}]
addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
fem? ( dev-python/ply[${PYTHON_USEDEP}] )
@@ -270,8 +270,6 @@ src_install() {
python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage 
"${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
# compile main package in python site-packages as well
python_optimize
-
-   doenvd "${FILESDIR}/99${PN}"
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2021-11-28 Thread Miroslav Šulc 
commit: c9c70febe01d558f88c2d621515b889075afd1f1
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Nov 28 09:57:56 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Nov 28 09:58:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c70feb

media-gfx/freecad: dropped patch in live

patch is already applied by upstream and so prevented building freecad

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...-Add-memory-header-for-std-shared_ptr.patch | 31 --
 media-gfx/freecad/freecad-.ebuild  |  1 -
 2 files changed, 32 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad--Add-memory-header-for-std-shared_ptr.patch
 
b/media-gfx/freecad/files/freecad--Add-memory-header-for-std-shared_ptr.patch
deleted file mode 100644
index 81a8f22d8937..
--- 
a/media-gfx/freecad/files/freecad--Add-memory-header-for-std-shared_ptr.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Bernd Waibel 
-Date: Sat, 16 Oct 2021 17:02:19 +0200
-Subject: [PATCH] Add memory header for std::shared_ptr
-
-Signed-off-by: Bernd Waibel 

- src/App/Metadata.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/App/Metadata.h b/src/App/Metadata.h
-index de8be3ea8e..2c5fd8f417 100644
 a/src/App/Metadata.h
-+++ b/src/App/Metadata.h
-@@ -30,6 +30,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include 
- #include 
-@@ -296,4 +297,4 @@ namespace App {
- 
- }
- 
--#endif
-\ No newline at end of file
-+#endif
--- 
-2.33.1
-

diff --git a/media-gfx/freecad/freecad-.ebuild 
b/media-gfx/freecad/freecad-.ebuild
index cef63f28477e..df78793c7f3b 100644
--- a/media-gfx/freecad/freecad-.ebuild
+++ b/media-gfx/freecad/freecad-.ebuild
@@ -120,7 +120,6 @@ REQUIRED_USE="
 PATCHES=(

"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch

"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
-   "${FILESDIR}"/${P}-Add-memory-header-for-std-shared_ptr.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2021-07-10 Thread Ionen Wolkens 
commit: 44073440183298d04de422fe7978ff4ef9d199d5
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Jul  9 08:29:26 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jul 10 09:17:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44073440

media-gfx/freecad: drop 0.19.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Ionen Wolkens  gentoo.org>

 media-gfx/freecad/Manifest |   1 -
 ...ndCoin3DDoc.cmake-fix-patch-for-coin-docs.patch |  26 --
 media-gfx/freecad/freecad-0.19.1-r1.ebuild | 286 -
 media-gfx/freecad/metadata.xml |  16 --
 4 files changed, 329 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index e67bfab4a78..fe0489b287e 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,3 +1,2 @@
-DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B 
de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118
 SHA512 
5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b9d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 
69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2
 SHA512 
66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 
3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf
 SHA512 
420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72

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
deleted file mode 100644
index 9f4131f15a3..000
--- 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/freecad-0.19.1-r1.ebuild 
b/media-gfx/freecad/freecad-0.19.1-r1.ebuild
deleted file mode 100644
index 95e44586e4c..000
--- a/media-gfx/freecad/freecad-0.19.1-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# vtk needs updating to use 3.9
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
-
-if [[ ${PV} = * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
-   S="${WORKDIR}/freecad-${PV}"
-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"
-   KEYWORDS="~amd64"
-   S="${WORKDIR}/FreeCAD-${PV}"
-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"
-IUSE="debug headless pcl test"
-RESTRICT="!test? ( test )"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
-FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
-   inspection material mesh openscad part-design path points
-   raytracing robot show spreadsheet surface techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
-   IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-   IUSE="${IUSE} ${module}"
-done
-unset module
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-cpp/eigen-3.3.1:3
-   dev-libs/OpenNI2[opengl(+)]
-   dev-libs/libspnav[X]
-   dev-libs/xerces-c

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2021-03-14 Thread Joonas Niilola 
commit: 54beaeb99324abac5420da68a4e89b2abed059f5
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Mar 13 12:36:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar 14 11:41:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54beaeb9

media-gfx/freecad: bump to 0.19.1

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/freecad/Manifest |   1 +
 ...-0001-Gentoo-specific-Remove-ccache-usage.patch |  29 +++
 media-gfx/freecad/freecad-0.19.1.ebuild| 282 +
 3 files changed, 312 insertions(+)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 99ac7bbf679..c0966150ea1 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1 +1,2 @@
+DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B 
de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118
 SHA512 
5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b9d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
 DIST freecad-0.19_pre20201231.tar.gz 236040771 BLAKE2B 
648d8c1d8ab03f56403544f8e6a20dc5edc35b2cfc353c875202ce3e85449e450cbda93f410fec15366ce3aab342a93e981fa11cd9f5443a2fc40ef38ac0a1d0
 SHA512 
457792b0a12196d9e2d8113d9721a3b3a6d4fbc93bae001787db3eac43503a74a89a69564903b4005f8648476a150b6d871b3d78adfbf41c7260a4265132da34

diff --git 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
new file mode 100644
index 000..c8772febdee
--- /dev/null
+++ 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
@@ -0,0 +1,29 @@
+From 74664bf8c9142320be335ab91dca53cb1a1187a2 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Fri, 12 Mar 2021 23:55:09 +0100
+Subject: [PATCH] [Gentoo specific] Remove ccache usage
+
+Signed-off-by: Bernd Waibel 
+---
+ CMakeLists.txt | 5 -
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b17736..38e482a 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -8,11 +8,6 @@ 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}")
+-endif()
+-
+ project(FreeCAD)
+ 
+ set(PACKAGE_VERSION_NAME "Vulcan")
+-- 
+2.30.1
+

diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild 
b/media-gfx/freecad/freecad-0.19.1.ebuild
new file mode 100644
index 000..4a113baa229
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.19.1.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# vtk needs updating to use 3.9
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD;
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
+   S="${WORKDIR}/freecad-${PV}"
+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"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/FreeCAD-${PV}"
+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"
+IUSE="debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
+   inspection material mesh openscad part-design path points
+   raytracing robot show spreadsheet surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+   IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+   IUSE="${IUSE} -${module}"
+done
+unset module
+
+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/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   dev-qt/qtxml:5
+   >=media-libs/coin-4.0.0
+   media-libs/freetype
+   media-libs/qhull
+   sci-libs/flann[openmp]
+   >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/

2021-02-15 Thread Joonas Niilola 
commit: b74dc61c869a750563368af98db0758853b7cd23
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Feb 16 07:11:09 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Feb 16 07:11:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74dc61c

media-gfx/freecad: fix patch file formatting

Closes: https://bugs.gentoo.org/770820
Signed-off-by: Joonas Niilola  gentoo.org>

 ...001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch | 16 
 ...re20201231-0003-Gentoo-specific-don-t-check-vcs.patch | 16 
 2 files changed, 16 insertions(+), 16 deletions(-)

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
index d0097ab0730..9f4131f15a3 100644
--- 
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
@@ -13,14 +13,14 @@ 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})
+   # 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-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
index 1a384198ae3..ac8d194d00e 100644
--- 
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
@@ -13,14 +13,14 @@ 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
+ 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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, profiles/, media-gfx/freecad/

2018-08-07 Thread Andreas Sturmlechner 
commit: 00e86d362b301de831131147ba4a1f541200d883
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  1 16:34:21 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug  7 07:27:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e86d36

media-gfx/freecad: Remove last-rited

Closes: https://bugs.gentoo.org/620702

 media-gfx/freecad/Manifest |   1 -
 .../files/freecad-0.14.3702-install-paths.patch|  21 
 .../freecad/files/freecad-0.17_pre-no-webkit.patch |  45 ---
 media-gfx/freecad/files/freecad.sharedmimeinfo |   8 --
 media-gfx/freecad/freecad-0.16.6712.ebuild | 131 -
 media-gfx/freecad/metadata.xml |  12 --
 profiles/package.mask  |   4 -
 7 files changed, 222 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
deleted file mode 100644
index 662e0f20394..000
--- a/media-gfx/freecad/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B 
ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2
 SHA512 
ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e

diff --git a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch 
b/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch
deleted file mode 100644
index d042695e88c..000
--- a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 freecad-0.14.3702/CMakeLists.txt
-+++ freecad-0.14.3702/CMakeLists.txt
-@@ -69,9 +69,15 @@
- SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH 
"Installation root directory")
- endif(WIN32)
- 
--SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and 
resource files")
--SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header 
files")
--SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation 
and license files")
-+if(NOT CMAKE_INSTALL_DATADIR)
-+   SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data 
and resource files")
-+endif(NOT CMAKE_INSTALL_DATADIR)
-+if(NOT CMAKE_INSTALL_INCLUDEDIR)
-+   SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for 
header files")
-+endif(NOT CMAKE_INSTALL_INCLUDEDIR)
-+if(NOT CMAKE_INSTALL_DOCDIR)
-+   SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for 
documentation and license files")
-+endif(NOT CMAKE_INSTALL_DOCDIR)
- # Don't set it without manual adaption of LibDir variable in 
src/App/FreeCADInit.py
- SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
- 

diff --git a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch 
b/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch
deleted file mode 100644
index 60dcfed22c7..000
--- a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Remove Qt4-Webkit dependency
-Author: Anton Gladky 
-Bug-Debian: https://bugs.debian.org/784464
-Last-Update: 2017-09-06
-
-* asturm: tidied up and amended to use and not override BUILD_WEB
-
 a/src/Gui/DownloadManager.cpp
-+++ b/src/Gui/DownloadManager.cpp
-@@ -33,7 +33,6 @@
- #include 
- #include 
- #include 
--#include 
- 
- #include "DownloadItem.h"
- #include "DownloadManager.h"
-@@ -224,11 +223,12 @@ void DownloadManager::updateRow()
- ui->downloadsView->setRowHeight(row, item->minimumSizeHint().height());
- 
- bool remove = false;
-+/*
- QWebSettings *globalSettings = QWebSettings::globalSettings();
- if (!item->downloading()
- && 
globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
- remove = true;
--
-+*/
- if (item->downloadedSuccessfully()
- && removePolicy() == DownloadManager::SuccessFullDownload) {
- remove = true;
 a/CMakeLists.txt   2018-03-02 22:39:46.374140506 +0100
-+++ b/CMakeLists.txt   2018-03-02 22:41:59.904216932 +0100
-@@ -351,11 +351,6 @@
-   set(BUILD_MESH ON)
- endif(BUILD_JTREADER)
- 
--#a runtime dependency
--if(BUILD_START)
--  set(BUILD_WEB ON)
--endif(BUILD_START)
--
- #leaving test module for someone else.
- #image has none. as far as I can tell.
- #mesh has none. as far as I can tell.

diff --git a/media-gfx/freecad/files/freecad.sharedmimeinfo 
b/media-gfx/freecad/files/freecad.sharedmimeinfo
deleted file mode 100644
index 6d5e93e7d13..000
--- a/media-gfx/freecad/files/freecad.sharedmimeinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-   
-   
-   FreeCAD document files
-   
-   
-

diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild 
b/media-gfx/freecad/freecad-0.16.6712.ebuild
deleted file mode 100644
index 0c65c49697b..000
---

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2018-03-02 Thread Andreas Sturmlechner 
commit: 506f827c4f6bdbaf6c93463f2d8e6390d2be6a4e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  2 21:48:50 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  2 22:08:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506f827c

media-gfx/freecad: Add no-webkit patch

Bug: https://bugs.gentoo.org/620702
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../freecad/files/freecad-0.17_pre-no-webkit.patch |  45 +++
 media-gfx/freecad/freecad-0.17_pre-r1.ebuild   | 133 +
 2 files changed, 178 insertions(+)

diff --git a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch 
b/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch
new file mode 100644
index 000..60dcfed22c7
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch
@@ -0,0 +1,45 @@
+Description: Remove Qt4-Webkit dependency
+Author: Anton Gladky 
+Bug-Debian: https://bugs.debian.org/784464
+Last-Update: 2017-09-06
+
+* asturm: tidied up and amended to use and not override BUILD_WEB
+
+--- a/src/Gui/DownloadManager.cpp
 b/src/Gui/DownloadManager.cpp
+@@ -33,7 +33,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ 
+ #include "DownloadItem.h"
+ #include "DownloadManager.h"
+@@ -224,11 +223,12 @@ void DownloadManager::updateRow()
+ ui->downloadsView->setRowHeight(row, item->minimumSizeHint().height());
+ 
+ bool remove = false;
++/*
+ QWebSettings *globalSettings = QWebSettings::globalSettings();
+ if (!item->downloading()
+ && 
globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+ remove = true;
+-
++*/
+ if (item->downloadedSuccessfully()
+ && removePolicy() == DownloadManager::SuccessFullDownload) {
+ remove = true;
+--- a/CMakeLists.txt   2018-03-02 22:39:46.374140506 +0100
 b/CMakeLists.txt   2018-03-02 22:41:59.904216932 +0100
+@@ -351,11 +351,6 @@
+   set(BUILD_MESH ON)
+ endif(BUILD_JTREADER)
+ 
+-#a runtime dependency
+-if(BUILD_START)
+-  set(BUILD_WEB ON)
+-endif(BUILD_START)
+-
+ #leaving test module for someone else.
+ #image has none. as far as I can tell.
+ #mesh has none. as far as I can tell.

diff --git a/media-gfx/freecad/freecad-0.17_pre-r1.ebuild 
b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
new file mode 100644
index 000..18a7d527d17
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils xdg-utils fortran-2 python-single-r1
+
+DESCRIPTION="Qt based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git;
+else
+   SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+   ${PYTHON_DEPS}
+   dev-cpp/eigen:3
+   dev-java/xerces
+   dev-libs/boost:=[python,${PYTHON_USEDEP}]
+   dev-libs/xerces-c[icu]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/pyside:0[X,svg,${PYTHON_USEDEP}]
+   dev-python/shiboken:0[${PYTHON_USEDEP}]
+   dev-qt/designer:4
+   dev-qt/qtgui:4[-egl]
+   dev-qt/qtopengl:4[-egl]
+   dev-qt/qtsvg:4
+   media-libs/coin
+   media-libs/freetype
+   sci-libs/opencascade:*[vtk(+)]
+   sci-libs/orocos_kdl
+   sys-libs/zlib
+   virtual/glu"
+RDEPEND="${COMMON_DEPEND}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pivy[${PYTHON_USEDEP}]
+   dev-qt/assistant:4"
+DEPEND="${COMMON_DEPEND}
+   >=dev-lang/swig-2.0.4-r1:0
+   dev-python/pyside-tools:0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
+   "${FILESDIR}"/${P}-no-webkit.patch
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=352435
+# 
https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+RESTRICT="mirror"
+
+# TODO:
+#   DEPEND and RDEPEND:
+#  salome-smesh - science overlay
+#  zipio++ - not in portage yet
+
+S="${WORKDIR}/FreeCAD-${PV}"
+
+DOCS=( README.md ChangeLog.txt )
+
+pkg_setup() {
+   fortran-2_pkg_setup
+   python-single-r1_pkg_setup
+
+   [[ -z ${CASROOT} ]] && die "empty \$CASROOT, run eselect opencascade 
set or define otherwise"
+}
+
+src_configure() {
+   export QT_SELECT=4
+
+   #-DOCC_* defined with cMake/FindOpenCasCade.cmake
+   #-DCOIN3D_* defined with cMake/FindCoin3D.cmake
+   #-DSOQT_ not used
+   local mycmakeargs=(
+   -DOCC_INCLUDE_DIR="${CASROOT}"/inc
+   -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2016-03-20 Thread Michael Weber 
commit: 45f7a63ea41df92d92eda4b3aebbae40d8c79a36
Author: Michael Weber  gentoo  org>
AuthorDate: Sun Mar 20 20:50:31 2016 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sun Mar 20 20:50:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f7a63e

media-gfx/freecad: drop old and unsecure versions (bug 526090).

Package-Manager: portage-2.2.28

 media-gfx/freecad/Manifest |   3 -
 .../freecad/files/freecad-0.12.5284-boost148.patch |  25 --
 .../files/freecad-0.12.5284-cmake-2.8.12.patch | 294 -
 .../freecad/files/freecad-0.12.5284-gcc46.patch|  11 -
 .../freecad/files/freecad-0.12.5284-glu.patch  |  12 -
 .../files/freecad-0.12.5284-no-3rdParty.patch  |   9 -
 .../files/freecad-0.12.5284-no-permissive.patch|  40 ---
 .../freecad/files/freecad-0.12.5284-nodir.patch|  21 --
 .../freecad/files/freecad-0.12.5284-nopivy.patch   |  17 --
 .../files/freecad-0.12.5284-occ-6.5.5.patch| 224 
 .../freecad/files/freecad-0.12.5284-occ-6.6.patch  |  69 -
 .../files/freecad-0.12.5284-qt3support.patch   |  36 ---
 .../files/freecad-0.12.5284-removeoldswig.patch| 111 
 .../freecad-0.12.5284-salomesmesh-occ-6.5.5.patch  | 228 
 .../files/freecad-0.13.1830-CMakefile.patch|  21 --
 .../freecad-0.13.1830-avoid-include-salome.patch   |  11 -
 .../files/freecad-0.13.1830-cmake-2.8.12.patch | 294 -
 .../files/freecad-0.13.1830-no-machdist.patch  |  11 -
 .../freecad/files/freecad-0.13.1830-occ-6.7.patch  |  63 -
 .../freecad-0.13.1830-remove-qt3-support.patch |  33 ---
 .../files/freecad-0.13.1830-startpage-links.patch  |  97 ---
 media-gfx/freecad/freecad-0.12.5284-r4.ebuild  | 119 -
 media-gfx/freecad/freecad-0.13.1830-r1.ebuild  | 141 --
 media-gfx/freecad/freecad-0.14.3702-r1.ebuild  | 155 ---
 24 files changed, 2045 deletions(-)

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 1ce41bc..ef0b503 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,4 +1 @@
-DIST freecad-0.12.5284.tar.gz 48399004 SHA256 
45486c6cc3ae212fd3eba994c603fd97962c7f505bf2a807d1533f9ee6d6026d SHA512 
f1fee73ae7b43e7b3a136847f0dbb0b3f3e8f62ad3a9063f759efd8b9ed5a0dfff54961870465f37c0563161c4c5e2821f1f3379ead72dbdeddae36702e2ec0a
 WHIRLPOOL 
7a46119d86a5d43ae8eaec6b5532e4739d54b0443769381630e644aa16c3f4185b63b513e4350c7562beacd86d56a7edbb3b506d10cb54190cbeaab48a504d5f
-DIST freecad-0.13.1830.tar.gz 70168706 SHA256 
550ed16225e4cd67a463ae9b826f3a64edf7d2819cc8d235b15a89e10be72f13 SHA512 
3e8d4eed8cace38da9615965f79a2b0da21d31a6df793ceaf3f732e0abd5666e9715ec9eb162e6ff998718e8d609a7dff2d0993b28f493200b734318a2322160
 WHIRLPOOL 
6d41565423edf8a0c67901a8559600ff1088f645c3ecb4aad8d7597490522f80d6475af3e7f5a623fc30b4d1571187bf6e6a132e6c480825798b957bea90bb83
-DIST freecad-0.14.3702.tar.gz 66927339 SHA256 
ee24cf3542bfb1a887a12d2df52458bcc0e3e82679370c449b9d8b5b473b9dc9 SHA512 
6333bc8256728084b492687c5c6a5b3356212cbcab4bf0beb95fcdb0f9ac7c49df8eee0275e83feadc7b2460cf2396e88b0b309cbc1e1c9d46375bcadb334c13
 WHIRLPOOL 
eb7d22f255536d4fde5a182e5b59c63eb38a6d70ecf0b6a7abdf1d76c00c51492c517053d09eb56d5657d8cc3a49bad56e67e8965ce03d27982d36dcd1944982
 DIST freecad-0.15.4671.tar.gz 93680347 SHA256 
8dda8f355cb59866a55c9c6096f39a3ebc5347892284db4c305352cc9be03bbc SHA512 
695081117b5511bbc0b7335b63a8760e164987a6dff2c5b0dc86b6b0a93bb7d7b83aa9f4fab1d66d7d2c917a42b0135af78553b463579873a1d1e52e3dd9aecb
 WHIRLPOOL 
0c351ad9ee360dfd9af54af9cc348a6ba3d8c15b6743667f6943e41aa252cec9bd2149baa32fceeceac65660a9b629aefba3c80a5c3a84c45a8d502323547287

diff --git a/media-gfx/freecad/files/freecad-0.12.5284-boost148.patch 
b/media-gfx/freecad/files/freecad-0.12.5284-boost148.patch
deleted file mode 100644
index 4c9c735..000
--- a/media-gfx/freecad/files/freecad-0.12.5284-boost148.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d6061d30a053617b8127c96e8c6a65e47589a182 Mon Sep 17 00:00:00 2001
-From: Werner Mayer 
-Date: Sat, 31 Mar 2012 19:22:11 +0200
-Subject: [PATCH] #585: bug with boost 1.48
-

- CMakeLists.txt |2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 920aca7..9e3bbf5 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -284,6 +284,8 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X 
FREECAD_LIBPACK_CHECKFILE7X)
- # get include dirs
- QT4_GET_MOC_FLAGS(moc_flags)
- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
-+# fixes bug 585: bug with boost 1.48
-+SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- foreach(it ${moc_files})
- get_filename_component(it ${it} ABSOLUTE)
--- 
-1.7.9.2
-

diff --git a/media-gfx/freecad/files/freecad-0.12.5284-cmake-2.8.12.patch

[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/

2015-08-11 Thread Michael Weber 
commit: 122ef11195655fc578f5df41ff608df3fb8b4004
Author: Michael Weber xmw AT gentoo DOT org
AuthorDate: Tue Aug 11 09:01:49 2015 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Tue Aug 11 09:02:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122ef111

media-gfx/freecad: install the proper icons and file associations (bug 551872, 
thanks Fat-Zer).

Package-Manager: portage-2.2.20

 media-gfx/freecad/files/freecad.sharedmimeinfo |  8 
 media-gfx/freecad/freecad-0.14.3702-r1.ebuild  | 26 +---
 media-gfx/freecad/freecad-0.15.4671.ebuild | 28 ++
 media-gfx/freecad/freecad-.ebuild  | 27 +
 4 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/media-gfx/freecad/files/freecad.sharedmimeinfo 
b/media-gfx/freecad/files/freecad.sharedmimeinfo
new file mode 100644
index 000..6d5e93e
--- /dev/null
+++ b/media-gfx/freecad/files/freecad.sharedmimeinfo
@@ -0,0 +1,8 @@
+?xml version=1.0 encoding=UTF-8?
+mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'
+   mime-type type=application/x-extension-fcstd
+   !-- sub-class-of type=application/zip/ --
+   commentFreeCAD document files/comment
+   glob pattern=*.fcstd/
+   /mime-type
+/mime-info

diff --git a/media-gfx/freecad/freecad-0.14.3702-r1.ebuild 
b/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
index 30df418..c1158cb 100644
--- a/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils eutils fortran-2 multilib python-single-r1
+inherit cmake-utils eutils fortran-2 multilib python-single-r1 fdo-mime
 
 DESCRIPTION=QT based Computer Aided Design application
 HOMEPAGE=http://www.freecadweb.org/;
@@ -123,14 +123,34 @@ src_install() {
${EROOT}usr/$(get_libdir)/${P}/bin/FreeCADCmd \
 ${EROOT}usr/$(get_libdir)/${P}/lib
 
-   newicon src/Main/icon.ico ${PN}.ico
-   make_desktop_entry FreeCAD
+   make_desktop_entry FreeCAD FreeCAD   
MimeType=application/x-extension-fcstd;
 
dodoc README.Linux ChangeLog.txt
 
+   # install mimetype for FreeCAD files
+   insinto /usr/share/mime/packages
+   newins ${FILESDIR}/${PN}.sharedmimeinfo ${PN}.xml
+
+   # install icons to correct place rather than /usr/share/freecad
+   pushd ${ED}/usr/share/${P}
+   for size in 16 32 48 64; do
+   newicon -s ${size} freecad-icon-${size}.png freecad.png
+   done
+   doicon -s scalable freecad.svg
+   newicon -s 64 -c mimetypes freecad-doc.png 
application-x-extension-fcstd.png
+   popd
+
# disable compression of QT assistant help files
 ${ED}usr/share/doc/${P}/freecad.qhc.ecompress.skip
 ${ED}usr/share/doc/${P}/freecad.qch.ecompress.skip
 
python_optimize ${ED}usr/{$(get_libdir),share}/${P}/Mod/
 }
+
+pkg_postinst() {
+   fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+   fdo-mime_mime_database_update
+}

diff --git a/media-gfx/freecad/freecad-0.15.4671.ebuild 
b/media-gfx/freecad/freecad-0.15.4671.ebuild
index 63375fb..a0b4954 100644
--- a/media-gfx/freecad/freecad-0.15.4671.ebuild
+++ b/media-gfx/freecad/freecad-0.15.4671.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils eutils fortran-2 multilib python-single-r1
+inherit cmake-utils eutils fortran-2 multilib python-single-r1 fdo-mime
 
 DESCRIPTION=QT based Computer Aided Design application
 HOMEPAGE=http://www.freecadweb.org/;
@@ -111,10 +111,22 @@ src_install() {
${EROOT}usr/$(get_libdir)/${P}/bin/FreeCADCmd \
 ${EROOT}usr/$(get_libdir)/${P}/lib
 
-   newicon src/Main/icon.ico ${PN}.ico
-   make_desktop_entry FreeCAD
+   make_desktop_entry FreeCAD FreeCAD   
MimeType=application/x-extension-fcstd;
 
-   dodoc README.Linux ChangeLog.txt
+   dodoc README.linux ChangeLog.txt
+
+   # install mimetype for FreeCAD files
+   insinto /usr/share/mime/packages
+   newins ${FILESDIR}/${PN}.sharedmimeinfo ${PN}.xml
+
+   # install icons to correct place rather than /usr/share/freecad
+   pushd ${ED}/usr/share/${P}
+   for size in 16 32 48 64; do
+   newicon -s ${size} freecad-icon-${size}.png freecad.png
+   done
+   doicon -s scalable freecad.svg
+   newicon -s 64 -c mimetypes freecad-doc.png 
application-x-extension-fcstd.png
+   popd
 
# disable compression of QT assistant help files
 ${ED}usr/share/doc/${P}/freecad.qhc.ecompress.skip
@@ -122,3 +134,11 @@ src_install() {
 
python_optimize ${ED}usr/{$(get_libdir),share}/${P}/Mod/
 }
+
+pkg_postinst() {
+   fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+   fdo-mime_mime_database_update
+}

diff --git a/media-gfx/freecad/freecad-.ebuild