[SCM] KDevelop Platform packaging branch, master, updated. debian/5.0.1-2

Pino Toscano pino at moszumanska.debian.org
Wed Sep 21 05:14:56 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevplatform.git;a=commitdiff;h=2f3ce7c

The following commit has been merged in the master branch:
commit 2f3ce7c8b3cb6bf1360a1d2e1a64b5c125833a53
Author: Pino Toscano <pino at debian.org>
Date:   Thu Aug 25 22:42:26 2016 +0200

    fix deps in cmake config files
    
    backport upstream commit b64f24d70164c65805e3fff965478a21fd74326b
---
 debian/changelog                                   |  3 ++
 debian/patches/series                              |  1 +
 .../patches/upstream_find-all-dependencies.patch   | 62 ++++++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4d994a8..dcba39d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ kdevplatform (5.0-0r1) UNRELEASED; urgency=medium
       drop, backported from upstream
   * Update install files.
   * Add in kdevplatform10-libs breaks/replaces against old kdevplatform8-libs.
+  * Backport upstream commit b64f24d70164c65805e3fff965478a21fd74326b to fix
+    dependencies in the cmake configuration files; patch
+    upstream_find-all-dependencies.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Aug 2016 19:23:00 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3b2f9e7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_find-all-dependencies.patch
diff --git a/debian/patches/upstream_find-all-dependencies.patch b/debian/patches/upstream_find-all-dependencies.patch
new file mode 100644
index 0000000..56f2583
--- /dev/null
+++ b/debian/patches/upstream_find-all-dependencies.patch
@@ -0,0 +1,62 @@
+From b64f24d70164c65805e3fff965478a21fd74326b Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter at kde.org>
+Date: Tue, 23 Aug 2016 13:23:31 +0200
+Subject: [PATCH] find all dependencies
+
+Summary:
+otherwise cmake falls over when it tries to create the imported targets,
+since it can't find its dependencies
+
+Reviewers: apol
+
+Reviewed By: apol
+
+Subscribers: kdevelop-devel
+
+Differential Revision: https://phabricator.kde.org/D2547
+---
+ KDevPlatformConfig.cmake.in | 30 +++++++++++++++++++++++++++++-
+ 1 file changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/KDevPlatformConfig.cmake.in b/KDevPlatformConfig.cmake.in
+index 12c8068..73664eb 100644
+--- a/KDevPlatformConfig.cmake.in
++++ b/KDevPlatformConfig.cmake.in
+@@ -2,5 +2,33 @@
+ 
+ set(KDEV_PLUGIN_VERSION @KDEV_PLUGIN_VERSION@)
+ 
+-include("${CMAKE_CURRENT_LIST_DIR}/KDevPlatformTargets.cmake")
+ include("${CMAKE_CURRENT_LIST_DIR}/KDevPlatformMacros.cmake")
++
++find_dependency(Qt5Concurrent "@QT_MIN_VERSION@")
++find_dependency(Qt5Core "@QT_MIN_VERSION@")
++find_dependency(Qt5Quick "@QT_MIN_VERSION@")
++find_dependency(Qt5QuickWidgets "@QT_MIN_VERSION@")
++find_dependency(Qt5Test "@QT_MIN_VERSION@")
++
++find_dependency(KF5Archive "@KF5_DEP_VERSION@")
++find_dependency(KF5Config "@KF5_DEP_VERSION@")
++find_dependency(KF5ConfigWidgets "@KF5_DEP_VERSION@")
++find_dependency(KF5GuiAddons "@KF5_DEP_VERSION@")
++find_dependency(KF5I18n "@KF5_DEP_VERSION@")
++find_dependency(KF5IconThemes "@KF5_DEP_VERSION@")
++find_dependency(KF5ItemViews "@KF5_DEP_VERSION@")
++find_dependency(KF5JobWidgets "@KF5_DEP_VERSION@")
++find_dependency(KF5KCMUtils "@KF5_DEP_VERSION@")
++find_dependency(KF5KIO "@KF5_DEP_VERSION@")
++find_dependency(KF5NewStuff "@KF5_DEP_VERSION@")
++find_dependency(KF5Notifications "@KF5_DEP_VERSION@")
++find_dependency(KF5NotifyConfig "@KF5_DEP_VERSION@")
++find_dependency(KF5Parts "@KF5_DEP_VERSION@")
++find_dependency(KF5Service "@KF5_DEP_VERSION@")
++find_dependency(KF5TextEditor "@KF5_DEP_VERSION@")
++find_dependency(KF5ThreadWeaver "@KF5_DEP_VERSION@")
++find_dependency(KF5WindowSystem "@KF5_DEP_VERSION@")
++
++find_dependency(Grantlee5)
++
++include("${CMAKE_CURRENT_LIST_DIR}/KDevPlatformTargets.cmake")
+-- 
+2.9.3
+

-- 
KDevelop Platform packaging



More information about the pkg-kde-commits mailing list