Your message dated Fri, 06 Dec 2019 07:24:09 +0000
with message-id <[email protected]>
and subject line Bug#946229: fixed in sfcgal 1.3.7-3
has caused the Debian Bug report #946229,
regarding [NMU] FTFBS with CGAL 5.0
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
946229: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946229
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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 <[email protected]> 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 <[email protected]>
+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 <[email protected]>
+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 <[email protected]>
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
--- End Message ---
--- Begin Message ---
Source: sfcgal
Source-Version: 1.3.7-3
We believe that the bug you reported is fixed in the latest version of
sfcgal, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Bas Couwenberg <[email protected]> (supplier of updated sfcgal package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Fri, 06 Dec 2019 06:43:24 +0100
Source: sfcgal
Architecture: source
Version: 1.3.7-3
Distribution: unstable
Urgency: medium
Maintainer: Debian GIS Project <[email protected]>
Changed-By: Bas Couwenberg <[email protected]>
Closes: 946229
Changes:
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~).
Checksums-Sha1:
1cf50b5028a65bd84a4c27713cc8d6724f115a7e 2095 sfcgal_1.3.7-3.dsc
fe2958d052eff29f2a8890bba8a8852205c66413 137956 sfcgal_1.3.7-3.debian.tar.xz
bfaade0add627f48f069c78e9847c4887a3f2a7d 13712 sfcgal_1.3.7-3_amd64.buildinfo
Checksums-Sha256:
9f14eace91a45f35db68e34089db81cec8435455d6d90de7d28a55e341a3b103 2095
sfcgal_1.3.7-3.dsc
28b5ddd48d57a14da043966db4d3634cabccbdd5c914e152f8c8532db9cc7010 137956
sfcgal_1.3.7-3.debian.tar.xz
d365b90d37d8b08fd2a21524ddea0769fbdf1c67bb31d48f77a57b47ddb44193 13712
sfcgal_1.3.7-3_amd64.buildinfo
Files:
0a0e7507a4ae0900f92ed92c0c375ba9 2095 science optional sfcgal_1.3.7-3.dsc
dc23d3019252ad769059833144abeaeb 137956 science optional
sfcgal_1.3.7-3.debian.tar.xz
60f252dc7c51789e35aad336dc26ec99 13712 science optional
sfcgal_1.3.7-3_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEgYLeQXBWQI1hRlDRZ1DxCuiNSvEFAl3p+7IACgkQZ1DxCuiN
SvE/bBAAqr+JJZT1pwA280qFvMepFVRgU+c/EbLHgmUeABnM5oSI08nf2m5vADht
ZpoNSbOpEafxI7g00PsYiPGh8OCg5tUckYvwZSo80NmvfBy1ZKEtZH/eWP8B8jfw
e/5FIBRTsUT+TXGNnFh4mIR4LNmKJay1Ge6nV92ZcSwqjtEP/flVeYOht6dch7AP
5pjcKjlTLolFvVsGrO2YoVxW+fHo4Ia5xgN4ixPJ83CQzQcczV2zm1HGNsfaSG1r
Nh97F2Erv2uHcp3B3Kt5P9h8JgPCWjrxWek0FmycLGY84i00ozpUU3v/Gj0LD1hz
WX8E/fkWxJ7prMWaKDVYkMUOAycqdoeOobME4BcfigIFoFX9r261dp1iyHGc4c3m
f31iFE+WurjFvpwxhr6d5XmOFy1VeciyqkfO64BpUpcSwpboeCoQVbnbtAkult4A
R5nrdKdd1By4s34ZKHFN9KGkDWr6XAwRwbsDrs+VayZevWLE/1J1DlaVfFxgJuk9
uzdMhDWqC64J/AqFMPRLi7c1J4rRszNJtEpj0wXQhYhwHcoFAfULfC9DcTes2HSh
4xq2ghLOAbm0mMAJnQqvhBBV0GdTO86vNNQfkpKMElS1Olb7OwY9tfu3rHFijxss
00KkK4Sw3olOCOaGiCodR83kCE5xDhj6/y8svPPQAC/M2fGgIsI=
=dc2R
-----END PGP SIGNATURE-----
--- End Message ---
