4.8.2
This commit is contained in:
Jaroslav Reznik
parent
0143b76a8a
commit
278467117c
|
|
@ -1,4 +1,2 @@
|
|||
/kdelibs-4.6.5.tar.bz2
|
||||
/kdelibs-4.7.4.tar.bz2
|
||||
/kdelibs-4.8.0.tar.bz2
|
||||
/kdelibs-4.8.1.tar.xz
|
||||
/kdelibs-4.8.2.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp
|
||||
index abe55ea..e65e66e 100644
|
||||
--- a/nepomuk/core/resourcedata.cpp
|
||||
+++ b/nepomuk/core/resourcedata.cpp
|
||||
@@ -175,7 +175,7 @@ void Nepomuk::ResourceData::resetAll( bool isDelete )
|
||||
if( !m_uri.isEmpty() ) {
|
||||
m_rm->m_initializedData.remove( m_uri );
|
||||
if( m_rm->m_watcher && m_addedToWatcher ) {
|
||||
- m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri));
|
||||
+ QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri)));
|
||||
m_addedToWatcher = false;
|
||||
}
|
||||
}
|
||||
@@ -394,15 +394,16 @@ bool Nepomuk::ResourceData::load()
|
||||
|
||||
if(!m_rm->m_watcher) {
|
||||
m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager);
|
||||
+ m_rm->m_watcher->moveToThread(m_rm->m_manager->thread());
|
||||
QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
|
||||
m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
|
||||
QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
|
||||
m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
|
||||
m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
|
||||
- m_rm->m_watcher->start();
|
||||
+ QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection);
|
||||
}
|
||||
else {
|
||||
- m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
|
||||
+ QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) );
|
||||
}
|
||||
m_addedToWatcher = true;
|
||||
|
||||
diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h
|
||||
index 06b9622..92b12f5 100644
|
||||
--- a/nepomuk/core/resourcewatcher.h
|
||||
+++ b/nepomuk/core/resourcewatcher.h
|
||||
@@ -93,6 +93,7 @@ namespace Nepomuk {
|
||||
*/
|
||||
virtual ~ResourceWatcher();
|
||||
|
||||
+ public Q_SLOTS:
|
||||
/**
|
||||
* \brief Add a type to be watched.
|
||||
*
|
||||
@@ -204,7 +205,6 @@ namespace Nepomuk {
|
||||
*/
|
||||
QList<Types::Property> properties() const;
|
||||
|
||||
- public Q_SLOTS:
|
||||
/**
|
||||
* \brief Start the signalling of changes.
|
||||
*
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
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);
|
||||
19
kdelibs.spec
19
kdelibs.spec
|
|
@ -19,8 +19,8 @@
|
|||
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.8.1
|
||||
Release: 3%{?dist}
|
||||
Version: 4.8.2
|
||||
Release: 1%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
|
|
@ -133,16 +133,6 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
|
|||
# don't set rpath on multiarch dirs, https://git.reviewboard.kde.org/r/103422
|
||||
Patch101: kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch
|
||||
|
||||
# Nepomuk::Resource[Data|Watcher] thread-safety
|
||||
# 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
|
||||
|
|
@ -332,8 +322,6 @@ 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
|
||||
|
|
@ -587,6 +575,9 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 30 2012 Jaroslav Reznik <jreznik@redhat.com> - 6:4.8.2-1
|
||||
- 4.8.2
|
||||
|
||||
* 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)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue