[Git][debian-gis-team/sfcgal][master] 3 commits: Add upstream patch to fix FTBFS with CGAL 4.12. (closes: #897487)
Bas Couwenberg
gitlab at salsa.debian.org
Thu Jun 21 17:03:45 BST 2018
Bas Couwenberg pushed to branch master at Debian GIS Project / sfcgal
Commits:
2cea6557 by Bas Couwenberg at 2018-06-21T13:47:32+02:00
Add upstream patch to fix FTBFS with CGAL 4.12. (closes: #897487)
- - - - -
c184b7f7 by Bas Couwenberg at 2018-06-21T14:37:17+02:00
Update symbols for amd64.
- - - - -
f7f529e6 by Bas Couwenberg at 2018-06-21T16:32:07+02:00
Set distribution to unstable.
- - - - -
4 changed files:
- debian/changelog
- debian/libsfcgal1.symbols
- + debian/patches/0001-add-missing-boost-lib-requirements-in-tests-and-exam.patch
- + debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-sfcgal (1.3.5-2) UNRELEASED; urgency=medium
+sfcgal (1.3.5-2) unstable; urgency=medium
* Strip trailing whitespace from rules file.
+ * Add upstream patch to fix FTBFS with CGAL 4.12.
+ (closes: #897487)
+ * Update symbols for amd64.
- -- Bas Couwenberg <sebastic at debian.org> Thu, 03 May 2018 07:31:53 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 21 Jun 2018 16:31:56 +0200
sfcgal (1.3.5-1) unstable; urgency=medium
=====================================
debian/libsfcgal1.symbols
=====================================
The diff for this file was not included because it is too large.
=====================================
debian/patches/0001-add-missing-boost-lib-requirements-in-tests-and-exam.patch
=====================================
--- /dev/null
+++ b/debian/patches/0001-add-missing-boost-lib-requirements-in-tests-and-exam.patch
@@ -0,0 +1,198 @@
+From e47828f7b4a8737fee2d45c45f29ff81681c135d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot at cgal.org>
+Date: Thu, 21 Jun 2018 11:02:06 +0200
+Subject: add missing boost lib requirements in tests and examples
+
+---
+ example/CGAL-basic_manip/CMakeLists.txt | 3 ++-
+ example/CGAL-cartesian_kernel/CMakeLists.txt | 3 ++-
+ example/CGAL-point_generator/CMakeLists.txt | 3 ++-
+ example/CGAL-polygon_triangulation2/CMakeLists.txt | 3 ++-
+ example/CGAL-triangulation2/CMakeLists.txt | 3 ++-
+ example/SFCGAL-building/CMakeLists.txt | 4 +++-
+ example/SFCGAL-export-osg/CMakeLists.txt | 3 ++-
+ example/SFCGAL-offset/CMakeLists.txt | 3 ++-
+ test/bench/CMakeLists.txt | 5 ++++-
+ test/garden/CMakeLists.txt | 4 +++-
+ test/regress/convex_hull/CMakeLists.txt | 4 +++-
+ test/regress/polygon_triangulator/CMakeLists.txt | 4 +++-
+ test/regress/standalone/CMakeLists.txt | 4 +++-
+ test/unit/CMakeLists.txt | 5 ++++-
+ 14 files changed, 37 insertions(+), 14 deletions(-)
+
+--- a/example/CGAL-basic_manip/CMakeLists.txt
++++ b/example/CGAL-basic_manip/CMakeLists.txt
+@@ -2,6 +2,7 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME}
+ main.cpp
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
++find_package(Boost REQUIRED COMPONENTS serialization)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES})
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/CGAL-cartesian_kernel/CMakeLists.txt
++++ b/example/CGAL-cartesian_kernel/CMakeLists.txt
+@@ -2,6 +2,7 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME}
+ main.cpp
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
++find_package(Boost REQUIRED COMPONENTS serialization)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES})
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/CGAL-point_generator/CMakeLists.txt
++++ b/example/CGAL-point_generator/CMakeLists.txt
+@@ -2,6 +2,7 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME}
+ main.cpp
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
++find_package(Boost REQUIRED COMPONENTS serialization)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES})
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/CGAL-polygon_triangulation2/CMakeLists.txt
++++ b/example/CGAL-polygon_triangulation2/CMakeLists.txt
+@@ -2,6 +2,7 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME}
+ main.cpp
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
++find_package(Boost REQUIRED COMPONENTS serialization)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES})
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/CGAL-triangulation2/CMakeLists.txt
++++ b/example/CGAL-triangulation2/CMakeLists.txt
+@@ -2,6 +2,7 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME}
+ main.cpp
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
++find_package(Boost REQUIRED COMPONENTS serialization)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES})
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/SFCGAL-building/CMakeLists.txt
++++ b/example/SFCGAL-building/CMakeLists.txt
+@@ -2,6 +2,8 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME}
+ main.cpp
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} SFCGAL SFCGAL-osg)
++
++find_package(Boost REQUIRED COMPONENTS serialization)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES} SFCGAL-osg)
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/SFCGAL-export-osg/CMakeLists.txt
++++ b/example/SFCGAL-export-osg/CMakeLists.txt
+@@ -2,6 +2,7 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME}
+ main.cpp
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} SFCGAL SFCGAL-osg)
++find_package(Boost REQUIRED COMPONENTS serialization)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL SFCGAL-osg ${Boost_LIBRARIES})
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/SFCGAL-offset/CMakeLists.txt
++++ b/example/SFCGAL-offset/CMakeLists.txt
+@@ -2,6 +2,7 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME}
+ main.cpp
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
++find_package(Boost REQUIRED COMPONENTS serialization)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES})
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/test/bench/CMakeLists.txt
++++ b/test/bench/CMakeLists.txt
+@@ -1,6 +1,9 @@
+ file( GLOB SFCGAL_BENCHS_SOURCES *.cpp )
+ add_executable( bench-SFCGAL ${SFCGAL_BENCHS_SOURCES} )
+-target_link_libraries( bench-SFCGAL SFCGAL)
++
++find_package(Boost REQUIRED COMPONENTS unit_test_framework timer serialization)
++
++target_link_libraries( bench-SFCGAL SFCGAL ${Boost_LIBRARIES})
+ set_target_properties( bench-SFCGAL PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS bench-SFCGAL DESTINATION bin )
+
+--- a/test/garden/CMakeLists.txt
++++ b/test/garden/CMakeLists.txt
+@@ -1,11 +1,13 @@
+ #-- polygon_triangulator test
+ file( GLOB_RECURSE SFCGAL_REGRESS_GARDEN_TEST_SOURCES *.cpp )
+
++find_package(Boost REQUIRED COMPONENTS program_options serialization)
++
+ 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} )
++target_link_libraries( ${REGRESS_NAME} ${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
+@@ -4,9 +4,11 @@ file( GLOB_RECURSE SFCGAL_REGRESS_CONVEX
+ set( REGRESS_NAME test-regress-convex_hull )
+ add_executable( ${REGRESS_NAME} ${SFCGAL_REGRESS_CONVEX_HULL_TEST_SOURCES} )
+
++find_package(Boost REQUIRED COMPONENTS program_options filesystem serialization)
++
+ target_link_libraries( ${REGRESS_NAME} SFCGAL)
+
+-target_link_libraries( ${REGRESS_NAME} ${CGAL_3RD_PARTY_LIBRARIES} )
++target_link_libraries( ${REGRESS_NAME} ${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
+@@ -4,8 +4,10 @@ file( GLOB_RECURSE SFCGAL_REGRESS_POLYGO
+ set( REGRESS_NAME test-regress-polygon_triangulator )
+ add_executable( ${REGRESS_NAME} ${SFCGAL_REGRESS_POLYGON_TRIANGULATOR_TEST_SOURCES} )
+
++find_package(Boost REQUIRED COMPONENTS program_options filesystem serialization)
++
+ target_link_libraries( ${REGRESS_NAME} SFCGAL)
+-target_link_libraries( ${REGRESS_NAME} ${CGAL_3RD_PARTY_LIBRARIES})
++target_link_libraries( ${REGRESS_NAME} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES})
+
+
+ set_target_properties( ${REGRESS_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+--- a/test/regress/standalone/CMakeLists.txt
++++ b/test/regress/standalone/CMakeLists.txt
+@@ -2,7 +2,9 @@
+ file( GLOB_RECURSE SFCGAL_REGRESS_STANDALONE_TEST_SOURCES *.cpp )
+ add_executable( standalone-regress-test-SFCGAL ${SFCGAL_REGRESS_STANDALONE_TEST_SOURCES} )
+
+-target_link_libraries( standalone-regress-test-SFCGAL SFCGAL)
++find_package(Boost REQUIRED COMPONENTS unit_test_framework filesystem serialization)
++
++target_link_libraries( standalone-regress-test-SFCGAL SFCGAL ${Boost_LIBRARIES})
+
+ set_target_properties( standalone-regress-test-SFCGAL PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS standalone-regress-test-SFCGAL DESTINATION bin )
+--- a/test/unit/CMakeLists.txt
++++ b/test/unit/CMakeLists.txt
+@@ -1,8 +1,11 @@
+ #-- build unit tests
++
++find_package(Boost REQUIRED COMPONENTS unit_test_framework serialization)
++
+ 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})
++target_link_libraries(unit-test-SFCGAL ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES})
+
+ #include( PrecompiledHeader )
+ #if(PCHSupport_FOUND)
=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-add-missing-boost-lib-requirements-in-tests-and-exam.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/0955cdcdaef139d86fc193312482857dea0a5bea...f7f529e6ef2b9c2135cfdb28f92aca218d53145f
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/0955cdcdaef139d86fc193312482857dea0a5bea...f7f529e6ef2b9c2135cfdb28f92aca218d53145f
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/20180621/baaa7384/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list