[SCM] KDE Bindings module packaging branch, kde4.4, updated. debian/4.4.5-4-3-gffa0988

Sune Vuorela pusling-guest at alioth.debian.org
Fri Apr 1 00:10:10 UTC 2011


The following commit has been merged in the kde4.4 branch:
commit ffa0988c627a75d88aeef0783cd22bc9074c5f18
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Fri Apr 1 02:09:43 2011 +0200

    fix builds with qtwebkit
---
 debian/changelog                            |    3 +++
 debian/patches/add_qtwebkit_includedir.diff |   14 ++++++++++++++
 debian/patches/series                       |    1 +
 3 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f65837..3d4a30d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ kdebindings (4:4.4.5-5) UNRELEASED; urgency=high
     - Urgency high for Qt4.7 transition.
   * Add libqtwebkit-dev B-D (Closes: #618215)
 
+  [ Sune Vuorela ]
+  * Add qtwebkit includes to python build
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 31 Mar 2011 14:31:18 +0200
 
 kdebindings (4:4.4.5-4) unstable; urgency=low
diff --git a/debian/patches/add_qtwebkit_includedir.diff b/debian/patches/add_qtwebkit_includedir.diff
new file mode 100644
index 0000000..601392d
--- /dev/null
+++ b/debian/patches/add_qtwebkit_includedir.diff
@@ -0,0 +1,14 @@
+Origin: vendor
+Forwarded: Not needed
+Author: sune
+
+--- kdebindings-4.4.5.orig/python/pykde4/CMakeLists.txt
++++ kdebindings-4.4.5/python/pykde4/CMakeLists.txt
+@@ -75,6 +75,7 @@ INCLUDE_DIRECTORIES(
+     ${QT_QTSQL_INCLUDE_DIR}
+     ${QT_QTXML_INCLUDE_DIR}
+     ${QT_QTSVG_INCLUDE_DIR}
++    ${QT_QTWEBKIT_INCLUDE_DIR}
+     ${KDE4_INCLUDE_DIR}
+     ${KDE4_INCLUDE_DIR}/solid
+     ${KDE4_INCLUDE_DIR}/kio
diff --git a/debian/patches/series b/debian/patches/series
index 0d3b299..d1a7aa7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ backport_r1170602.diff
 backport_r1184022.diff
 backport_r1209688.diff
 backport_r1211266.diff
+add_qtwebkit_includedir.diff

-- 
KDE Bindings module packaging



More information about the pkg-kde-commits mailing list