diff --git a/debian/changelog b/debian/changelog index 3806949eb..826485986 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ cmake (3.3.1-1) UNRELEASED; urgency=medium * New upstream release. + * Drop patch that have been applied upstream: + - cpack-doc-typo.patch + - protect-tests-from-makeflags.patch + - custom-sphinx-flags.patch + - fix-mips-endian.patch + - openjdk-8-detection.patch * Move bash_completion from /etc to /usr/share. - Stop using dh_bash-completion. It still installs files to /etc and dh_install works just fine. diff --git a/debian/patches/cpack-doc-typo.patch b/debian/patches/cpack-doc-typo.patch deleted file mode 100644 index de555cbda..000000000 --- a/debian/patches/cpack-doc-typo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake -index 35259c4..4b66964 100644 ---- a/Modules/CPack.cmake -+++ b/Modules/CPack.cmake -@@ -228,7 +228,7 @@ - # - # List of four values that specify what project to install. The four values - # are: Build directory, Project Name, Project Component, Directory. If --# omitted, CPack will build an installer that installers everything. -+# omitted, CPack will build an installer that installs everything. - # - # .. variable:: CPACK_SYSTEM_NAME - # diff --git a/debian/patches/custom-sphinx-flags.patch b/debian/patches/custom-sphinx-flags.patch deleted file mode 100644 index ad9cf635a..000000000 --- a/debian/patches/custom-sphinx-flags.patch +++ /dev/null @@ -1,79 +0,0 @@ -From dd107b30d26b2cdaa5b1766f733428f3c4c7cd42 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Thu, 30 Apr 2015 09:30:14 -0400 -Subject: [PATCH] Add option to pass custom flags to sphinx-build (#15545) - -Create a SPHINX_FLAGS cache entry that users can populate with -command-line flags for sphinx-build. Add an option to the -bootstrap script to populate it up front. - -Suggested-by: Felix Geyer ---- - Utilities/Sphinx/CMakeLists.txt | 4 ++++ - bootstrap | 8 ++++++++ - 2 files changed, 12 insertions(+) - -diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt -index da81752..a755ca1 100644 ---- a/Utilities/Sphinx/CMakeLists.txt -+++ b/Utilities/Sphinx/CMakeLists.txt -@@ -31,8 +31,11 @@ find_program(SPHINX_EXECUTABLE - NAMES sphinx-build - DOC "Sphinx Documentation Builder (sphinx-doc.org)" - ) -+set(SPHINX_FLAGS "" CACHE STRING "Flags to pass to sphinx-build") -+separate_arguments(sphinx_flags UNIX_COMMAND "${SPHINX_FLAGS}") - - mark_as_advanced(SPHINX_TEXT) -+mark_as_advanced(SPHINX_FLAGS) - - if(NOT SPHINX_MAN AND NOT SPHINX_HTML AND NOT SPHINX_SINGLEHTML AND NOT SPHINX_QTHELP AND NOT SPHINX_TEXT) - return() -@@ -114,6 +117,7 @@ foreach(format ${doc_formats}) - -c ${CMAKE_CURRENT_BINARY_DIR} - -d ${CMAKE_CURRENT_BINARY_DIR}/doctrees - -b ${format} -+ ${sphinx_flags} - ${CMake_SOURCE_DIR}/Help - ${CMAKE_CURRENT_BINARY_DIR}/${format} - > ${doc_format_log} # log stdout, pass stderr -diff --git a/bootstrap b/bootstrap -index 00b51b5..14046ee 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -74,6 +74,7 @@ cmake_sphinx_man="" - cmake_sphinx_html="" - cmake_sphinx_qthelp="" - cmake_sphinx_build="" -+cmake_sphinx_flags="" - - # Determine whether this is a Cygwin environment. - if echo "${cmake_system}" | grep CYGWIN >/dev/null 2>&1; then -@@ -423,6 +424,7 @@ Configuration: - --sphinx-html build html help with Sphinx - --sphinx-qthelp build qch help with Sphinx - --sphinx-build= use as the sphinx-build executable -+ --sphinx-flags= pass to sphinx-build executable - - Directory and file names: - --prefix=PREFIX install files in tree rooted at PREFIX -@@ -660,6 +662,7 @@ while test $# != 0; do - --sphinx-html) cmake_sphinx_html="1" ;; - --sphinx-qthelp) cmake_sphinx_qthelp="1" ;; - --sphinx-build=*) cmake_sphinx_build=`cmake_arg "$1"` ;; -+ --sphinx-flags=*) cmake_sphinx_flags=`cmake_arg "$1"` ;; - --help) cmake_usage ;; - --version) cmake_version_display ; exit 2 ;; - --verbose) cmake_verbose=TRUE ;; -@@ -1684,6 +1687,11 @@ if [ "x${cmake_sphinx_build}" != "x" ]; then - set (SPHINX_EXECUTABLE "'"${cmake_sphinx_build}"'" CACHE FILEPATH "Location of Qt sphinx-build" FORCE) - ' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake" - fi -+if [ "x${cmake_sphinx_flags}" != "x" ]; then -+ echo ' -+set (SPHINX_FLAGS [==['"${cmake_sphinx_flags}"']==] CACHE STRING "Flags to pass to sphinx-build" FORCE) -+' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake" -+fi - - # Add user-specified settings. Handle relative-path case for - # specification of cmake_init_file. diff --git a/debian/patches/fix-mips-endian.patch b/debian/patches/fix-mips-endian.patch deleted file mode 100644 index 0830b6639..000000000 --- a/debian/patches/fix-mips-endian.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b1d560a0b9e6c545f65c170bdbbcf5da35123b58 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Tue, 12 May 2015 11:38:02 -0400 -Subject: [PATCH] CPU: MIPS is biendian - -MIPS machines are biendian hence they can run both big endian kernels -e.g. Debian mips architecture, and little endian kernels e.g. Debian -mipsel architecture. Use predefined macros to distinguish them. - -Change-Id: I75fccd3cb1ef7915c8754ebbb64cb52a948b4ad8 -Reported-by: Mathieu Malaterre -Inspired-by: Modestas Vainius ---- - CPU.h.in | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Source/kwsys/CPU.h.in b/Source/kwsys/CPU.h.in -index 626914b..884d71a 100644 ---- a/Source/kwsys/CPU.h.in -+++ b/Source/kwsys/CPU.h.in -@@ -76,7 +76,15 @@ - #elif defined(__m68k__) || defined(M68000) - # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG - --/* MIPS */ -+/* MIPSel (MIPS little endian) */ -+#elif defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) -+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE -+ -+/* MIPSeb (MIPS big endian) */ -+#elif defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) -+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG -+ -+/* MIPS (fallback, big endian) */ - #elif defined(__mips) || defined(__mips__) || defined(__MIPS__) - # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG - --- -1.9.1 - diff --git a/debian/patches/openjdk-8-detection.patch b/debian/patches/openjdk-8-detection.patch deleted file mode 100644 index 259b345b4..000000000 --- a/debian/patches/openjdk-8-detection.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7953867ba46223dfab373ce58cff0a4bc20c3864 Mon Sep 17 00:00:00 2001 -From: Felix Geyer -Date: Tue, 12 May 2015 13:45:43 -0400 -Subject: [PATCH] FindJava: Fix OpenJDK 8 version detection (#15565) - -The openjdk-8 (8u45-b14-2) package on Debian unstable has extra -text after the version number components. Match this and add it -to the reported version string. ---- - Modules/FindJava.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake -index bb73853..9e43174 100644 ---- a/Modules/FindJava.cmake -+++ b/Modules/FindJava.cmake -@@ -137,7 +137,7 @@ if(Java_JAVA_EXECUTABLE) - elseif(var MATCHES "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+)\"") - # Kaffe style - set(Java_VERSION_STRING "${CMAKE_MATCH_1}") -- elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+)\"") -+ elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+.*)\"") - # OpenJDK ver 1.7.x on OpenBSD - set(Java_VERSION_STRING "${CMAKE_MATCH_1}") - else() --- -1.7.10.4 - diff --git a/debian/patches/protect-tests-from-makeflags.patch b/debian/patches/protect-tests-from-makeflags.patch deleted file mode 100644 index 355a14119..000000000 --- a/debian/patches/protect-tests-from-makeflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 703e76252930429ac39d3ebf456e3e1e688d1982 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Wed, 29 Apr 2015 16:13:50 -0400 -Subject: [PATCH] Tests: Protect RunCMake tests from MAKEFLAGS in environment - (#15542) - ---- - Tests/RunCMake/RunCMake.cmake | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake -index b24ae0b..70c0d6c 100644 ---- a/Tests/RunCMake/RunCMake.cmake -+++ b/Tests/RunCMake/RunCMake.cmake -@@ -135,3 +135,6 @@ function(run_cmake_command test) - set(RunCMake_TEST_COMMAND "${ARGN}") - run_cmake(${test}) - endfunction() -+ -+# Protect RunCMake tests from calling environment. -+unset(ENV{MAKEFLAGS}) diff --git a/debian/patches/series b/debian/patches/series index 75d9709b4..14733af94 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,8 +3,3 @@ qt_import_dir_variable.diff fix-ftbfs-on-kfreebsd.patch FindJNI.cmake.mips.patch fix-hdf5-hl.patch -cpack-doc-typo.patch -protect-tests-from-makeflags.patch -custom-sphinx-flags.patch -fix-mips-endian.patch -openjdk-8-detection.patch