[Pkg-owncloud-commits] [qtkeychain] 62/63: Add patch: fix-qt4-build.patch

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch master
in repository qtkeychain.

commit 8e62c0d06e87b71af810a82cf9cf4d2a949a05b6
Author: Sandro Knauß <hefee at debian.org>
Date:   Sat Jun 10 16:35:50 2017 +0200

    Add patch: fix-qt4-build.patch
---
 debian/changelog                   |  4 +++-
 debian/patches/fix-qt4-build.patch | 19 +++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 917288d..3a8bcf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ qtkeychain (0.8.0-1) UNRELEASED; urgency=medium
 
   * new upstream release.
   * Updated copyright information.
-  * Add new build dependencies.
+  * Add new build dependencies (pkg-config and libsecret-1).
+  * Add patch: fix-qt4-build.patch:
+    - Make Qt4 builds successfull again.
 
  -- Sandro Knauß <hefee at debian.org>  Sat, 10 Jun 2017 15:12:54 +0200
 
diff --git a/debian/patches/fix-qt4-build.patch b/debian/patches/fix-qt4-build.patch
new file mode 100644
index 0000000..171113f
--- /dev/null
+++ b/debian/patches/fix-qt4-build.patch
@@ -0,0 +1,19 @@
+Description: Make it possible to build with Qt4
+ Without this patch no Qt4 libary is buit anymore
+Author: Sandro Knauß <hefee at debian.org>
+Origin: Debian
+Forwarded: https://github.com/frankosterfeld/qtkeychain/pull/102
+Last-Update: 2017-06-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,7 +38,7 @@ if( NOT BUILD_WITH_QT4 )
+     find_package(Qt5Core QUIET)
+ endif()
+ 
+-if (Qt5Core_FOUND)
++if (Qt5Core_FOUND AND NOT BUILD_WITH_QT4)
+   set(QTKEYCHAIN_VERSION_INFIX 5)
+ 
+   if(UNIX AND NOT APPLE AND NOT ANDROID)
diff --git a/debian/patches/series b/debian/patches/series
index 7c75c50..538af39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix-qt4-build.patch
 use_system_GNUInstallDirs.cmake

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/qtkeychain.git