[SCM] kstars packaging branch, master, updated. debian/16.08.3-1-81-g6423b1c
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Nov 21 15:09:29 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kstars.git;a=commitdiff;h=d257925
The following commit has been merged in the master branch:
commit d25792516c96476610f7776270d8018b66e5fed2
Author: Jonathan Riddell <jr at jriddell.org>
Date: Wed Mar 8 10:41:53 2017 +0000
add kde_findindi_cmake.diff from https://git.reviewboard.kde.org/r/129998/
---
debian/patches/kde_findindi_cmake.diff | 291 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 292 insertions(+)
diff --git a/debian/patches/kde_findindi_cmake.diff b/debian/patches/kde_findindi_cmake.diff
new file mode 100644
index 0000000..38ab33a
--- /dev/null
+++ b/debian/patches/kde_findindi_cmake.diff
@@ -0,0 +1,291 @@
+https://git.reviewboard.kde.org/r/129998/
+
+diff --git a/cmake/modules/FindINDI.cmake b/cmake/modules/FindINDI.cmake
+index 2eab50a..e14163b 100644
+--- a/cmake/modules/FindINDI.cmake
++++ b/cmake/modules/FindINDI.cmake
+@@ -17,150 +17,150 @@
+ # Redistribution AND use is allowed according to the terms of the BSD license.
+
+ macro(_INDI_check_version)
+- file(READ "${INDI_INCLUDE_DIR}/indiapi.h" _INDI_version_header)
+-
+- string(REGEX MATCH "#define INDI_VERSION_MAJOR[ ]+([0-9]+)" _INDI_version_major_match "${_INDI_version_header}")
+- set(INDI_VERSION_MAJOR "${CMAKE_MATCH_1}")
+- string(REGEX MATCH "#define INDI_VERSION_MINOR[ ]+([0-9]+)" _INDI_version_minor_match "${_INDI_version_header}")
+- set(INDI_VERSION_MINOR "${CMAKE_MATCH_1}")
+- string(REGEX MATCH "#define INDI_VERSION_RELEASE[ ]+([0-9]+)" _INDI_version_release_match "${_INDI_version_header}")
+- set(INDI_VERSION_RELEASE "${CMAKE_MATCH_1}")
+-
+- set(INDI_VERSION ${INDI_VERSION_MAJOR}.${INDI_VERSION_MINOR}.${INDI_VERSION_RELEASE})
+- if(${INDI_VERSION} VERSION_LESS ${INDI_FIND_VERSION})
+- set(INDI_VERSION_OK FALSE)
+- else(${INDI_VERSION} VERSION_LESS ${INDI_FIND_VERSION})
+- set(INDI_VERSION_OK TRUE)
+- endif(${INDI_VERSION} VERSION_LESS ${INDI_FIND_VERSION})
+-
+- if(NOT INDI_VERSION_OK)
+- message(STATUS "INDI version ${INDI_VERSION} found in ${INDI_INCLUDE_DIR}, "
+- "but at least version ${INDI_FIND_VERSION} is required")
+- else(NOT INDI_VERSION_OK)
+- mark_as_advanced(INDI_VERSION_MAJOR INDI_VERSION_MINOR INDI_VERSION_RELEASE)
+- endif(NOT INDI_VERSION_OK)
++ file(READ "${INDI_INCLUDE_DIR}/indiapi.h" _INDI_version_header)
++
++ string(REGEX MATCH "#define INDI_VERSION_MAJOR[ ]+([0-9]+)" _INDI_version_major_match "${_INDI_version_header}")
++ set(INDI_VERSION_MAJOR "${CMAKE_MATCH_1}")
++ string(REGEX MATCH "#define INDI_VERSION_MINOR[ ]+([0-9]+)" _INDI_version_minor_match "${_INDI_version_header}")
++ set(INDI_VERSION_MINOR "${CMAKE_MATCH_1}")
++ string(REGEX MATCH "#define INDI_VERSION_RELEASE[ ]+([0-9]+)" _INDI_version_release_match "${_INDI_version_header}")
++ set(INDI_VERSION_RELEASE "${CMAKE_MATCH_1}")
++
++ set(INDI_VERSION ${INDI_VERSION_MAJOR}.${INDI_VERSION_MINOR}.${INDI_VERSION_RELEASE})
++ if(${INDI_VERSION} VERSION_LESS ${INDI_FIND_VERSION})
++ set(INDI_VERSION_OK FALSE)
++ else(${INDI_VERSION} VERSION_LESS ${INDI_FIND_VERSION})
++ set(INDI_VERSION_OK TRUE)
++ endif(${INDI_VERSION} VERSION_LESS ${INDI_FIND_VERSION})
++
++ if(NOT INDI_VERSION_OK)
++ message(STATUS "INDI version ${INDI_VERSION} found in ${INDI_INCLUDE_DIR}, "
++ "but at least version ${INDI_FIND_VERSION} is required")
++ else(NOT INDI_VERSION_OK)
++ mark_as_advanced(INDI_VERSION_MAJOR INDI_VERSION_MINOR INDI_VERSION_RELEASE)
++ endif(NOT INDI_VERSION_OK)
+ endmacro(_INDI_check_version)
+
+-if (INDI_INCLUDE_DIR)
+- # in cache already
+- _INDI_check_version()
+- if(ANDROID)
+- if(INDI_CLIENT_ANDROID_LIBRARIES)
+- set(INDI_FOUND ${INDI_VERSION_OK})
+- message(STATUS "Found INDI: ${INDI_CLIENT_ANDROID_LIBRARIES}")
+- endif(INDI_CLIENT_ANDROID_LIBRARIES)
+- else(ANDROID)
+- if (INDI_VERSION VERSION_LESS "1.4" AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
+- set(INDI_FOUND ${INDI_VERSION_OK})
+- message(STATUS "Found INDI: ${INDI_LIBRARIES}, ${INDI_CLIENT_LIBRARIES}, ${INDI_INCLUDE_DIR}")
+- elseif (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES)
+- set(INDI_FOUND ${INDI_VERSION_OK})
+- message(STATUS "Found INDI: ${INDI_CLIENT_LIBRARIES}, ${INDI_INCLUDE_DIR}")
+- endif(INDI_VERSION VERSION_LESS "1.4" AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
+- endif(ANDROID)
+-endif(INDI_INCLUDE_DIR)
+-
+ if(NOT INDI_FOUND)
+- if (NOT WIN32 AND NOT ANDROID)
+- find_package(PkgConfig)
+- if (PKG_CONFIG_FOUND)
+- pkg_check_modules(PC_INDI INDI)
+- endif (PKG_CONFIG_FOUND)
+- endif (NOT WIN32 AND NOT ANDROID)
+-
+- find_path(INDI_INCLUDE_DIR indidevapi.h
+- PATH_SUFFIXES libindi
+- ${PC_INDI_INCLUDE_DIRS}
+- ${_obIncDir}
+- ${GNUWIN32_DIR}/include
+- )
+-
+-if (INDI_INCLUDE_DIR)
+- _INDI_check_version()
+-
+-if(ANDROID)
+- find_library(INDI_CLIENT_ANDROID_LIBRARIES NAMES indiclientandroid
+- PATHS
+- ${BUILD_KSTARSLITE_DIR}/android_libs/${ANDROID_ARCHITECTURE}/
+- )
+-else(ANDROID)
+-
+- if (INDI_VERSION VERSION_LESS "1.4")
+- find_library(INDI_LIBRARIES NAMES indi
+- PATHS
+- ${PC_INDI_LIBRARY_DIRS}
+- ${_obLinkDir}
+- ${GNUWIN32_DIR}/lib
++ if (NOT WIN32 AND NOT ANDROID)
++ find_package(PkgConfig)
++ if (PKG_CONFIG_FOUND)
++ pkg_check_modules(PC_INDI libindi)
++ endif (PKG_CONFIG_FOUND)
++ endif (NOT WIN32 AND NOT ANDROID)
++
++ find_path(INDI_INCLUDE_DIR indidevapi.h
++ PATH_SUFFIXES libindi
++ ${PC_INDI_INCLUDE_DIRS}
++ ${_obIncDir}
++ ${GNUWIN32_DIR}/include
+ )
+- endif(INDI_VERSION VERSION_LESS "1.4")
+
+- find_library(INDI_CLIENT_LIBRARIES NAMES indiclient
+- PATHS
+- ${PC_INDI_LIBRARY_DIRS}
+- ${_obLinkDir}
+- ${GNUWIN32_DIR}/lib
+- )
++ if (INDI_INCLUDE_DIR)
++ _INDI_check_version()
+
+- find_library(INDI_CLIENT_QT_LIBRARIES NAMES indiclientqt
+- PATHS
+- ${PC_INDI_LIBRARY_DIRS}
+- ${_obLinkDir}
+- ${GNUWIN32_DIR}/lib
+- )
+-endif(ANDROID)
+-endif(INDI_INCLUDE_DIR)
+-
+-if(ANDROID)
+- if(INDI_INCLUDE_DIR AND INDI_CLIENT_ANDROID_LIBRARIES)
+- set(INDI_FOUND TRUE)
+- else()
+- set(INDI_FOUND FALSE)
+- endif()
+-else(ANDROID)
+- if (INDI_INCLUDE_DIR AND (INDI_VERSION VERSION_GREATER "1.4" OR INDI_LIBRARIES) AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES) AND INDI_VERSION_OK)
+- # If INDI is found we need to make sure on WIN32 we have INDI Client Qt backend otherwise we can't use INDI
+- if (WIN32)
+- if (INDI_CLIENT_QT_LIBRARIES)
+- set(INDI_FOUND TRUE)
+- else(INDI_CLIENT_QT_LIBRARIES)
+- set(INDI_FOUND FALSE)
+- endif(INDI_CLIENT_QT_LIBRARIES)
+- else (WIN32)
+- set(INDI_FOUND TRUE)
+- endif(WIN32)
+- else(INDI_INCLUDE_DIR AND (INDI_VERSION VERSION_GREATER "1.4" OR INDI_LIBRARIES) AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES) AND INDI_VERSION_OK)
+- set(INDI_FOUND FALSE)
+- endif(INDI_INCLUDE_DIR AND (INDI_VERSION VERSION_GREATER "1.4" OR INDI_LIBRARIES) AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES) AND INDI_VERSION_OK)
+-endif(ANDROID)
+-
+- if (INDI_FOUND)
+- if (NOT INDI_FIND_QUIETLY)
+ if(ANDROID)
+- message(STATUS "Found INDI Android Client: ${INDI_CLIENT_ANDROID_LIBRARIES}")
++ find_library(INDI_CLIENT_ANDROID_LIBRARIES NAMES indiclientandroid
++ PATHS
++ ${BUILD_KSTARSLITE_DIR}/android_libs/${ANDROID_ARCHITECTURE}/
++ )
+ else(ANDROID)
+- message(STATUS "Found INDI: ${INDI_LIBRARIES}, ${INDI_INCLUDE_DIR}")
+-
+- if (INDI_CLIENT_LIBRARIES)
+- message(STATUS "Found INDI Client Library: ${INDI_CLIENT_LIBRARIES}")
+- endif (INDI_CLIENT_LIBRARIES)
+- if (INDI_CLIENT_QT_LIBRARIES)
+- message(STATUS "Found INDI Qt5 Client Library: ${INDI_CLIENT_QT_LIBRARIES}")
+- endif (INDI_CLIENT_QT_LIBRARIES)
+- endif(ANDROID)
+- endif (NOT INDI_FIND_QUIETLY)
+- else (INDI_FOUND)
+- if (INDI_FIND_REQUIRED)
+- message(FATAL_ERROR "INDI not found. Please install INDI and try again.")
+- endif (INDI_FIND_REQUIRED)
+- endif (INDI_FOUND)
++
++ if (INDI_VERSION VERSION_LESS "1.4")
++ find_library(INDI_LIBRARIES NAMES indi
++ PATHS
++ ${PC_INDI_LIBRARY_DIRS}
++ ${_obLinkDir}
++ ${GNUWIN32_DIR}/lib
++ )
++ endif(INDI_VERSION VERSION_LESS "1.4")
++
++ find_library(INDI_CLIENT_LIBRARIES NAMES indiclient
++ PATHS
++ ${PC_INDI_LIBRARY_DIRS}
++ ${_obLinkDir}
++ ${GNUWIN32_DIR}/lib
++ )
++
++ find_library(INDI_CLIENT_QT_LIBRARIES NAMES indiclientqt
++ PATHS
++ ${PC_INDI_LIBRARY_DIRS}
++ ${_obLinkDir}
++ ${GNUWIN32_DIR}/lib
++ )
++ endif(ANDROID)
++ endif(INDI_INCLUDE_DIR)
+
+ if(ANDROID)
+- mark_as_advanced(INDI_INCLUDE_DIR INDI_CLIENT_ANDROID_LIBRARIES)
++ if(INDI_INCLUDE_DIR AND INDI_CLIENT_ANDROID_LIBRARIES)
++ set(INDI_FOUND TRUE)
++ else()
++ set(INDI_FOUND FALSE)
++ endif()
+ else(ANDROID)
+- if (INDI_VERSION VERSION_LESS "1.4")
+- mark_as_advanced(INDI_INCLUDE_DIR INDI_LIBRARIES INDI_CLIENT_LIBRARIES INDI_CLIENT_QT_LIBRARIES)
+- else(INDI_VERSION VERSION_LESS "1.4")
+- mark_as_advanced(INDI_INCLUDE_DIR INDI_CLIENT_LIBRARIES INDI_CLIENT_QT_LIBRARIES)
+- endif(INDI_VERSION VERSION_LESS "1.4")
++ if (INDI_INCLUDE_DIR AND (INDI_VERSION VERSION_GREATER "1.4" OR INDI_LIBRARIES) AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES) AND INDI_VERSION_OK)
++ # If INDI is found we need to make sure on WIN32 we have INDI Client Qt backend otherwise we can't use INDI
++ if (WIN32)
++ if (INDI_CLIENT_QT_LIBRARIES)
++ set(INDI_FOUND TRUE)
++ else(INDI_CLIENT_QT_LIBRARIES)
++ set(INDI_FOUND FALSE)
++ endif(INDI_CLIENT_QT_LIBRARIES)
++ else (WIN32)
++ set(INDI_FOUND TRUE)
++ endif(WIN32)
++ else(INDI_INCLUDE_DIR AND (INDI_VERSION VERSION_GREATER "1.4" OR INDI_LIBRARIES) AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES) AND INDI_VERSION_OK)
++ set(INDI_FOUND FALSE)
++ endif(INDI_INCLUDE_DIR AND (INDI_VERSION VERSION_GREATER "1.4" OR INDI_LIBRARIES) AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES) AND INDI_VERSION_OK)
++ endif(ANDROID)
++
++ if (INDI_FOUND)
++ if (NOT INDI_FIND_QUIETLY)
++ if(ANDROID)
++ message(STATUS "Found INDI Android Client: ${INDI_CLIENT_ANDROID_LIBRARIES}")
++ else(ANDROID)
++ message(STATUS "Found INDI: ${INDI_LIBRARIES}, ${INDI_INCLUDE_DIR}")
++
++ if (INDI_CLIENT_LIBRARIES)
++ message(STATUS "Found INDI Client Library: ${INDI_CLIENT_LIBRARIES}")
++ endif (INDI_CLIENT_LIBRARIES)
++ if (INDI_CLIENT_QT_LIBRARIES)
++ message(STATUS "Found INDI Qt5 Client Library: ${INDI_CLIENT_QT_LIBRARIES}")
++ endif (INDI_CLIENT_QT_LIBRARIES)
++ endif(ANDROID)
++ endif (NOT INDI_FIND_QUIETLY)
++ else (INDI_FOUND)
++ if (INDI_FIND_REQUIRED)
++ message(FATAL_ERROR "INDI not found. Please install INDI and try again.")
++ endif (INDI_FIND_REQUIRED)
++ endif (INDI_FOUND)
++
++ if(ANDROID)
++ mark_as_advanced(INDI_INCLUDE_DIR INDI_CLIENT_ANDROID_LIBRARIES)
++ else(ANDROID)
++ if (INDI_VERSION VERSION_LESS "1.4")
++ mark_as_advanced(INDI_INCLUDE_DIR INDI_LIBRARIES INDI_CLIENT_LIBRARIES INDI_CLIENT_QT_LIBRARIES)
++ else(INDI_VERSION VERSION_LESS "1.4")
++ mark_as_advanced(INDI_INCLUDE_DIR INDI_CLIENT_LIBRARIES INDI_CLIENT_QT_LIBRARIES)
++ endif(INDI_VERSION VERSION_LESS "1.4")
+ endif(ANDROID)
+ endif(NOT INDI_FOUND)
++
++if (INDI_INCLUDE_DIR)
++ # in cache already
++ _INDI_check_version()
++ if(ANDROID)
++ if(INDI_CLIENT_ANDROID_LIBRARIES)
++ set(INDI_FOUND ${INDI_VERSION_OK})
++ message(STATUS "Found INDI: ${INDI_CLIENT_ANDROID_LIBRARIES}")
++ endif(INDI_CLIENT_ANDROID_LIBRARIES)
++ else(ANDROID)
++ if (INDI_VERSION VERSION_LESS "1.4" AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
++ set(INDI_FOUND ${INDI_VERSION_OK})
++ message(STATUS "Found INDI: ${INDI_LIBRARIES}, ${INDI_CLIENT_LIBRARIES}, ${INDI_INCLUDE_DIR}")
++ elseif (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES)
++ set(INDI_FOUND ${INDI_VERSION_OK})
++ message(STATUS "Found INDI: ${INDI_CLIENT_LIBRARIES}, ${INDI_INCLUDE_DIR}")
++ endif(INDI_VERSION VERSION_LESS "1.4" AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
++ endif(ANDROID)
++endif(INDI_INCLUDE_DIR)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..412a70c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kde_findindi_cmake.diff
--
kstars packaging
More information about the pkg-kde-commits
mailing list