Hello community,
here is the log from the commit of package kdebase4-runtime for openSUSE:Factory
checked in at Fri Jul 22 16:29:12 CEST 2011.
--------
--- KDE/kdebase4-runtime/kdebase4-runtime.changes 2011-07-01 11:41:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2011-07-21 14:24:20.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 21 12:23:28 UTC 2011 - idonmez@novell.com
+
+- Update to 4.6.95
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
4_5_BRANCH.diff
kcontrol-locale-fix.patch
kdebase-runtime-4.6.5.tar.bz2
knetattach-show.diff
New:
----
desktop-files.diff
fix-nepomuk-indexing.patch
kde-runtime-4.6.95.tar.bz2
nepomuk-cpu.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-runtime.spec ++++++
--- /var/tmp/diff_new_pack.e1wLbu/_old 2011-07-22 15:15:33.000000000 +0200
+++ /var/tmp/diff_new_pack.e1wLbu/_new 2011-07-22 15:15:33.000000000 +0200
@@ -22,7 +22,7 @@
Group: System/GUI/KDE
Summary: The KDE Runtime Components
Url: http://www.kde.org/
-Version: 4.6.5
+Version: 4.6.95
Release: 1
BuildRequires: libkde4-devel >= %version
BuildRequires: NetworkManager-devel bluez-devel libqimageblitz-devel openslp-devel
@@ -32,33 +32,29 @@
BuildRequires: soprano-backend-redland soprano-backend-virtuoso
BuildRequires: libcanberra-devel libpulse-devel
BuildRequires: libssh-devel
-%if %suse_version > 1110
BuildRequires: xz-devel
BuildRequires: lzma-devel
-## not needed on openSUSE because we use NetworkManager
-#BuildRequires: libntrack-qt4-devel
-%endif
-Source0: kdebase-runtime-%version.tar.bz2
+Source0: kde-runtime-%version.tar.bz2
Source1: kde4-essential.menu
Source2: kde-settings.menu
Source3: kde-settings.directory
Source4: KDE-Sys-Log-Out.ogg
Source99: nepomuk.png
-Patch0: 4_5_BRANCH.diff
Patch2: phonon-wakeups.diff
Patch3: hotplug-kde3.diff
Patch4: kde4-wrapper.diff
Patch5: kdesu-remember-keep-password.diff
Patch7: simple-ccsm-kde.diff
-Patch8: knetattach-show.diff
Patch10: khelpcenter-gnome-support.patch
Patch11: khelpcenter-use-susehelp.patch
Patch13: ksuseinstall.diff
Patch15: kdesu-symbol-lookup-workaround.diff
Patch16: phonon-always-forget.diff
-Patch17: kcontrol-locale-fix.patch
+Patch17: desktop-files.diff
+Patch18: nepomuk-cpu.patch
+Patch19: fix-nepomuk-indexing.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: oxygen-icon-theme >= %version
+Requires: oxygen-icon-theme >= 4.6.40
Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`)
Requires: kdelibs4 >= %version
Requires: phonon dbus-1-x11 soprano-backend-redland
@@ -72,18 +68,15 @@
Recommends: htdig
%define debug_package_requires %name = %version-%release kdelibs4-debuginfo
Obsoletes: kdebase3 <= 3.5.1
-%if %suse_version == 1110
-Requires: %name-branding = 11.1
-%endif
-%if %suse_version == 1120
-Requires: %name-branding = 11.2
-%endif
%if %suse_version == 1130
Requires: %name-branding = 11.3
%endif
-%if %suse_version > 1130
+%if %suse_version == 1140
Requires: %name-branding = 11.4
%endif
+%if %suse_version > 1140
+Requires: %name-branding = 12.1
+%endif
Provides: plasma-theme-air = 4.2.90
Obsoletes: plasma-theme-air <= 4.2.90
# packages older than 4.4.x had too strict kdebase4-runtime requirement
@@ -100,18 +93,15 @@
License: GPLv2+
Group: System/GUI/KDE
#BRAND: FIXME
-%if %suse_version == 1110
-Provides: %{name}-branding = 11.1
-%endif
-%if %suse_version == 1120
-Provides: %{name}-branding = 11.2
-%endif
%if %suse_version == 1130
Provides: %{name}-branding = 11.3
%endif
-%if %suse_version > 1130
+%if %suse_version == 1140
Provides: %{name}-branding = 11.4
%endif
+%if %suse_version > 1140
+Provides: %{name}-branding = 12.1
+%endif
Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(kdebase4-runtime:branding-upstream)
@@ -150,22 +140,22 @@
The KDE Team
%prep
-%setup -q -n kdebase-runtime-%version
-cp %{SOURCE4} $RPM_BUILD_DIR/kdebase-runtime-%version/knotify/sounds/
-%patch0
+%setup -q -n kde-runtime-%version
+cp %{SOURCE4} $RPM_BUILD_DIR/kde-runtime-%version/knotify/sounds/
# causes crashes, disabled for now
#%patch2
%patch3
%patch4
%patch5
%patch7
-%patch8
%patch10
%patch11
%patch13
%patch15
%patch16
-%patch17 -p1
+%patch17
+%patch18 -p1
+%patch19 -p1
%build
%cmake_kde4 -d build
@@ -332,7 +322,7 @@
%_kde4_modulesdir/kcm_attica.so
%_kde4_modulesdir/kcm_device_automounter.so
%_kde4_modulesdir/kded_device_automounter.so
-%_kde4_modulesdir/nepomukremovablestorageservice.so
+#_kde4_modulesdir/nepomukremovablestorageservice.so
%_kde_config_dir/emoticons.knsrc
%_kde_config_dir/icons.knsrc
%_kde_config_dir/khotnewstuff_upload.knsrc
@@ -364,6 +354,7 @@
%_kde4_appsdir/konqsidebartng
%_kde4_appsdir/hardwarenotifications/hardwarenotifications.notifyrc
%_kde_share_dir/config.kcfg/khelpcenter.kcfg
+%_kde_share_dir/config.kcfg/jpegcreatorsettings.kcfg
%_kde4_mandir/man1/kdesu.1*
%_kde4_servicesdir/about.protocol
%_kde4_servicesdir/nepomuk.protocol
@@ -470,6 +461,7 @@
%_kde4_libdir/libmolletnetwork.so
%_kde4_libdir/libmolletnetwork.so.*
%_kde4_libdir/libnepomukcommon.so
+%_kde4_libdir/libnepomukdatamanagement.so
%_kde4_bindir/kcmshell4
%_kde4_bindir/kde4
%_kde4_bindir/kde4-menu
@@ -491,17 +483,21 @@
%_kde4_bindir/kquitapp
%_kde4_bindir/kreadconfig
%_kde4_bindir/kstart
-%_kde4_bindir/ksvgtopng
%_kde4_bindir/ktraderclient
%_kde4_bindir/ktrash
%_kde4_bindir/kuiserver
%_kde4_bindir/kwalletd
%_kde4_bindir/kwriteconfig
+%_kde4_bindir/nepomukcontroller
+%_kde4_bindir/nepomukindexer
%_kde4_bindir/nepomukserver
%_kde4_bindir/nepomukservicestub
%_kde4_bindir/solid-hardware
+%_kde4_bindir/plasma-remote-helper
%_kde4_applicationsdir/Help.desktop
+%_kde4_applicationsdir/nepomukcontroller.desktop
%_kde4_applicationsdir/knetattach.desktop
+/usr/share/autostart/nepomukcontroller.desktop
/usr/share/autostart/nepomukserver.desktop
/usr/share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
/usr/share/dbus-1/interfaces/org.kde.KTimeZoned.xml
@@ -514,12 +510,12 @@
/usr/share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
/usr/share/dbus-1/interfaces/org.kde.nepomuk.Strigi.xml
/usr/share/dbus-1/interfaces/org.kde.network.kioslavenotifier.xml
-/usr/share/dbus-1/interfaces/org.kde.nepomuk.RemovableStorage.xml
/usr/share/dbus-1/services/org.kde.knotify.service
+/usr/share/dbus-1/interfaces/org.kde.nepomuk.DataManagement.xml
+/usr/share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcher.xml
+/usr/share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml
/usr/share/dbus-1/services/org.kde.kuiserver.service
/usr/share/desktop-directories
-/usr/share/emoticons
-%_kde4_iconsdir/default.kde4
%_kde4_iconsdir/hicolor/*/apps/knetattach.*
/usr/share/locale/*
/usr/share/sounds/*.ogg
@@ -540,10 +536,9 @@
%_kde4_modulesdir/plasma_dataenginescript_javascript.so
%_kde4_servicesdir/plasma-scriptengine-dataengine-javascript.desktop
%_kde4_appsdir/kglobalaccel
-%if %suse_version > 1110
+%_kde4_appsdir/nepomukfilewatch
%_kde4_servicesdir/lzma.protocol
%_kde4_servicesdir/xz.protocol
-%endif
%_kde4_modulesdir/kded_networkstatus.so
%_kde4_libexecdir/kdontchangethehostname
%_kde4_servicesdir/kded/activitymanager.desktop
@@ -552,37 +547,32 @@
%config %_kde4_sysconfdir/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
/usr/share/dbus-1/system-services/org.kde.kcontrol.kcmremotewidgets.service
%_kde4_libexecdir/kcmremotewidgetshelper
-%if %suse_version > 1110
/usr/share/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy
-%else
-/usr/share/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
-%endif
/usr/share/ontology/kde/
%_kde4_servicesdir/plasma-kpart.desktop
%_kde4_modulesdir/plasma-kpart.so
+/usr/include/knotify_export*
%_kde4_modulesdir/imports/
%_kde4_modulesdir/plasma_appletscript_declarative.so
%_kde4_servicesdir/plasma-scriptengine-applet-declarative.desktop
%_kde4_servicesdir/kactivitymanagerd.desktop
%_kde4_bindir/kactivitymanagerd
-%_kde4_modulesdir/jpegrotatedthumbnail.so
%_kde4_libdir/libknotifyplugin.so
-%_kde4_servicesdir/jpegrotatedthumbnail.desktop
%_kde4_servicetypes/knotifynotifymethod.desktop
/usr/include/knotifyconfig.h
/usr/include/knotifyplugin.h
-/usr/include/knotify_export.h
+/usr/include/nepomuk
%_kde4_modulesdir/nepomukbackupsync.so
/usr/share/dbus-1/interfaces/org.kde.nepomuk.BackupSync.xml
-/usr/share/dbus-1/interfaces/org.kde.nepomuk.BackupSync.xml
/usr/share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
/usr/share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml
-/usr/share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.identifier.xml
-/usr/share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.merger.xml
%_kde4_servicesdir/nepomukbackupsync.desktop
%_kde4_bindir/nepomukbackup
/usr/share/pixmaps/nepomuk.png
%_kde4_applicationsdir/nepomukbackup.desktop
%_kde4_libdir/libnepomuksync.so*
+%_datadir/emoticons/
+%_datadir/icons/default.kde4
+%_kde4_bindir/ksvgtopng
%changelog
++++++ desktop-files.diff ++++++
--- nepomuk/controller/nepomukcontroller.desktop
+++ nepomuk/controller/nepomukcontroller.desktop
@@ -51,7 +51,8 @@
Icon=nepomuk
Exec=nepomukcontroller
Type=Application
-Categories=Qt;KDE;System;
+OnlyShowIn=KDE
+Categories=Qt;KDE;System;Archiving
X-KDE-autostart-after=panel
X-DBUS-StartupType=Unique
X-KDE-StartupNotify=false
++++++ fix-nepomuk-indexing.patch ++++++
commit 7414a3c38b29cb4b2c37457ca8bd1e894aab57c5
Author: Vishesh Handa
Date: Tue Jul 12 14:56:17 2011 +0530
Improve storeResources file resolution
This patch does three things -
1. Use QUrl::toLocalFile, when testing if the url exists using QFileInfo
2. Before resolving all the url present in the objects. Convert them
from the QVariant into Soprano::Node using the ClassAndPropertyTree,
this way based on the type, the variant is converted to the correct
node. Resolution is a lot simpler ( and correct ) this way.
3. Fix SyncResource blank node handling - When blank nodes are stored
as QUrls they should be stored as "_:identifier" not "identifier"
This fixes testStoreResources_folder ( and strigi indexing )
diff --git a/nepomuk/services/backupsync/lib/syncresource.cpp b/nepomuk/services/backupsync/lib/syncresource.cpp
index 640a332..72f4701 100644
--- a/nepomuk/services/backupsync/lib/syncresource.cpp
+++ b/nepomuk/services/backupsync/lib/syncresource.cpp
@@ -120,7 +120,7 @@ void Nepomuk::Sync::SyncResource::setUri(const Soprano::Node& node)
d->uri = node.uri();
}
else if( node.isBlank() ) {
- d->uri = KUrl( node.identifier() );
+ d->uri = KUrl( node.toN3() );
}
}
diff --git a/nepomuk/services/storage/datamanagementmodel.cpp b/nepomuk/services/storage/datamanagementmodel.cpp
index 1a40f27..af1ed5d 100644
--- a/nepomuk/services/storage/datamanagementmodel.cpp
+++ b/nepomuk/services/storage/datamanagementmodel.cpp
@@ -158,6 +158,13 @@ namespace {
return OtherUri;
}
}
+
+ inline Soprano::Node convertIfBlankUri(const QUrl &uri) {
+ if( uri.toString().startsWith(QLatin1String("_:")) )
+ return Soprano::Node( uri.toString().mid(2) );
+ else
+ return Soprano::Node( uri );
+ }
}
class Nepomuk::DataManagementModel::Private
@@ -1372,7 +1379,7 @@ void Nepomuk::DataManagementModel::storeResources(const Nepomuk::SimpleResourceG
res.addProperty( NIE::url(), nieUrl );
res.addProperty( RDF::type(), NFO::FileDataObject() );
- if( QFileInfo( nieUrl.toString() ).isDir() )
+ if( QFileInfo( nieUrl.toLocalFile() ).isDir() )
res.addProperty( RDF::type(), NFO::Folder() );
}
resolvedNodes.insert( nieUrl, newResUri );
@@ -1413,28 +1420,49 @@ void Nepomuk::DataManagementModel::storeResources(const Nepomuk::SimpleResourceG
// Resolve URLs in property values and prepare the resource identifier
//
foreach( const SimpleResource& res, resGraph.toList() ) {
- SimpleResource resolvedRes(res.uri());
- QHashIterator it( res.properties() );
+ // Convert to a Sync::SyncResource
+ //
+ Sync::SyncResource syncRes( res.uri() ); //vHanda: Will this set the uri properly?
+ QHashIterator hit( res.properties() );
+ while( hit.hasNext() ) {
+ hit.next();
+
+ Soprano::Node n = d->m_classAndPropertyTree->variantToNode( hit.value(), hit.key() );
+ // The ClassAndPropertyTree returns blank nodes as URIs. It does not understand the
+ // concept of blank nodes, and since only storeResources requires blank nodes,
+ // it's easier to keep the blank node logic outside.
+ if( n.isResource() )
+ n = convertIfBlankUri( n.uri() );
+
+ const Soprano::Error::Error error = d->m_classAndPropertyTree->lastError();
+ if( error ) {
+ setError( error.message(), error.code() );
+ return;
+ }
+ syncRes.insert( hit.key(), n );
+ }
+
+ QMutableHashIterator it( syncRes );
while( it.hasNext() ) {
it.next();
- const QVariant value(it.value());
- if( value.type() == QVariant::Url && it.key() != NIE::url() ) {
- const UriState state = uriState(value.toUrl());
+ const Soprano::Node object = it.value();
+ if( object.isResource() && it.key() != NIE::url() ) {
+ const UriState state = uriState(object.uri());
if(state==NepomukUri || state==BlankUri || state == OntologyUri) {
- resolvedRes.addProperty(it.key(), it.value());
+ continue;
}
else if(state == NonExistingFileUrl) {
- setError(QString::fromLatin1("Cannot store information about non-existing local files. File '%1' does not exist.").arg(value.toUrl().toLocalFile()),
+ setError(QString::fromLatin1("Cannot store information about non-existing local files. File '%1' does not exist.").arg(object.uri().toLocalFile()),
Soprano::Error::ErrorInvalidArgument);
return;
}
else if(state == ExistingFileUrl || state==SupportedUrl) {
- const QUrl nieUrl = value.toUrl();
+ const QUrl nieUrl = object.uri();
// Need to resolve it
QHash< QUrl, QUrl >::const_iterator findIter = resolvedNodes.constFind( nieUrl );
if( findIter != resolvedNodes.constEnd() ) {
- resolvedRes.addProperty(it.key(), findIter.value());
+ it.setValue( convertIfBlankUri(findIter.value()) );
}
else {
Sync::SyncResource newRes;
@@ -1446,7 +1474,7 @@ void Nepomuk::DataManagementModel::storeResources(const Nepomuk::SimpleResourceG
newRes.insert( RDF::type(), NFO::FileDataObject() );
newRes.insert( NIE::url(), nieUrl );
- if( QFileInfo( nieUrl.toString() ).isDir() )
+ if( QFileInfo( nieUrl.toLocalFile() ).isDir() )
newRes.insert( RDF::type(), NFO::Folder() );
}
@@ -1454,28 +1482,24 @@ void Nepomuk::DataManagementModel::storeResources(const Nepomuk::SimpleResourceG
extraResources.append( newRes );
resolvedNodes.insert( nieUrl, resolvedUri );
- resolvedRes.addProperty(it.key(), resolvedUri);
+ it.setValue( convertIfBlankUri(resolvedUri) );
}
}
else if(state == OtherUri) {
// We use resolveUrl to check if the otherUri exists. If it doesn't exist,
// then resolveUrl which set the last error
- const QUrl legacyUri = resolveUrl( value.toUrl() );
+ const QUrl legacyUri = resolveUrl( object.uri() );
if( lastError() )
return;
// It apparently exists, so we must support it
- resolvedRes.addProperty( it.key(), it.value() );
- }
- }
- else {
- resolvedRes.addProperty(it.key(), it.value());
}
}
+ } // while( it.hasNext() )
// The resource is now ready.
// Push it into the Resource Identifier
- QList< Soprano::Statement > stList = d->m_classAndPropertyTree->simpleResourceToStatementList(resolvedRes);
+ QList< Soprano::Statement > stList = syncRes.toStatementList();
allStatements << stList;
if(stList.isEmpty()) {
@@ -1483,12 +1507,11 @@ void Nepomuk::DataManagementModel::storeResources(const Nepomuk::SimpleResourceG
return;
}
- Sync::SyncResource simpleRes = Sync::SyncResource::fromStatementList( stList );
- if( !simpleRes.isValid() ) {
+ if( !syncRes.isValid() ) {
setError(QLatin1String("storeResources: Contains invalid resources."), Soprano::Error::ErrorParsingFailed);
return;
}
- resIdent.addSyncResource( simpleRes );
+ resIdent.addSyncResource( syncRes );
}
++++++ kdebase-runtime-4.6.5.tar.bz2 -> kde-runtime-4.6.95.tar.bz2 ++++++
++++ 72822 lines of diff (skipped)
++++++ ksuseinstall.diff ++++++
--- /var/tmp/diff_new_pack.e1wLbu/_old 2011-07-22 15:15:35.000000000 +0200
+++ /var/tmp/diff_new_pack.e1wLbu/_new 2011-07-22 15:15:35.000000000 +0200
@@ -1,5 +1,73 @@
---- drkonqi/susedebugpackageinstaller.cpp.sav 2010-03-22 23:26:01.351710150 +0100
-+++ drkonqi/susedebugpackageinstaller.cpp 2010-03-22 23:26:01.352604393 +0100
+--- drkonqi/backtracewidget.cpp 2011-04-29 21:38:13.000000000 +0200
++++ drkonqi/backtracewidget.cpp 2011-04-30 08:52:05.680000631 +0200
+@@ -39,6 +39,10 @@
+ #include <KToolInvocation>
+ #include <KGlobalSettings>
+
++#if 1
++#include "susedebugpackageinstaller.h"
++#endif
++
+ const char *extraDetailsLabelMargin = " margin: 5px; ";
+
+ BacktraceWidget::BacktraceWidget(BacktraceGenerator *generator, QWidget *parent,
+@@ -50,7 +54,11 @@
+ ui.setupUi(this);
+
+ //Debug package installer
++#if 1
++ m_debugPackageInstaller = new SUSEDebugPackageInstaller(this);
++#else
+ m_debugPackageInstaller = new DebugPackageInstaller(this);
++#endif
+ connect(m_debugPackageInstaller, SIGNAL(error(QString)), this, SLOT(debugPackageError(QString)));
+ connect(m_debugPackageInstaller, SIGNAL(packagesInstalled()), this, SLOT(regenerateBacktrace()));
+ connect(m_debugPackageInstaller, SIGNAL(canceled()), this, SLOT(debugPackageCanceled()));
+--- drkonqi/backtracewidget.h 2011-04-29 21:38:13.000000000 +0200
++++ drkonqi/backtracewidget.h 2011-04-30 08:52:05.681000631 +0200
+@@ -29,6 +29,10 @@
+ class BacktraceRatingWidget;
+ class BacktraceGenerator;
+
++#if 1
++class SUSEDebugPackageInstaller;
++#endif
++
+ class BacktraceWidget: public QWidget
+ {
+ Q_OBJECT
+@@ -55,7 +59,11 @@
+ Ui::Form ui;
+ BacktraceRatingWidget * m_backtraceRatingWidget;
+ QSyntaxHighlighter *m_highlighter;
++#if 1
++ SUSEDebugPackageInstaller * m_debugPackageInstaller;
++#else
+ DebugPackageInstaller * m_debugPackageInstaller;
++#endif
+
+ private Q_SLOTS:
+ void loadData();
+--- drkonqi/CMakeLists.txt 2011-04-29 21:38:13.000000000 +0200
++++ drkonqi/CMakeLists.txt 2011-04-30 08:52:48.179000716 +0200
+@@ -40,6 +40,7 @@
+ debugpackageinstaller.cpp
+ systeminformation.cpp
+ crashedapplication.cpp
++ susedebugpackageinstaller.cpp
+ debugger.cpp
+ debuggerlaunchers.cpp
+ debuggermanager.cpp
+@@ -70,6 +71,6 @@
+
+ kde4_add_executable(drkonqi ${drkonqi_SRCS})
+
+-target_link_libraries(drkonqi ${KDE4_KIO_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KDEWEBKIT_LIBRARY} drkonqi_backtrace_parser)
++target_link_libraries(drkonqi ${KDE4_KIO_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KDEWEBKIT_LIBRARY} ksuseinstall drkonqi_backtrace_parser)
+
+ install(TARGETS drkonqi DESTINATION ${LIBEXEC_INSTALL_DIR})
+--- drkonqi/susedebugpackageinstaller.cpp 1970-01-01 01:00:00.000000000 +0100
++++ drkonqi/susedebugpackageinstaller.cpp 2011-04-30 08:52:05.679000631 +0200
@@ -0,0 +1,51 @@
+/*******************************************************************
+* debugpackageinstaller.cpp
@@ -52,8 +120,8 @@
+ else
+ emit error(i18nc("@info", "Could not find debug symbol packages for this application."));
+}
---- drkonqi/susedebugpackageinstaller.h.sav 2010-03-22 23:26:01.352604393 +0100
-+++ drkonqi/susedebugpackageinstaller.h 2010-03-22 23:26:01.352604393 +0100
+--- drkonqi/susedebugpackageinstaller.h 1970-01-01 01:00:00.000000000 +0100
++++ drkonqi/susedebugpackageinstaller.h 2011-04-30 08:52:05.680000631 +0200
@@ -0,0 +1,46 @@
+/*******************************************************************
+* debugpackageinstaller.h
@@ -101,72 +169,3 @@
+};
+
+#endif
---- drkonqi/backtracewidget.cpp 2010-04-07 13:23:32.000000000 +0200
-+++ drkonqi/backtracewidget.cpp 2010-04-14 16:23:49.772202327 +0200
-@@ -39,6 +39,10 @@
- #include <KToolInvocation>
- #include <KGlobalSettings>
-
-+#if 1
-+#include "susedebugpackageinstaller.h"
-+#endif
-+
- const char *extraDetailsLabelMargin = " margin: 5px; ";
-
- BacktraceWidget::BacktraceWidget(BacktraceGenerator *generator, QWidget *parent,
-@@ -49,7 +53,11 @@
- ui.setupUi(this);
-
- //Debug package installer
-+#if 1
-+ m_debugPackageInstaller = new SUSEDebugPackageInstaller(this);
-+#else
- m_debugPackageInstaller = new DebugPackageInstaller(this);
-+#endif
- connect(m_debugPackageInstaller, SIGNAL(error(QString)), this, SLOT(debugPackageError(QString)));
- connect(m_debugPackageInstaller, SIGNAL(packagesInstalled()), this, SLOT(regenerateBacktrace()));
- connect(m_debugPackageInstaller, SIGNAL(canceled()), this, SLOT(debugPackageCanceled()));
---- drkonqi/backtracewidget.h 2010-02-20 12:31:40.000000000 +0100
-+++ drkonqi/backtracewidget.h 2010-04-14 16:25:37.228953082 +0200
-@@ -29,6 +29,10 @@
- class BacktraceRatingWidget;
- class BacktraceGenerator;
-
-+#if 1
-+class SUSEDebugPackageInstaller;
-+#endif
-+
- class BacktraceWidget: public QWidget
- {
- Q_OBJECT
-@@ -55,7 +59,11 @@
- Ui::Form ui;
- BacktraceRatingWidget * m_backtraceRatingWidget;
- QSyntaxHighlighter *m_highlighter;
-+#if 1
-+ SUSEDebugPackageInstaller * m_debugPackageInstaller;
-+#else
- DebugPackageInstaller * m_debugPackageInstaller;
-+#endif
-
- private Q_SLOTS:
- void loadData();
---- drkonqi/CMakeLists.txt 2010-03-03 19:24:58.000000000 +0100
-+++ drkonqi/CMakeLists.txt 2010-04-14 16:22:10.185946487 +0200
-@@ -40,6 +40,7 @@
- debugpackageinstaller.cpp
- systeminformation.cpp
- crashedapplication.cpp
-+ susedebugpackageinstaller.cpp
- debugger.cpp
- debuggerlaunchers.cpp
- debuggermanager.cpp
-@@ -64,6 +65,6 @@
-
- kde4_add_executable(drkonqi ${drkonqi_SRCS})
-
--target_link_libraries(drkonqi ${KDE4_KIO_LIBS} drkonqi_backtrace_parser)
-+target_link_libraries(drkonqi ${KDE4_KIO_LIBS} ksuseinstall drkonqi_backtrace_parser)
-
- install(TARGETS drkonqi DESTINATION ${LIBEXEC_INSTALL_DIR})
-
++++++ nepomuk-cpu.patch ++++++
diff --git a/nepomuk/services/strigi/indexcleaner.cpp b/nepomuk/services/strigi/indexcleaner.cpp
index ae79e24..657384e 100644
--- a/nepomuk/services/strigi/indexcleaner.cpp
+++ b/nepomuk/services/strigi/indexcleaner.cpp
@@ -47,7 +47,8 @@ using namespace Soprano::Vocabulary;
Nepomuk::IndexCleaner::IndexCleaner(QObject* parent)
- : KJob(parent)
+ : KJob(parent),
+ m_delay(0)
{
setCapabilities( Suspendable );
}
@@ -268,12 +269,13 @@ void Nepomuk::IndexCleaner::slotRemoveResourcesDone(KJob* job)
QMutexLocker lock(&m_stateMutex);
if( !m_suspended ) {
- clearNextBatch();
+ QTimer::singleShot(m_delay, this, SLOT(clearNextBatch()));
}
}
void Nepomuk::IndexCleaner::clearNextBatch()
{
+ kDebug() << m_query;
QList<QUrl> resources;
Soprano::QueryResultIterator it
= ResourceManager::instance()->mainModel()->executeQuery( m_query, Soprano::Query::QueryLanguageSparql );
@@ -283,7 +285,6 @@ void Nepomuk::IndexCleaner::clearNextBatch()
if( !resources.isEmpty() ) {
KJob* job = Nepomuk::clearIndexedData(resources);
- job->start();
connect( job, SIGNAL(finished(KJob*)), this, SLOT(slotRemoveResourcesDone(KJob*)) );
}
@@ -314,4 +315,9 @@ bool Nepomuk::IndexCleaner::doResume()
return true;
}
+void Nepomuk::IndexCleaner::setDelay(int msecs)
+{
+ m_delay = msecs;
+}
+
#include "indexcleaner.moc"
diff --git a/nepomuk/services/strigi/indexcleaner.h b/nepomuk/services/strigi/indexcleaner.h
index e1c38ca..bf0713e 100644
--- a/nepomuk/services/strigi/indexcleaner.h
+++ b/nepomuk/services/strigi/indexcleaner.h
@@ -41,6 +41,16 @@ namespace Nepomuk {
virtual bool doSuspend();
virtual bool doResume();
+ public slots:
+ /**
+ * Set the delay between the cleanup queries.
+ * Used for throtteling the cleaner to not grab too
+ * many resources. Default is 0.
+ *
+ * \sa IndexScheduler::setIndexingSpeed()
+ */
+ void setDelay(int msecs);
+
private slots:
void clearNextBatch();
void slotRemoveResourcesDone(KJob* job);
@@ -52,6 +62,7 @@ namespace Nepomuk {
QMutex m_stateMutex;
bool m_suspended;
+ int m_delay;
};
}
diff --git a/nepomuk/services/strigi/indexscheduler.cpp b/nepomuk/services/strigi/indexscheduler.cpp
index 54fe30a..f3c6c36 100644
--- a/nepomuk/services/strigi/indexscheduler.cpp
+++ b/nepomuk/services/strigi/indexscheduler.cpp
@@ -208,12 +208,11 @@ Nepomuk::IndexScheduler::IndexScheduler( QObject* parent )
: QObject( parent ),
m_suspended( false ),
m_indexing( false ),
- m_speed( FullSpeed )
+ m_indexingDelay( 0 )
{
- m_cleaner = new IndexCleaner();
- m_cleaner->start();
-
+ m_cleaner = new IndexCleaner(this);
connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) );
+ m_cleaner->start();
connect( StrigiServiceConfig::self(), SIGNAL( configChanged() ),
this, SLOT( slotConfigChanged() ) );
@@ -267,7 +266,13 @@ void Nepomuk::IndexScheduler::setSuspended( bool suspended )
void Nepomuk::IndexScheduler::setIndexingSpeed( IndexingSpeed speed )
{
kDebug() << speed;
- m_speed = speed;
+ m_indexingDelay = 0;
+ if ( speed != FullSpeed ) {
+ m_indexingDelay = (speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay;
+ }
+ if( m_cleaner ) {
+ m_cleaner->setDelay(m_indexingDelay);
+ }
}
@@ -342,11 +347,11 @@ void Nepomuk::IndexScheduler::doIndexing()
m_currentUrl = file.filePath();
m_currentFolder = m_currentUrl.directory();
+ emit indexingFile( m_currentUrl.toLocalFile() );
+
KJob * indexer = new Indexer( file );
connect( indexer, SIGNAL(finished(KJob*)), this, SLOT(slotIndexingDone(KJob*)) );
indexer->start();
-
- emit indexingFile( m_currentUrl.toLocalFile() );
}
// get the next folder
@@ -482,11 +487,7 @@ bool Nepomuk::IndexScheduler::analyzeDir( const QString& dir_, Nepomuk::IndexSch
void Nepomuk::IndexScheduler::callDoIndexing()
{
if( !m_suspended ) {
- uint delay = 0;
- if ( m_speed != FullSpeed ) {
- delay = (m_speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay;
- }
- QTimer::singleShot( delay, this, SLOT(doIndexing()) );
+ QTimer::singleShot( m_indexingDelay, this, SLOT(doIndexing()) );
}
}
diff --git a/nepomuk/services/strigi/indexscheduler.h b/nepomuk/services/strigi/indexscheduler.h
index 9ae1f18..8756206 100644
--- a/nepomuk/services/strigi/indexscheduler.h
+++ b/nepomuk/services/strigi/indexscheduler.h
@@ -121,8 +121,6 @@ namespace Nepomuk {
SnailPace
};
- IndexingSpeed currentSpeed() const { return m_speed; }
-
public Q_SLOTS:
void suspend();
void resume();
@@ -226,7 +224,7 @@ namespace Nepomuk {
QString m_currentFolder;
KUrl m_currentUrl;
- IndexingSpeed m_speed;
+ int m_indexingDelay;
IndexCleaner* m_cleaner;
};
++++++ phonon-always-forget.diff ++++++
--- /var/tmp/diff_new_pack.e1wLbu/_old 2011-07-22 15:15:35.000000000 +0200
+++ /var/tmp/diff_new_pack.e1wLbu/_new 2011-07-22 15:15:35.000000000 +0200
@@ -6,10 +6,10 @@
--- phonon/kded-module/phononserver.cpp 2010-05-27 14:45:22.785788783 +0100
+++ phonon/kded-module/phononserver.cpp 2010-05-27 15:12:09.003725702 +0100
-@@ -781,8 +781,17 @@
+@@ -1090,8 +1090,17 @@
+ if (!areAudio && !areVideo)
+ return;
- void PhononServer::askToRemoveDevices(const QStringList &devList, const QList<int> &indexes)
- {
- const QString &dontAskAgainName = QLatin1String("phonon_forget_devices_") +
- devList.join(QLatin1String("_"));
+ KSharedConfigPtr config = KGlobal::config();
@@ -23,6 +23,6 @@
+ dontAskAgainName = QLatin1String("phonon_forget_devices_") +
+ devList.join(QLatin1String("_"));
+ }
+
KMessageBox::ButtonCode result;
if (!KMessageBox::shouldBeShownYesNo(dontAskAgainName, result)) {
- if (result == KMessageBox::Yes) {
++++++ simple-ccsm-kde.diff ++++++
--- /var/tmp/diff_new_pack.e1wLbu/_old 2011-07-22 15:15:35.000000000 +0200
+++ /var/tmp/diff_new_pack.e1wLbu/_new 2011-07-22 15:15:35.000000000 +0200
@@ -7,11 +7,12 @@
===================================================================
--- kcontrol/componentchooser/windowmanagers/compiz.desktop.orig
+++ kcontrol/componentchooser/windowmanagers/compiz.desktop
-@@ -75,5 +75,6 @@ Name[zh_CN]=Compiz
+@@ -80,5 +80,7 @@
Name[zh_TW]=Compiz
Exec=compiz ccp
TryExec=compiz
-X-KDE-WindowManagerConfigure=simple-ccsm
X-KDE-WindowManagerRestartArgument=--replace
-+X-KDE-WindowManagerConfigure=simple-ccsm-kde
-+X-KDE-WindowManagerConfigureParentArgument=--parent
+++X-KDE-WindowManagerConfigure=simple-ccsm-kde
+++X-KDE-WindowManagerConfigureParentArgument=--parent
++
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org