[Git][debian-gis-team/sfcgal][master] 4 commits: Apply patch by Joachim Reichel to fix FTBFS with CGAL 5.0.
Bas Couwenberg
gitlab at salsa.debian.org
Fri Dec 6 06:57:14 GMT 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / sfcgal
Commits:
9e5be04c by Bas Couwenberg at 2019-12-06T05:49:10Z
Apply patch by Joachim Reichel to fix FTBFS with CGAL 5.0.
Add patch to fix FTBFS with CGAL >= 5.0 (Closes: #946229).
Add Build-Depends: libcgal-dev (>= 5.0~).
- - - - -
445c8c8a by Bas Couwenberg at 2019-12-06T06:27:05Z
Drop unused lintian overrides.
- - - - -
0f16f7a6 by Bas Couwenberg at 2019-12-06T06:27:28Z
Update symbols for amd64.
- - - - -
2487b282 by Bas Couwenberg at 2019-12-06T06:27:30Z
Set distribution to unstable.
- - - - -
7 changed files:
- debian/changelog
- debian/control
- − debian/libsfcgal1.lintian-overrides
- debian/libsfcgal1.symbols
- + debian/patches/fix-ftbfs-with-cgal-5.x.patch
- + debian/patches/fix-linker-error.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,15 @@
-sfcgal (1.3.7-3) UNRELEASED; urgency=medium
+sfcgal (1.3.7-3) unstable; urgency=medium
+ [ Bas Couwenberg ]
* Bump Standards-Version to 4.4.1, no changes.
+ * Drop unused lintian overrides.
+ * Update symbols for amd64.
+
+ [ Joachim Reichel ]
+ * Add patch to fix FTBFS with CGAL >= 5.0 (Closes: #946229).
+ * Add Build-Depends: libcgal-dev (>= 5.0~).
- -- Bas Couwenberg <sebastic at debian.org> Mon, 30 Sep 2019 20:01:59 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 06 Dec 2019 06:43:24 +0100
sfcgal (1.3.7-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Section: science
Priority: optional
Build-Depends: debhelper (>= 9.20160114),
cmake,
- libcgal-dev (>= 4.10.1),
+ libcgal-dev (>= 5.0~),
libboost-all-dev,
libmpfr-dev,
libgmp-dev,
=====================================
debian/libsfcgal1.lintian-overrides deleted
=====================================
@@ -1,7 +0,0 @@
-# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
-# Fortify Source functions: no, only unprotected functions found!
-hardening-no-fortify-functions usr/lib/*/libSFCGAL.so.*
-
-# Source uses __FILE__ macro
-file-references-package-build-path *
-
=====================================
debian/libsfcgal1.symbols
=====================================
The diff for this file was not included because it is too large.
=====================================
debian/patches/fix-ftbfs-with-cgal-5.x.patch
=====================================
@@ -0,0 +1,43 @@
+Description: Require C++14 and CGAL >= 5.0
+Author: Joachim Reichel <reichel at debian.org>
+Bug: https://github.com/Oslandia/SFCGAL/issues/198
+Bug-Debian: https://bugs.debian.org/946229
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ cmake_minimum_required( VERSION 2.8 )
+ project( SFCGAL )
+
++set(CMAKE_CXX_STANDARD 14)
++
+ set( CMAKE_DEBUG_POSTFIX "d" )
+
+ #----------------------------------------------------------------------------
+@@ -51,19 +53,19 @@ endif()
+
+ # 4.3 minimal
+ # 4.13 recommended
+-find_package( CGAL 4.3 COMPONENTS Core REQUIRED )
++find_package( CGAL COMPONENTS Core REQUIRED )
+ message( STATUS "CGAL ${CGAL_VERSION} found" )
+
+ include_directories( ${CMAKE_BINARY_DIR}/include )
+
+ # For CGAL versions < 4.3, we add a local directory that contains some tweaked include files from unreleased versions
+ # They will overwrite files from the CGAL installation
+-if( "${CGAL_VERSION}" VERSION_LESS "4.3" )
+- include_directories( patches/CGAL-4.2 )
+-elseif( "${CGAL_VERSION}" VERSION_LESS "4.10")
+- include_directories( patches/CGAL-4.3 )
+- add_definitions( "-DCGAL_INTERSECTION_VERSION=1" )
+-endif()
++# if( "${CGAL_VERSION}" VERSION_LESS "4.3" )
++# include_directories( patches/CGAL-4.2 )
++# elseif( "${CGAL_VERSION}" VERSION_LESS "4.10")
++# include_directories( patches/CGAL-4.3 )
++# add_definitions( "-DCGAL_INTERSECTION_VERSION=1" )
++# endif()
+
+ #-- BOOST --------------------------------------------------
+ option( Boost_USE_AUTO_LINK "boost use autolink" OFF )
=====================================
debian/patches/fix-linker-error.patch
=====================================
@@ -0,0 +1,71 @@
+Description: Force GMPXX as workaround for a linker error (used to be the
+ default for CGAL 4.x packages)
+Author: Joachim Reichel <reichel at debian.org>
+Bug: https://github.com/Oslandia/SFCGAL/issues/198
+Bug-Debian: https://bugs.debian.org/946229
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,6 +55,7 @@ endif()
+ # 4.13 recommended
+ find_package( CGAL COMPONENTS Core REQUIRED )
+ message( STATUS "CGAL ${CGAL_VERSION} found" )
++add_definitions( "-DCGAL_USE_GMPXX=1" )
+
+ include_directories( ${CMAKE_BINARY_DIR}/include )
+
+--- a/test/garden/CMakeLists.txt
++++ b/test/garden/CMakeLists.txt
+@@ -7,7 +7,7 @@ set( REGRESS_NAME garden-test-SFCGAL )
+ add_executable( ${REGRESS_NAME} ${SFCGAL_REGRESS_GARDEN_TEST_SOURCES} )
+
+ target_link_libraries( ${REGRESS_NAME} SFCGAL)
+-target_link_libraries( ${REGRESS_NAME} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES})
++target_link_libraries( ${REGRESS_NAME} gmpxx ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES})
+
+ set_target_properties( ${REGRESS_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS ${REGRESS_NAME} DESTINATION bin )
+--- a/test/regress/convex_hull/CMakeLists.txt
++++ b/test/regress/convex_hull/CMakeLists.txt
+@@ -8,7 +8,7 @@ find_package(Boost REQUIRED COMPONENTS p
+
+ target_link_libraries( ${REGRESS_NAME} SFCGAL)
+
+-target_link_libraries( ${REGRESS_NAME} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES})
++target_link_libraries( ${REGRESS_NAME} gmpxx ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES})
+
+ set_target_properties( ${REGRESS_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS ${REGRESS_NAME} DESTINATION bin )
+--- a/test/regress/polygon_triangulator/CMakeLists.txt
++++ b/test/regress/polygon_triangulator/CMakeLists.txt
+@@ -7,7 +7,7 @@ add_executable( ${REGRESS_NAME} ${SFCGAL
+ find_package(Boost REQUIRED COMPONENTS program_options filesystem serialization)
+
+ target_link_libraries( ${REGRESS_NAME} SFCGAL)
+-target_link_libraries( ${REGRESS_NAME} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES})
++target_link_libraries( ${REGRESS_NAME} gmpxx ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES})
+
+
+ set_target_properties( ${REGRESS_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+--- a/test/unit/CMakeLists.txt
++++ b/test/unit/CMakeLists.txt
+@@ -5,7 +5,7 @@ find_package(Boost REQUIRED COMPONENTS u
+ file( GLOB_RECURSE SFCGAL_UNIT_TEST_SOURCES *.cpp )
+ add_executable( unit-test-SFCGAL ${SFCGAL_UNIT_TEST_SOURCES} )
+ target_link_libraries( unit-test-SFCGAL SFCGAL)
+-target_link_libraries(unit-test-SFCGAL ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES})
++target_link_libraries(unit-test-SFCGAL gmpxx ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES})
+
+ #include( PrecompiledHeader )
+ #if(PCHSupport_FOUND)
+--- a/test/regress/standalone/CMakeLists.txt
++++ b/test/regress/standalone/CMakeLists.txt
+@@ -4,7 +4,7 @@ add_executable( standalone-regress-test-
+
+ find_package(Boost REQUIRED COMPONENTS unit_test_framework filesystem serialization)
+
+-target_link_libraries( standalone-regress-test-SFCGAL SFCGAL ${Boost_LIBRARIES})
++target_link_libraries( standalone-regress-test-SFCGAL SFCGAL gmpxx ${Boost_LIBRARIES})
+
+ set_target_properties( standalone-regress-test-SFCGAL PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS standalone-regress-test-SFCGAL DESTINATION bin )
=====================================
debian/patches/series
=====================================
@@ -1 +1,3 @@
no-c++98.patch
+fix-ftbfs-with-cgal-5.x.patch
+fix-linker-error.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/7f088423f84f8b3c986a606bf105289cb1df569d...2487b282cf76c57de31f57e2b39525af2b8104b4
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/7f088423f84f8b3c986a606bf105289cb1df569d...2487b282cf76c57de31f57e2b39525af2b8104b4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20191206/36f35d21/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list