[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=61effbb
The following commit has been merged in the master branch:
commit 61effbb29845f9c9da931ae32530ab6f508f6959
Author: Jonathan Riddell <jr at jriddell.org>
Date: Wed Mar 8 11:06:03 2017 +0000
update FindINDI
---
debian/patches/kde_findindi_cmake.diff | 70 ++++++++++++++++++----------------
1 file changed, 37 insertions(+), 33 deletions(-)
diff --git a/debian/patches/kde_findindi_cmake.diff b/debian/patches/kde_findindi_cmake.diff
index 755661a..8c1456c 100644
--- a/debian/patches/kde_findindi_cmake.diff
+++ b/debian/patches/kde_findindi_cmake.diff
@@ -1,11 +1,25 @@
-https://git.reviewboard.kde.org/r/129998/
-
-Index: kstars/cmake/modules/FindINDI.cmake
+Index: kstars-16.12.2/cmake/modules/FindINDI.cmake
===================================================================
---- kstars.orig/cmake/modules/FindINDI.cmake
-+++ kstars/cmake/modules/FindINDI.cmake
-@@ -17,150 +17,150 @@
- # Redistribution AND use is allowed according to the terms of the BSD license.
+--- kstars-16.12.2.orig/cmake/modules/FindINDI.cmake
++++ kstars-16.12.2/cmake/modules/FindINDI.cmake
+@@ -6,152 +6,161 @@
+ # For Android
+ # INDI_CLIENT_ANDROID_LIBRARIES - Link to these for INDI Android client
+ # For other platforms
+-# INDI_LIBRARIES - Link to these for XML and INDI Common support
++# INDI_LIBRARIES - Link to these for XML and INDI Common support (INDI < 1.4 only)
+ # INDI_CLIENT_LIBRARIES - Link to these to build INDI clients
+ # INDI_CLIENT_QT_LIBRARIES - Link to these to build INDI clients with Qt5 backend
+-
+-# Copyright (c) 2016, Jasem Mutlaq <mutlaqja at ikarustech.com>
++# INDI_CLIENT_ANDROID_LIBRARIES - Link to these to build INDI clients with Qt5 backend on Android
++# Copyright (c) 2012-2017, Jasem Mutlaq <mutlaqja at ikarustech.com>
+ # Copyright (c) 2012, Pino Toscano <pino at kde.org>
+ # Based on FindLibfacile by Carsten Niehaus, <cniehaus at gmx.de>
+ #
+-# Redistribution ANDuse is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++# 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)
@@ -62,13 +76,10 @@ Index: kstars/cmake/modules/FindINDI.cmake
- 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))
+- if(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(INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
- endif(ANDROID)
-endif(INDI_INCLUDE_DIR)
-
@@ -96,13 +107,18 @@ Index: kstars/cmake/modules/FindINDI.cmake
- ${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
+- )
+-
+- find_library(INDI_CLIENT_LIBRARIES NAMES indiclient
+- PATHS
+- ${PC_INDI_LIBRARY_DIRS}
+- ${_obLinkDir}
+- ${GNUWIN32_DIR}/lib
+ if (NOT WIN32 AND NOT ANDROID)
+ find_package(PkgConfig)
+ if (PKG_CONFIG_FOUND)
@@ -116,15 +132,7 @@ Index: kstars/cmake/modules/FindINDI.cmake
+ ${_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
-- )
--
+
- find_library(INDI_CLIENT_QT_LIBRARIES NAMES indiclientqt
- PATHS
- ${PC_INDI_LIBRARY_DIRS}
@@ -133,7 +141,7 @@ Index: kstars/cmake/modules/FindINDI.cmake
- )
-endif(ANDROID)
-endif(INDI_INCLUDE_DIR)
-
+-
-if(ANDROID)
- if(INDI_INCLUDE_DIR AND INDI_CLIENT_ANDROID_LIBRARIES)
- set(INDI_FOUND TRUE)
@@ -141,7 +149,7 @@ Index: kstars/cmake/modules/FindINDI.cmake
- 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_INCLUDE_DIR AND 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)
@@ -152,9 +160,9 @@ Index: kstars/cmake/modules/FindINDI.cmake
- 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)
+- else (INDI_INCLUDE_DIR AND 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_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES) AND INDI_VERSION_OK)
-endif(ANDROID)
+ if (INDI_INCLUDE_DIR)
+ _INDI_check_version()
@@ -216,11 +224,7 @@ Index: kstars/cmake/modules/FindINDI.cmake
+ 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")
+- mark_as_advanced(INDI_INCLUDE_DIR INDI_LIBRARIES INDI_CLIENT_LIBRARIES INDI_CLIENT_QT_LIBRARIES)
+ 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)
--
kstars packaging
More information about the pkg-kde-commits
mailing list