[freecad] 01/02: Update patches, remove some of them.
Anton Gladky
gladk at alioth.debian.org
Wed Sep 18 19:04:54 UTC 2013
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository freecad.
commit 37d60d07c8fd6469e0367f0ba9c308518a06230a
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Wed Sep 18 21:03:50 2013 +0200
Update patches, remove some of them.
---
.../patches/do_not_install_binary_examples.patch | 18 ++++++++++++
debian/patches/fix_armel_FTBFS.patch | 30 ++++++++++----------
debian/patches/series | 7 +++--
debian/patches/set_install_rpath.patch | 2 +-
debian/patches/use_install_rpath.patch | 4 +--
debian/patches/use_share.patch | 2 +-
6 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/debian/patches/do_not_install_binary_examples.patch b/debian/patches/do_not_install_binary_examples.patch
new file mode 100644
index 0000000..a33d3c4
--- /dev/null
+++ b/debian/patches/do_not_install_binary_examples.patch
@@ -0,0 +1,18 @@
+Description: binary examples were removed, remove them from Cmake-target
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-09-18
+
+--- freecad-0.13.2519-dfsg.orig/data/examples/CMakeLists.txt
++++ freecad-0.13.2519-dfsg/data/examples/CMakeLists.txt
+@@ -1,11 +1,6 @@
+
+ SET(Examples_Files
+ Schenkel.stp
+- DrawingExample.FCStd
+- EngineBlock.FCStd
+- PartDesignExample.FCStd
+- RobotExample.FCStd
+- ArchDetail.FCStd
+ )
+
+ ADD_CUSTOM_TARGET(Example_data ALL
diff --git a/debian/patches/fix_armel_FTBFS.patch b/debian/patches/fix_armel_FTBFS.patch
index 0329bf4..7cbe2c0 100644
--- a/debian/patches/fix_armel_FTBFS.patch
+++ b/debian/patches/fix_armel_FTBFS.patch
@@ -270,7 +270,7 @@ Last-Update: 2011-10-27
#endif
--- a/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
+++ b/src/3rdParty/salomesmesh/inc/StdMeshers_MEFISTO_2D.hxx
-@@ -64,7 +64,7 @@
+@@ -61,7 +61,7 @@
typedef std::vector< StdMeshers_FaceSidePtr > TWireVector;
bool LoadPoints(TWireVector & wires,
@@ -279,7 +279,7 @@ Last-Update: 2011-10-27
std::vector< const SMDS_MeshNode*>& mefistoToDS,
double scalex, double scaley);
-@@ -73,7 +73,7 @@
+@@ -70,7 +70,7 @@
double& scalex,
double& scaley);
@@ -397,7 +397,7 @@ Last-Update: 2011-10-27
#endif
--- a/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
+++ b/src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp
-@@ -73,9 +73,9 @@
+@@ -68,9 +68,9 @@
void aptrte( Z nutysu, R aretmx,
@@ -410,7 +410,7 @@ Last-Update: 2011-10-27
Z & nbt, Z * & nust,
Z & ierr )
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -127,11 +127,11 @@
+@@ -122,11 +122,11 @@
//no st1, st2, st3, 0 (non quadrangle)
R d, tcpu=0;
@@ -424,7 +424,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
-@@ -146,7 +146,7 @@
+@@ -141,7 +141,7 @@
Z *mnarst=NULL;
Z *mnlftr=NULL;
@@ -433,7 +433,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;
-@@ -176,7 +176,7 @@
+@@ -171,7 +171,7 @@
NEWDEPART:
//mnpxyd( 3, mxsomm ) les coordonnees UV des sommets et la taille d'arete aux sommets
if( mnpxyd!=NULL ) delete [] mnpxyd;
@@ -442,7 +442,7 @@ Last-Update: 2011-10-27
if( mnpxyd==NULL ) goto ERREUR;
// le tableau mnsoar des aretes des triangles
-@@ -638,7 +638,7 @@
+@@ -633,7 +633,7 @@
// generation du tableau uvst de la surface triangulee
// ---------------------------------------------------
if( uvst != NULL ) delete [] uvst;
@@ -451,7 +451,7 @@ Last-Update: 2011-10-27
if( uvst == NULL ) goto ERREUR;
nbst=-1;
-@@ -738,7 +738,7 @@
+@@ -733,7 +733,7 @@
}
}
@@ -462,7 +462,7 @@ Last-Update: 2011-10-27
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
-@@ -223,12 +223,12 @@
+@@ -218,12 +218,12 @@
Z nblf; //nombre de lignes fermees (enveloppe en tete)
Z *nudslf = NULL; //numero du dernier sommet de chaque ligne fermee
@@ -478,7 +478,7 @@ Last-Update: 2011-10-27
Z nbt;
Z *nust = NULL;
Z ierr = 0;
-@@ -251,7 +251,7 @@
+@@ -246,7 +246,7 @@
nudslf[iw++] = nbpnt;
}
@@ -487,7 +487,7 @@ Last-Update: 2011-10-27
double scalex, scaley;
ComputeScaleOnFace(aMesh, F, scalex, scaley);
-@@ -377,7 +377,7 @@
+@@ -288,7 +288,7 @@
//purpose : prevent failure due to overlapped adjacent links
//=======================================================================
@@ -496,7 +496,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 );
-@@ -428,7 +428,7 @@
+@@ -339,7 +339,7 @@
//purpose :
//=======================================================================
@@ -505,7 +505,7 @@ Last-Update: 2011-10-27
const TopoDS_Vertex& theV,
const TopoDS_Face& theF,
const TopTools_IndexedDataMapOfShapeListOfShape & theVWMap,
-@@ -527,7 +527,7 @@
+@@ -438,7 +438,7 @@
nextUV = uv;
}
}
@@ -514,7 +514,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();
-@@ -561,7 +561,7 @@
+@@ -472,7 +472,7 @@
//=============================================================================
bool StdMeshers_MEFISTO_2D::LoadPoints(TWireVector & wires,
@@ -523,7 +523,7 @@ Last-Update: 2011-10-27
vector<const SMDS_MeshNode*>& mefistoToDS,
double scalex,
double scaley)
-@@ -736,7 +736,7 @@
+@@ -647,7 +647,7 @@
*/
//=============================================================================
diff --git a/debian/patches/series b/debian/patches/series
index 3926208..bca02e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,9 @@
-disable_memory_check.patch
+#disable_memory_check.patch
fix_armel_FTBFS.patch
fix_FTBFS_on_precise.patch
set_install_rpath.patch
use_install_rpath.patch
use_share.patch
-dir_as_string.patch
-coin80.patch
+#dir_as_string.patch
+#coin80.patch
+do_not_install_binary_examples.patch
diff --git a/debian/patches/set_install_rpath.patch b/debian/patches/set_install_rpath.patch
index 0758720..5fc34bb 100644
--- a/debian/patches/set_install_rpath.patch
+++ b/debian/patches/set_install_rpath.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-06-14
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -66,7 +66,10 @@
+@@ -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")
diff --git a/debian/patches/use_install_rpath.patch b/debian/patches/use_install_rpath.patch
index 9541b76..1af563c 100644
--- a/debian/patches/use_install_rpath.patch
+++ b/debian/patches/use_install_rpath.patch
@@ -1,6 +1,6 @@
--- a/src/Mod/PartDesign/App/CMakeLists.txt
+++ b/src/Mod/PartDesign/App/CMakeLists.txt
-@@ -96,7 +96,6 @@
+@@ -97,7 +97,6 @@
)
SET(PartDesign_Scripts
@@ -8,7 +8,7 @@
Init.py
TestPartDesignApp.py
Scripts/__init__.py
-@@ -130,9 +129,9 @@
+@@ -131,9 +130,9 @@
else(MSVC)
set_target_properties(PartDesign PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
set_target_properties(PartDesign PROPERTIES PREFIX "")
diff --git a/debian/patches/use_share.patch b/debian/patches/use_share.patch
index 443665c..47aab68 100644
--- a/debian/patches/use_share.patch
+++ b/debian/patches/use_share.patch
@@ -35,7 +35,7 @@
path = os.environ["PATH"].split(os.pathsep)
--- a/src/Mod/Drawing/App/CMakeLists.txt
+++ b/src/Mod/Drawing/App/CMakeLists.txt
-@@ -86,7 +86,7 @@
+@@ -80,7 +80,7 @@
fc_target_copy_resource(Drawing
${CMAKE_SOURCE_DIR}/src/Mod/Drawing
--
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