[freecad] 02/06: Update/remove patches.
Anton Gladky
gladk at moszumanska.debian.org
Sun May 25 22:52:33 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 0fe87be62cdafa35dc47af56c30b6b3fa2971d43
Author: Anton Gladky <gladk at debian.org>
Date: Sun May 25 16:57:30 2014 +0200
Update/remove patches.
---
debian/patches/coin80.patch | 24 ------
debian/patches/dir_as_string.patch | 34 ---------
debian/patches/disable_memory_check.patch | 14 ++--
.../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 | 76 ++++++++++---------
debian/patches/fix_syntax_importOca.patch | 22 ------
debian/patches/series | 2 -
debian/patches/set_install_rpath.patch | 18 -----
debian/patches/use_install_rpath.patch | 51 -------------
debian/patches/use_share.patch | 86 +++++++++++++---------
12 files changed, 118 insertions(+), 231 deletions(-)
diff --git a/debian/patches/coin80.patch b/debian/patches/coin80.patch
deleted file mode 100644
index 144290c..0000000
--- a/debian/patches/coin80.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: fix compilation error afainst coin80
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-05-23
-
---- freecad-0.13.1830-dfsg.orig/src/Gui/SoTextLabel.cpp
-+++ freecad-0.13.1830-dfsg/src/Gui/SoTextLabel.cpp
-@@ -55,7 +55,7 @@
- #include <Inventor/elements/SoViewVolumeElement.h>
- #include <Inventor/elements/SoViewportRegionElement.h>
- #include <Inventor/elements/SoGLTextureEnabledElement.h>
--#include <Inventor/elements/SoGLTexture3EnabledElement.h>
-+#include <Inventor/elements/SoMultiTextureEnabledElement.h>
-
- #include "SoTextLabel.h"
- #include "SoFCInteractiveElement.h"
-@@ -250,7 +250,7 @@ void SoTextLabel::GLRender(SoGLRenderAct
-
- // disable textures for all units
- SoGLTextureEnabledElement::set(state, this, FALSE);
-- SoGLTexture3EnabledElement::set(state, this, FALSE);
-+ SoMultiTextureEnabledElement::set(state, this, FALSE);
-
- glPushAttrib(GL_ENABLE_BIT | GL_PIXEL_MODE_BIT | GL_COLOR_BUFFER_BIT);
- glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
diff --git a/debian/patches/dir_as_string.patch b/debian/patches/dir_as_string.patch
deleted file mode 100644
index 724ee78..0000000
--- a/debian/patches/dir_as_string.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description:
- - only sets RESOURCEDIR, if not set via cmdline
- - markes CMAKE_INSTALL_INCLUDEDIR, CMAKE_INSTALL_DOCDIR, and
- CMAKE_INSTALL_DATADIR as string, otherwise i had problems with absolute
- pathes.
-Author: Sandro Knauß <bugs at sandroknauss.de>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -72,16 +72,20 @@
- ENDIF(NOT INSTALL_RPATH)
- 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")
-+SET(CMAKE_INSTALL_DATADIR data CACHE STRING "Output directory for data and resource files")
-+SET(CMAKE_INSTALL_INCLUDEDIR include CACHE STRING "Output directory for header files")
-+SET(CMAKE_INSTALL_DOCDIR doc CACHE STRING "Output directory for documentation and license files")
-
- # used as compiler defines
--SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
-+IF(NOT RESOURCEDIR)
-+ SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
-+ENDIF(NOT RESOURCEDIR)
-+
- SET(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
-
- MESSAGE( STATUS "prefix: ${CMAKE_INSTALL_PREFIX}")
- MESSAGE(STATUS "datadir: ${CMAKE_INSTALL_DATADIR}")
-+MESSAGE("RESOURCEDIR: ${RESOURCEDIR}")
- MESSAGE(STATUS "docdir: ${CMAKE_INSTALL_DOCDIR}")
- MESSAGE(STATUS "includedir: ${CMAKE_INSTALL_INCLUDEDIR}")
-
diff --git a/debian/patches/disable_memory_check.patch b/debian/patches/disable_memory_check.patch
index 0ca34de..e7ff008 100644
--- a/debian/patches/disable_memory_check.patch
+++ b/debian/patches/disable_memory_check.patch
@@ -7,8 +7,10 @@ Author: Anton Gladky <gladky.anton at gmail.com>
Bug-Debian: http://bugs.debian.org/623560
Last-Update: 2011-09-24
---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
-+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
+Index: freecad-0.13.3637-dfsg/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
@@ -42,12 +42,6 @@
#include <iterator>
using namespace std;
@@ -22,7 +24,7 @@ Last-Update: 2011-09-24
// number of added entitis to check memory after
#define CHECKMEMORY_INTERVAL 1000
-@@ -61,49 +55,7 @@
+@@ -61,49 +55,7 @@ using namespace std;
int SMDS_Mesh::CheckMemory(const bool doNotRaise) throw (std::bad_alloc)
{
@@ -73,8 +75,10 @@ Last-Update: 2011-09-24
}
///////////////////////////////////////////////////////////////////////////////
---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
-+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
+Index: freecad-0.13.3637-dfsg/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
@@ -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 29b3a19..c8d4cfc 100644
--- a/debian/patches/do_not_install_binary_examples.patch
+++ b/debian/patches/do_not_install_binary_examples.patch
@@ -2,8 +2,10 @@ Description: binary examples were removed, remove them from Cmake-target
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-09-18
---- a/data/examples/CMakeLists.txt
-+++ b/data/examples/CMakeLists.txt
+Index: freecad-0.13.3637-dfsg/data/examples/CMakeLists.txt
+===================================================================
+--- freecad-0.13.3637-dfsg.orig/data/examples/CMakeLists.txt
++++ freecad-0.13.3637-dfsg/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 7d75456..faf4c67 100644
--- a/debian/patches/exclude_ply.patch
+++ b/debian/patches/exclude_ply.patch
@@ -2,9 +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
---- a/src/Mod/OpenSCAD/CMakeLists.txt
-+++ b/src/Mod/OpenSCAD/CMakeLists.txt
-@@ -23,7 +23,7 @@
+Index: freecad-0.13.3637-dfsg/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
)
SOURCE_GROUP("ply" FILES ${ply_SRCS})
@@ -13,7 +15,7 @@ Last-Update: 2013-09-25
ADD_CUSTOM_TARGET(OpenSCAD ALL
SOURCES ${allfiles}
-@@ -33,12 +33,6 @@
+@@ -34,12 +34,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 1a98965..ed76949 100644
--- a/debian/patches/fix_FTBFS_on_precise.patch
+++ b/debian/patches/fix_FTBFS_on_precise.patch
@@ -4,8 +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
---- a/src/Mod/Image/Gui/GLImageBox.cpp
-+++ b/src/Mod/Image/Gui/GLImageBox.cpp
+Index: freecad-0.13.3637-dfsg/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
@@ -16,6 +16,7 @@
* *
***************************************************************************/
diff --git a/debian/patches/fix_armel_FTBFS.patch b/debian/patches/fix_armel_FTBFS.patch
index 7cbe2c0..0c799c2 100644
--- a/debian/patches/fix_armel_FTBFS.patch
+++ b/debian/patches/fix_armel_FTBFS.patch
@@ -4,8 +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
---- a/src/3rdParty/salomesmesh/inc/Rn.h
-+++ b/src/3rdParty/salomesmesh/inc/Rn.h
+Index: freecad-0.13.3637-dfsg/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
@@ -33,7 +33,7 @@
#include <gp_Dir.hxx> //Dans OpenCascade
@@ -15,7 +17,7 @@ Last-Update: 2011-10-27
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// AUTEUR : Frederic HECHT ANALYSE NUMERIQUE UPMC PARIS OCTOBRE 2000
// MODIFS : Alain PERRONNET ANALYSE NUMERIQUE UPMC PARIS NOVEMBRE 2000
-@@ -84,155 +84,155 @@
+@@ -84,155 +84,155 @@ typedef double R;
//==============
//typedef struct { short int x,y } XPoint; //en fait ce type est defini dans X11-Window
// #include <X11/Xlib.h>
@@ -268,9 +270,11 @@ Last-Update: 2011-10-27
+{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
---- a/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
-+++ b/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
-@@ -61,7 +61,7 @@
+Index: freecad-0.13.3637-dfsg/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
+@@ -61,7 +61,7 @@ public:
typedef std::vector< StdMeshers_FaceSidePtr > TWireVector;
bool LoadPoints(TWireVector & wires,
@@ -279,7 +283,7 @@ Last-Update: 2011-10-27
std::vector< const SMDS_MeshNode*>& mefistoToDS,
double scalex, double scaley);
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ public:
double& scalex,
double& scaley);
@@ -288,8 +292,10 @@ Last-Update: 2011-10-27
std::vector< const SMDS_MeshNode*>& mefistoToDS,
double scalex, double scaley);
---- a/src/3rdParty/salomesmesh/inc/aptrte.h
-+++ b/src/3rdParty/salomesmesh/inc/aptrte.h
+Index: freecad-0.13.3637-dfsg/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
@@ -60,9 +60,9 @@
MEFISTO2D_EXPORT
@@ -303,7 +309,7 @@ Last-Update: 2011-10-27
Z & ierr );
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// but : appel de la triangulation par un arbre-4 recouvrant
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ MEFISTO2D_EXPORT
#define tesuex TESUEX
#define teamqt TEAMQT
#define nusotr NUSOTR
@@ -312,7 +318,7 @@ Last-Update: 2011-10-27
#define surtd2 SURTD2
#define qualitetrte QUALITETRTE
-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ MEFISTO2D_EXPORT
#endif
@@ -321,7 +327,7 @@ Last-Update: 2011-10-27
Z & mosoar, Z & mxsoar, Z *mnsoar,
Z & moartr, Z & mxartr, Z *mnartr,
Z & nbtria, R & quamoy, R & quamin ); }
-@@ -258,20 +258,20 @@
+@@ -258,20 +258,20 @@ extern "C" {void MEFISTO2D_STDCALL fasoa
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//initialisation du tableau letree et ajout dans letree des sommets 1 a nbsomm
@@ -346,7 +352,7 @@ Last-Update: 2011-10-27
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 @@
+@@ -283,14 +283,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
@@ -363,7 +369,7 @@ Last-Update: 2011-10-27
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 @@
+@@ -301,7 +301,7 @@ extern "C" { void MEFISTO2D_STDCALL tere
// triangulation frontale pour les restaurer
extern "C" { void MEFISTO2D_STDCALL tesuex( Z & nblf, Z * nulftr,
@@ -372,7 +378,7 @@ Last-Update: 2011-10-27
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 @@
+@@ -314,7 +314,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,
@@ -381,7 +387,7 @@ Last-Update: 2011-10-27
Z & ierr );
}
// amelioration de la qualite de la triangulation par
-@@ -327,10 +327,10 @@
+@@ -327,10 +327,10 @@ extern "C" { void MEFISTO2D_STDCALL nuso
}
//retrouver les numero des 3 sommets du triangle nt
@@ -395,9 +401,11 @@ Last-Update: 2011-10-27
//calcul de la surface d'un triangle defini par 3 points de r**2
#endif
---- a/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
-+++ b/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
-@@ -68,9 +68,9 @@
+Index: freecad-0.13.3637-dfsg/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
+@@ -68,9 +68,9 @@ void MEFISTO2D_STDCALL deltacpu_( R & dt
void aptrte( Z nutysu, R aretmx,
@@ -410,7 +418,7 @@ Last-Update: 2011-10-27
Z & nbt, Z * & nust,
Z & ierr )
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -122,11 +122,11 @@
+@@ -122,11 +122,11 @@ void aptrte( Z nutysu, R aretmx,
//no st1, st2, st3, 0 (non quadrangle)
R d, tcpu=0;
@@ -424,7 +432,7 @@ Last-Update: 2011-10-27
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 @@
+@@ -141,7 +141,7 @@ void aptrte( Z nutysu, R aretmx,
Z *mnarst=NULL;
Z *mnlftr=NULL;
@@ -433,7 +441,7 @@ Last-Update: 2011-10-27
R aremin, aremax; //longueur minimale et maximale des aretes
R airemx; //aire maximale souhaitee d'un triangle
R quamoy, quamin;
-@@ -171,7 +171,7 @@
+@@ -171,7 +171,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;
@@ -442,7 +450,7 @@ Last-Update: 2011-10-27
if( mnpxyd==NULL ) goto ERREUR;
// le tableau mnsoar des aretes des triangles
-@@ -633,7 +633,7 @@
+@@ -633,7 +633,7 @@ void aptrte( Z nutysu, R aretmx,
// generation du tableau uvst de la surface triangulee
// ---------------------------------------------------
if( uvst != NULL ) delete [] uvst;
@@ -451,7 +459,7 @@ Last-Update: 2011-10-27
if( uvst == NULL ) goto ERREUR;
nbst=-1;
-@@ -733,7 +733,7 @@
+@@ -733,7 +733,7 @@ void aptrte( Z nutysu, R aretmx,
}
}
@@ -460,9 +468,11 @@ Last-Update: 2011-10-27
Z & mosoar, Z & mxsoar, Z *mnsoar,
Z & moartr, Z & mxartr, Z *mnartr,
Z & nbtria, R & quamoy, R & quamin )
---- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
-+++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MEFISTO_2D.cpp
-@@ -218,12 +218,12 @@
+Index: freecad-0.13.3637-dfsg/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
+@@ -218,12 +218,12 @@ bool StdMeshers_MEFISTO_2D::Compute(SMES
Z nblf; //nombre de lignes fermees (enveloppe en tete)
Z *nudslf = NULL; //numero du dernier sommet de chaque ligne fermee
@@ -478,7 +488,7 @@ Last-Update: 2011-10-27
Z nbt;
Z *nust = NULL;
Z ierr = 0;
-@@ -246,7 +246,7 @@
+@@ -246,7 +246,7 @@ bool StdMeshers_MEFISTO_2D::Compute(SMES
nudslf[iw++] = nbpnt;
}
@@ -487,7 +497,7 @@ Last-Update: 2011-10-27
double scalex, scaley;
ComputeScaleOnFace(aMesh, F, scalex, scaley);
-@@ -288,7 +288,7 @@
+@@ -288,7 +288,7 @@ bool StdMeshers_MEFISTO_2D::Compute(SMES
//purpose : prevent failure due to overlapped adjacent links
//=======================================================================
@@ -496,7 +506,7 @@ Last-Update: 2011-10-27
{
gp_XY v1( uv0.x - uv1.x, uv0.y - uv1.y );
gp_XY v2( uv2.x - uv1.x, uv2.y - uv1.y );
-@@ -339,7 +339,7 @@
+@@ -339,7 +339,7 @@ static bool fixOverlappedLinkUV( R2& uv0
//purpose :
//=======================================================================
@@ -505,7 +515,7 @@ Last-Update: 2011-10-27
const TopoDS_Vertex& theV,
const TopoDS_Face& theF,
const TopTools_IndexedDataMapOfShapeListOfShape & theVWMap,
-@@ -438,7 +438,7 @@
+@@ -438,7 +438,7 @@ static bool fixCommonVertexUV (R2 &
nextUV = uv;
}
}
@@ -514,7 +524,7 @@ Last-Update: 2011-10-27
uv0.x = thisUV.X(); uv0.y = thisUV.Y();
uv1.x = nextUV.X(); uv1.y = nextUV.Y();
uv2.x = thisUV.X(); uv2.y = thisUV.Y();
-@@ -472,7 +472,7 @@
+@@ -472,7 +472,7 @@ static bool fixCommonVertexUV (R2 &
//=============================================================================
bool StdMeshers_MEFISTO_2D::LoadPoints(TWireVector & wires,
@@ -523,7 +533,7 @@ Last-Update: 2011-10-27
vector<const SMDS_MeshNode*>& mefistoToDS,
double scalex,
double scaley)
-@@ -647,7 +647,7 @@
+@@ -647,7 +647,7 @@ void StdMeshers_MEFISTO_2D::ComputeScale
*/
//=============================================================================
diff --git a/debian/patches/fix_syntax_importOca.patch b/debian/patches/fix_syntax_importOca.patch
deleted file mode 100644
index 9bacc60..0000000
--- a/debian/patches/fix_syntax_importOca.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: fix syntax error.
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-09-27
-
---- a/src/Mod/Draft/importOCA.py
-+++ b/src/Mod/Draft/importOCA.py
-@@ -258,13 +258,13 @@
- oca.write("# edges\r\n")
- count = 1
- for e in edges:
-- if DraftGeomUtils.geomType(e) == "Line"):
-+ if (DraftGeomUtils.geomType(e) == "Line"):
- oca.write("L"+str(count)+"=")
- oca.write(writepoint(e.Vertexes[0].Point))
- oca.write(" ")
- oca.write(writepoint(e.Vertexes[-1].Point))
- oca.write("\r\n")
-- elif DraftGeomUtils.geomType(e) == "Circle"):
-+ elif (DraftGeomUtils.geomType(e) == "Circle"):
- if (len(e.Vertexes) > 1):
- oca.write("C"+str(count)+"=ARC ")
- oca.write(writepoint(e.Vertexes[0].Point))
diff --git a/debian/patches/series b/debian/patches/series
index cd4cd7d..8f1161e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
fix_armel_FTBFS.patch
fix_FTBFS_on_precise.patch
-set_install_rpath.patch
-use_install_rpath.patch
use_share.patch
do_not_install_binary_examples.patch
exclude_ply.patch
diff --git a/debian/patches/set_install_rpath.patch b/debian/patches/set_install_rpath.patch
deleted file mode 100644
index 5fc34bb..0000000
--- a/debian/patches/set_install_rpath.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Let INSTALL_RPATH be set from the command line
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-06-14
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,7 +65,10 @@
- SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "Installation root directory")
- else(WIN32)
- SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH "Installation root directory")
-- SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+
-+ IF(NOT INSTALL_RPATH)
-+ SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+ ENDIF(NOT INSTALL_RPATH)
- endif(WIN32)
-
- SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
diff --git a/debian/patches/use_install_rpath.patch b/debian/patches/use_install_rpath.patch
deleted file mode 100644
index 905bc94..0000000
--- a/debian/patches/use_install_rpath.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/src/Mod/PartDesign/App/CMakeLists.txt
-+++ b/src/Mod/PartDesign/App/CMakeLists.txt
-@@ -98,7 +98,6 @@
- )
-
- SET(PartDesign_Scripts
-- __init__.py
- Init.py
- TestPartDesignApp.py
- Scripts/__init__.py
-@@ -132,9 +131,9 @@
- else(MSVC)
- set_target_properties(PartDesign PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
- set_target_properties(PartDesign PROPERTIES PREFIX "")
-- set_target_properties(PartDesign PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/Mod/PartDesign)
-+ set_target_properties(PartDesign PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
- endif(MSVC)
-
- # The PartDesign module must go to where the __init__.py file is
--INSTALL(TARGETS PartDesign DESTINATION Mod/PartDesign)
-+INSTALL(TARGETS PartDesign DESTINATION lib)
-
---- a/src/Mod/PartDesign/Gui/CMakeLists.txt
-+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
-@@ -201,9 +201,9 @@
- else(MSVC)
- set_target_properties(PartDesignGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
- set_target_properties(PartDesignGui PROPERTIES PREFIX "")
-- set_target_properties(PartDesignGui PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/Mod/PartDesign)
-+ set_target_properties(PartDesignGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
- endif(MSVC)
-
- # The PartDesign module must go to where the __init__.py file is
--INSTALL(TARGETS PartDesignGui DESTINATION Mod/PartDesign)
-+INSTALL(TARGETS PartDesignGui DESTINATION lib)
-
---- a/src/Mod/PartDesign/__init__.py
-+++ /dev/null
-@@ -1,2 +0,0 @@
--import PartDesign
--makeFilletArc = PartDesign.makeFilletArc
---- a/src/Mod/PartDesign/CMakeLists.txt
-+++ b/src/Mod/PartDesign/CMakeLists.txt
-@@ -6,7 +6,6 @@
-
- INSTALL(
- FILES
-- __init__.py
- Init.py
- InitGui.py
- TestPartDesignApp.py
diff --git a/debian/patches/use_share.patch b/debian/patches/use_share.patch
index ffde70c..08c39c3 100644
--- a/debian/patches/use_share.patch
+++ b/debian/patches/use_share.patch
@@ -1,6 +1,8 @@
---- a/src/App/FreeCADInit.py
-+++ b/src/App/FreeCADInit.py
-@@ -43,6 +43,8 @@
+Index: freecad-0.13.3637-dfsg/src/App/FreeCADInit.py
+===================================================================
+--- freecad-0.13.3637-dfsg.orig/src/App/FreeCADInit.py
++++ freecad-0.13.3637-dfsg/src/App/FreeCADInit.py
+@@ -43,6 +43,8 @@ def InitApplications():
# Checking on FreeCAD module path ++++++++++++++++++++++++++++++++++++++++++
ModDir = FreeCAD.getHomePath()+'Mod'
ModDir = os.path.realpath(ModDir)
@@ -9,7 +11,7 @@
BinDir = FreeCAD.getHomePath()+'bin'
BinDir = os.path.realpath(BinDir)
LibDir = FreeCAD.getHomePath()+'lib'
-@@ -65,6 +67,14 @@
+@@ -65,6 +67,14 @@ def InitApplications():
for i in ModDirs: ModDict[i.lower()] = os.path.join(ModDir,i)
else:
Wrn ("No modules found in " + ModDir + "\n")
@@ -24,18 +26,20 @@
# Search for additional modules in the home directory
if os.path.isdir(HomeMod):
HomeMods = os.listdir(HomeMod)
-@@ -105,6 +115,8 @@
+@@ -105,6 +115,8 @@ def InitApplications():
sys.path.insert(0,LibDir)
sys.path.insert(0,ModDir)
Log("Using "+ModDir+" as module path!\n")
+ sys.path.insert(0,ModShareDir)
+ Log("Using "+ModShareDir+" as module path!\n")
# new paths must be prepended to avoid to load a wrong version of a library
- os.environ["PATH"] = PathExtension + os.environ["PATH"]
- path = os.environ["PATH"].split(os.pathsep)
---- a/src/Mod/Drawing/App/CMakeLists.txt
-+++ b/src/Mod/Drawing/App/CMakeLists.txt
-@@ -82,7 +82,7 @@
+ try:
+ os.environ["PATH"] = PathExtension + os.environ["PATH"]
+Index: freecad-0.13.3637-dfsg/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
+@@ -83,7 +83,7 @@ fc_target_copy_resource(Drawing
fc_target_copy_resource(Drawing
${CMAKE_SOURCE_DIR}/src/Mod/Drawing
@@ -43,10 +47,12 @@
+ ${CMAKE_INSTALL_DATADIR}/Mod/Drawing
${Drawing_Templates})
- if(MSVC)
---- a/src/Mod/Robot/App/CMakeLists.txt
-+++ b/src/Mod/Robot/App/CMakeLists.txt
-@@ -135,7 +135,7 @@
+ SET_BIN_DIR(Drawing Drawing /Mod/Drawing)
+Index: freecad-0.13.3637-dfsg/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
+@@ -136,7 +136,7 @@ fc_target_copy_resource(Robot
fc_target_copy_resource(Robot
${CMAKE_SOURCE_DIR}/src/Mod/Robot
@@ -54,10 +60,12 @@
+ ${CMAKE_INSTALL_DATADIR}/Mod/Robot
${Robot_Resources})
-
---- a/src/Mod/Start/Gui/CMakeLists.txt
-+++ b/src/Mod/Start/Gui/CMakeLists.txt
-@@ -72,7 +72,7 @@
+ SET_BIN_DIR(Robot Robot /Mod/Robot)
+Index: freecad-0.13.3637-dfsg/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
+@@ -72,7 +72,7 @@ fc_target_copy_resource(StartGui
fc_target_copy_resource(StartGui
${CMAKE_SOURCE_DIR}/src/Mod/Start
@@ -65,19 +73,23 @@
+ ${CMAKE_INSTALL_DATADIR}/Mod/Start
${StartPage_Resources})
- if(MSVC)
---- a/src/Mod/Start/CMakeLists.txt
-+++ b/src/Mod/Start/CMakeLists.txt
-@@ -10,5 +10,5 @@
+ SET_BIN_DIR(StartGui StartGui /Mod/Start)
+Index: freecad-0.13.3637-dfsg/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
+@@ -10,5 +10,5 @@ INSTALL(
Init.py
InitGui.py
DESTINATION
- Mod/Start
+ ${CMAKE_INSTALL_DATADIR}/Mod/Start
)
---- a/src/Mod/Start/StartPage/CMakeLists.txt
-+++ b/src/Mod/Start/StartPage/CMakeLists.txt
-@@ -33,7 +33,7 @@
+Index: freecad-0.13.3637-dfsg/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
+@@ -34,7 +34,7 @@ SET(StartPage_DATA
)
INSTALL(FILES ${StartPage_SRCS}
@@ -86,9 +98,11 @@
)
INSTALL(FILES ${StartPage_DATA}
---- a/src/Mod/Raytracing/CMakeLists.txt
-+++ b/src/Mod/Raytracing/CMakeLists.txt
-@@ -10,7 +10,7 @@
+Index: freecad-0.13.3637-dfsg/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
+@@ -10,7 +10,7 @@ INSTALL(
InitGui.py
RaytracingExample.py
DESTINATION
@@ -97,9 +111,11 @@
)
INSTALL(
---- a/src/Mod/Drawing/CMakeLists.txt
-+++ b/src/Mod/Drawing/CMakeLists.txt
-@@ -12,7 +12,7 @@
+Index: freecad-0.13.3637-dfsg/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
+@@ -12,7 +12,7 @@ INSTALL(
DrawingExample.py
DrawingTests.py
DESTINATION
@@ -108,9 +124,11 @@
)
INSTALL(
---- a/src/Mod/Robot/CMakeLists.txt
-+++ b/src/Mod/Robot/CMakeLists.txt
-@@ -13,7 +13,7 @@
+Index: freecad-0.13.3637-dfsg/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
+@@ -13,7 +13,7 @@ INSTALL(
RobotExample.py
RobotExampleTrajectoryOutOfShapes.py
DESTINATION
--
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