[freecad] 04/07: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Thu Aug 27 20:57:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository freecad.
commit 80ccaacb14ce8364c1439580ff1d6b20e584cc94
Author: Anton Gladky <gladk at debian.org>
Date: Thu Aug 27 22:32:10 2015 +0200
Refresh patches.
---
...01-Disable-automatic-DXF-library-download.patch | 143 ---------------------
debian/patches/disable_memory_check.patch | 12 +-
.../patches/do_not_install_binary_examples.patch | 6 +-
debian/patches/exclude_ply.patch | 14 +-
debian/patches/fix_FTBFS_on_precise.patch | 6 +-
debian/patches/fix_armel_FTBFS.patch | 54 ++++----
debian/patches/fix_clang_compilation.patch | 66 ++++++----
debian/patches/gcc5.patch | 42 +++---
debian/patches/remove_doc-files.patch | 26 ++++
debian/patches/series | 2 +-
debian/patches/unittest_to_stdout.patch | 12 +-
debian/patches/use_share.patch | 10 +-
12 files changed, 151 insertions(+), 242 deletions(-)
diff --git a/debian/patches/0001-Disable-automatic-DXF-library-download.patch b/debian/patches/0001-Disable-automatic-DXF-library-download.patch
deleted file mode 100644
index be39ce9..0000000
--- a/debian/patches/0001-Disable-automatic-DXF-library-download.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From e2c69f2b445ddf3eab8f9e94e5d41f7ee3d6e590 Mon Sep 17 00:00:00 2001
-From: Yorik van Havre <yorik at uncreated.net>
-Date: Fri, 24 Oct 2014 18:54:58 +0200
-Subject: [PATCH] Disable automatic DXF library download
-
----
- src/Mod/Draft/Draft_rc.py | 6 ++--
- src/Mod/Draft/Resources/ui/userprefs-import1.ui | 33 +++++++++++++++++--
- src/Mod/Draft/importDXF.py | 43 +++++++++++++++++--------
- 3 files changed, 64 insertions(+), 18 deletions(-)
-
-diff --git a/src/Mod/Draft/Draft_rc.py b/src/Mod/Draft/Draft_rc.py
-index 645252f..c70c8a4 100644
---- a/src/Mod/Draft/Draft_rc.py
-+++ b/src/Mod/Draft/Draft_rc.py
-@@ -2,16 +2,16 @@
-
- # Resource object code
- #
--# Created: Tue Jun 10 10:08:25 2014
-+# Created: Fri Oct 24 18:53:25 2014
- # by: The Resource Compiler for PySide (Qt v4.8.6)
- #
- # WARNING! All changes made in this file will be lost!
-
- from PySide import QtCore
-
--qt_resource_data = "\x00\x00\x0a\xed<?xml version=\x221.0\x22 encoding=\x22UTF-8\x22 standalone=\x22no\x22?>\x0a<svg\x0a xmlns:dc=\x22http://purl.org/dc/elements/1.1/\x22\x0a xmlns:cc=\x22http://creativecommons.org/ns#\x22\x0a xmlns:rdf=\x22http://www.w3.org/1999/02/22-rdf-syntax-ns#\x22\x0a xmlns:svg=\x22http://www.w3.org/2000/svg\x22\x0a xmlns=\x22http://www.w3.org/2000/svg\x22\x0a xmlns:sodipodi=\x22http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\x22\x0a xmlns:inksca [...]
-+qt_resource_data = "\x00\x00\x0a\xed<?xml version=\x221.0\x22 encoding=\x22UTF-8\x22 standalone=\x22no\x22?>\x0a<svg\x0a xmlns:dc=\x22http://purl.org/dc/elements/1.1/\x22\x0a xmlns:cc=\x22http://creativecommons.org/ns#\x22\x0a xmlns:rdf=\x22http://www.w3.org/1999/02/22-rdf-syntax-ns#\x22\x0a xmlns:svg=\x22http://www.w3.org/2000/svg\x22\x0a xmlns=\x22http://www.w3.org/2000/svg\x22\x0a xmlns:sodipodi=\x22http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\x22\x0a xmlns:inksca [...]
- qt_resource_name = "\x00\x05\x00o\xa6S\x00i\x00c\x00o\x00n\x00s\x00\x02\x00\x00\x07\xb9\x00u\x00i\x00\x0c\x0d\xfc\x11\x13\x00t\x00r\x00a\x00n\x00s\x00l\x00a\x00t\x00i\x00o\x00n\x00s\x00\x08\x08\xba\xc7\x93\x00p\x00a\x00t\x00t\x00e\x00r\x00n\x00s\x00\x08\x00HT\xa7\x00l\x00i\x00n\x00e\x00.\x00s\x00v\x00g\x00\x09\x06\xa6\x8f\xe7\x00c\x00r\x00o\x00s\x00s\x00.\x00s\x00v\x00g\x00\x0a\x08\x8b\x0b\xa7\x00s\x00q\x00u\x00a\x00r\x00e\x00.\x00s\x00v\x00g\x00\x0a\x07+\x1aG\x00s\x00i\x00m\x00p\x00l\x [...]
--qt_resource_struct = "\x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x01\x00\x00\x00\x10\x00\x02\x00\x00\x00\x05\x00\x00\x00c\x00\x00\x00\x00\x00\x02\x00\x00\x00B\x00\x00\x00!\x00\x00\x008\x00\x02\x00\x00\x00\x05\x00\x00\x00\x1c\x00\x00\x00\x1a\x00\x02\x00\x00\x00\x17\x00\x00\x00\x05\x00\x00\x01\xb4\x00\x00\x00\x00\x00\x01\x00\x083^\x00\x00\x03\x00\x00\x00\x00\x00\x00\x01\x00\x12\xeb\x06\x00\x00\x02\xde\x00\x00\x00\x00\x00\x01\x00\x11\xde\x99\x00\x00\x02h\x00\x00\x00\x00\x00\x01\x [...]
-+qt_resource_struct = "\x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x01\x00\x00\x00\x10\x00\x02\x00\x00\x00\x05\x00\x00\x00c\x00\x00\x00\x00\x00\x02\x00\x00\x00B\x00\x00\x00!\x00\x00\x008\x00\x02\x00\x00\x00\x05\x00\x00\x00\x1c\x00\x00\x00\x1a\x00\x02\x00\x00\x00\x17\x00\x00\x00\x05\x00\x00\x01\xb4\x00\x00\x00\x00\x00\x01\x00\x083^\x00\x00\x03\x00\x00\x00\x00\x00\x00\x01\x00\x12\xeb\x06\x00\x00\x02\xde\x00\x00\x00\x00\x00\x01\x00\x11\xde\x99\x00\x00\x02h\x00\x00\x00\x00\x00\x01\x [...]
- def qInitResources():
- QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
-
-diff --git a/src/Mod/Draft/Resources/ui/userprefs-import1.ui b/src/Mod/Draft/Resources/ui/userprefs-import1.ui
-index 11442f6..5af3ae9 100644
---- a/src/Mod/Draft/Resources/ui/userprefs-import1.ui
-+++ b/src/Mod/Draft/Resources/ui/userprefs-import1.ui
-@@ -6,8 +6,8 @@
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>496</width>
-- <height>524</height>
-+ <width>505</width>
-+ <height>543</height>
- </rect>
- </property>
- <property name="windowTitle">
-@@ -21,6 +21,35 @@
- <number>9</number>
- </property>
- <item>
-+ <widget class="QGroupBox" name="groupBox_2">
-+ <property name="title">
-+ <string>Automatic update</string>
-+ </property>
-+ <layout class="QVBoxLayout" name="verticalLayout_2">
-+ <item>
-+ <layout class="QHBoxLayout" name="horizontalLayout_9">
-+ <item>
-+ <widget class="Gui::PrefCheckBox" name="checkBox_3">
-+ <property name="toolTip">
-+ <string><html><head/><body><p>By checking this, you will allow FreeCAD to download and update the</p><p>components needed for DXF import and export. You can also do that</p><p>manually, by visiting https://github.com/yorikvanhavre/Draft-dxf-importer</p></body></html></string>
-+ </property>
-+ <property name="text">
-+ <string>Allow FreeCAD to automatically download and update the DXF libraries</string>
-+ </property>
-+ <property name="prefEntry" stdset="0">
-+ <cstring>dxfAllowDownload</cstring>
-+ </property>
-+ <property name="prefPath" stdset="0">
-+ <cstring>Mod/Draft</cstring>
-+ </property>
-+ </widget>
-+ </item>
-+ </layout>
-+ </item>
-+ </layout>
-+ </widget>
-+ </item>
-+ <item>
- <widget class="QGroupBox" name="GroupBox12">
- <property name="title">
- <string>DXF format options</string>
-diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py
-index 320d467..cddfc49 100644
---- a/src/Mod/Draft/importDXF.py
-+++ b/src/Mod/Draft/importDXF.py
-@@ -69,19 +69,36 @@ else:
- FreeCAD.Console.PrintWarning("DXF libraries need to be updated. Downloading...\n")
- libsok = False
- if not libsok:
-- files = ['dxfColorMap.py','dxfImportObjects.py','dxfLibrary.py','dxfReader.py']
-- baseurl = 'https://raw.github.com/yorikvanhavre/Draft-dxf-importer/master/'
-- import ArchCommands
-- for f in files:
-- p = None
-- p = ArchCommands.download(baseurl+f,force=True)
-- if not p:
-- FreeCAD.Console.PrintWarning("Download of dxf libraries failed. Please download them manually from\nhttps://github.com/yorikvanhavre/Draft-dxf-importer\nand place them in your macros folder\n")
--
-- sys.path.append(FreeCAD.ConfigGet("UserAppData"))
-- try:
-- import dxfColorMap, dxfLibrary, dxfReader
-- except:
-+ p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")
-+ dxfAllowDownload = p.GetBool("dxfAllowDownload",False)
-+ if dxfAllowDownload:
-+ files = ['dxfColorMap.py','dxfImportObjects.py','dxfLibrary.py','dxfReader.py']
-+ baseurl = 'https://raw.githubusercontent.com/yorikvanhavre/Draft-dxf-importer/'+str(CURRENTDXFLIB)+"/"
-+ import ArchCommands
-+ from FreeCAD import Base
-+ progressbar = Base.ProgressIndicator()
-+ progressbar.start("Downloading files...",4)
-+ for f in files:
-+ progressbar.next()
-+ p = None
-+ p = ArchCommands.download(baseurl+f,force=True)
-+ if not p:
-+ FreeCAD.Console.PrintWarning("Download of dxf libraries failed. Please download them manually from\nhttps://github.com/yorikvanhavre/Draft-dxf-importer\nand place them in your macros folder\n")
-+ break
-+ progressbar.stop()
-+
-+ sys.path.append(FreeCAD.ConfigGet("UserAppData"))
-+ try:
-+ import dxfColorMap, dxfLibrary, dxfReader
-+ except ImportError:
-+ dxfReader = None
-+ dxfLibrary = None
-+ else:
-+ FreeCAD.Console.PrintWarning("The DXF import/export libraries needed by FreeCAD to handle the DXF format\n")
-+ FreeCAD.Console.PrintWarning("were not found on this system. Please either enable FreeCAD to download these\n")
-+ FreeCAD.Console.PrintWarning("libraries (menu Edit > Preferences > Import-Export > DXF > Enable downloads) or download\n")
-+ FreeCAD.Console.PrintWarning("these libraries manually, as explained on\n")
-+ FreeCAD.Console.PrintWarning("https://github.com/yorikvanhavre/Draft-dxf-importer\n")
- dxfReader = None
- dxfLibrary = None
-
---
-2.1.1
-
diff --git a/debian/patches/disable_memory_check.patch b/debian/patches/disable_memory_check.patch
index 3aef33d..c7a2b41 100644
--- a/debian/patches/disable_memory_check.patch
+++ b/debian/patches/disable_memory_check.patch
@@ -7,10 +7,10 @@ Author: Anton Gladky <gladky.anton at gmail.com>
Bug-Debian: http://bugs.debian.org/623560
Last-Update: 2011-09-24
-Index: freecad/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
+Index: freecad-0.15.4671/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
===================================================================
---- freecad.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
-+++ freecad/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
+--- freecad-0.15.4671.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
++++ freecad-0.15.4671/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
@@ -42,12 +42,6 @@
#include <iterator>
using namespace std;
@@ -75,10 +75,10 @@ Index: freecad/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
}
///////////////////////////////////////////////////////////////////////////////
-Index: freecad/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
+Index: freecad-0.15.4671/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
===================================================================
---- freecad.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
-+++ freecad/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
+--- freecad-0.15.4671.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
++++ freecad-0.15.4671/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
@@ -27,11 +27,6 @@
// This is not done inside a function of SALOME because allocated memory is not returned
// to the system. (PAL16631)
diff --git a/debian/patches/do_not_install_binary_examples.patch b/debian/patches/do_not_install_binary_examples.patch
index f58b959..812b9cb 100644
--- a/debian/patches/do_not_install_binary_examples.patch
+++ b/debian/patches/do_not_install_binary_examples.patch
@@ -2,10 +2,10 @@ Description: binary examples were removed, remove them from Cmake-target
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-09-18
-Index: freecad/data/examples/CMakeLists.txt
+Index: freecad-0.15.4671/data/examples/CMakeLists.txt
===================================================================
---- freecad.orig/data/examples/CMakeLists.txt
-+++ freecad/data/examples/CMakeLists.txt
+--- freecad-0.15.4671.orig/data/examples/CMakeLists.txt
++++ freecad-0.15.4671/data/examples/CMakeLists.txt
@@ -1,11 +1,6 @@
SET(Examples_Files
diff --git a/debian/patches/exclude_ply.patch b/debian/patches/exclude_ply.patch
index 92a5acb..b32ad71 100644
--- a/debian/patches/exclude_ply.patch
+++ b/debian/patches/exclude_ply.patch
@@ -2,11 +2,11 @@ Description: exclude ply from build-sources, use packaged version
Author: Anton Gladky <gladk at debian.org>, Sebastian Hoogen <sebastian at hoogen.de>
Last-Update: 2013-09-25
-Index: freecad/src/Mod/OpenSCAD/CMakeLists.txt
+Index: freecad-0.15.4671/src/Mod/OpenSCAD/CMakeLists.txt
===================================================================
---- freecad.orig/src/Mod/OpenSCAD/CMakeLists.txt
-+++ freecad/src/Mod/OpenSCAD/CMakeLists.txt
-@@ -23,7 +23,7 @@ SET(ply_SRCS
+--- freecad-0.15.4671.orig/src/Mod/OpenSCAD/CMakeLists.txt
++++ freecad-0.15.4671/src/Mod/OpenSCAD/CMakeLists.txt
+@@ -24,7 +24,7 @@ SET(ply_SRCS
)
SOURCE_GROUP("ply" FILES ${ply_SRCS})
@@ -14,8 +14,8 @@ Index: freecad/src/Mod/OpenSCAD/CMakeLists.txt
+set(all_files ${OpenSCAD_SRCS} )
ADD_CUSTOM_TARGET(OpenSCAD ALL
- SOURCES ${allfiles}
-@@ -33,12 +33,6 @@ fc_copy_sources(OpenSCAD "${CMAKE_BINARY
+ SOURCES ${allfiles} ${OpenSCAD_QRC_SRCS}
+@@ -39,12 +39,6 @@ fc_target_copy_resource(OpenSCAD
INSTALL(
FILES
@@ -26,5 +26,5 @@ Index: freecad/src/Mod/OpenSCAD/CMakeLists.txt
-INSTALL(
- FILES
${OpenSCAD_SRCS}
+ ${OpenSCAD_QRC_SRCS}
DESTINATION
- Mod/OpenSCAD
diff --git a/debian/patches/fix_FTBFS_on_precise.patch b/debian/patches/fix_FTBFS_on_precise.patch
index 8a5d1bd..b2b9027 100644
--- a/debian/patches/fix_FTBFS_on_precise.patch
+++ b/debian/patches/fix_FTBFS_on_precise.patch
@@ -4,10 +4,10 @@ Origin: https://bugs.launchpad.net/ubuntu/+source/freecad/+bug/932723/comments/2
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-02-17
-Index: freecad/src/Mod/Image/Gui/GLImageBox.cpp
+Index: freecad-0.15.4671/src/Mod/Image/Gui/GLImageBox.cpp
===================================================================
---- freecad.orig/src/Mod/Image/Gui/GLImageBox.cpp
-+++ freecad/src/Mod/Image/Gui/GLImageBox.cpp
+--- freecad-0.15.4671.orig/src/Mod/Image/Gui/GLImageBox.cpp
++++ freecad-0.15.4671/src/Mod/Image/Gui/GLImageBox.cpp
@@ -16,6 +16,7 @@
* *
***************************************************************************/
diff --git a/debian/patches/fix_armel_FTBFS.patch b/debian/patches/fix_armel_FTBFS.patch
index f7ec2ac..baf3ac4 100644
--- a/debian/patches/fix_armel_FTBFS.patch
+++ b/debian/patches/fix_armel_FTBFS.patch
@@ -4,10 +4,10 @@ Description: fix compilation on Armel due to coincident variables in
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-10-27
-Index: freecad/src/3rdParty/salomesmesh/inc/Rn.h
+Index: freecad-0.15.4671/src/3rdParty/salomesmesh/inc/Rn.h
===================================================================
---- freecad.orig/src/3rdParty/salomesmesh/inc/Rn.h
-+++ freecad/src/3rdParty/salomesmesh/inc/Rn.h
+--- freecad-0.15.4671.orig/src/3rdParty/salomesmesh/inc/Rn.h
++++ freecad-0.15.4671/src/3rdParty/salomesmesh/inc/Rn.h
@@ -33,7 +33,7 @@
#include <gp_Dir.hxx> //Dans OpenCascade
@@ -270,10 +270,10 @@ Index: freecad/src/3rdParty/salomesmesh/inc/Rn.h
+{return R_3(P.x>Q.x ? P.x : Q.x, P.y>Q.y ? P.y : Q.y, P.z>Q.z ? P.z : Q.z);} //Pt de xyz Max
#endif
-Index: freecad/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
+Index: freecad-0.15.4671/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
===================================================================
---- freecad.orig/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
-+++ freecad/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
+--- freecad-0.15.4671.orig/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
++++ freecad-0.15.4671/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
@@ -61,7 +61,7 @@ public:
typedef std::vector< StdMeshers_FaceSidePtr > TWireVector;
@@ -292,10 +292,10 @@ Index: freecad/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
std::vector< const SMDS_MeshNode*>& mefistoToDS,
double scalex, double scaley);
-Index: freecad/src/3rdParty/salomesmesh/inc/aptrte.h
+Index: freecad-0.15.4671/src/3rdParty/salomesmesh/inc/aptrte.h
===================================================================
---- freecad.orig/src/3rdParty/salomesmesh/inc/aptrte.h
-+++ freecad/src/3rdParty/salomesmesh/inc/aptrte.h
+--- freecad-0.15.4671.orig/src/3rdParty/salomesmesh/inc/aptrte.h
++++ freecad-0.15.4671/src/3rdParty/salomesmesh/inc/aptrte.h
@@ -60,9 +60,9 @@
MEFISTO2D_EXPORT
@@ -318,7 +318,7 @@ Index: freecad/src/3rdParty/salomesmesh/inc/aptrte.h
#define surtd2 SURTD2
#define qualitetrte QUALITETRTE
-@@ -159,7 +159,7 @@ MEFISTO2D_EXPORT
+@@ -174,7 +174,7 @@ MEFISTO2D_EXPORT
#endif
@@ -327,7 +327,7 @@ Index: freecad/src/3rdParty/salomesmesh/inc/aptrte.h
Z & mosoar, Z & mxsoar, Z *mnsoar,
Z & moartr, Z & mxartr, Z *mnartr,
Z & nbtria, R & quamoy, R & quamin ); }
-@@ -258,20 +258,20 @@ extern "C" {void MEFISTO2D_STDCALL fasoa
+@@ -273,20 +273,20 @@ extern "C" {void MEFISTO2D_STDCALL fasoa
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//initialisation du tableau letree et ajout dans letree des sommets 1 a nbsomm
@@ -352,7 +352,7 @@ Index: freecad/src/3rdParty/salomesmesh/inc/aptrte.h
Z & mxqueu, Z * mnqueu, Z * mntree,
Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar,
Z & moartr, Z & mxartr, Z & n1artr, Z * mnartr, Z * mnarst,
-@@ -283,14 +283,14 @@ extern "C" {void MEFISTO2D_STDCALL tetrt
+@@ -298,14 +298,14 @@ extern "C" {void MEFISTO2D_STDCALL tetrt
extern "C" { void MEFISTO2D_STDCALL aisoar( Z & mosoar, Z & mxsoar, Z * mnsoar, Z & na ); }
// formation du chainage 6 des aretes internes a echanger eventuellement
@@ -369,7 +369,7 @@ Index: freecad/src/3rdParty/salomesmesh/inc/aptrte.h
Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar,
Z & moartr, Z & mxartr, Z & n1artr, Z * mnartr, Z * mnarst,
Z & mxarcf, Z * mnarc1, Z * mnarc2,
-@@ -301,7 +301,7 @@ extern "C" { void MEFISTO2D_STDCALL tere
+@@ -316,7 +316,7 @@ extern "C" { void MEFISTO2D_STDCALL tere
// triangulation frontale pour les restaurer
extern "C" { void MEFISTO2D_STDCALL tesuex( Z & nblf, Z * nulftr,
@@ -378,7 +378,7 @@ Index: freecad/src/3rdParty/salomesmesh/inc/aptrte.h
Z & mosoar, Z & mxsoar, Z * mnsoar,
Z & moartr, Z & mxartr, Z & n1artr, Z * mnartr, Z * mnarst,
Z & nbtria, Z * mntrsu, Z & ierr );
-@@ -314,7 +314,7 @@ extern "C" { void MEFISTO2D_STDCALL team
+@@ -329,7 +329,7 @@ extern "C" { void MEFISTO2D_STDCALL team
Z & mxarcf, Z * mntrcf, Z * mnstbo,
Z * n1arcf, Z * mnarcf, Z * mnarc1,
Z & nbarpi, Z & nbsomm, Z & mxsomm,
@@ -387,7 +387,7 @@ Index: freecad/src/3rdParty/salomesmesh/inc/aptrte.h
Z & ierr );
}
// amelioration de la qualite de la triangulation par
-@@ -327,10 +327,10 @@ extern "C" { void MEFISTO2D_STDCALL nuso
+@@ -342,10 +342,10 @@ extern "C" { void MEFISTO2D_STDCALL nuso
}
//retrouver les numero des 3 sommets du triangle nt
@@ -401,11 +401,11 @@ Index: freecad/src/3rdParty/salomesmesh/inc/aptrte.h
//calcul de la surface d'un triangle defini par 3 points de r**2
#endif
-Index: freecad/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
+Index: freecad-0.15.4671/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
===================================================================
---- freecad.orig/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
-+++ freecad/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
-@@ -68,9 +68,9 @@ void MEFISTO2D_STDCALL deltacpu_( R & dt
+--- freecad-0.15.4671.orig/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
++++ freecad-0.15.4671/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
+@@ -70,9 +70,9 @@ void MEFISTO2D_STDCALL deltacpu_( R & dt
void aptrte( Z nutysu, R aretmx,
@@ -418,7 +418,7 @@ Index: freecad/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
Z & nbt, Z * & nust,
Z & ierr )
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -122,11 +122,11 @@ void aptrte( Z nutysu, R aretmx,
+@@ -124,11 +124,11 @@ void aptrte( Z nutysu, R aretmx,
//no st1, st2, st3, 0 (non quadrangle)
R d, tcpu=0;
@@ -432,7 +432,7 @@ Index: freecad/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
Z *mnsoar=NULL, mosoar=7, mxsoar, n1soar; //le hachage des aretes
Z *mnartr=NULL, moartr=3, mxartr, n1artr; //le no des 3 aretes des triangles
Z *mntree=NULL, motree=9, mxtree; //L'arbre 4 de TE et nombre d'entiers par TE
-@@ -141,7 +141,7 @@ void aptrte( Z nutysu, R aretmx,
+@@ -143,7 +143,7 @@ void aptrte( Z nutysu, R aretmx,
Z *mnarst=NULL;
Z *mnlftr=NULL;
@@ -441,7 +441,7 @@ Index: freecad/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
R aremin, aremax; //longueur minimale et maximale des aretes
R airemx; //aire maximale souhaitee d'un triangle
R quamoy, quamin;
-@@ -171,7 +171,7 @@ void aptrte( Z nutysu, R aretmx,
+@@ -173,7 +173,7 @@ void aptrte( Z nutysu, R aretmx,
NEWDEPART:
//mnpxyd( 3, mxsomm ) les coordonnees UV des sommets et la taille d'arete aux sommets
if( mnpxyd!=NULL ) delete [] mnpxyd;
@@ -450,7 +450,7 @@ Index: freecad/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
if( mnpxyd==NULL ) goto ERREUR;
// le tableau mnsoar des aretes des triangles
-@@ -633,7 +633,7 @@ void aptrte( Z nutysu, R aretmx,
+@@ -635,7 +635,7 @@ void aptrte( Z nutysu, R aretmx,
// generation du tableau uvst de la surface triangulee
// ---------------------------------------------------
if( uvst != NULL ) delete [] uvst;
@@ -459,7 +459,7 @@ Index: freecad/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
if( uvst == NULL ) goto ERREUR;
nbst=-1;
-@@ -733,7 +733,7 @@ void aptrte( Z nutysu, R aretmx,
+@@ -735,7 +735,7 @@ void aptrte( Z nutysu, R aretmx,
}
}
@@ -468,10 +468,10 @@ Index: freecad/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
Z & mosoar, Z & mxsoar, Z *mnsoar,
Z & moartr, Z & mxartr, Z *mnartr,
Z & nbtria, R & quamoy, R & quamin )
-Index: freecad/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
+Index: freecad-0.15.4671/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
===================================================================
---- freecad.orig/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
-+++ freecad/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
+--- freecad-0.15.4671.orig/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
++++ freecad-0.15.4671/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
@@ -218,12 +218,12 @@ bool StdMeshers_MEFISTO_2D::Compute(SMES
Z nblf; //nombre de lignes fermees (enveloppe en tete)
diff --git a/debian/patches/fix_clang_compilation.patch b/debian/patches/fix_clang_compilation.patch
index 9c3d6a1..5b34cd9 100644
--- a/debian/patches/fix_clang_compilation.patch
+++ b/debian/patches/fix_clang_compilation.patch
@@ -4,8 +4,10 @@ Bug-Debian: http://bugs.debian.org/755305
Reviewed-By: Anton Gladky <gladk at debian.org>
Last-Update: 2014-08-23
---- freecad-0.14.3702+dfsg.orig/src/Mod/Robot/App/kdl_cp/frameacc.hpp
-+++ freecad-0.14.3702+dfsg/src/Mod/Robot/App/kdl_cp/frameacc.hpp
+Index: freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/frameacc.hpp
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Robot/App/kdl_cp/frameacc.hpp
++++ freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/frameacc.hpp
@@ -79,9 +79,9 @@ public:
IMETHOD friend VectorAcc operator / (const VectorAcc& r2,const doubleAcc& r1);
@@ -58,8 +60,10 @@ Last-Update: 2014-08-23
IMETHOD Twist GetTwist() const;
---- freecad-0.14.3702+dfsg.orig/src/Mod/Robot/App/kdl_cp/frames.cpp
-+++ freecad-0.14.3702+dfsg/src/Mod/Robot/App/kdl_cp/frames.cpp
+Index: freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/frames.cpp
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Robot/App/kdl_cp/frames.cpp
++++ freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/frames.cpp
@@ -377,7 +377,7 @@ double Rotation::GetRotAngle(Vector& axi
bool operator==(const Rotation& a,const Rotation& b) {
@@ -69,8 +73,10 @@ Last-Update: 2014-08-23
#else
return ( a.data[0]==b.data[0] &&
a.data[1]==b.data[1] &&
---- freecad-0.14.3702+dfsg.orig/src/Mod/Robot/App/kdl_cp/frames.hpp
-+++ freecad-0.14.3702+dfsg/src/Mod/Robot/App/kdl_cp/frames.hpp
+Index: freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/frames.hpp
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Robot/App/kdl_cp/frames.hpp
++++ freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/frames.hpp
@@ -244,7 +244,7 @@ public:
//! do not use operator == because the definition of Equal(.,.) is slightly
@@ -143,8 +149,10 @@ Last-Update: 2014-08-23
};
IMETHOD Vector diff(const Vector& a,const Vector& b,double dt=1);
---- freecad-0.14.3702+dfsg.orig/src/Mod/Robot/App/kdl_cp/frames.inl
-+++ freecad-0.14.3702+dfsg/src/Mod/Robot/App/kdl_cp/frames.inl
+Index: freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/frames.inl
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Robot/App/kdl_cp/frames.inl
++++ freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/frames.inl
@@ -1294,7 +1294,7 @@ IMETHOD void posrandom(Frame& F) {
IMETHOD bool operator==(const Frame& a,const Frame& b ) {
@@ -190,8 +198,10 @@ Last-Update: 2014-08-23
#else
return (a.data[0]==b.data[0]&&
a.data[1]==b.data[1] );
---- freecad-0.14.3702+dfsg.orig/src/Mod/Robot/App/kdl_cp/framevel.hpp
-+++ freecad-0.14.3702+dfsg/src/Mod/Robot/App/kdl_cp/framevel.hpp
+Index: freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/framevel.hpp
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Robot/App/kdl_cp/framevel.hpp
++++ freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/framevel.hpp
@@ -111,9 +111,9 @@ public:
IMETHOD friend void SetToZero(VectorVel& v);
@@ -244,8 +254,10 @@ Last-Update: 2014-08-23
// = Conversion to other entities
IMETHOD Twist GetTwist() const;
---- freecad-0.14.3702+dfsg.orig/src/Mod/Robot/App/kdl_cp/jacobian.cpp
-+++ freecad-0.14.3702+dfsg/src/Mod/Robot/App/kdl_cp/jacobian.cpp
+Index: freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jacobian.cpp
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Robot/App/kdl_cp/jacobian.cpp
++++ freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jacobian.cpp
@@ -126,12 +126,12 @@ namespace KDL
bool Jacobian::operator ==(const Jacobian& arg)const
@@ -261,8 +273,10 @@ Last-Update: 2014-08-23
}
bool Equal(const Jacobian& a,const Jacobian& b,double eps)
---- freecad-0.14.3702+dfsg.orig/src/Mod/Robot/App/kdl_cp/jacobian.hpp
-+++ freecad-0.14.3702+dfsg/src/Mod/Robot/App/kdl_cp/jacobian.hpp
+Index: freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jacobian.hpp
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Robot/App/kdl_cp/jacobian.hpp
++++ freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jacobian.hpp
@@ -44,7 +44,7 @@ namespace KDL
bool operator ==(const Jacobian& arg)const;
bool operator !=(const Jacobian& arg)const;
@@ -272,8 +286,10 @@ Last-Update: 2014-08-23
~Jacobian();
---- freecad-0.14.3702+dfsg.orig/src/Mod/Robot/App/kdl_cp/jntarrayacc.hpp
-+++ freecad-0.14.3702+dfsg/src/Mod/Robot/App/kdl_cp/jntarrayacc.hpp
+Index: freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jntarrayacc.hpp
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Robot/App/kdl_cp/jntarrayacc.hpp
++++ freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jntarrayacc.hpp
@@ -61,7 +61,7 @@ namespace KDL
friend void Divide(const JntArrayAcc& src,const doubleVel& factor,JntArrayAcc& dest);
friend void Divide(const JntArrayAcc& src,const doubleAcc& factor,JntArrayAcc& dest);
@@ -283,8 +299,10 @@ Last-Update: 2014-08-23
};
}
---- freecad-0.14.3702+dfsg.orig/src/Mod/Robot/App/kdl_cp/jntarrayvel.hpp
-+++ freecad-0.14.3702+dfsg/src/Mod/Robot/App/kdl_cp/jntarrayvel.hpp
+Index: freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jntarrayvel.hpp
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Robot/App/kdl_cp/jntarrayvel.hpp
++++ freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jntarrayvel.hpp
@@ -54,7 +54,7 @@ namespace KDL
friend void Divide(const JntArrayVel& src,const double& factor,JntArrayVel& dest);
friend void Divide(const JntArrayVel& src,const doubleVel& factor,JntArrayVel& dest);
@@ -294,8 +312,10 @@ Last-Update: 2014-08-23
};
}
---- freecad-0.14.3702+dfsg.orig/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.cpp
-+++ freecad-0.14.3702+dfsg/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.cpp
+Index: freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.cpp
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.cpp
++++ freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.cpp
@@ -115,7 +115,7 @@ namespace KDL
return src1.data.isApprox(src2.data,eps);
}
@@ -305,8 +325,10 @@ Last-Update: 2014-08-23
//bool operator!=(const JntSpaceInertiaMatrix& src1,const JntSpaceInertiaMatrix& src2){return Equal(src1,src2);};
}
---- freecad-0.14.3702+dfsg.orig/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.hpp
-+++ freecad-0.14.3702+dfsg/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.hpp
+Index: freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.hpp
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.hpp
++++ freecad-0.15.4671/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.hpp
@@ -203,7 +203,7 @@ class MyTask : public RTT::TaskContext
* @return true if each element of src1 is within eps of the same
* element in src2, or if both src1 and src2 have no data (ie 0==rows())
diff --git a/debian/patches/gcc5.patch b/debian/patches/gcc5.patch
index 8dce1e7..e5b5033 100644
--- a/debian/patches/gcc5.patch
+++ b/debian/patches/gcc5.patch
@@ -4,10 +4,10 @@ Acked-By: Anton Gladky <gladk at debian.org>
Bug-Debian: http://bugs.debian.org/795069
Last-Update: 2015-08-12
-Index: freecad/src/Gui/ManualAlignment.h
+Index: freecad-0.15.4671/src/Gui/ManualAlignment.h
===================================================================
---- freecad.orig/src/Gui/ManualAlignment.h
-+++ freecad/src/Gui/ManualAlignment.h
+--- freecad-0.15.4671.orig/src/Gui/ManualAlignment.h
++++ freecad-0.15.4671/src/Gui/ManualAlignment.h
@@ -30,7 +30,9 @@
#include <Gui/Application.h>
#include <Gui/Document.h>
@@ -18,10 +18,10 @@ Index: freecad/src/Gui/ManualAlignment.h
class SbVec3f;
class SoPickedPoint;
-Index: freecad/src/App/Application.h
+Index: freecad-0.15.4671/src/App/Application.h
===================================================================
---- freecad.orig/src/App/Application.h
-+++ freecad/src/App/Application.h
+--- freecad-0.15.4671.orig/src/App/Application.h
++++ freecad-0.15.4671/src/App/Application.h
@@ -25,7 +25,9 @@
#ifndef APP_APPLICATION_H
#define APP_APPLICATION_H
@@ -32,10 +32,10 @@ Index: freecad/src/App/Application.h
#include <vector>
-Index: freecad/src/App/Document.h
+Index: freecad-0.15.4671/src/App/Document.h
===================================================================
---- freecad.orig/src/App/Document.h
-+++ freecad/src/App/Document.h
+--- freecad-0.15.4671.orig/src/App/Document.h
++++ freecad-0.15.4671/src/App/Document.h
@@ -35,9 +35,10 @@
#include <vector>
#include <stack>
@@ -48,10 +48,10 @@ Index: freecad/src/App/Document.h
namespace Base {
class Writer;
-Index: freecad/src/App/DocumentObserver.h
+Index: freecad-0.15.4671/src/App/DocumentObserver.h
===================================================================
---- freecad.orig/src/App/DocumentObserver.h
-+++ freecad/src/App/DocumentObserver.h
+--- freecad-0.15.4671.orig/src/App/DocumentObserver.h
++++ freecad-0.15.4671/src/App/DocumentObserver.h
@@ -24,7 +24,9 @@
#ifndef APP_DOCUMENTOBSERVER_H
#define APP_DOCUMENTOBSERVER_H
@@ -62,10 +62,10 @@ Index: freecad/src/App/DocumentObserver.h
#include <set>
namespace App
-Index: freecad/src/App/DocumentObserverPython.h
+Index: freecad-0.15.4671/src/App/DocumentObserverPython.h
===================================================================
---- freecad.orig/src/App/DocumentObserverPython.h
-+++ freecad/src/App/DocumentObserverPython.h
+--- freecad-0.15.4671.orig/src/App/DocumentObserverPython.h
++++ freecad-0.15.4671/src/App/DocumentObserverPython.h
@@ -26,8 +26,10 @@
#include <CXX/Objects.hxx>
@@ -77,10 +77,10 @@ Index: freecad/src/App/DocumentObserverPython.h
namespace App
{
-Index: freecad/src/Gui/MergeDocuments.h
+Index: freecad-0.15.4671/src/Gui/MergeDocuments.h
===================================================================
---- freecad.orig/src/Gui/MergeDocuments.h
-+++ freecad/src/Gui/MergeDocuments.h
+--- freecad-0.15.4671.orig/src/Gui/MergeDocuments.h
++++ freecad-0.15.4671/src/Gui/MergeDocuments.h
@@ -24,7 +24,9 @@
#ifndef GUI_MERGEDOCUMENTS_H
#define GUI_MERGEDOCUMENTS_H
@@ -91,10 +91,10 @@ Index: freecad/src/Gui/MergeDocuments.h
#include <Base/Persistence.h>
namespace zipios {
-Index: freecad/src/Gui/Placement.h
+Index: freecad-0.15.4671/src/Gui/Placement.h
===================================================================
---- freecad.orig/src/Gui/Placement.h
-+++ freecad/src/Gui/Placement.h
+--- freecad-0.15.4671.orig/src/Gui/Placement.h
++++ freecad-0.15.4671/src/Gui/Placement.h
@@ -28,8 +28,10 @@
#include <Gui/TaskView/TaskView.h>
#include <Base/Placement.h>
diff --git a/debian/patches/remove_doc-files.patch b/debian/patches/remove_doc-files.patch
new file mode 100644
index 0000000..0cc8bce
--- /dev/null
+++ b/debian/patches/remove_doc-files.patch
@@ -0,0 +1,26 @@
+Description: Remove documentation, which was shipped as binary
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-08-27
+
+Index: freecad-0.15.4671/src/CMakeLists.txt
+===================================================================
+--- freecad-0.15.4671.orig/src/CMakeLists.txt
++++ freecad-0.15.4671/src/CMakeLists.txt
+@@ -8,8 +8,6 @@ add_subdirectory(Mod)
+ if(BUILD_GUI)
+ add_subdirectory(Gui)
+ configure_file(Doc/Start_Page.html ${CMAKE_BINARY_DIR}/doc/Start_Page.html COPYONLY)
+- configure_file(Doc/freecad.qhc ${CMAKE_BINARY_DIR}/doc/freecad.qhc COPYONLY)
+- configure_file(Doc/freecad.qch ${CMAKE_BINARY_DIR}/doc/freecad.qch COPYONLY)
+ endif(BUILD_GUI)
+
+ if(BUILD_TEMPLATE)
+@@ -21,7 +19,7 @@ add_subdirectory(Doc)
+ if(FREECAD_MAINTAINERS_BUILD AND WIN32)
+ #add_subdirectory(WindowsInstaller)
+ endif(FREECAD_MAINTAINERS_BUILD AND WIN32)
+-INSTALL(FILES Doc/Start_Page.html Doc/freecad.qhc Doc/freecad.qch
++INSTALL(FILES Doc/Start_Page.html
+ DESTINATION ${CMAKE_INSTALL_DOCDIR}
+ )
+
diff --git a/debian/patches/series b/debian/patches/series
index febe488..19031cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,5 @@ exclude_ply.patch
disable_memory_check.patch
unittest_to_stdout.patch
fix_clang_compilation.patch
-0001-Disable-automatic-DXF-library-download.patch
gcc5.patch
+remove_doc-files.patch
diff --git a/debian/patches/unittest_to_stdout.patch b/debian/patches/unittest_to_stdout.patch
index 07c9191..430795b 100644
--- a/debian/patches/unittest_to_stdout.patch
+++ b/debian/patches/unittest_to_stdout.patch
@@ -2,8 +2,10 @@ Description: move output from unittest into stdout
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2014-07-22
---- freecad-0.14.3702.orig/src/Mod/Test/TestApp.py
-+++ freecad-0.14.3702/src/Mod/Test/TestApp.py
+Index: freecad-0.15.4671/src/Mod/Test/TestApp.py
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Test/TestApp.py
++++ freecad-0.15.4671/src/Mod/Test/TestApp.py
@@ -22,7 +22,7 @@
#* Juergen Riegel 2002 *
#***************************************************************************/
@@ -22,8 +24,10 @@ Last-Update: 2014-07-22
r.run(s)
def Test(s):
---- freecad-0.14.3702.orig/src/Mod/Test/TestGui.py
-+++ freecad-0.14.3702/src/Mod/Test/TestGui.py
+Index: freecad-0.15.4671/src/Mod/Test/TestGui.py
+===================================================================
+--- freecad-0.15.4671.orig/src/Mod/Test/TestGui.py
++++ freecad-0.15.4671/src/Mod/Test/TestGui.py
@@ -31,6 +31,7 @@
import FreeCAD,FreeCADGui
# import the App Test module
diff --git a/debian/patches/use_share.patch b/debian/patches/use_share.patch
index a19987f..3039c53 100644
--- a/debian/patches/use_share.patch
+++ b/debian/patches/use_share.patch
@@ -1,7 +1,7 @@
-Index: freecad/src/App/FreeCADInit.py
+Index: freecad-0.15.4671/src/App/FreeCADInit.py
===================================================================
---- freecad.orig/src/App/FreeCADInit.py
-+++ freecad/src/App/FreeCADInit.py
+--- freecad-0.15.4671.orig/src/App/FreeCADInit.py
++++ freecad-0.15.4671/src/App/FreeCADInit.py
@@ -43,6 +43,8 @@ def InitApplications():
# Checking on FreeCAD module path ++++++++++++++++++++++++++++++++++++++++++
ModDir = FreeCAD.getHomePath()+'Mod'
@@ -11,7 +11,7 @@ Index: freecad/src/App/FreeCADInit.py
BinDir = FreeCAD.getHomePath()+'bin'
BinDir = os.path.realpath(BinDir)
LibDir = FreeCAD.getHomePath()+'lib'
-@@ -65,6 +67,14 @@ def InitApplications():
+@@ -64,6 +66,14 @@ def InitApplications():
for i in ModDirs: ModDict[i.lower()] = os.path.join(ModDir,i)
else:
Wrn ("No modules found in " + ModDir + "\n")
@@ -26,7 +26,7 @@ Index: freecad/src/App/FreeCADInit.py
# Search for additional modules in the home directory
if os.path.isdir(HomeMod):
HomeMods = os.listdir(HomeMod)
-@@ -105,6 +115,8 @@ def InitApplications():
+@@ -104,6 +114,8 @@ def InitApplications():
sys.path.insert(0,LibDir)
sys.path.insert(0,ModDir)
Log("Using "+ModDir+" as module path!\n")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freecad.git
More information about the debian-science-commits
mailing list