From 72945fa47b941b4221c9b3f2c1e376aab915c456 Mon Sep 17 00:00:00 2001 From: Gard Spreemann Date: Tue, 10 Dec 2019 14:31:00 +0100 Subject: Renumber patches. --- ...ing-against-libatomic-for-parts-that-use-T.patch | 21 +++++++++++++++++++++ debian/patches/0004-Offline-header-for-docs.patch | 21 +++++++++++++++++++++ debian/patches/0005-Disable-Sphinx.patch | 20 ++++++++++++++++++++ ...ing-against-libatomic-for-parts-that-use-T.patch | 21 --------------------- ...-Install-Python-module-in-correct-location.patch | 21 +++++++++++++++++++++ debian/patches/0006-Offline-header-for-docs.patch | 21 --------------------- debian/patches/0007-Disable-Sphinx.patch | 20 -------------------- ...-Install-Python-module-in-correct-location.patch | 21 --------------------- debian/patches/series | 8 ++++---- 9 files changed, 87 insertions(+), 87 deletions(-) create mode 100644 debian/patches/0003-Force-linking-against-libatomic-for-parts-that-use-T.patch create mode 100644 debian/patches/0004-Offline-header-for-docs.patch create mode 100644 debian/patches/0005-Disable-Sphinx.patch delete mode 100644 debian/patches/0005-Force-linking-against-libatomic-for-parts-that-use-T.patch create mode 100644 debian/patches/0006-Install-Python-module-in-correct-location.patch delete mode 100644 debian/patches/0006-Offline-header-for-docs.patch delete mode 100644 debian/patches/0007-Disable-Sphinx.patch delete mode 100644 debian/patches/0008-Install-Python-module-in-correct-location.patch diff --git a/debian/patches/0003-Force-linking-against-libatomic-for-parts-that-use-T.patch b/debian/patches/0003-Force-linking-against-libatomic-for-parts-that-use-T.patch new file mode 100644 index 00000000..0a20ce1e --- /dev/null +++ b/debian/patches/0003-Force-linking-against-libatomic-for-parts-that-use-T.patch @@ -0,0 +1,21 @@ +From: Gard Spreemann +Date: Wed, 25 Sep 2019 15:18:08 +0200 +Subject: Force linking against libatomic for parts that use TBB. + +--- + src/cmake/modules/FindTBB.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/cmake/modules/FindTBB.cmake b/src/cmake/modules/FindTBB.cmake +index 13f4d92..6baa8d7 100644 +--- a/src/cmake/modules/FindTBB.cmake ++++ b/src/cmake/modules/FindTBB.cmake +@@ -375,6 +375,8 @@ if (TBB_INCLUDE_DIR) + endif(NOT TBB_without_pthread) + endif(UNIX AND NOT APPLE) + ++ list(APPEND ALL_TBB_LIBRARIES atomic) ++ + set (TBB_LIBRARIES ${ALL_TBB_LIBRARIES} + CACHE PATH "TBB libraries" FORCE) + diff --git a/debian/patches/0004-Offline-header-for-docs.patch b/debian/patches/0004-Offline-header-for-docs.patch new file mode 100644 index 00000000..232d7e53 --- /dev/null +++ b/debian/patches/0004-Offline-header-for-docs.patch @@ -0,0 +1,21 @@ +From: Gard Spreemann +Date: Wed, 25 Sep 2019 15:19:14 +0200 +Subject: Offline header for docs. + +--- + src/Doxyfile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Doxyfile.in b/src/Doxyfile.in +index de452c9..98d8b96 100644 +--- a/src/Doxyfile.in ++++ b/src/Doxyfile.in +@@ -1045,7 +1045,7 @@ HTML_FILE_EXTENSION = .html + # of the possible markers and block names see the documentation. + # This tag requires that the tag GENERATE_HTML is set to YES. + +-HTML_HEADER = doc/common/header.html ++HTML_HEADER = doc/common/offline_header.html + + # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each + # generated HTML page. If the tag is left blank doxygen will generate a standard diff --git a/debian/patches/0005-Disable-Sphinx.patch b/debian/patches/0005-Disable-Sphinx.patch new file mode 100644 index 00000000..e3f42382 --- /dev/null +++ b/debian/patches/0005-Disable-Sphinx.patch @@ -0,0 +1,20 @@ +From: Gard Spreemann +Date: Wed, 25 Sep 2019 15:28:15 +0200 +Subject: Disable Sphinx. + +--- + src/cmake/modules/GUDHI_third_party_libraries.cmake | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake +index 360a230..bffd2ee 100644 +--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake ++++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake +@@ -124,7 +124,6 @@ if( PYTHONINTERP_FOUND ) + find_python_module("matplotlib") + find_python_module("numpy") + find_python_module("scipy") +- find_python_module("sphinx") + endif() + + if(NOT GUDHI_PYTHON_PATH) diff --git a/debian/patches/0005-Force-linking-against-libatomic-for-parts-that-use-T.patch b/debian/patches/0005-Force-linking-against-libatomic-for-parts-that-use-T.patch deleted file mode 100644 index 0a20ce1e..00000000 --- a/debian/patches/0005-Force-linking-against-libatomic-for-parts-that-use-T.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Gard Spreemann -Date: Wed, 25 Sep 2019 15:18:08 +0200 -Subject: Force linking against libatomic for parts that use TBB. - ---- - src/cmake/modules/FindTBB.cmake | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/cmake/modules/FindTBB.cmake b/src/cmake/modules/FindTBB.cmake -index 13f4d92..6baa8d7 100644 ---- a/src/cmake/modules/FindTBB.cmake -+++ b/src/cmake/modules/FindTBB.cmake -@@ -375,6 +375,8 @@ if (TBB_INCLUDE_DIR) - endif(NOT TBB_without_pthread) - endif(UNIX AND NOT APPLE) - -+ list(APPEND ALL_TBB_LIBRARIES atomic) -+ - set (TBB_LIBRARIES ${ALL_TBB_LIBRARIES} - CACHE PATH "TBB libraries" FORCE) - diff --git a/debian/patches/0006-Install-Python-module-in-correct-location.patch b/debian/patches/0006-Install-Python-module-in-correct-location.patch new file mode 100644 index 00000000..67999267 --- /dev/null +++ b/debian/patches/0006-Install-Python-module-in-correct-location.patch @@ -0,0 +1,21 @@ +From: Gard Spreemann +Date: Thu, 26 Sep 2019 13:26:22 +0200 +Subject: Install Python module in correct location. + +--- + src/python/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt +index 1778290..a999cea 100644 +--- a/src/python/CMakeLists.txt ++++ b/src/python/CMakeLists.txt +@@ -208,7 +208,7 @@ if(PYTHONINTERP_FOUND) + add_custom_target(python ALL DEPENDS gudhi.so + COMMENT "Do not forget to add ${CMAKE_CURRENT_BINARY_DIR}/ to your PYTHONPATH before using examples or tests") + +- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install)") ++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install --root=${CMAKE_SOURCE_DIR}/debian/tmp --single-version-externally-managed --install-layout=deb WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") + + # Test examples + if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0) diff --git a/debian/patches/0006-Offline-header-for-docs.patch b/debian/patches/0006-Offline-header-for-docs.patch deleted file mode 100644 index 232d7e53..00000000 --- a/debian/patches/0006-Offline-header-for-docs.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Gard Spreemann -Date: Wed, 25 Sep 2019 15:19:14 +0200 -Subject: Offline header for docs. - ---- - src/Doxyfile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Doxyfile.in b/src/Doxyfile.in -index de452c9..98d8b96 100644 ---- a/src/Doxyfile.in -+++ b/src/Doxyfile.in -@@ -1045,7 +1045,7 @@ HTML_FILE_EXTENSION = .html - # of the possible markers and block names see the documentation. - # This tag requires that the tag GENERATE_HTML is set to YES. - --HTML_HEADER = doc/common/header.html -+HTML_HEADER = doc/common/offline_header.html - - # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each - # generated HTML page. If the tag is left blank doxygen will generate a standard diff --git a/debian/patches/0007-Disable-Sphinx.patch b/debian/patches/0007-Disable-Sphinx.patch deleted file mode 100644 index e3f42382..00000000 --- a/debian/patches/0007-Disable-Sphinx.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Gard Spreemann -Date: Wed, 25 Sep 2019 15:28:15 +0200 -Subject: Disable Sphinx. - ---- - src/cmake/modules/GUDHI_third_party_libraries.cmake | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake -index 360a230..bffd2ee 100644 ---- a/src/cmake/modules/GUDHI_third_party_libraries.cmake -+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake -@@ -124,7 +124,6 @@ if( PYTHONINTERP_FOUND ) - find_python_module("matplotlib") - find_python_module("numpy") - find_python_module("scipy") -- find_python_module("sphinx") - endif() - - if(NOT GUDHI_PYTHON_PATH) diff --git a/debian/patches/0008-Install-Python-module-in-correct-location.patch b/debian/patches/0008-Install-Python-module-in-correct-location.patch deleted file mode 100644 index ef99842a..00000000 --- a/debian/patches/0008-Install-Python-module-in-correct-location.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Gard Spreemann -Date: Thu, 26 Sep 2019 13:26:22 +0200 -Subject: Install Python module in correct location. - ---- - src/python/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 4c6840f..9954ac5 100644 ---- a/src/python/CMakeLists.txt -+++ b/src/python/CMakeLists.txt -@@ -208,7 +208,7 @@ if(PYTHONINTERP_FOUND) - add_custom_target(python ALL DEPENDS gudhi.so - COMMENT "Do not forget to add ${CMAKE_CURRENT_BINARY_DIR}/ to your PYTHONPATH before using examples or tests") - -- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install)") -+ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install --root=${CMAKE_SOURCE_DIR}/debian/tmp --single-version-externally-managed --install-layout=deb WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") - - # Test examples - if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0) diff --git a/debian/patches/series b/debian/patches/series index 06bb48b7..091402d1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ 0001-Disable-tests-that-use-DFSG-deleted-data-files.patch 0002-Use-system-MathJax.patch -0005-Force-linking-against-libatomic-for-parts-that-use-T.patch -0006-Offline-header-for-docs.patch -0007-Disable-Sphinx.patch -0008-Install-Python-module-in-correct-location.patch +0003-Force-linking-against-libatomic-for-parts-that-use-T.patch +0004-Offline-header-for-docs.patch +0005-Disable-Sphinx.patch +0006-Install-Python-module-in-correct-location.patch -- cgit v1.2.3