* Add myself to Uploaders. * Build-Depend on liblzma-dev and libjsoncpp-dev. * Drop patches merged upstream: - fix-FindImageMagick-1.diff - fix-FindImageMagick-2.diff - FindJNI_ppc64le.diff - hurd_host_system_processor.diff * Refresh patches: - FindBoost_add_-lpthread_#563479.diff - FindJNI.cmake.mips.patch - fix-ftbfs-on-kfreebsd.patch - fix-hdf5-hl.patch - qt_import_dir_variable.diff * Bump Standards-Version to 3.9.6. * Fix "Typo in cpack documentation" by adding new patch cpack-doc-typo.patch (Closes: #760298)ci/unstable
Mario Lang
10 years ago
parent
824dd175df
commit
ca75aed246
@ -1,17 +0,0 @@
|
|||||||
Description: FindJNI: Add ppc64le architecture
|
|
||||||
Author: Dinar Valeev <dvaleev@suse.com>
|
|
||||||
Origin: upstream, commit 18ac6713e8657cca8fc791bcd581a47a7be6ebce
|
|
||||||
|
|
||||||
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
|
|
||||||
index 669e3e2..6a496af 100644
|
|
||||||
--- a/Modules/FindJNI.cmake
|
|
||||||
+++ b/Modules/FindJNI.cmake
|
|
||||||
@@ -54,7 +54,7 @@ macro(java_append_library_directories _var)
|
|
||||||
# endianess of the underlying system.
|
|
||||||
set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb" "mips64" "mips64el" "mipsn32" "mipsn32el")
|
|
||||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
|
|
||||||
- set(_java_libarch "ppc64le")
|
|
||||||
+ set(_java_libarch "ppc64" "ppc64le")
|
|
||||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
|
|
||||||
set(_java_libarch "ppc64" "ppc")
|
|
||||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
|
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
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
|
||||||
|
#
|
||||||
@ -1,55 +0,0 @@
|
|||||||
From 6f5581c105d59ed00cc065b9ab9b3c8c0a441db3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: bastien ROUCARIES <roucaries.bastien@gmail.com>
|
|
||||||
Date: Tue, 22 Jul 2014 22:24:15 +0200
|
|
||||||
Subject: [PATCH] FindImageMagick: Find arch include dir (#15007)
|
|
||||||
|
|
||||||
---
|
|
||||||
Modules/FindImageMagick.cmake | 19 ++++++++++++++++++-
|
|
||||||
1 file changed, 18 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
|
|
||||||
index f6c8b3a..33f95ce 100644
|
|
||||||
--- a/Modules/FindImageMagick.cmake
|
|
||||||
+++ b/Modules/FindImageMagick.cmake
|
|
||||||
@@ -115,7 +115,19 @@ function(FIND_IMAGEMAGICK_API component header)
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
|
|
||||||
PATH_SUFFIXES
|
|
||||||
ImageMagick ImageMagick-6
|
|
||||||
- DOC "Path to the ImageMagick include dir."
|
|
||||||
+ DOC "Path to the ImageMagick arch-independent include dir."
|
|
||||||
+ )
|
|
||||||
+ find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR
|
|
||||||
+ NAMES magick/magick-baseconfig.h
|
|
||||||
+ HINTS
|
|
||||||
+ ${PC_${component}_INCLUDEDIR}
|
|
||||||
+ ${PC_${component}_INCLUDE_DIRS}
|
|
||||||
+ PATHS
|
|
||||||
+ ${ImageMagick_INCLUDE_DIRS}
|
|
||||||
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
|
|
||||||
+ PATH_SUFFIXES
|
|
||||||
+ ImageMagick ImageMagick-6
|
|
||||||
+ DOC "Path to the ImageMagick arch-specific include dir."
|
|
||||||
)
|
|
||||||
find_library(ImageMagick_${component}_LIBRARY
|
|
||||||
NAMES ${ARGN}
|
|
||||||
@@ -127,12 +139,17 @@ function(FIND_IMAGEMAGICK_API component header)
|
|
||||||
DOC "Path to the ImageMagick Magick++ library."
|
|
||||||
)
|
|
||||||
|
|
||||||
+ # old version have only indep dir
|
|
||||||
if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
|
|
||||||
set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
|
|
||||||
|
|
||||||
list(APPEND ImageMagick_INCLUDE_DIRS
|
|
||||||
${ImageMagick_${component}_INCLUDE_DIR}
|
|
||||||
)
|
|
||||||
+ if(ImageMagick_${component}_ARCH_INCLUDE_DIR)
|
|
||||||
+ list(APPEND ImageMagick_INCLUDE_DIRS
|
|
||||||
+ ${ImageMagick_${component}_ARCH_INCLUDE_DIR})
|
|
||||||
+ endif()
|
|
||||||
list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)
|
|
||||||
set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
From 1342e0222fed06f748f266a3a4e82c907cb76726 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Brad King <brad.king@kitware.com>
|
|
||||||
Date: Wed, 23 Jul 2014 15:33:48 -0400
|
|
||||||
Subject: [PATCH] FindImageMagick: Provide per-component include dirs (#15007)
|
|
||||||
|
|
||||||
Set the ImageMagick_<component>_INCLUDE_DIRS variable that is mentioned
|
|
||||||
in the documentation but was not set before.
|
|
||||||
---
|
|
||||||
Modules/FindImageMagick.cmake | 11 +++++++++--
|
|
||||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
|
|
||||||
index 33f95ce..65458b7 100644
|
|
||||||
--- a/Modules/FindImageMagick.cmake
|
|
||||||
+++ b/Modules/FindImageMagick.cmake
|
|
||||||
@@ -143,13 +143,20 @@ function(FIND_IMAGEMAGICK_API component header)
|
|
||||||
if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
|
|
||||||
set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
|
|
||||||
|
|
||||||
- list(APPEND ImageMagick_INCLUDE_DIRS
|
|
||||||
+ # Construct per-component include directories.
|
|
||||||
+ set(ImageMagick_${component}_INCLUDE_DIRS
|
|
||||||
${ImageMagick_${component}_INCLUDE_DIR}
|
|
||||||
)
|
|
||||||
if(ImageMagick_${component}_ARCH_INCLUDE_DIR)
|
|
||||||
- list(APPEND ImageMagick_INCLUDE_DIRS
|
|
||||||
+ list(APPEND ImageMagick_${component}_INCLUDE_DIRS
|
|
||||||
${ImageMagick_${component}_ARCH_INCLUDE_DIR})
|
|
||||||
endif()
|
|
||||||
+ list(REMOVE_DUPLICATES ImageMagick_${component}_INCLUDE_DIRS)
|
|
||||||
+ set(ImageMagick_${component}_INCLUDE_DIRS
|
|
||||||
+ ${ImageMagick_${component}_INCLUDE_DIRS} PARENT_SCOPE)
|
|
||||||
+
|
|
||||||
+ # Add the per-component include directories to the full include dirs.
|
|
||||||
+ list(APPEND ImageMagick_INCLUDE_DIRS ${ImageMagick_${component}_INCLUDE_DIRS})
|
|
||||||
list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)
|
|
||||||
set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
From 89d7a5a417dccbdc97107d30a6678e94ced9ca5d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Geyer <debfx@ubuntu.com>
|
|
||||||
Date: Wed, 10 Sep 2014 08:55:00 -0400
|
|
||||||
Subject: [PATCH] Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd
|
|
||||||
(#15147)
|
|
||||||
|
|
||||||
On Debian GNU/Hurd 'uname -p' prints "unknown", so use 'uname -m'
|
|
||||||
instead.
|
|
||||||
---
|
|
||||||
Modules/CMakeDetermineSystem.cmake | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
|
|
||||||
index 1c0941a..fe292ea 100644
|
|
||||||
--- a/Modules/CMakeDetermineSystem.cmake
|
|
||||||
+++ b/Modules/CMakeDetermineSystem.cmake
|
|
||||||
@@ -47,7 +47,7 @@ if(CMAKE_HOST_UNIX)
|
|
||||||
if(CMAKE_UNAME)
|
|
||||||
exec_program(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
|
|
||||||
exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
|
|
||||||
- if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin")
|
|
||||||
+ if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$")
|
|
||||||
exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
|
|
||||||
RETURN_VALUE val)
|
|
||||||
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
Loading…
Reference in new issue