[SCM] konqueror packaging branch, master, updated. debian/4%17.08.1-1-13-g3dc92bf

Fri Dec 15 18:01:52 UTC 2017

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konqueror.git;a=commitdiff;h=71f1974

The following commit has been merged in the master branch:
commit 71f1974ee105bb8c6114def28cbdd38788de2db4
Author: Pino Toscano <pino at debian.org>
Date:   Fri Dec 15 18:54:01 2017 +0100

    allow to build konqueror w/o qtwebengine
---
 debian/changelog                         |  6 +++
 debian/control                           |  3 +-
 debian/konqueror.install                 | 11 ++---
 debian/patches/optional-qtwebengine.diff | 70 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 5 files changed, 85 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1233e1a..5da466d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,12 @@ konqueror (4:17.08.3-0r1) UNRELEASED; urgency=medium
   * Remove the extra kde-l10n-ast, and kde-l10n-eo breaks/replaces, as already
     included in ${kde-l10n:all}.
   * Add back the konq-plugins suggest in konqueror.
+  * Make konqueror buildable also without QtWebEngine:
+    - build the code using it conditionally; patch optional-qtwebengine.diff
+    - add the dh-exec build dependency
+    - restrict the webengine-related files on architectures with QtWebEngine
+    - restrict the qtwebengine5-dev build dependency on the architectures
+      where it is available: amd64 arm64 armhf i386 mipsel.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 Oct 2017 18:02:01 +0100
 
diff --git a/debian/control b/debian/control
index 635f356..08234c7 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>,
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
+               dh-exec,
                extra-cmake-modules (>= 5.27.0~),
                kinit-dev,
                libkf5activities-dev (>= 5.27.0~),
@@ -31,7 +32,7 @@ Build-Depends: cmake (>= 2.8.12~),
                pkg-kde-tools (>= 0.12),
                qtbase5-dev (>= 5.5.0~),
                qtscript5-dev,
-               qtwebengine5-dev (>= 5.5.0~),
+               qtwebengine5-dev (>= 5.5.0~) [amd64 arm64 armhf i386 mipsel],
                zlib1g-dev,
 Standards-Version: 4.1.2
 Homepage: http://www.kde.org/
diff --git a/debian/konqueror.install b/debian/konqueror.install
old mode 100644
new mode 100755
index 8f0b2e9..269ed61
--- a/debian/konqueror.install
+++ b/debian/konqueror.install
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
 etc/xdg/autostart/konqy_preload.desktop
 etc/xdg/konqueror.categories
 usr/bin/kfmclient
@@ -5,12 +6,12 @@ usr/bin/konqueror
 usr/lib/*/libkdeinit5_kfmclient.so
 usr/lib/*/libkdeinit5_konqueror.so
 usr/lib/*/libkonquerorprivate.so.*
-usr/lib/*/libkwebenginepartlib.so
+[amd64 arm64 armhf i386 mipsel] usr/lib/*/libkwebenginepartlib.so
 usr/lib/*/qt5/plugins/kcm_bookmarks.so
 usr/lib/*/qt5/plugins/kcm_konq.so
 usr/lib/*/qt5/plugins/kcm_konqhtml.so
 usr/lib/*/qt5/plugins/kcm_performance.so
-usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so
+[amd64 arm64 armhf i386 mipsel] usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so
 usr/lib/*/qt5/plugins/konq_aboutpage.so
 usr/share/applications/kfmclient.desktop
 usr/share/applications/kfmclient_*.desktop
@@ -20,7 +21,7 @@ usr/share/dbus-1/interfaces/org.kde.Konqueror.*.xml
 usr/share/doc/HTML/*/kcontrol5/
 usr/share/doc/HTML/*/konqueror/
 usr/share/icons/hicolor/*/apps/konqueror.png
-usr/share/icons/hicolor/*/apps/webengine.png
+[amd64 arm64 armhf i386 mipsel] usr/share/icons/hicolor/*/apps/webengine.png
 usr/share/kcmcss/
 usr/share/kcontrol/pics/*png
 usr/share/konqueror/
@@ -29,10 +30,10 @@ usr/share/kservices5/kcmkonqyperformance.desktop
 usr/share/kservices5/kcmperformance.desktop
 usr/share/kservices5/konq_aboutpage.desktop
 usr/share/kservices5/org.kde.konqueror.desktop
-usr/share/kservices5/webenginepart.desktop
+[amd64 arm64 armhf i386 mipsel] usr/share/kservices5/webenginepart.desktop
 usr/share/kservicetypes5/konqaboutpage.desktop
 usr/share/kwebkitpart/
-usr/share/kxmlgui5/webenginepart/
+[amd64 arm64 armhf i386 mipsel] usr/share/kxmlgui5/webenginepart/
 usr/share/locale/*/LC_MESSAGES/kcmbookmarks.mo
 usr/share/locale/*/LC_MESSAGES/kcmkonq.mo
 usr/share/locale/*/LC_MESSAGES/kcmkonqhtml.mo
