[SCM] gammaray packaging branch, master, updated. debian/2.3.0-3-32-g2c7d1d2
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Tue Jul 26 20:05:56 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=937a149
The following commit has been merged in the master branch:
commit 937a149c17f299e4eb1b6dc43346bb27a543d424
Author: Jakub Adam <jakub.adam at tieto.com>
Date: Tue Jul 26 11:56:33 2016 +0200
Don't check QtWebKit plugin buring Qt4 build
---
debian/patches/disable-qt4-webinspector.patch | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/debian/patches/disable-qt4-webinspector.patch b/debian/patches/disable-qt4-webinspector.patch
index d701046..8ac068f 100644
--- a/debian/patches/disable-qt4-webinspector.patch
+++ b/debian/patches/disable-qt4-webinspector.patch
@@ -3,9 +3,23 @@ Date: Wed, 1 Jul 2015 19:55:52 +0200
Subject: disable-qt4-webinspector
---
+ CMakeLists.txt | 2 +-
plugins/CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d8335da..1b32d33 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -324,7 +324,7 @@ else()
+ # minimum set
+ find_package(Qt4 4.8.0 REQUIRED QtCore QtGui QtNetwork)
+ endif()
+- find_package(Qt4 4.8.0 QUIET COMPONENTS QtScript QtScriptTools QtWebKit QtDesigner QtSvg QtTest)
++ find_package(Qt4 4.8.0 QUIET COMPONENTS QtScript QtScriptTools QtDesigner QtSvg QtTest)
+
+ include(${QT_USE_FILE})
+ set(HAVE_QT_CONCURRENT true)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 3058e72..f651c06 100644
--- a/plugins/CMakeLists.txt
--
gammaray packaging
More information about the pkg-kde-commits
mailing list