[SCM] QtWebKit packaging branch, master, updated. debian/2.0-week26-2-5-g80dc99a

Fathi Boudra fabo at alioth.debian.org
Fri Jul 23 13:20:01 UTC 2010


The following commit has been merged in the master branch:
commit 80dc99aaf587ac873632ee7c5b633ef41f937c98
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Jul 23 16:19:32 2010 +0300

    Add 0002_add_webkit_qt_config.patch to include webkit in QT_CONFIG
---
 debian/changelog                               |    1 +
 debian/patches/0002_add_webkit_qt_config.patch |   15 +++++++++++++++
 debian/patches/series                          |    1 +
 3 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e18779..084c837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtwebkit (2.0~week27-1) experimental; urgency=low
 
   * New upstream release.
+  * Add 0002_add_webkit_qt_config.patch to include webkit in QT_CONFIG.
   * Update debian/control:
     - build depends on Qt 4.7.0 beta 2.
     - add libqtwebkit-qmlwebkitplugin package.
diff --git a/debian/patches/0002_add_webkit_qt_config.patch b/debian/patches/0002_add_webkit_qt_config.patch
new file mode 100644
index 0000000..0551bdd
--- /dev/null
+++ b/debian/patches/0002_add_webkit_qt_config.patch
@@ -0,0 +1,15 @@
+Description: when Qt is built with -no-webkit and Qt WebKit is used
+             Qt applications cannot found webkit as they rely on qmake. 
+Author: Simon Hausmann <simon.hausmann at nokia.com>
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+
+--- a/WebKit/qt/qt_webkit_version.pri
++++ b/WebKit/qt/qt_webkit_version.pri
+@@ -1,3 +1,7 @@
++#configuration
++QT_CONFIG *= webkit
++
++#versioning
+ QT_WEBKIT_VERSION = 4.7.0
+ QT_WEBKIT_MAJOR_VERSION = 4
+ QT_WEBKIT_MINOR_VERSION = 7
diff --git a/debian/patches/series b/debian/patches/series
index acce5e4..d0fc0d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # upstream patches
 0001_fix_symbols_visibility_for_webcore.diff
+0002_add_webkit_qt_config.patch
 
 # debian patches
 01_lflags_as-needed.diff

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list