[freecad] 03/08: Remove dependency on Qt4 Webkit. (Closes: #784464)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository freecad.

commit c2f67a5132dc1e33188658e0c1a56597bf178c45
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Sep 7 22:25:59 2017 +0200

    Remove dependency on Qt4 Webkit. (Closes: #784464)
---
 debian/control                     |  1 -
 debian/patches/remove_webkit.patch | 46 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  2 +-
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index ac03c0a..a6e96e3 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,6 @@ Build-Depends: cmake,
                libode-dev,
                libpyside-dev,
                libqt4-dev,
-               libqtwebkit-dev,
                libshiboken-dev,
                libsoqt4-dev (>= 1.6),
                libspnav-dev,
diff --git a/debian/patches/remove_webkit.patch b/debian/patches/remove_webkit.patch
new file mode 100644
index 0000000..8f07c33
--- /dev/null
+++ b/debian/patches/remove_webkit.patch
@@ -0,0 +1,46 @@
+Description: Remove Qt4-Webkit dependency
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/784464
+Last-Update: 2017-09-06
+
+Index: freecad-0.16.6712+dfsg1/src/Gui/DownloadManager.cpp
+===================================================================
+--- freecad-0.16.6712+dfsg1.orig/src/Gui/DownloadManager.cpp
++++ freecad-0.16.6712+dfsg1/src/Gui/DownloadManager.cpp
+@@ -33,7 +33,7 @@
+ #include <QMetaEnum>
+ #include <QSettings>
+ #include <QFileIconProvider>
+-#include <QWebSettings>
++// #include <QWebSettings>
+ 
+ #include "DownloadItem.h"
+ #include "DownloadManager.h"
+@@ -224,11 +224,12 @@ void DownloadManager::updateRow()
+     ui->downloadsView->setRowHeight(row, item->minimumSizeHint().height());
+ 
+     bool remove = false;
+-    QWebSettings *globalSettings = QWebSettings::globalSettings();
++    /*
++     * QWebSettings *globalSettings = QWebSettings::globalSettings();
+     if (!item->downloading()
+         && globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+         remove = true;
+-
++*/
+     if (item->downloadedSuccessfully()
+         && removePolicy() == DownloadManager::SuccessFullDownload) {
+         remove = true;
+Index: freecad-0.16.6712+dfsg1/src/Mod/CMakeLists.txt
+===================================================================
+--- freecad-0.16.6712+dfsg1.orig/src/Mod/CMakeLists.txt
++++ freecad-0.16.6712+dfsg1/src/Mod/CMakeLists.txt
+@@ -67,7 +67,7 @@ if(BUILD_DRAFT)
+ endif(BUILD_DRAFT)
+ 
+ if(BUILD_WEB)
+-  add_subdirectory(Web)
++ #add_subdirectory(Web)
+ endif(BUILD_WEB)
+ 
+ if(BUILD_START)
diff --git a/debian/patches/series b/debian/patches/series
index eed7e7c..8905109 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@ do_not_install_binary_examples.patch
 exclude_ply.patch
 disable_memory_check.patch
 remove_doc-files.patch
-
+remove_webkit.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freecad.git