[Git][debian-gis-team/sfcgal][master] 4 commits: Add another patch by Sebastien Loriot to fix FTBFS with CGAL 4.11.
Bas Couwenberg
gitlab at salsa.debian.org
Fri Mar 30 15:17:59 UTC 2018
Bas Couwenberg pushed to branch master at Debian GIS Project / sfcgal
Commits:
c8103a8b by Bas Couwenberg at 2018-03-22T21:23:00+01:00
Add another patch by Sebastien Loriot to fix FTBFS with CGAL 4.11.
- - - - -
f53763ea by Bas Couwenberg at 2018-03-30T16:46:27+02:00
Drop inputstreamreader.patch, not required.
- - - - -
e546fc96 by Bas Couwenberg at 2018-03-30T16:49:56+02:00
Add another patch by Sebastien Loriot to fix FTBFS with CGAL 4.11.
- - - - -
8cc6cdc4 by Bas Couwenberg at 2018-03-30T17:17:23+02:00
Update symbols for amd64.
- - - - -
6 changed files:
- debian/changelog
- debian/libsfcgal-osg1.symbols
- debian/libsfcgal1.symbols
- + debian/patches/fix-IO-input-with-gmpxx.patch
- debian/patches/series
- + debian/patches/the-polygons-of-the-convex-hull-are-always-triangulated.patch
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ sfcgal (1.3.2-1) UNRELEASED; urgency=medium
* Add patches by Sebastien Loriot to fix FTBFS with CGAL 4.11.
(closes: #876521)
* Add patch to remove FindCGAL.cmake, breaks Config mode.
+ * Update symbols for amd64.
-- Bas Couwenberg <sebastic at debian.org> Fri, 15 Sep 2017 20:49:16 +0200
=====================================
debian/libsfcgal-osg1.symbols
=====================================
--- a/debian/libsfcgal-osg1.symbols
+++ b/debian/libsfcgal-osg1.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 1.3.1 amd64 arm64 armhf hppa i386 kfreebsd-i386 m68k mips64el powerpc powerpcspe ppc64 ppc64el s390x
+# SymbolsHelper-Confirmed: 1.3.2 amd64
libSFCGAL-osg.so.1 libsfcgal-osg1 #MINVER#
_ZGVN4CGAL10Handle_forINS_3Nef14Polynomial_repIdEESaIS3_EE9allocatorE at Base 1.3.1
_ZGVN4CGAL10Handle_forINS_3Nef14Polynomial_repIiEESaIS3_EE9allocatorE at Base 1.3.1
@@ -43,9 +43,6 @@ libSFCGAL-osg.so.1 libsfcgal-osg1 #MINVER#
_ZN4CGAL10Handle_forINS_8Gmpz_repESaIS1_EE9allocatorE at Base 1.3.1
_ZN4CGAL10Handle_forINS_9Gmpfr_repESaIS1_EE9allocatorE at Base 1.3.1
_ZN4CGAL10Handle_forINS_9Gmpzf_repESaIS1_EE9allocatorE at Base 1.3.1
- _ZN4CGAL13Lazy_exact_ntINS_4GmpqEE31relative_precision_of_to_doubleE at Base 1.3.1
- _ZN4CGAL6HandleD1Ev at Base 1.3.1
- _ZN4CGAL6HandleD2Ev at Base 1.3.1
(optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZN5boost12basic_formatIcSt11char_traitsIcESaIcEE18make_or_reuse_dataEj at Base 1.3.1
(optional=templinst)_ZN5boost12basic_formatIcSt11char_traitsIcESaIcEE18make_or_reuse_dataEm at Base 1.3.1
(optional=templinst)_ZN5boost12basic_formatIcSt11char_traitsIcESaIcEE5clearEv at Base 1.3.1
@@ -76,18 +73,18 @@ libSFCGAL-osg.so.1 libsfcgal-osg1 #MINVER#
_ZN5boost16exception_detail14bad_exception_D0Ev at Base 1.3.1
_ZN5boost16exception_detail14bad_exception_D1Ev at Base 1.3.1
_ZN5boost16exception_detail14bad_exception_D2Ev at Base 1.3.1
- (optional=templinst|arch=armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io12too_few_argsEEC1ERKS4_ at Base 1.3.1
- (optional=templinst|arch=armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io12too_few_argsEEC2ERKS4_ at Base 1.3.1
+ (optional=templinst|arch=amd64 armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io12too_few_argsEEC1ERKS4_ at Base 1.3.1
+ (optional=templinst|arch=amd64 armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io12too_few_argsEEC2ERKS4_ at Base 1.3.1
(optional=templinst)_ZN5boost16exception_detail19error_info_injectorINS_2io12too_few_argsEED0Ev at Base 1.3.1
(optional=templinst)_ZN5boost16exception_detail19error_info_injectorINS_2io12too_few_argsEED1Ev at Base 1.3.1
(optional=templinst)_ZN5boost16exception_detail19error_info_injectorINS_2io12too_few_argsEED2Ev at Base 1.3.1
- (optional=templinst|arch=armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io13too_many_argsEEC1ERKS4_ at Base 1.3.1
- (optional=templinst|arch=armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io13too_many_argsEEC2ERKS4_ at Base 1.3.1
+ (optional=templinst|arch=amd64 armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io13too_many_argsEEC1ERKS4_ at Base 1.3.1
+ (optional=templinst|arch=amd64 armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io13too_many_argsEEC2ERKS4_ at Base 1.3.1
(optional=templinst)_ZN5boost16exception_detail19error_info_injectorINS_2io13too_many_argsEED0Ev at Base 1.3.1
(optional=templinst)_ZN5boost16exception_detail19error_info_injectorINS_2io13too_many_argsEED1Ev at Base 1.3.1
(optional=templinst)_ZN5boost16exception_detail19error_info_injectorINS_2io13too_many_argsEED2Ev at Base 1.3.1
- (optional=templinst|arch=armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io17bad_format_stringEEC1ERKS4_ at Base 1.3.1
- (optional=templinst|arch=armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io17bad_format_stringEEC2ERKS4_ at Base 1.3.1
+ (optional=templinst|arch=amd64 armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io17bad_format_stringEEC1ERKS4_ at Base 1.3.1
+ (optional=templinst|arch=amd64 armhf hppa)_ZN5boost16exception_detail19error_info_injectorINS_2io17bad_format_stringEEC2ERKS4_ at Base 1.3.1
(optional=templinst)_ZN5boost16exception_detail19error_info_injectorINS_2io17bad_format_stringEED0Ev at Base 1.3.1
(optional=templinst)_ZN5boost16exception_detail19error_info_injectorINS_2io17bad_format_stringEED1Ev at Base 1.3.1
(optional=templinst)_ZN5boost16exception_detail19error_info_injectorINS_2io17bad_format_stringEED2Ev at Base 1.3.1
@@ -238,18 +235,19 @@ libSFCGAL-osg.so.1 libsfcgal-osg1 #MINVER#
(optional=templinst)_ZNSaIN4CGAL10Handle_forINS_9Gmpzf_repESaIS1_EE10RefCountedEED2Ev at Base 1.3.1
(optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_ at Base 1.3.1
(optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_ at Base 1.3.1
- (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE19_M_emplace_back_auxIJRKS1_EEEvDpOT_ at Base 1.3.1
+ (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_ at Base 1.3.2
(optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZNSt6vectorIN5boost2io6detail11format_itemIcSt11char_traitsIcESaIcEEESaIS7_EE14_M_fill_assignEjRKS7_ at Base 1.3.1
(optional=templinst)_ZNSt6vectorIN5boost2io6detail11format_itemIcSt11char_traitsIcESaIcEEESaIS7_EE14_M_fill_assignEmRKS7_ at Base 1.3.1
(optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZNSt6vectorIN5boost2io6detail11format_itemIcSt11char_traitsIcESaIcEEESaIS7_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS7_S9_EEjRKS7_ at Base 1.3.1
(optional=templinst)_ZNSt6vectorIN5boost2io6detail11format_itemIcSt11char_traitsIcESaIcEEESaIS7_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS7_S9_EEmRKS7_ at Base 1.3.1
(optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iteratorjb at Base 1.3.1
(optional=templinst)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iteratormb at Base 1.3.1
- (optional=templinst)_ZNSt6vectorIjSaIjEE19_M_emplace_back_auxIJRKjEEEvDpOT_ at Base 1.3.1
+ (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_ at Base 1.3.2
(optional=templinst)_ZNSt8_Rb_treeIN5boost16exception_detail10type_info_ESt4pairIKS2_NS0_10shared_ptrINS1_15error_info_baseEEEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE24_M_get_insert_unique_posERS4_ at Base 1.3.1
(optional=templinst)_ZNSt8_Rb_treeIN5boost16exception_detail10type_info_ESt4pairIKS2_NS0_10shared_ptrINS1_15error_info_baseEEEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS4_ at Base 1.3.1
(optional=templinst)_ZNSt8_Rb_treeIN5boost16exception_detail10type_info_ESt4pairIKS2_NS0_10shared_ptrINS1_15error_info_baseEEEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_PSt18_Rb_tree_node_baseRT_ at Base 1.3.1
(optional=templinst)_ZNSt8_Rb_treeIN5boost16exception_detail10type_info_ESt4pairIKS2_NS0_10shared_ptrINS1_15error_info_baseEEEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E at Base 1.3.1
+ (optional=templinst)_ZNSt8_Rb_treeIN5boost16exception_detail10type_info_ESt4pairIKS2_NS0_10shared_ptrINS1_15error_info_baseEEEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EEaSERKSE_ at Base 1.3.2
_ZTIN3osg11MixinVectorINS_5Vec3fEEE at Base 1.3.1
_ZTIN3osg11MixinVectorIjEE at Base 1.3.1
_ZTIN3osg12DrawElementsE at Base 1.3.1
@@ -346,6 +344,7 @@ libSFCGAL-osg.so.1 libsfcgal-osg1 #MINVER#
_ZTVN5boost6detail17sp_counted_impl_pINS_16exception_detail10clone_implINS2_14bad_exception_EEEEE at Base 1.3.1
_ZTVN5boost6detail18sp_counted_impl_pdIPNS_2io18basic_altstringbufIcSt11char_traitsIcESaIcEEENS2_22basic_oaltstringstreamIcS5_S6_E5No_OpEEE at Base 1.3.1
_ZTVN5boost9exceptionE at Base 1.3.1
+ _ZZN4CGAL13Lazy_exact_ntI10__gmp_exprIA1_12__mpq_structS3_EE40relative_precision_of_to_double_internalEvE31relative_precision_of_to_double at Base 1.3.2
(optional=templinst)_ZZN5boost16exception_detail27get_static_exception_objectINS0_10bad_alloc_EEENS_13exception_ptrEvE2ep at Base 1.3.1
(optional=templinst)_ZZN5boost16exception_detail27get_static_exception_objectINS0_14bad_exception_EEENS_13exception_ptrEvE2ep at Base 1.3.1
(c++)"non-virtual thunk to boost::exception_detail::bad_alloc_::~bad_alloc_()@Base" 1.3.1
=====================================
debian/libsfcgal1.symbols
=====================================
The diff for this file was not included because it is too large.
=====================================
debian/patches/fix-IO-input-with-gmpxx.patch
=====================================
--- /dev/null
+++ b/debian/patches/fix-IO-input-with-gmpxx.patch
@@ -0,0 +1,74 @@
+Description: fix I/O input with gmpxx + make it similar to Gmpq
+Author: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot at cgal.org>
+Origin: https://github.com/Oslandia/SFCGAL/pull/157/commits/8de5943b4f392b1a6b7b4d89bfed5d735cb9a277
+Bug: https://github.com/Oslandia/SFCGAL/issues/145
+Bug-Debian: https://bugs.debian.org/876521
+
+--- a/src/Coordinate.cpp
++++ b/src/Coordinate.cpp
+@@ -267,10 +267,10 @@ private:
+
+ Kernel::FT _roundFT( const Kernel::FT& v ) const {
+ #ifdef CGAL_USE_GMPXX
+- return Kernel::FT( ::mpq_class(
+- SFCGAL::round( v.exact() * _scaleFactor ),
+- _scaleFactor
+- ) ) ;
++ ::mpq_class q( SFCGAL::round( v.exact() * _scaleFactor ),
++ _scaleFactor) ;
++ q.canonicalize();
++ return Kernel::FT(q);
+ #else
+ return Kernel::FT( CGAL::Gmpq(
+ SFCGAL::round( v.exact() * _scaleFactor ),
+--- a/src/detail/io/WktWriter.cpp
++++ b/src/detail/io/WktWriter.cpp
+@@ -40,6 +40,22 @@ namespace SFCGAL {
+ namespace detail {
+ namespace io {
+
++namespace impl {
++std::ostream& writeFT(std::ostream& s, const CGAL::Gmpq& ft)
++{
++ s << ft;
++ return s;
++}
++
++#ifdef CGAL_USE_GMPXX
++std::ostream& writeFT(std::ostream& s, const mpq_class& ft)
++{
++ s << ft.get_num() << "/" << ft.get_den();
++ return s;
++}
++#endif
++} //end of impl namespace
++
+ ///
+ ///
+ ///
+@@ -135,10 +151,12 @@ void WktWriter::writeCoordinateType( con
+ void WktWriter::writeCoordinate( const Point& g )
+ {
+ if ( _exactWrite ) {
+- _s << CGAL::exact( g.x() ) << " " << CGAL::exact( g.y() );
++ impl::writeFT(_s, CGAL::exact( g.x() )) << " ";
++ impl::writeFT(_s, CGAL::exact( g.y() ));
+
+ if ( g.is3D() ) {
+- _s << " " << CGAL::exact( g.z() );
++ _s << " ";
++ impl::writeFT(_s, CGAL::exact( g.z() ));
+ }
+ }
+ else {
+--- a/src/detail/tools/InputStreamReader.h
++++ b/src/detail/tools/InputStreamReader.h
+@@ -150,7 +150,7 @@ public:
+ skipWhiteSpaces();
+ }
+
+- if ( _s >> value ) {
++ if ( CGAL::Input_rep<T>(value)(_s) ) {
+ commit();
+ return true ;
+ }
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ Compatibility-with-gmpxx.patch
fix-gmpxx-compatibility-in-tests.patch
update-cmake-scripts.patch
remove-findcgal.patch
+fix-IO-input-with-gmpxx.patch
+the-polygons-of-the-convex-hull-are-always-triangulated.patch
=====================================
debian/patches/the-polygons-of-the-convex-hull-are-always-triangulated.patch
=====================================
--- /dev/null
+++ b/debian/patches/the-polygons-of-the-convex-hull-are-always-triangulated.patch
@@ -0,0 +1,15 @@
+Description: the polygons of the convex hull are always triangulated
+Author: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot at cgal.org>
+Origin: https://github.com/Oslandia/SFCGAL/pull/157/commits/174dbb78303e6365bcf72ce920cb0a0c918b589b
+
+--- a/test/unit/SFCGAL/algorithm/ConvexHullTest.cpp
++++ b/test/unit/SFCGAL/algorithm/ConvexHullTest.cpp
+@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE( testConvexHull3D_L
+ LineString lineString( points ) ;
+ std::auto_ptr< Geometry > hull( algorithm::convexHull3D( lineString ) );
+ BOOST_CHECK( hull->is< PolyhedralSurface >() );
+- BOOST_CHECK_EQUAL( hull->as< PolyhedralSurface >().numPolygons(), 1U );
++ BOOST_CHECK_EQUAL( hull->as< PolyhedralSurface >().numPolygons(), 2U );
+ }
+
+
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/6f577f50b0da4856954cbf2905f41197e4c9ae12...8cc6cdc47b050feb30292fe3b18c6bf98078e0b9
---
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/6f577f50b0da4856954cbf2905f41197e4c9ae12...8cc6cdc47b050feb30292fe3b18c6bf98078e0b9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180330/dfe1860f/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list