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

Merge branch 'master' into f16

This commit is contained in:
Jaroslav Reznik 2012-03-22 13:52:27 +01:00
parent 1367bf1087 0143b76a8a
commit efcabf6ef9
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kdelibs-4.8.1-sonnet-highlighter.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up kdelibs-4.8.1/kdeui/sonnet/highlighter.cpp.sonnet-highlighter kdelibs-4.8.1/kdeui/sonnet/highlighter.cpp
--- kdelibs-4.8.1/kdeui/sonnet/highlighter.cpp.sonnet-highlighter 2012-02-29 22:55:52.000000000 +0100
+++ kdelibs-4.8.1/kdeui/sonnet/highlighter.cpp 2012-03-22 13:16:26.921298645 +0100
@@ -108,6 +108,10 @@ Highlighter::Highlighter(QTextEdit *text
d->dict = new Sonnet::Speller();
d->spellCheckerFound = d->dict->isValid();
+ d->rehighlightRequest = new QTimer(this);
+ connect( d->rehighlightRequest, SIGNAL(timeout()),
+ this, SLOT(slotRehighlight()));
+
if(!d->spellCheckerFound)
return;
@@ -121,9 +125,6 @@ Highlighter::Highlighter(QTextEdit *text
for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) {
d->dict->addToSession( *it );
}
- d->rehighlightRequest = new QTimer(this);
- connect( d->rehighlightRequest, SIGNAL(timeout()),
- this, SLOT(slotRehighlight()));
d->completeRehighlightRequired = true;
d->rehighlightRequest->setInterval(0);
d->rehighlightRequest->setSingleShot(true);

12
kdelibs.spec
View File

@ -20,7 +20,7 @@
Summary: KDE Libraries
Version: 4.8.1
Release: 2%{?dist}
Release: 3%{?dist}
Name: kdelibs
Epoch: 6
@ -137,6 +137,12 @@ Patch101: kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch
# https://bugs.kde.org/show_bug.cgi?id=295474
Patch102: kdelibs-4.8.1-nepomuk_threading.patch
# Sonnet highlighter crash due to unitialized value access by Matt Whitlock (Gentoo)
# https://bugs.kde.org/show_bug.cgi?id=295615
# https://bugzilla.redhat.com/show_bug.cgi?id=805010
# https://bugs.gentoo.org/show_bug.cgi?id=407709
Patch103: kdelibs-4.8.1-sonnet-highlighter.patch
## security fix
# Not Upstreamed? why not ? -- Rex
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@ -327,6 +333,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# upstream patches
%patch101 -p1 -b .cmake_cxx_implicit_link_directories
%patch102 -p1 -b .nepomuk_threading
%patch103 -p1 -b .sonnet-highlighter
# security fixes
%patch200 -p1 -b .CVE-2009-2702
@ -580,6 +587,9 @@ rm -rf %{buildroot}
%changelog
* Thu Mar 22 2012 Jaroslav Reznik <jreznik@redhat.com> 6:4.8.1-3
- Sonnet crash due to unitialized value access (kde#295615, rhbz#805010)
* Tue Mar 13 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.8.1-2
- Nepomuk::Resource[Data|Watcher] thread-safety (kde#295474)