[freecad] 02/05: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Tue Jul 22 22:02:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository freecad.
commit 3edf0de81f21deeb524da502d1559de685112f35
Author: Anton Gladky <gladk at debian.org>
Date: Tue Jul 22 19:43:29 2014 +0200
Refresh patches.
---
debian/patches/disable_memory_check.patch | 12 ++---
.../patches/do_not_install_binary_examples.patch | 6 +--
debian/patches/exclude_ply.patch | 10 ++--
debian/patches/fix_FTBFS_on_precise.patch | 6 +--
debian/patches/fix_armel_FTBFS.patch | 30 ++++++------
debian/patches/use_share.patch | 54 +++++++++++-----------
6 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/debian/patches/disable_memory_check.patch b/debian/patches/disable_memory_check.patch
index e7ff008..3aef33d 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-0.13.3637-dfsg/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
+Index: freecad/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
-+++ freecad-0.13.3637-dfsg/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
@@ -42,12 +42,6 @@
#include <iterator>
using namespace std;
@@ -75,10 +75,10 @@ Index: freecad-0.13.3637-dfsg/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
}
///////////////////////////////////////////////////////////////////////////////
-Index: freecad-0.13.3637-dfsg/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
+Index: freecad/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
-+++ freecad-0.13.3637-dfsg/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
@@ -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 c8d4cfc..f58b959 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-0.13.3637-dfsg/data/examples/CMakeLists.txt
+Index: freecad/data/examples/CMakeLists.txt
===================================================================
---- freecad-0.13.3637-dfsg.orig/data/examples/CMakeLists.txt
-+++ freecad-0.13.3637-dfsg/data/examples/CMakeLists.txt
+--- freecad.orig/data/examples/CMakeLists.txt
++++ freecad/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 faf4c67..92a5acb 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-0.13.3637-dfsg/src/Mod/OpenSCAD/CMakeLists.txt
+Index: freecad/src/Mod/OpenSCAD/CMakeLists.txt
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/Mod/OpenSCAD/CMakeLists.txt
-+++ freecad-0.13.3637-dfsg/src/Mod/OpenSCAD/CMakeLists.txt
-@@ -24,7 +24,7 @@ SET(ply_SRCS
+--- freecad.orig/src/Mod/OpenSCAD/CMakeLists.txt
++++ freecad/src/Mod/OpenSCAD/CMakeLists.txt
+@@ -23,7 +23,7 @@ SET(ply_SRCS
)
SOURCE_GROUP("ply" FILES ${ply_SRCS})
@@ -15,7 +15,7 @@ Index: freecad-0.13.3637-dfsg/src/Mod/OpenSCAD/CMakeLists.txt
ADD_CUSTOM_TARGET(OpenSCAD ALL
SOURCES ${allfiles}
-@@ -34,12 +34,6 @@ fc_copy_sources(OpenSCAD "${CMAKE_BINARY
+@@ -33,12 +33,6 @@ fc_copy_sources(OpenSCAD "${CMAKE_BINARY
INSTALL(
FILES
diff --git a/debian/patches/fix_FTBFS_on_precise.patch b/debian/patches/fix_FTBFS_on_precise.patch
index ed76949..8a5d1bd 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.13.3637-dfsg/src/Mod/Image/Gui/GLImageBox.cpp
+Index: freecad/src/Mod/Image/Gui/GLImageBox.cpp
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/Mod/Image/Gui/GLImageBox.cpp
-+++ freecad-0.13.3637-dfsg/src/Mod/Image/Gui/GLImageBox.cpp
+--- freecad.orig/src/Mod/Image/Gui/GLImageBox.cpp
++++ freecad/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 0c799c2..f7ec2ac 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.13.3637-dfsg/src/3rdParty/salomesmesh/inc/Rn.h
+Index: freecad/src/3rdParty/salomesmesh/inc/Rn.h
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/3rdParty/salomesmesh/inc/Rn.h
-+++ freecad-0.13.3637-dfsg/src/3rdParty/salomesmesh/inc/Rn.h
+--- freecad.orig/src/3rdParty/salomesmesh/inc/Rn.h
++++ freecad/src/3rdParty/salomesmesh/inc/Rn.h
@@ -33,7 +33,7 @@
#include <gp_Dir.hxx> //Dans OpenCascade
@@ -270,10 +270,10 @@ Index: freecad-0.13.3637-dfsg/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.13.3637-dfsg/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
+Index: freecad/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
-+++ freecad-0.13.3637-dfsg/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
@@ -61,7 +61,7 @@ public:
typedef std::vector< StdMeshers_FaceSidePtr > TWireVector;
@@ -292,10 +292,10 @@ Index: freecad-0.13.3637-dfsg/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D
std::vector< const SMDS_MeshNode*>& mefistoToDS,
double scalex, double scaley);
-Index: freecad-0.13.3637-dfsg/src/3rdParty/salomesmesh/inc/aptrte.h
+Index: freecad/src/3rdParty/salomesmesh/inc/aptrte.h
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/3rdParty/salomesmesh/inc/aptrte.h
-+++ freecad-0.13.3637-dfsg/src/3rdParty/salomesmesh/inc/aptrte.h
+--- freecad.orig/src/3rdParty/salomesmesh/inc/aptrte.h
++++ freecad/src/3rdParty/salomesmesh/inc/aptrte.h
@@ -60,9 +60,9 @@
MEFISTO2D_EXPORT
@@ -401,10 +401,10 @@ Index: freecad-0.13.3637-dfsg/src/3rdParty/salomesmesh/inc/aptrte.h
//calcul de la surface d'un triangle defini par 3 points de r**2
#endif
-Index: freecad-0.13.3637-dfsg/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
+Index: freecad/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
-+++ freecad-0.13.3637-dfsg/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
@@ -468,10 +468,10 @@ Index: freecad-0.13.3637-dfsg/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.13.3637-dfsg/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
+Index: freecad/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
-+++ freecad-0.13.3637-dfsg/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
@@ -218,12 +218,12 @@ bool StdMeshers_MEFISTO_2D::Compute(SMES
Z nblf; //nombre de lignes fermees (enveloppe en tete)
diff --git a/debian/patches/use_share.patch b/debian/patches/use_share.patch
index 08c39c3..521c0af 100644
--- a/debian/patches/use_share.patch
+++ b/debian/patches/use_share.patch
@@ -1,7 +1,7 @@
-Index: freecad-0.13.3637-dfsg/src/App/FreeCADInit.py
+Index: freecad/src/App/FreeCADInit.py
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/App/FreeCADInit.py
-+++ freecad-0.13.3637-dfsg/src/App/FreeCADInit.py
+--- freecad.orig/src/App/FreeCADInit.py
++++ freecad/src/App/FreeCADInit.py
@@ -43,6 +43,8 @@ def InitApplications():
# Checking on FreeCAD module path ++++++++++++++++++++++++++++++++++++++++++
ModDir = FreeCAD.getHomePath()+'Mod'
@@ -35,10 +35,10 @@ Index: freecad-0.13.3637-dfsg/src/App/FreeCADInit.py
# new paths must be prepended to avoid to load a wrong version of a library
try:
os.environ["PATH"] = PathExtension + os.environ["PATH"]
-Index: freecad-0.13.3637-dfsg/src/Mod/Drawing/App/CMakeLists.txt
+Index: freecad/src/Mod/Drawing/App/CMakeLists.txt
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/Mod/Drawing/App/CMakeLists.txt
-+++ freecad-0.13.3637-dfsg/src/Mod/Drawing/App/CMakeLists.txt
+--- freecad.orig/src/Mod/Drawing/App/CMakeLists.txt
++++ freecad/src/Mod/Drawing/App/CMakeLists.txt
@@ -83,7 +83,7 @@ fc_target_copy_resource(Drawing
fc_target_copy_resource(Drawing
@@ -48,10 +48,10 @@ Index: freecad-0.13.3637-dfsg/src/Mod/Drawing/App/CMakeLists.txt
${Drawing_Templates})
SET_BIN_DIR(Drawing Drawing /Mod/Drawing)
-Index: freecad-0.13.3637-dfsg/src/Mod/Robot/App/CMakeLists.txt
+Index: freecad/src/Mod/Robot/App/CMakeLists.txt
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/Mod/Robot/App/CMakeLists.txt
-+++ freecad-0.13.3637-dfsg/src/Mod/Robot/App/CMakeLists.txt
+--- freecad.orig/src/Mod/Robot/App/CMakeLists.txt
++++ freecad/src/Mod/Robot/App/CMakeLists.txt
@@ -136,7 +136,7 @@ fc_target_copy_resource(Robot
fc_target_copy_resource(Robot
@@ -61,10 +61,10 @@ Index: freecad-0.13.3637-dfsg/src/Mod/Robot/App/CMakeLists.txt
${Robot_Resources})
SET_BIN_DIR(Robot Robot /Mod/Robot)
-Index: freecad-0.13.3637-dfsg/src/Mod/Start/Gui/CMakeLists.txt
+Index: freecad/src/Mod/Start/Gui/CMakeLists.txt
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/Mod/Start/Gui/CMakeLists.txt
-+++ freecad-0.13.3637-dfsg/src/Mod/Start/Gui/CMakeLists.txt
+--- freecad.orig/src/Mod/Start/Gui/CMakeLists.txt
++++ freecad/src/Mod/Start/Gui/CMakeLists.txt
@@ -72,7 +72,7 @@ fc_target_copy_resource(StartGui
fc_target_copy_resource(StartGui
@@ -74,10 +74,10 @@ Index: freecad-0.13.3637-dfsg/src/Mod/Start/Gui/CMakeLists.txt
${StartPage_Resources})
SET_BIN_DIR(StartGui StartGui /Mod/Start)
-Index: freecad-0.13.3637-dfsg/src/Mod/Start/CMakeLists.txt
+Index: freecad/src/Mod/Start/CMakeLists.txt
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/Mod/Start/CMakeLists.txt
-+++ freecad-0.13.3637-dfsg/src/Mod/Start/CMakeLists.txt
+--- freecad.orig/src/Mod/Start/CMakeLists.txt
++++ freecad/src/Mod/Start/CMakeLists.txt
@@ -10,5 +10,5 @@ INSTALL(
Init.py
InitGui.py
@@ -85,10 +85,10 @@ Index: freecad-0.13.3637-dfsg/src/Mod/Start/CMakeLists.txt
- Mod/Start
+ ${CMAKE_INSTALL_DATADIR}/Mod/Start
)
-Index: freecad-0.13.3637-dfsg/src/Mod/Start/StartPage/CMakeLists.txt
+Index: freecad/src/Mod/Start/StartPage/CMakeLists.txt
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/Mod/Start/StartPage/CMakeLists.txt
-+++ freecad-0.13.3637-dfsg/src/Mod/Start/StartPage/CMakeLists.txt
+--- freecad.orig/src/Mod/Start/StartPage/CMakeLists.txt
++++ freecad/src/Mod/Start/StartPage/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(StartPage_DATA
)
@@ -98,10 +98,10 @@ Index: freecad-0.13.3637-dfsg/src/Mod/Start/StartPage/CMakeLists.txt
)
INSTALL(FILES ${StartPage_DATA}
-Index: freecad-0.13.3637-dfsg/src/Mod/Raytracing/CMakeLists.txt
+Index: freecad/src/Mod/Raytracing/CMakeLists.txt
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/Mod/Raytracing/CMakeLists.txt
-+++ freecad-0.13.3637-dfsg/src/Mod/Raytracing/CMakeLists.txt
+--- freecad.orig/src/Mod/Raytracing/CMakeLists.txt
++++ freecad/src/Mod/Raytracing/CMakeLists.txt
@@ -10,7 +10,7 @@ INSTALL(
InitGui.py
RaytracingExample.py
@@ -111,10 +111,10 @@ Index: freecad-0.13.3637-dfsg/src/Mod/Raytracing/CMakeLists.txt
)
INSTALL(
-Index: freecad-0.13.3637-dfsg/src/Mod/Drawing/CMakeLists.txt
+Index: freecad/src/Mod/Drawing/CMakeLists.txt
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/Mod/Drawing/CMakeLists.txt
-+++ freecad-0.13.3637-dfsg/src/Mod/Drawing/CMakeLists.txt
+--- freecad.orig/src/Mod/Drawing/CMakeLists.txt
++++ freecad/src/Mod/Drawing/CMakeLists.txt
@@ -12,7 +12,7 @@ INSTALL(
DrawingExample.py
DrawingTests.py
@@ -124,10 +124,10 @@ Index: freecad-0.13.3637-dfsg/src/Mod/Drawing/CMakeLists.txt
)
INSTALL(
-Index: freecad-0.13.3637-dfsg/src/Mod/Robot/CMakeLists.txt
+Index: freecad/src/Mod/Robot/CMakeLists.txt
===================================================================
---- freecad-0.13.3637-dfsg.orig/src/Mod/Robot/CMakeLists.txt
-+++ freecad-0.13.3637-dfsg/src/Mod/Robot/CMakeLists.txt
+--- freecad.orig/src/Mod/Robot/CMakeLists.txt
++++ freecad/src/Mod/Robot/CMakeLists.txt
@@ -13,7 +13,7 @@ INSTALL(
RobotExample.py
RobotExampleTrajectoryOutOfShapes.py
--
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