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

fix a crash (appearing in KSMServer)

This commit is contained in:
Than Ngo 2009-01-12 13:43:16 +00:00
parent bbbb68e279
commit adc85e5dc4
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
kdelibs-4.1.96-crash.patch Normal file
View File

@ -0,0 +1,42 @@
--- kdelibs-4.1.96/plasma/framesvg.cpp.orig 2009/01/06 17:13:38 906699
+++ kdelibs-4.1.96/plasma/framesvg.cpp 2009/01/11 17:31:47 909478
@@ -583,7 +583,8 @@
}
}
} else {
- if (frame->enabledBorders & FrameSvg::LeftBorder && q->hasElement(prefix + "left")) {
+ if (frame->enabledBorders & FrameSvg::LeftBorder && q->hasElement(prefix + "left")
+ && leftHeight > 0 && frame->leftWidth > 0) {
QPixmap left(frame->leftWidth, leftHeight);
left.fill(Qt::transparent);
@@ -594,7 +595,8 @@
p.drawTiledPixmap(QRect(leftOffset, contentTop, frame->leftWidth, contentHeight), left);
}
- if (frame->enabledBorders & FrameSvg::RightBorder && q->hasElement(prefix + "right")) {
+ if (frame->enabledBorders & FrameSvg::RightBorder && q->hasElement(prefix + "right") &&
+ leftHeight > 0 && frame->rightWidth > 0) {
QPixmap right(frame->rightWidth, leftHeight);
right.fill(Qt::transparent);
@@ -605,7 +607,8 @@
p.drawTiledPixmap(QRect(rightOffset, contentTop, frame->rightWidth, contentHeight), right);
}
- if (frame->enabledBorders & FrameSvg::TopBorder && q->hasElement(prefix + "top")) {
+ if (frame->enabledBorders & FrameSvg::TopBorder && q->hasElement(prefix + "top")
+ && topWidth > 0 && frame->topHeight > 0) {
QPixmap top(topWidth, frame->topHeight);
top.fill(Qt::transparent);
@@ -616,7 +619,8 @@
p.drawTiledPixmap(QRect(contentLeft, topOffset, contentWidth, frame->topHeight), top);
}
- if (frame->enabledBorders & FrameSvg::BottomBorder && q->hasElement(prefix + "bottom")) {
+ if (frame->enabledBorders & FrameSvg::BottomBorder && q->hasElement(prefix + "bottom")
+ && topWidth > 0 && frame->bottomHeight > 0) {
QPixmap bottom(topWidth, frame->bottomHeight);
bottom.fill(Qt::transparent);

11
kdelibs.spec
View File

@ -1,6 +1,6 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.1.96
Release: 5%{?dist}
Release: 6%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -80,6 +80,9 @@ Patch20: kdelibs-4.1.70-cmake.patch
Patch21: kdelibs-4.1.85-plasma-default-wallpaper.patch
Patch22: kdelibs-4.1.96-cmake.patch
# upstream
Patch100: kdelibs-4.1.96-crash.patch
BuildRequires: qt4-devel >= 4.4.0
Requires: qt4 >= %{_qt4_version}
Requires: xdg-utils
@ -205,6 +208,9 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch21 -p1 -b .plasma-default-wallpaper
%patch22 -p1 -b .kdepimlibs-cmake
# upstream patches
%patch100 -p1 -b .crash
%build
mkdir -p %{_target_platform}
@ -365,6 +371,9 @@ rm -rf %{buildroot}
%changelog
* Mon Jan 12 2009 Than Ngo <than@redhat.com> - 4.1.96-6
- fix a crash (appearing in KSMServer)
* Sat Jan 10 2009 Than Ngo <than@redhat.com> - 4.1.96-5
- kdeworkspace cmake files in correct place