rev 20725 - in kde-extras/kchmviewer/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2017-01-21 08:09:17 +0000 (Sat, 21 Jan 2017)
New Revision: 20725

Added:
   kde-extras/kchmviewer/trunk/debian/patches/force_qtwebkit.diff
Removed:
   kde-extras/kchmviewer/trunk/debian/patches/link-x11.diff
Modified:
   kde-extras/kchmviewer/trunk/debian/changelog
   kde-extras/kchmviewer/trunk/debian/patches/disable_check_new_version.patch
   kde-extras/kchmviewer/trunk/debian/patches/series
Log:
update the patches


Modified: kde-extras/kchmviewer/trunk/debian/changelog
===================================================================
--- kde-extras/kchmviewer/trunk/debian/changelog	2017-01-21 07:58:14 UTC (rev 20724)
+++ kde-extras/kchmviewer/trunk/debian/changelog	2017-01-21 08:09:17 UTC (rev 20725)
@@ -8,6 +8,11 @@
     - add the qtbase5-dev, and libqt5webkit5-dev build dependencies
     - drop the usage of the kde dh addon
     - force the use of the qmake build system
+  * Update the patches:
+    - disable_check_new_version.patch: refresh
+    - link-x11.diff: drop, cmake is no more used
+  * Force the usage of QtWebKit, no matter the Qt5 version; patch
+    force_qtwebkit.diff.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 21 Jan 2017 08:45:43 +0100
 

Modified: kde-extras/kchmviewer/trunk/debian/patches/disable_check_new_version.patch
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/disable_check_new_version.patch	2017-01-21 07:58:14 UTC (rev 20724)
+++ kde-extras/kchmviewer/trunk/debian/patches/disable_check_new_version.patch	2017-01-21 08:09:17 UTC (rev 20725)
@@ -2,7 +2,7 @@
 Bug: 602535
 --- a/src/config.cpp
 +++ b/src/config.cpp
-@@ -53,7 +53,7 @@ Config::Config()
+@@ -51,7 +51,7 @@ Config::Config()
  	m_advLayoutDirectionRL = settings.value( "advanced/layoutltr", false ).toBool();
  	m_advAutodetectEncoding = settings.value( "advanced/autodetectenc", false ).toBool();
  	m_advExternalEditorPath = settings.value( "advanced/editorpath", "/usr/bin/kate" ).toString();
@@ -13,12 +13,12 @@
  
 --- a/src/dialog_setup.cpp
 +++ b/src/dialog_setup.cpp
-@@ -177,7 +177,7 @@ void DialogSetup::accept()
- 	
- 	// Autodetect encoding
- 	Check_Need_Restart( boxAutodetectEncoding, &pConfig->m_advAutodetectEncoding, &need_restart );
--	pConfig->m_advCheckNewVersion = cbCheckForUpdates->isChecked();
-+	pConfig->m_advCheckNewVersion = false;
- 
- 	// Layout direction management
- 	bool layout_rl = boxLayoutDirectionRL->isChecked();
+@@ -178,7 +178,7 @@ void DialogSetup::accept()
+ 	
+ 	// Autodetect encoding
+ 	Check_Need_Restart( boxAutodetectEncoding, &pConfig->m_advAutodetectEncoding, &need_restart );
+-	pConfig->m_advCheckNewVersion = cbCheckForUpdates->isChecked();
++	pConfig->m_advCheckNewVersion = false;
+ 
+ 	// Layout direction management
+ 	bool layout_rl = boxLayoutDirectionRL->isChecked();

Added: kde-extras/kchmviewer/trunk/debian/patches/force_qtwebkit.diff
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/force_qtwebkit.diff	                        (rev 0)
+++ kde-extras/kchmviewer/trunk/debian/patches/force_qtwebkit.diff	2017-01-21 08:09:17 UTC (rev 20725)
@@ -0,0 +1,32 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Force the use of QtWebKit for any Qt5 version
+ QtWebKit is used only when Qt is < 5.6, but the QtWebEngine alternative is
+ considered experimental, and an error is issued.
+ .
+ Hence, just use QtWebKit for any version of Qt5.
+Last-Update: 2017-01-21
+Forwarded: not-needed
+
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -114,20 +114,10 @@ unix:!macx: {
+ 
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     # Qt 5
+-    greaterThan(QT_MINOR_VERSION, 5) {
+-        # Qt 5.6+
+-        error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")
+-        QT += webengine webenginewidgets
+-        DEFINES += USE_WEBENGINE
+-        SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp
+-        HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h
+-    } else {
+-        # Qt 5.0-5.5
+         QT += webkit webkitwidgets
+         DEFINES += USE_WEBKIT
+         SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
+         HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
+-    }
+ } else {
+     message("Qt4 is not supported anymore, please do not report any errors")
+     QT += webkit webkitwidgets

Modified: kde-extras/kchmviewer/trunk/debian/patches/series
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/series	2017-01-21 07:58:14 UTC (rev 20724)
+++ kde-extras/kchmviewer/trunk/debian/patches/series	2017-01-21 08:09:17 UTC (rev 20725)
@@ -1,2 +1,2 @@
 disable_check_new_version.patch
-link-x11.diff
+force_qtwebkit.diff