diff --git a/debian/patches/optional-qtwebengine.diff b/debian/patches/optional-qtwebengine.diff
new file mode 100644
index 0000000..e45d154
--- /dev/null
+++ b/debian/patches/optional-qtwebengine.diff
@@ -0,0 +1,70 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Make QtWebEngine an optional requirement
+ This allows to build konqueror, albeith without an HTML component, also on
+ architectures that do not have QtWebEngine.
+Forwarded: no
+Last-Update: 2017-12-15
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,8 @@ include(ECMQtDeclareLoggingCategory)
+ set(KONQUEROR_LIB_VERSION "5.0.97")
+ set(KONQUEROR_VERSION "${KONQUEROR_LIB_VERSION}")
+ 
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets)
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets)
++find_package(Qt5 ${QT_MIN_VERSION} COMPONENTS WebEngineWidgets)
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils KHtml KDELibs4Support Archive Crash)
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities DocTools) # Optional
+@@ -53,7 +54,9 @@ add_subdirectory( libkonq )
+ add_subdirectory( src )
+ add_subdirectory( client )
+ add_subdirectory( autotests )
+-add_subdirectory( webenginepart )
++if (Qt5WebEngineWidgets_FOUND)
++    add_subdirectory( webenginepart )
++endif()
+ 
+ add_subdirectory( about )
+ add_subdirectory( pics )
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
+@@ -7,12 +7,14 @@ include_directories( ${CMAKE_CURRENT_SOU
+ 
+ ########### konqviewmgrtest ###############
+ 
+-add_executable(konqviewmgrtest konqviewmgrtest.cpp)
+-add_test(konqviewmgrtest konqviewmgrtest)
+-ecm_mark_as_test(konqviewmgrtest)
+-target_link_libraries(konqviewmgrtest kdeinit_konqueror Qt5::Core Qt5::Gui
+-   # KF5::KHtml
+-   kwebenginepartlib Qt5::WebEngineWidgets Qt5::Test)
++if (Qt5WebEngineWidgets_FOUND)
++  add_executable(konqviewmgrtest konqviewmgrtest.cpp)
++  add_test(konqviewmgrtest konqviewmgrtest)
++  ecm_mark_as_test(konqviewmgrtest)
++  target_link_libraries(konqviewmgrtest kdeinit_konqueror Qt5::Core Qt5::Gui
++     # KF5::KHtml
++     kwebenginepartlib Qt5::WebEngineWidgets Qt5::Test)
++endif()
+ 
+ ########### historymanagertest ###############
+ 
+@@ -30,10 +32,12 @@ target_link_libraries(undomanagertest kd
+ 
+ ########### konqhtmltest ###############
+ 
+-add_executable(konqhtmltest konqhtmltest.cpp)
+-add_test(konqhtmltest konqhtmltest)
+-ecm_mark_as_test(konqhtmltest)
+-target_link_libraries(konqhtmltest kdeinit_konqueror kwebenginepartlib Qt5::Core Qt5::Test)
++if (Qt5WebEngineWidgets_FOUND)
++  add_executable(konqhtmltest konqhtmltest.cpp)
++  add_test(konqhtmltest konqhtmltest)
++  ecm_mark_as_test(konqhtmltest)
++  target_link_libraries(konqhtmltest kdeinit_konqueror kwebenginepartlib Qt5::Core Qt5::Test)
++endif()
+ 
+ ########### konqviewtest ###############
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3e3084e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+optional-qtwebengine.diff

-- 
konqueror packaging

