[Pkg-cmake-commits] [cmake] 03/04: Refresh patches.

[Lisandro Damián Nicanor Pérez]

This is an automated email from the git hooks/post-receive script.

lisandro pushed a commit to branch master
in repository cmake.

commit 38f2951d7d03386f3d447d862a4b1729ccd8d368
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Oct 14 22:19:17 2016 -0300

    Refresh patches.
---
 debian/changelog                                    |  1 +
 debian/patches/FindBoost_add_-lpthread_#563479.diff | 14 ++++++++------
 debian/patches/fix-ftbfs-on-kfreebsd.patch          | 12 +++++++-----
 debian/patches/qt_import_dir_variable.diff          | 12 +++++++-----
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ffd47dc..bc786e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ cmake (3.6.2-2) UNRELEASED; urgency=medium
   * Add mips-rld-map-rel.patch to solve segfaults caused by new
     DT_MIPS_RLD_MAP_REL tag and RPATH removers (Closes: #820334).
     Thanks James Cowgill for the patch.
+  * Refresh patches.
 
  -- Debian CMake Team <pkg-cmake-team at lists.alioth.debian.org>  Fri, 14 Oct 2016 22:12:26 -0300
 
diff --git a/debian/patches/FindBoost_add_-lpthread_#563479.diff b/debian/patches/FindBoost_add_-lpthread_#563479.diff
index 8fea4ec..b04e588 100644
--- a/debian/patches/FindBoost_add_-lpthread_#563479.diff
+++ b/debian/patches/FindBoost_add_-lpthread_#563479.diff
@@ -7,11 +7,13 @@ Bug: http://cmake.org/Bug/view.php?id=10692
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=563479
 Forwarded: http://cmake.org/Bug/file_download.php?file_id=3629&type=bug
 
-Index: cmake/Modules/FindBoost.cmake
-===================================================================
---- cmake.orig/Modules/FindBoost.cmake
-+++ cmake/Modules/FindBoost.cmake
-@@ -447,6 +447,22 @@ function(_Boost_GUESS_COMPILER_PREFIX _r
+---
+ Modules/FindBoost.cmake |   19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+--- a/Modules/FindBoost.cmake
++++ b/Modules/FindBoost.cmake
+@@ -861,6 +861,22 @@ function(_Boost_MISSING_DEPENDENCIES com
    set(${extravar} ${_boost_extra_components} PARENT_SCOPE)
  endfunction()
  
@@ -34,7 +36,7 @@ Index: cmake/Modules/FindBoost.cmake
  #
  # End functions/macros
  #
-@@ -1177,6 +1193,9 @@ if(Boost_FOUND)
+@@ -1748,6 +1764,9 @@ if(Boost_FOUND)
        list(APPEND Boost_LIBRARIES ${Boost_${UPPERCOMPONENT}_LIBRARY})
      endif()
    endforeach()
diff --git a/debian/patches/fix-ftbfs-on-kfreebsd.patch b/debian/patches/fix-ftbfs-on-kfreebsd.patch
index 5af0f39..06c428a 100644
--- a/debian/patches/fix-ftbfs-on-kfreebsd.patch
+++ b/debian/patches/fix-ftbfs-on-kfreebsd.patch
@@ -14,11 +14,13 @@ all places.
 
 [1] https://buildd.debian.org/status/fetch.php?pkg=cmake&arch=kfreebsd-amd64&ver=2.8.12-1&stamp=1383507045
 
-Index: cmake/Source/kwsys/SystemInformation.cxx
-===================================================================
---- cmake.orig/Source/kwsys/SystemInformation.cxx
-+++ cmake/Source/kwsys/SystemInformation.cxx
-@@ -125,7 +125,7 @@ typedef int siginfo_t;
+---
+ Source/kwsys/SystemInformation.cxx |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Source/kwsys/SystemInformation.cxx
++++ b/Source/kwsys/SystemInformation.cxx
+@@ -123,7 +123,7 @@ typedef int siginfo_t;
  # endif
  #endif
  
diff --git a/debian/patches/qt_import_dir_variable.diff b/debian/patches/qt_import_dir_variable.diff
index 6b7f21f..eebcc04 100644
--- a/debian/patches/qt_import_dir_variable.diff
+++ b/debian/patches/qt_import_dir_variable.diff
@@ -8,11 +8,13 @@ Origin: vendor
 
 This happens when there are no plugins currently installed.
 
-Index: cmake/Modules/FindQt4.cmake
-===================================================================
---- cmake.orig/Modules/FindQt4.cmake
-+++ cmake/Modules/FindQt4.cmake
-@@ -734,7 +734,7 @@ if (QT_QMAKE_EXECUTABLE AND
+---
+ Modules/FindQt4.cmake |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Modules/FindQt4.cmake
++++ b/Modules/FindQt4.cmake
+@@ -736,7 +736,7 @@ if (QT_QMAKE_EXECUTABLE AND
    if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
      _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
      if(qt_imports_dir)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cmake/cmake.git