Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refresh patches.

Browse Source
This commit is contained in:
Lisandro Damián Nicanor Pérez Meyer 2016-10-14 22:19:17 -03:00
parent a68d32f152
commit 38f2951d7d
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -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@lists.alioth.debian.org> Fri, 14 Oct 2016 22:12:26 -0300

14
debian/patches/FindBoost_add_-lpthread_#563479.diff vendored
View File

@ -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()

12
debian/patches/fix-ftbfs-on-kfreebsd.patch vendored
View File

@ -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

12
debian/patches/qt_import_dir_variable.diff vendored
View File

@ -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)