1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
|
Description: Remove webkit from CMakeLists.txt
* QA upload.
* Remove Qt4 QtWebKit support in support of Stretch removal plans (Closes:
#816811)
- Remove libqtwebkit-dev from build-depends
- Add disable-webkit patch to remove webkit support from build
configuration
Author: Scott Kitterman <scott@kitterman.com>
Bug-Debian: http://bugs.debian.org/816811
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- pythonqt-3.0.orig/CMakeLists.txt
+++ pythonqt-3.0/CMakeLists.txt
@@ -25,7 +25,7 @@ add_definitions(-DPYTHONQT_USE_RELEASE_P
option(PythonQt_Wrap_QtAll "Make all Qt components available in python" OFF)
-set(qtlibs core gui network opengl sql svg uitools webkit xml xmlpatterns)
+set(qtlibs core gui network opengl sql svg uitools xml xmlpatterns)
foreach(qtlib ${qtlibs})
OPTION(PythonQt_Wrap_Qt${qtlib} "Make all of Qt${qtlib} available in python" OFF)
endforeach()
@@ -64,7 +64,7 @@ if(QT4_FOUND)
endif()
# Enable required qt module
- foreach(qtlib network opengl sql svg uitools webkit xml xmlpatterns)
+ foreach(qtlib network opengl sql svg uitools xml xmlpatterns)
string(TOUPPER ${qtlib} qtlib_uppercase)
if (NOT ${QT_QT${qtlib_uppercase}_FOUND})
message(FATAL_ERROR "QT_QT${${qtlib_uppercase} *not* FOUND - Try to disable PythonQt_Wrap_Qt${qtlib}")
@@ -162,7 +162,7 @@ set(moc_sources
#-----------------------------------------------------------------------------
# Add extra sources
-foreach(qtlib core gui network opengl sql svg uitools webkit xml xmlpatterns)
+foreach(qtlib core gui network opengl sql svg uitools xml xmlpatterns)
if (${PythonQt_Wrap_Qt${qtlib}})
|