[konq-plugins] - ftbfs qt47 issues (#599830)

[Rex Dieter]

commit f83b68c828195fb8793b47a4faf19d7a48ea86d9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 7 15:54:09 2010 -0500

    - ftbfs qt47 issues (#599830)

 konq-plugins-4.4.0-qt47.patch |   12 ++++++++++++
 konq-plugins.spec             |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/konq-plugins-4.4.0-qt47.patch b/konq-plugins-4.4.0-qt47.patch
new file mode 100644
index 0000000..0261460
--- /dev/null
+++ b/konq-plugins-4.4.0-qt47.patch
@@ -0,0 +1,12 @@
+diff -up konq-plugins-4.4.0/adblock/adblock.cpp.qt47 konq-plugins-4.4.0/adblock/adblock.cpp
+--- konq-plugins-4.4.0/adblock/adblock.cpp.qt47	2010-09-07 15:51:03.776797042 -0500
++++ konq-plugins-4.4.0/adblock/adblock.cpp	2010-09-07 15:51:47.901818132 -0500
+@@ -300,7 +300,7 @@ void AdBlock::updateFilters()
+ // ----------------------------------------------------------------------------
+ 
+ AdElement::AdElement() :
+-  m_url(0), m_category(0), m_type(0), m_blocked(false) {}
++  m_blocked(false) {}
+ 
+ AdElement::AdElement(const QString &url, const QString &category,
+ 		     const QString &type, bool blocked, const DOM::Node&node) :
diff --git a/konq-plugins.spec b/konq-plugins.spec
index e4a195c..008ee66 100644
--- a/konq-plugins.spec
+++ b/konq-plugins.spec
@@ -2,7 +2,7 @@
 
 Name:           konq-plugins
 Version:        4.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -13,6 +13,9 @@ Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-p
 Patch100:       konq-plugins-4.4.0-babelfish-kwebkitpart.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+Patch50: konq-plugins-4.4.0-qt47.patch
+
 BuildRequires: cmake
 BuildRequires: gettext
 BuildRequires: kdebase4-devel >= %{version}
@@ -51,6 +54,7 @@ Some additional plugins that interact with konqueror
 
 %prep
 %setup -q
+%patch50 -p1 -b .qt47
 %patch100 -p0 -b .babelfish-kwebkitpart
 
 
@@ -142,6 +146,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Tue Sep 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-4
+- ftbfs qt47 issues (#599830)
+
 * Tue Feb 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-3
 - Requires: kdebase4 (it's not multilib'd, no need for arch'd dep)