From e00a432d21d82416c659feec247a0367b73ae4fa Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 8 Oct 2010 07:21:16 -0500
Subject: [PATCH 1/4] - switching comic in commic applet crashes plasma
 (kde#253387,rh#640619)

---
 kdelibs-4.5.2-comic_applet_kde253387.patch | 19 +++++++++++++++++++
 kdelibs.spec                               | 11 ++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 kdelibs-4.5.2-comic_applet_kde253387.patch

diff --git a/kdelibs-4.5.2-comic_applet_kde253387.patch b/kdelibs-4.5.2-comic_applet_kde253387.patch
new file mode 100644
index 0000000..420a119
--- /dev/null
+++ b/kdelibs-4.5.2-comic_applet_kde253387.patch
@@ -0,0 +1,19 @@
+--- branches/KDE/4.5/kdelibs/plasma/tooltipmanager.cpp	2010/09/28 01:19:58	1180436
++++ branches/KDE/4.5/kdelibs/plasma/tooltipmanager.cpp	2010/10/08 11:35:52	1183776
+@@ -236,10 +236,12 @@
+             }
+         }
+ 
+-        d->tipWidget->setContent(widget, data);
+-        d->tipWidget->prepareShowing();
+-        if (m_corona) {
+-            d->tipWidget->moveTo(m_corona->popupPosition(widget, d->tipWidget->size(), Qt::AlignCenter));
++        if (d->tipWidget) {
++            d->tipWidget->setContent(widget, data);
++            d->tipWidget->prepareShowing();
++            if (m_corona) {
++                d->tipWidget->moveTo(m_corona->popupPosition(widget, d->tipWidget->size(), Qt::AlignCenter));
++            }
+         }
+     }
+ }
diff --git a/kdelibs.spec b/kdelibs.spec
index 79d3dd5..d74762f 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -12,7 +12,7 @@
 
 Summary: KDE Libraries
 Version: 4.5.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -90,9 +90,10 @@ Patch27: kdelibs-4.4.80-no_rpath.patch
 Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
 
 ## 4.5 upstream
+Patch100:  kdelibs-4.5.2-comic_applet_kde253387.patch 
 
 ## trunk upstream
-Patch100: kdelibs-4.5.2-krun-kde#253294.patch
+Patch150: kdelibs-4.5.2-krun-kde#253294.patch
 
 ## security fix
 # Not Upstreamed? why not ? -- Rex
@@ -257,7 +258,8 @@ format for use with the Qt 4 Assistant or KDevelop 4.
 %patch50 -p1 -b .knewstuff_gpg2
 
 # upstream patches
-%patch100 -p1 -b .kde#253294
+%patch100 -p1 -b .comic_applet_kde253387
+%patch150 -p1 -b .kde#253294
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -505,6 +507,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 08 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.2-5
+- switching comic in commic applet crashes plasma (kde#253387,rh#640619)
+
 * Thu Oct 07 2010 Than Ngo <than@redhat.com> - 4.5.2-4
 - kde253294, KMail and Kopete download and open https url instead of only opening
 

From 411685d022302cd06d460eed4a4a31d66fd558fd Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 8 Oct 2010 07:24:07 -0500
Subject: [PATCH 2/4] move sed call near to relevant branding patch

---
 kdelibs.spec | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kdelibs.spec b/kdelibs.spec
index d74762f..43e77e9 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -244,6 +244,8 @@ format for use with the Qt 4 Assistant or KDevelop 4.
 %patch2 -p1 -b .kde149705
 %patch8 -p1 -b .install_all_css
 %patch9 -p1 -b .branding
+# add release version as part of branding (suggested by cailon)
+sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch11 -p1 -b .policykit-workaround
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
@@ -267,9 +269,6 @@ format for use with the Qt 4 Assistant or KDevelop 4.
 
 %build
 
-# add release version
-sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..

From ed4e146527d1044aea3f8b3ba058fa921025c246 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 8 Oct 2010 07:29:37 -0500
Subject: [PATCH 3/4] QTDOCDIR, use %_qt4_docdir if available, fallback to
 pkg-config if not (though I think we could probably assume _qt4_docdir is
 present these days)

---
 kdelibs.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kdelibs.spec b/kdelibs.spec
index 43e77e9..94091d0 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -278,7 +278,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 # build apidocs
 %if 0%{?apidocs}
-export QTDOCDIR=`pkg-config --variable=docdir Qt`
+export QTDOCDIR="%{?_qt4_docdir}%{?!_qt4_docdir:%(pkg-config --variable=docdir Qt)}"
 %if 0%{?apidocs_qch}
 export PROJECT_NAME="%{name}"
 export PROJECT_VERSION="%{version}%{?alphatag}"

From 61bdfa02e21c9224eb3b71c5620ac15c4b99b1aa Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 8 Oct 2010 07:30:51 -0500
Subject: [PATCH 4/4] fix application of patch100 (-p4)

---
 kdelibs.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kdelibs.spec b/kdelibs.spec
index 94091d0..3b3c434 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -260,7 +260,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch50 -p1 -b .knewstuff_gpg2
 
 # upstream patches
-%patch100 -p1 -b .comic_applet_kde253387
+%patch100 -p4 -b .comic_applet_kde253387
 %patch150 -p1 -b .kde#253294
 
 # security fix