Source: sfcgal Version: 1.3.7-2 Severity: serious Tags: ftbfs Control: block 944417 by -1
Hi, the transition to CGAL 5.0 started (see bug #944417) and your package FTBFS. I intend to NMU the package with the attached diff to DELAYED/5-day. Best regards, Joachim
diff -Nru sfcgal-1.3.7/debian/changelog sfcgal-1.3.7/debian/changelog --- sfcgal-1.3.7/debian/changelog 2019-08-18 07:57:14.000000000 +0200 +++ sfcgal-1.3.7/debian/changelog 2019-12-05 21:34:40.000000000 +0100 @@ -1,3 +1,11 @@ +sfcgal (1.3.7-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch to fix FTBFS with CGAL >= 5.0 (Closes: #xxxxxx). + * Add Build-Depends: libcgal-dev (>= 5.0~). + + -- Joachim Reichel <reic...@debian.org> Thu, 05 Dec 2019 21:34:40 +0100 + sfcgal (1.3.7-2) unstable; urgency=medium * Bump Standards-Version to 4.4.0, no changes. diff -Nru sfcgal-1.3.7/debian/control sfcgal-1.3.7/debian/control --- sfcgal-1.3.7/debian/control 2019-08-18 07:55:35.000000000 +0200 +++ sfcgal-1.3.7/debian/control 2019-12-05 21:34:40.000000000 +0100 @@ -6,7 +6,7 @@ Priority: optional Build-Depends: debhelper (>= 9.20160114), cmake, - libcgal-dev (>= 4.10.1), + libcgal-dev (>= 5.0~), libboost-all-dev, libmpfr-dev, libgmp-dev, diff -Nru sfcgal-1.3.7/debian/patches/fix-ftbfs-with-cgal-5.x.patch sfcgal-1.3.7/debian/patches/fix-ftbfs-with-cgal-5.x.patch --- sfcgal-1.3.7/debian/patches/fix-ftbfs-with-cgal-5.x.patch 1970-01-01 01:00:00.000000000 +0100 +++ sfcgal-1.3.7/debian/patches/fix-ftbfs-with-cgal-5.x.patch 2019-12-05 21:34:40.000000000 +0100 @@ -0,0 +1,44 @@ +Description: Require C++14 and CGAL >= 5.0 +Author: Joachim Reichel <reic...@debian.org> +Bug: https://github.com/Oslandia/SFCGAL/issues/198 + +Index: sfcgal-1.3.7/CMakeLists.txt +=================================================================== +--- sfcgal-1.3.7.orig/CMakeLists.txt ++++ sfcgal-1.3.7/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 ) diff -Nru sfcgal-1.3.7/debian/patches/fix-linker-error.patch sfcgal-1.3.7/debian/patches/fix-linker-error.patch --- sfcgal-1.3.7/debian/patches/fix-linker-error.patch 1970-01-01 01:00:00.000000000 +0100 +++ sfcgal-1.3.7/debian/patches/fix-linker-error.patch 2019-12-05 21:34:40.000000000 +0100 @@ -0,0 +1,82 @@ +Description: Force GMPXX as workaround for a linker error (used to be the + default for CGAL 4.x packages) +Author: Joachim Reichel <reic...@debian.org> +Bug: https://github.com/Oslandia/SFCGAL/issues/198 + +Index: sfcgal-1.3.7/CMakeLists.txt +=================================================================== +--- sfcgal-1.3.7.orig/CMakeLists.txt ++++ sfcgal-1.3.7/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 ) + +Index: sfcgal-1.3.7/test/garden/CMakeLists.txt +=================================================================== +--- sfcgal-1.3.7.orig/test/garden/CMakeLists.txt ++++ sfcgal-1.3.7/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 ) +Index: sfcgal-1.3.7/test/regress/convex_hull/CMakeLists.txt +=================================================================== +--- sfcgal-1.3.7.orig/test/regress/convex_hull/CMakeLists.txt ++++ sfcgal-1.3.7/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 ) +Index: sfcgal-1.3.7/test/regress/polygon_triangulator/CMakeLists.txt +=================================================================== +--- sfcgal-1.3.7.orig/test/regress/polygon_triangulator/CMakeLists.txt ++++ sfcgal-1.3.7/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" ) +Index: sfcgal-1.3.7/test/unit/CMakeLists.txt +=================================================================== +--- sfcgal-1.3.7.orig/test/unit/CMakeLists.txt ++++ sfcgal-1.3.7/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) +Index: sfcgal-1.3.7/test/regress/standalone/CMakeLists.txt +=================================================================== +--- sfcgal-1.3.7.orig/test/regress/standalone/CMakeLists.txt ++++ sfcgal-1.3.7/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 ) diff -Nru sfcgal-1.3.7/debian/patches/no-c++98.patch sfcgal-1.3.7/debian/patches/no-c++98.patch --- sfcgal-1.3.7/debian/patches/no-c++98.patch 2018-11-20 10:48:51.000000000 +0100 +++ sfcgal-1.3.7/debian/patches/no-c++98.patch 2019-12-05 21:34:40.000000000 +0100 @@ -2,8 +2,10 @@ Author: Bas Couwenberg <sebas...@debian.org> Bug: https://github.com/Oslandia/SFCGAL/issues/184 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +Index: sfcgal-1.3.7/CMakeLists.txt +=================================================================== +--- sfcgal-1.3.7.orig/CMakeLists.txt ++++ sfcgal-1.3.7/CMakeLists.txt @@ -39,11 +39,6 @@ if (CMAKE_CXX_COMPILER MATCHES ".*clang" set(CMAKE_COMPILER_IS_CLANGXX 1) endif () diff -Nru sfcgal-1.3.7/debian/patches/series sfcgal-1.3.7/debian/patches/series --- sfcgal-1.3.7/debian/patches/series 2018-11-20 10:48:34.000000000 +0100 +++ sfcgal-1.3.7/debian/patches/series 2019-12-05 21:34:40.000000000 +0100 @@ -1 +1,3 @@ no-c++98.patch +fix-ftbfs-with-cgal-5.x.patch +fix-linker-error.patch