[konq-plugins] - Embeddable Image Viewer permanently messes up status bar (kde#234624)

Rex Dieter rdieter at fedoraproject.org
Tue Sep 7 21:04:52 UTC 2010


commit b9dd15e86254ebc0c59a337640d34d3f667551d1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 7 16:10:26 2010 -0500

    - Embeddable Image Viewer permanently messes up status bar (kde#234624)

 konq-plugins-4.4.0-kde234624.patch |   15 +++++++++++++++
 konq-plugins.spec                  |   16 +++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/konq-plugins-4.4.0-kde234624.patch b/konq-plugins-4.4.0-kde234624.patch
new file mode 100644
index 0000000..1fe8786
--- /dev/null
+++ b/konq-plugins-4.4.0-kde234624.patch
@@ -0,0 +1,15 @@
+diff -up konq-plugins-4.4.0/adblock/adblock.cpp.kde234624 konq-plugins-4.4.0/adblock/adblock.cpp
+--- konq-plugins-4.4.0/adblock/adblock.cpp.kde234624	2010-09-07 15:51:47.901818132 -0500
++++ konq-plugins-4.4.0/adblock/adblock.cpp	2010-09-07 16:07:46.873058854 -0500
+@@ -105,10 +105,8 @@ AdBlock::~AdBlock()
+     KParts::StatusBarExtension *statusBarEx = KParts::StatusBarExtension::childObject(m_part);
+ 
+     if (statusBarEx)
+-    {
+         statusBarEx->removeStatusBarItem(m_label);
+-        delete m_label;
+-    }
++    delete m_label;
+     m_label = 0;
+     delete m_menu;
+     m_menu = 0;
diff --git a/konq-plugins.spec b/konq-plugins.spec
index 008ee66..973e837 100644
--- a/konq-plugins.spec
+++ b/konq-plugins.spec
@@ -9,12 +9,14 @@ Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
-# http://websvn.kde.org/?view=revision&revision=1089030
-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
+## upstream patches
+# http://websvn.kde.org/?view=revision&revision=1089030
+Patch100: konq-plugins-4.4.0-babelfish-kwebkitpart.patch
+Patch101: konq-plugins-4.4.0-qt47.patch
+# http://bugs.kde.org/234624
+Patch102: konq-plugins-4.4.0-kde234624.patch
 
 BuildRequires: cmake
 BuildRequires: gettext
@@ -54,8 +56,9 @@ Some additional plugins that interact with konqueror
 
 %prep
 %setup -q
-%patch50 -p1 -b .qt47
 %patch100 -p0 -b .babelfish-kwebkitpart
+%patch101 -p1 -b .qt47
+%patch102 -p1 -b .kdekde234624
 
 
 %build
@@ -146,6 +149,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Tue Sep 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-5
+- Embeddable Image Viewer permanently messes up status bar (kde#234624)
+
 * Tue Sep 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-4
 - ftbfs qt47 issues (#599830)
 


More information about the scm-commits mailing list