[freecad] 02/08: Refresh patches
Anton Gladky
gladk at moszumanska.debian.org
Fri Sep 8 21:03:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository freecad.
commit 70d3ebcccb0ee65464a81ddfdfd13a6144acfe23
Author: Anton Gladky <gladk at debian.org>
Date: Thu Sep 7 22:23:57 2017 +0200
Refresh patches
---
debian/patches/disable_memory_check.patch | 12 ++++-----
.../patches/do_not_install_binary_examples.patch | 6 +++--
debian/patches/exclude_ply.patch | 6 ++---
debian/patches/fix_FTBFS_on_precise.patch | 6 ++---
debian/patches/fix_armel_FTBFS.patch | 30 +++++++++++-----------
debian/patches/remove_doc-files.patch | 6 ++---
debian/patches/series | 1 +
debian/patches/use_share.patch | 6 ++---
8 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/debian/patches/disable_memory_check.patch b/debian/patches/disable_memory_check.patch
index d74aafe..9a97cf7 100644
--- a/debian/patches/disable_memory_check.patch
+++ b/debian/patches/disable_memory_check.patch
@@ -6,10 +6,10 @@ Description: Disable memory-check in SMDS because sysinfo.h is not working
BSD-platforms.
Or use http://code.google.com/p/sysinfo-bsd/source/browse/sysinfo.c
for them.
-Index: FreeCAD-0.16/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
+Index: FreeCAD-0.16.6712/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
===================================================================
---- FreeCAD-0.16.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
-+++ FreeCAD-0.16/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
+--- FreeCAD-0.16.6712.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
++++ FreeCAD-0.16.6712/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
@@ -42,12 +42,6 @@
#include <iterator>
using namespace std;
@@ -74,10 +74,10 @@ Index: FreeCAD-0.16/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
}
///////////////////////////////////////////////////////////////////////////////
-Index: FreeCAD-0.16/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
+Index: FreeCAD-0.16.6712/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
===================================================================
---- FreeCAD-0.16.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
-+++ FreeCAD-0.16/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
+--- FreeCAD-0.16.6712.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
++++ FreeCAD-0.16.6712/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 92d60d5..5bedc96 100644
--- a/debian/patches/do_not_install_binary_examples.patch
+++ b/debian/patches/do_not_install_binary_examples.patch
@@ -33,8 +33,10 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
---- freecad-0.16+dfsg2.orig/data/CMakeLists.txt
-+++ freecad-0.16+dfsg2/data/CMakeLists.txt
+Index: FreeCAD-0.16.6712/data/CMakeLists.txt
+===================================================================
+--- FreeCAD-0.16.6712.orig/data/CMakeLists.txt
++++ FreeCAD-0.16.6712/data/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(examples)
diff --git a/debian/patches/exclude_ply.patch b/debian/patches/exclude_ply.patch
index f15f735..248719b 100644
--- a/debian/patches/exclude_ply.patch
+++ b/debian/patches/exclude_ply.patch
@@ -2,10 +2,10 @@ 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-0.16/src/Mod/OpenSCAD/CMakeLists.txt
+Index: FreeCAD-0.16.6712/src/Mod/OpenSCAD/CMakeLists.txt
===================================================================
---- FreeCAD-0.16.orig/src/Mod/OpenSCAD/CMakeLists.txt
-+++ FreeCAD-0.16/src/Mod/OpenSCAD/CMakeLists.txt
+--- FreeCAD-0.16.6712.orig/src/Mod/OpenSCAD/CMakeLists.txt
++++ FreeCAD-0.16.6712/src/Mod/OpenSCAD/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(ply_SRCS
)
SOURCE_GROUP("ply" FILES ${ply_SRCS})
diff --git a/debian/patches/fix_FTBFS_on_precise.patch b/debian/patches/fix_FTBFS_on_precise.patch
index 51b8c9b..97db144 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-0.16/src/Mod/Image/Gui/GLImageBox.cpp
+Index: FreeCAD-0.16.6712/src/Mod/Image/Gui/GLImageBox.cpp
===================================================================
---- FreeCAD-0.16.orig/src/Mod/Image/Gui/GLImageBox.cpp
-+++ FreeCAD-0.16/src/Mod/Image/Gui/GLImageBox.cpp
+--- FreeCAD-0.16.6712.orig/src/Mod/Image/Gui/GLImageBox.cpp
++++ FreeCAD-0.16.6712/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 b5248bd..0bb047b 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-0.16/src/3rdParty/salomesmesh/inc/Rn.h
+Index: FreeCAD-0.16.6712/src/3rdParty/salomesmesh/inc/Rn.h
===================================================================
---- FreeCAD-0.16.orig/src/3rdParty/salomesmesh/inc/Rn.h
-+++ FreeCAD-0.16/src/3rdParty/salomesmesh/inc/Rn.h
+--- FreeCAD-0.16.6712.orig/src/3rdParty/salomesmesh/inc/Rn.h
++++ FreeCAD-0.16.6712/src/3rdParty/salomesmesh/inc/Rn.h
@@ -33,7 +33,7 @@
#include <gp_Dir.hxx> //Dans OpenCascade
@@ -270,10 +270,10 @@ Index: FreeCAD-0.16/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-0.16/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
+Index: FreeCAD-0.16.6712/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
===================================================================
---- FreeCAD-0.16.orig/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
-+++ FreeCAD-0.16/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
+--- FreeCAD-0.16.6712.orig/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
++++ FreeCAD-0.16.6712/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-0.16/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
std::vector< const SMDS_MeshNode*>& mefistoToDS,
double scalex, double scaley);
-Index: FreeCAD-0.16/src/3rdParty/salomesmesh/inc/aptrte.h
+Index: FreeCAD-0.16.6712/src/3rdParty/salomesmesh/inc/aptrte.h
===================================================================
---- FreeCAD-0.16.orig/src/3rdParty/salomesmesh/inc/aptrte.h
-+++ FreeCAD-0.16/src/3rdParty/salomesmesh/inc/aptrte.h
+--- FreeCAD-0.16.6712.orig/src/3rdParty/salomesmesh/inc/aptrte.h
++++ FreeCAD-0.16.6712/src/3rdParty/salomesmesh/inc/aptrte.h
@@ -60,9 +60,9 @@
MEFISTO2D_EXPORT
@@ -401,10 +401,10 @@ Index: FreeCAD-0.16/src/3rdParty/salomesmesh/inc/aptrte.h
//calcul de la surface d'un triangle defini par 3 points de r**2
#endif
-Index: FreeCAD-0.16/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
+Index: FreeCAD-0.16.6712/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
===================================================================
---- FreeCAD-0.16.orig/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
-+++ FreeCAD-0.16/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
+--- FreeCAD-0.16.6712.orig/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
++++ FreeCAD-0.16.6712/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
@@ -70,9 +70,9 @@ void MEFISTO2D_STDCALL deltacpu_( R & dt
@@ -468,10 +468,10 @@ Index: FreeCAD-0.16/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-0.16/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
+Index: FreeCAD-0.16.6712/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
===================================================================
---- FreeCAD-0.16.orig/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
-+++ FreeCAD-0.16/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
+--- FreeCAD-0.16.6712.orig/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
++++ FreeCAD-0.16.6712/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/remove_doc-files.patch b/debian/patches/remove_doc-files.patch
index 805b389..2f3a194 100644
--- a/debian/patches/remove_doc-files.patch
+++ b/debian/patches/remove_doc-files.patch
@@ -2,10 +2,10 @@ Description: Remove documentation, which was shipped as binary
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-08-27
-Index: FreeCAD-0.16/src/CMakeLists.txt
+Index: FreeCAD-0.16.6712/src/CMakeLists.txt
===================================================================
---- FreeCAD-0.16.orig/src/CMakeLists.txt
-+++ FreeCAD-0.16/src/CMakeLists.txt
+--- FreeCAD-0.16.6712.orig/src/CMakeLists.txt
++++ FreeCAD-0.16.6712/src/CMakeLists.txt
@@ -7,8 +7,6 @@ add_subdirectory(Main)
add_subdirectory(Mod)
if(BUILD_GUI)
diff --git a/debian/patches/series b/debian/patches/series
index 3432118..eed7e7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ do_not_install_binary_examples.patch
exclude_ply.patch
disable_memory_check.patch
remove_doc-files.patch
+
diff --git a/debian/patches/use_share.patch b/debian/patches/use_share.patch
index 2e49b81..b0b9db0 100644
--- a/debian/patches/use_share.patch
+++ b/debian/patches/use_share.patch
@@ -1,8 +1,8 @@
Description: Use_share
-Index: FreeCAD-0.16/src/App/FreeCADInit.py
+Index: FreeCAD-0.16.6712/src/App/FreeCADInit.py
===================================================================
---- FreeCAD-0.16.orig/src/App/FreeCADInit.py
-+++ FreeCAD-0.16/src/App/FreeCADInit.py
+--- FreeCAD-0.16.6712.orig/src/App/FreeCADInit.py
++++ FreeCAD-0.16.6712/src/App/FreeCADInit.py
@@ -43,6 +43,8 @@ def InitApplications():
# Checking on FreeCAD module path ++++++++++++++++++++++++++++++++++++++++++
ModDir = FreeCAD.getHomePath()+'Mod'
--
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