rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- switching comic in commic applet crashes plasma (kde#253387,rh#640619)

This commit is contained in:
Rex Dieter 2010-10-08 07:21:16 -05:00
parent 200df46c45
commit e00a432d21
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kdelibs-4.5.2-comic_applet_kde253387.patch Normal file
View File

@ -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));
+ }
}
}
}

11
kdelibs.spec
View File

@ -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