[SCM] konq-plugins packaging branch, master, updated. e11b303e51665723e9537b622528de33a4430b77

[Didier Raboud]

The following commit has been merged in the master branch:
commit f5beed3f4790bb05573af4e2b2664828899fd1b3
Author: Didier Raboud <odyx at debian.org>
Date:   Mon Mar 14 17:20:37 2011 +0100

    Add 01_qt47.patch from Ubuntu to fix FTBFS (Closes: #618058)
---
 debian/patches/01_qt47.patch |   14 ++++++++++++++
 debian/patches/series        |    1 +
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/debian/patches/01_qt47.patch b/debian/patches/01_qt47.patch
new file mode 100644
index 0000000..8d61ba7
--- /dev/null
+++ b/debian/patches/01_qt47.patch
@@ -0,0 +1,14 @@
+Description: Fixes build under Qt4.7/Gcc4.5
+Origin: upstream
+Last-Update: 2011-03-14
+--- a/adblock/adblock.cpp
++++ b/adblock/adblock.cpp
+@@ -300,7 +300,7 @@
+ // ----------------------------------------------------------------------------
+ 
+ AdElement::AdElement() :
+-  m_url(0), m_category(0), m_type(0), m_blocked(false) {}
++  m_url(QString()), m_category(QString()), m_type(QString()), m_blocked(false) {}
+ 
+ AdElement::AdElement(const QString &url, const QString &category,
+ 		     const QString &type, bool blocked, const DOM::Node&node) :
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b18dea0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_qt47.patch

-- 
konq-plugins packaging