Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kde-runtime new version and check

Browse Source
This commit is contained in:
groni
2015-07-17 12:34:42 +02:00
parent 6bafbdeea9
commit 0c59117476
20 changed files with 789 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/base/kde-runtime/actions.py
+28
View File
@@ -0,0 +1,28 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import pisitools
from pisi.actionsapi import kde4
def setup():
kde4.configure("-DWITH_PulseAudio=ON \
-DCMAKE_SKIP_RPATH=ON \
-DWITH_QNtrack=OFF \
-DKDE4_ENABLE_FPIE=ON \
-DWITH_NepomukCore=OFF \
-DKDERUNTIME_BUILD_NEPOMUK=OFF \
-Wno-dev ")
def build():
kde4.make()
def install():
kde4.install()
#remove index.theme file of hicolor icon theme, correct source for the file is the hicolor icon theme package itself
pisitools.remove("/usr/share/icons/hicolor/index.theme")
pisitools.dosym("/usr/lib/kde4/libexec/kdesud", "/usr/bin/kdesud")
desktop/kde/base/kde-runtime/comar/package.py
+9
View File
@@ -0,0 +1,9 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
import os
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
os.system("/bin/chmod g+s /usr/lib/kde4/libexec/kdesud")
os.system("/bin/chown :nobody /usr/lib/kde4/libexec/kdesud")
desktop/kde/base/kde-runtime/files/0006-phonon-Fix-PulseAudio-card-profile-list.patch
+32
View File
@@ -0,0 +1,32 @@
From 47c9fcc4400d19adcf7e7929d3d105764403d30b Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Thu, 1 May 2014 10:59:50 +0100
Subject: [PATCH 6/6] phonon: Fix PulseAudio card profile list.
If two profiles had the same priority, the map insert would overwrite any
previous profile with that priority.
Simple solutions is to use insertMulti() instead.
Reported by Andrei-Florin Amuraritei
via https://plus.google.com/u/0/+RobinJacobs/posts/GGLemECK6tp
---
phonon/kcm/audiosetup.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/phonon/kcm/audiosetup.cpp b/phonon/kcm/audiosetup.cpp
index 81a0f53..835799c 100644
--- a/phonon/kcm/audiosetup.cpp
+++ b/phonon/kcm/audiosetup.cpp
@@ -366,7 +366,7 @@ void AudioSetup::updateCard(const pa_card_info *pInfo)
const quint32 priority = profile->priority;
const QPair<QString, QString> name(profile->name ? QString::fromUtf8(profile->name) : QString(),
profile->description ? QString::fromUtf8(profile->description) : QString());
- info.profiles.insert(priority, name);
+ info.profiles.insertMulti(priority, name);
}
if (pInfo->active_profile)
--
1.9.0
desktop/kde/base/kde-runtime/files/pisilinux/disable-logout-sound.diff
+12
View File
@@ -0,0 +1,12 @@
diff -Naur kdebase-runtime-4.2.3-orig/knotify/kde.notifyrc kdebase-runtime-4.2.3/knotify/kde.notifyrc
--- kdebase-runtime-4.2.3-orig/knotify/kde.notifyrc 2009-05-22 19:03:32.692478771 +0300
+++ kdebase-runtime-4.2.3/knotify/kde.notifyrc 2009-05-22 19:10:44.681230582 +0300
@@ -1499,7 +1499,7 @@
Comment[x-test]=xxKDE is exitingxx
Comment[zh_CN]=KDE 正在退出
Comment[zh_TW]=KDE 結束中
-Action=Sound
+Action=
Sound=KDE-Sys-Log-Out.ogg
[Event/cancellogout]
desktop/kde/base/kde-runtime/files/pisilinux/disable-nepomuk-popups.diff
+37
View File
@@ -0,0 +1,37 @@
Index: kdebase-runtime-4.4.2/nepomuk/services/strigi/nepomukstrigiservice.notifyrc
===================================================================
--- kdebase-runtime-4.4.2.orig/nepomuk/services/strigi/nepomukstrigiservice.notifyrc
+++ kdebase-runtime-4.4.2/nepomuk/services/strigi/nepomukstrigiservice.notifyrc
@@ -179,7 +179,7 @@ Comment[uk]=Розпочато індеÐ
Comment[x-test]=xxIndexing of local files for fast searches has started.xx
Comment[zh_CN]=本地文件索引已�开始。
Comment[zh_TW]=已開始製作本地檔案的快速�尋索引。
-Action=Popup
+Action=
[Event/initialIndexingFinished]
Name=Initial Indexing finished
@@ -305,7 +305,7 @@ Comment[uk]=Початкове індеÐ
Comment[x-test]=xxThe initial indexing of local files for fast desktop searches has completed.xx
Comment[zh_CN]=Strigi 对本地文件的索引�始化工作已完�。
Comment[zh_TW]=已完��始化本地檔案的快速桌��尋索引。
-Action=Popup
+Action=
[Event/indexingSuspended]
Name=Indexing suspended
@@ -431,7 +431,7 @@ Comment[uk]=ІндекÑ�уваннÑ� Ñ„Ð
Comment[x-test]=xxFile indexing has been suspended by the search service.xx
Comment[zh_CN]=Strigi 文件索引�作已�被�索�务中断。
Comment[zh_TW]=檔案索引已被暫�。
-Action=Popup
+Action=
[Event/indexingResumed]
Name=Indexing resumed
@@ -557,4 +557,4 @@ Comment[uk]=ІндекÑ�уваннÑ� Ñ„Ð
Comment[x-test]=xxFile indexing has been resumed by the search service.xx
Comment[zh_CN]=Strigi 文件索引�作已�被�索�务��。
Comment[zh_TW]=檔案索引已回復。
-Action=Popup
+Action=
desktop/kde/base/kde-runtime/files/pisilinux/fix-kglobalaccel-sandbox-violation.diff
+17
View File
@@ -0,0 +1,17 @@
--- kglobalaccel/CMakeLists.txt.orig 2009-08-21 11:20:58.308387664 +0300
+++ kglobalaccel/CMakeLists.txt 2009-08-21 11:21:27.093013584 +0300
@@ -56,14 +56,3 @@
PATHS ${PLUGIN_INSTALL_DIR}
NO_DEFAULT_PATH)
# message(${KDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_PLUGIN})
-
-# Remove old kdedglobalaccel files
-if(KDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_DESKTOP_FILE)
- install(CODE "MESSAGE(\"Removing kdedglobalaccel desktop file\")")
- install(CODE "file(REMOVE ${KDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_DESKTOP_FILE})")
-endif(KDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_DESKTOP_FILE)
-if(KDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_PLUGIN)
- install(CODE "MESSAGE(\"Removing kdedglobalaccel plugin\")")
- install(CODE "file(REMOVE ${KDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_PLUGIN})")
-endif(KDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_PLUGIN)
-
desktop/kde/base/kde-runtime/files/pisilinux/installdbgsymbols.py
+69
View File
@@ -0,0 +1,69 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
import bz2
import sys
import pisi
import urllib2
import os
import piksemel
REPO_URL = "http://farm.pisilinux.org/.nofarm-repo/x86_64/"
def log(msg):
print "%s: %s" % (sys.argv[0], msg)
if __name__ == "__main__":
log("Requested debug packages for these binaries:")
for arg in sys.argv[1:]:
log(" %s" % arg)
log("Fetching repository info...")
url = urllib2.urlopen("%s/pisi-index.xml.bz2" % REPO_URL)
xml_content = bz2.decompress(url.read())
doc = piksemel.parseString(xml_content)
files_db = pisi.db.filesdb.FilesDB()
def get_filenames(packages):
for package_tag in doc.tags("Package"):
name = package_tag.getTagData("Name")
if name in packages:
yield package_tag.getTagData("PackageURI")
def get_package_name(path):
try:
package, path = files_db.get_file(path.lstrip("/"))
except KeyError:
sys.exit(2)
return package
idb = pisi.db.installdb.InstallDB()
source_packages = []
releases = {}
for path in sys.argv[1:]:
name = get_package_name(path)
package = idb.get_package(name)
dbg_name = "%s-dbginfo" % package.source.name
source_packages.append(dbg_name)
releases[dbg_name] = package.release
package_urls = []
log("Following debug packages will be installed:")
for filename in get_filenames(source_packages):
name, ver = pisi.util.parse_package_name(pisi.util.remove_suffix(".pisi", filename))
release = ver.split("-")[1]
if idb.has_package(name):
continue
if release != releases[name]:
sys.exit(2)
log(" %s" % name)
package_urls.append("/".join((REPO_URL, filename)))
sys.exit(os.system("pm-install %s" % " ".join(package_urls)))
desktop/kde/base/kde-runtime/files/pisilinux/pisiwallpaper.patch
+14
View File
@@ -0,0 +1,14 @@
diff -Nuar a/desktoptheme/air/metadata.desktop b/desktoptheme/air/metadata.desktop
--- a/desktoptheme/air/metadata.desktop 2014-06-03 12:32:16.000000000 +0300
+++ b/desktoptheme/air/metadata.desktop 2014-08-06 19:46:04.978996607 +0300
@@ -160,7 +160,7 @@
X-KDE-PluginInfo-EnabledByDefault=true
[Wallpaper]
-defaultWallpaperTheme=Elarun
+defaultWallpaperTheme=Tower
defaultFileSuffix=.png
-defaultWidth=2560
-defaultHeight=1600
+defaultWidth=1920
+defaultHeight=1440
desktop/kde/base/kde-runtime/files/pisilinux/strigi-systray-config.diff
+46
View File
@@ -0,0 +1,46 @@
Index: nepomuk/services/strigi/strigiserviceconfig.cpp
===================================================================
--- nepomuk/services/strigi/strigiserviceconfig.cpp.orig
+++ nepomuk/services/strigi/strigiserviceconfig.cpp
@@ -72,6 +72,10 @@ QStringList Nepomuk::StrigiServiceConfig
return fl;
}
+bool Nepomuk::StrigiServiceConfig::systrayEnabled() const
+{
+ return m_config.group( "General" ).readEntry( "enable systray applet", false );
+}
QStringList Nepomuk::StrigiServiceConfig::excludeFolders() const
{
Index: nepomuk/services/strigi/strigiserviceconfig.h
===================================================================
--- nepomuk/services/strigi/strigiserviceconfig.h.orig
+++ nepomuk/services/strigi/strigiserviceconfig.h
@@ -60,6 +60,8 @@ namespace Nepomuk {
QStringList excludeFilters() const;
+ bool systrayEnabled() const;
+
QList<QRegExp> excludeFilterRegExps() const { return m_excludeFilterRegExpCache; }
bool indexHiddenFolders() const;
Index: nepomuk/services/strigi/strigiservice.cpp
===================================================================
--- nepomuk/services/strigi/strigiservice.cpp.orig
+++ nepomuk/services/strigi/strigiservice.cpp
@@ -86,8 +86,11 @@ Nepomuk::StrigiService::StrigiService( Q
// create the status widget (hidden)
StatusWidget* sw = new StatusWidget( mainModel(), this );
- // create the systray
- new SystemTray( this, sw );
+ if (StrigiServiceConfig::self()->systrayEnabled())
+ {
+ // create the systray
+ new SystemTray( this, sw );
+ }
// setup status connections
connect( m_indexScheduler, SIGNAL( indexingStarted() ),
desktop/kde/base/kde-runtime/files/pisilinux/take-home-partition-freespace-into-account-in-trash.diff
+98
View File
@@ -0,0 +1,98 @@
Index: kdebase-runtime-4.4.2/kioslave/trash/discspaceutil.cpp
===================================================================
--- kdebase-runtime-4.4.2.orig/kioslave/trash/discspaceutil.cpp
+++ kdebase-runtime-4.4.2/kioslave/trash/discspaceutil.cpp
@@ -25,6 +25,8 @@
#include <QtCore/QFileInfo>
#include <kdiskfreespaceinfo.h>
+#include <kmountpoint.h>
+#include <kio/global.h>
#include <kdebug.h>
DiscSpaceUtil::DiscSpaceUtil( const QString &directory )
@@ -73,6 +75,15 @@ qulonglong DiscSpaceUtil::size() const
return mFullSize;
}
+qulonglong DiscSpaceUtil::freeSpace() const
+{
+ KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo( mDirectory );
+ if ( info.isValid() )
+ return info.available();
+
+ return 0;
+}
+
QString DiscSpaceUtil::mountPoint() const
{
return mMountPoint;
Index: kdebase-runtime-4.4.2/kioslave/trash/discspaceutil.h
===================================================================
--- kdebase-runtime-4.4.2.orig/kioslave/trash/discspaceutil.h
+++ kdebase-runtime-4.4.2/kioslave/trash/discspaceutil.h
@@ -53,6 +53,11 @@ class DiscSpaceUtil
qulonglong size() const;
/**
+ * Returns the free space of the partition in bytes.
+ */
+ qulonglong freeSpace() const;
+
+ /**
* Returns the mount point of the directory.
*/
QString mountPoint() const;
Index: kdebase-runtime-4.4.2/kioslave/trash/trashimpl.cpp
===================================================================
--- kdebase-runtime-4.4.2.orig/kioslave/trash/trashimpl.cpp
+++ kdebase-runtime-4.4.2/kioslave/trash/trashimpl.cpp
@@ -1101,13 +1101,24 @@ bool TrashImpl::adaptTrashSize( const QS
}
}
- if ( useSizeLimit ) { // check if size limit exceeded
+ DiscSpaceUtil util(trashPath + QString::fromLatin1("/files/"));
+ qulonglong freeSpace = util.freeSpace();
+ // calculate size of the files to be put into the trash
+ qulonglong additionalSize = DiscSpaceUtil::sizeOfPath( origPath );
+ // current used space of trash
+ qulonglong trashUsedSpace = DiscSpaceUtil::sizeOfPath(trashPath + QString::fromLatin1("/files/"));
+
+ // if we do not have enough empty space in the partition of Trash, return false
+ if (!useSizeLimit and (freeSpace < additionalSize))
+ {
+ m_lastErrorCode = KIO::ERR_SLAVE_DEFINED;
+ m_lastErrorMessage = i18n( "Not enough disk space to move file into trash.");
+ return false;
+ }
- // calculate size of the files to be put into the trash
- qulonglong additionalSize = DiscSpaceUtil::sizeOfPath( origPath );
+ if ( useSizeLimit ) { // check if size limit exceeded
const TrashSizeCache trashSize( trashPath );
- DiscSpaceUtil util(trashPath + QString::fromLatin1("/files/"));
if ( util.usage( trashSize.size() + additionalSize ) >= percent ) {
if ( actionType == 0 ) { // warn the user only
m_lastErrorCode = KIO::ERR_SLAVE_DEFINED;
@@ -1150,7 +1161,18 @@ bool TrashImpl::adaptTrashSize( const QS
}
}
}
- }
+
+ // check again if we have enough empty space in the partition of Trash
+ // recalculate free space, some files may be removed above
+ freeSpace = util.freeSpace();
+ if (freeSpace < additionalSize)
+ {
+ m_lastErrorCode = KIO::ERR_SLAVE_DEFINED;
+ m_lastErrorMessage = i18n( "Not enough disk space to move file into trash.");
+ return false;
+ }
+
+ } //end-if useSizeLimit
return true;
}
desktop/kde/base/kde-runtime/files/pisilinux/use-utf8-knetattach.diff
+19
View File
@@ -0,0 +1,19 @@
diff --exclude=.svn --exclude=.svnignore --exclude=CVS -Naur kdebase-runtime-4.2.1-orig/knetattach/knetattach.cpp kdebase-runtime-4.2.1/knetattach/knetattach.cpp
--- kdebase-runtime-4.2.1-orig/knetattach/knetattach.cpp 2009-03-06 14:32:40.000000000 +0200
+++ kdebase-runtime-4.2.1/knetattach/knetattach.cpp 2009-03-06 15:02:34.000000000 +0200
@@ -65,7 +65,14 @@
}
_encoding->clear();
_encoding->addItems(KGlobal::charsets()->descriptiveEncodingNames());
- _encoding->setCurrentIndex(0);
+
+ int utfIndex = _encoding->findText("UTF-8", Qt::MatchContains);
+
+ if (utfIndex == -1)
+ _encoding->setCurrentIndex(0);
+ else
+ _encoding->setCurrentIndex(utfIndex);
+
}
void KNetAttach::slotHelpClicked()
desktop/kde/base/kde-runtime/files/suse/kdesu-symbol-lookup-workaround.diff
+38
View File
@@ -0,0 +1,38 @@
Subject: Avoid error dialog caused by symbol lookup error
From: Lubos Lunak
Bug: bnc#444800
Patch-upstream: no
For whatever reason launching kdm control module leads to a symbol lookup error
during its exit, which leads to its exit code being 127, i.e. not found.
Add ugly hack to hide this case.
--- kdesu/kdesu/kdesu.cpp.sav 2010-03-16 10:33:25.000000000 +0100
+++ kdesu/kdesu/kdesu.cpp 2010-05-28 16:41:00.000000000 +0200
@@ -71,6 +71,8 @@ QByteArray dcopNetworkId()
static int startApp();
+static bool commandWasOk = false;
+
int main(int argc, char *argv[])
{
// FIXME: this can be considered a poor man's solution, as it's not
@@ -135,7 +137,7 @@ int main(int argc, char *argv[])
int result = startApp();
- if (result == 127)
+ if (result == 127 && !commandWasOk)
{
KMessageBox::sorry(0, i18n("Command '%1' not found.", QString::fromLocal8Bit(command)));
}
@@ -258,6 +260,8 @@ static int startApp()
command += QFile::encodeName(arg);
}
}
+ QStringList commandItems = QString::fromLocal8Bit( command ).split( ' ' );
+ commandWasOk = ( !commandItems.isEmpty() && !KStandardDirs::findExe( commandItems.first()).isEmpty());
// Don't change uid if we're don't need to.
if (!change_uid)
desktop/kde/base/kde-runtime/files/suse/phonon-always-forget.diff
+30
View File
@@ -0,0 +1,30 @@
Subject: Use the KDE configuration tool for Compiz instead of the Gtk one
From: Jaroslaw Zachwieja <grok@warwick.ac.uk>
Signed-off-by: Lubos Lunak
Patch-upstream: no (maybe later)
Bug: bnc#609396
Index: phonon/kded-module/phononserver.cpp
===================================================================
--- phonon/kded-module/phononserver.cpp.orig
+++ phonon/kded-module/phononserver.cpp
@@ -1087,8 +1087,17 @@ void PhononServer::askToRemoveDevices(co
if (!areAudio && !areVideo)
return;
- const QString &dontAskAgainName = QLatin1String("phonon_forget_devices_") +
- devList.join(QLatin1String("_"));
+ KSharedConfigPtr config = KGlobal::config();
+ KConfigGroup phononGroup = config->group("phonon");
+ bool alwaysForget = phononGroup.readEntry("phononAlwaysForget", false);
+ QString dontAskAgainName;
+ if (alwaysForget) {
+ dontAskAgainName = QLatin1String("phonon_forget_devices_always");
+ KMessageBox::saveDontShowAgainYesNo(dontAskAgainName, KMessageBox::Yes);
+ } else {
+ dontAskAgainName = QLatin1String("phonon_forget_devices_") +
+ devList.join(QLatin1String("_"));
+ }
KMessageBox::ButtonCode result;
if (!KMessageBox::shouldBeShownYesNo(dontAskAgainName, result)) {
desktop/kde/base/kde-runtime/files/ubuntu/03_disable_usr_lib_install_rpath.diff
+21
View File
@@ -0,0 +1,21 @@
Author: George Kiagiadakis <gkiagiad@csd.uoc.gr>
Subject: Do not set install RPATH to /usr/lib by default
/usr/lib RPATH is disallowed on Debian systems and is a bad practise in
general
Forwarded: not-needed
Index: kdebase-runtime-4.4.80/phonon/platform_kde/CMakeLists.txt
===================================================================
--- kdebase-runtime-4.4.80.orig/phonon/platform_kde/CMakeLists.txt 2010-03-18 05:07:48.000000000 -0400
+++ kdebase-runtime-4.4.80/phonon/platform_kde/CMakeLists.txt 2010-05-24 14:48:29.279440236 -0400
@@ -19,10 +19,8 @@
if(NOT WIN32)
set_target_properties(kde PROPERTIES
- INSTALL_RPATH_USE_LINK_PATH TRUE
SKIP_BUILD_RPATH TRUE
BUILD_WITH_INSTALL_RPATH TRUE
- INSTALL_RPATH ${LIB_INSTALL_DIR}
)
endif(NOT WIN32)
desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_01_nodisplay_knetattach.diff
+9
View File
@@ -0,0 +1,9 @@
Index: kde-runtime-4.7.1/knetattach/knetattach.desktop
===================================================================
--- kde-runtime-4.7.1.orig/knetattach/knetattach.desktop
+++ kde-runtime-4.7.1/knetattach/knetattach.desktop
@@ -186,3 +186,4 @@ X-KDE-StartupNotify=true
Categories=Qt;KDE;Network;RemoteAccess;
X-DocPath=knetattach/index.html
OnlyShowIn=KDE;
+NoDisplay=true
desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_03_knetattach_use_sftp.diff
+13
View File
@@ -0,0 +1,13 @@
Index: kdebase-runtime-4.4.80/knetattach/knetattach.cpp
===================================================================
--- kdebase-runtime-4.4.80.orig/knetattach/knetattach.cpp 2010-02-24 07:52:17.000000000 -0500
+++ kdebase-runtime-4.4.80/knetattach/knetattach.cpp 2010-05-24 14:48:49.046936849 -0400
@@ -176,7 +176,7 @@
KConfig config("kio_fishrc");
KConfigGroup cg(&config, _host->text().trimmed());
cg.writeEntry("Charset", KGlobal::charsets()->encodingForName(_encoding->currentText()));
- url.setProtocol("fish");
+ url.setProtocol("sftp");
url.setPort(_port->value());
} else if (_type == "FTP") {
url.setProtocol("ftp");
desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_07_oxygenify_knetattach_icon.diff
+26
View File
@@ -0,0 +1,26 @@
Index: kde-runtime-4.7.1/knetattach/knetattach.cpp
===================================================================
--- kde-runtime-4.7.1.orig/knetattach/knetattach.cpp
+++ kde-runtime-4.7.1/knetattach/knetattach.cpp
@@ -49,7 +49,7 @@ KNetAttach::KNetAttach( QWidget* parent
connect(_createIcon, SIGNAL(toggled(bool)), this, SLOT(updateFinishButtonText(bool)));
connect( this, SIGNAL(helpRequested()), this, SLOT( slotHelpClicked() ) );
connect( this, SIGNAL(currentIdChanged(int)), this, SLOT( slotPageChanged(int) ) );
- setWindowIcon(KIcon("knetattach"));
+ setWindowIcon(KIcon("folder-new"));
setOption(HaveHelpButton, true);
//setResizeMode(Fixed); FIXME: make the wizard fixed-geometry
button(FinishButton)->setEnabled(false);
Index: kde-runtime-4.7.1/knetattach/knetattach.desktop
===================================================================
--- kde-runtime-4.7.1.orig/knetattach/knetattach.desktop
+++ kde-runtime-4.7.1/knetattach/knetattach.desktop
@@ -179,7 +179,7 @@ GenericName[zh_CN]=网络文件夹向导
GenericName[zh_TW]=網路資料夾精靈
Exec=knetattach
InitialPreference=6
-Icon=knetattach
+Icon=folder-new
Type=Application
Terminal=false
X-KDE-StartupNotify=true
desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_89_strigi_ram_detection.diff
+81
View File
@@ -0,0 +1,81 @@
--- a/nepomuk/server/servicecontroller.cpp
+++ b/nepomuk/server/servicecontroller.cpp
@@ -30,6 +30,8 @@
#include <KConfigGroup>
#include <KDebug>
+// Added by Kubuntu Strigi-RAM patch
+#include <unistd.h>
namespace {
inline QString dbusServiceName( const QString& serviceName ) {
@@ -48,13 +50,15 @@
attached( false ),
started( false ),
initialized( false ),
- failedToInitialize( false ) {
+ failedToInitialize( false ),
+ stopForRam( false ) {
}
KService::Ptr service;
bool autostart;
bool startOnDemand;
bool runOnce;
+ bool stopForRam;
ProcessControl* processControl;
OrgKdeNepomukServiceControlInterface* serviceControlInterface;
@@ -85,6 +89,27 @@
KConfigGroup cg( Server::self()->config(), QString("Service-%1").arg(service->desktopEntryName()) );
autostart = cg.readEntry( "autostart", autostart );
+ // Kubuntu patch; We don't want strigi running on systems with too little RAM
+ if (service->desktopEntryName() == "nepomukstrigiservice") {
+ bool firstStart = cg.readEntry( "First start", false );
+ if ( firstStart == true ) {
+ int memorySize = sysconf(_SC_PHYS_PAGES);
+ memorySize *= sysconf(_SC_PAGESIZE) / 1024;
+
+ // 1GB in bytes divided by 1024
+ if (memorySize <= 1048576) {
+ kDebug() << "Not enough ram, scotty!";
+ // Don't start in the future unless set in nepomuk KCM
+ cg.writeEntry( "autostart", false);
+ // So we know to quit it later
+ stopForRam = true;
+ }
+ cg.writeEntry( "First start", false);
+ cg.sync();
+ }
+ }
+
+
QVariant p = service->property( "X-KDE-Nepomuk-start-on-demand", QVariant::Bool );
startOnDemand = ( p.isValid() ? p.toBool() : false );
@@ -198,6 +223,14 @@
else {
kDebug() << "Starting" << name();
+ // Kubuntu "stop strigi if not enough ram" patch
+ if (name() == "nepomukstrigiservice") {
+ if (d->stopForRam) {
+ d->stopForRam = false;
+ return false;
+ }
+ }
+
if( !d->processControl ) {
d->processControl = new ProcessControl( this );
connect( d->processControl, SIGNAL( finished( bool ) ),
--- a/nepomuk/server/nepomukserver.kcfg
+++ b/nepomuk/server/nepomukserver.kcfg
@@ -13,4 +13,7 @@
<default>sesame2</default>
</entry>
</group>
+ <entry key="First start" type="Bool">
+ <default>true</default>
+ </entry>
</kcfg>
desktop/kde/base/kde-runtime/pspec.xml
+164
View File
@@ -0,0 +1,164 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>kde-runtime</Name>
<Homepage>http://www.kde.org</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>app:gui</IsA>
<Summary>KDE4 Runtime Requirements</Summary>
<Description>kde-runtime contains KDE4 base runtime applications and data files needed at runtime by other KDE applications. In this package, core applications and libraries like Nepomuk server, kcmshell, kwalletd, kio libraries and kdesu are included.</Description>
<Archive type="tarxz" sha1sum="9984b22d2706e7d3efefeefca94a9de5b53f07c3">http://download.kde.org/stable/applications/15.04.3/src/kde-runtime-15.04.3.tar.xz</Archive>
<BuildDependencies>
<Dependency>webp-devel</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>qca2-devel</Dependency>
<Dependency>exiv2-devel</Dependency>
<Dependency>gpgme-devel</Dependency>
<Dependency>phonon-devel</Dependency>
<Dependency>attica-devel</Dependency>
<Dependency>openexr-devel</Dependency>
<Dependency>openslp-devel</Dependency>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>xine-lib-devel</Dependency>
<Dependency>qt-webkit-devel</Dependency>
<Dependency>libXcursor-devel</Dependency>
<Dependency>libcanberra-devel</Dependency>
<Dependency>kactivities-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency releaseFrom="5">libssh-devel</Dependency>
<Dependency>NetworkManager-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>shared-mime-info</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency releaseFrom="5">samba-devel</Dependency>
<Dependency versionFrom="4.14.3">kdelibs-devel</Dependency>
<Dependency versionFrom="4.14.3">kdepimlibs-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- Pisi Linux patches -->
<!-- <Patch level="1">pisilinux/pisiwallpaper.patch</Patch> -->
<!-- <Patch level="1">0006-phonon-Fix-PulseAudio-card-profile-list.patch</Patch> -->
</Patches>
</Source>
<Package>
<Name>kde-runtime</Name>
<IsA>app:gui</IsA>
<RuntimeDependencies>
<Dependency>qt</Dependency>
<Dependency>webp</Dependency>
<Dependency>gpgme</Dependency>
<Dependency>attica</Dependency>
<Dependency>phonon</Dependency>
<Dependency releaseFrom="5">libssh</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>qt-webkit</Dependency>
<Dependency>libXcursor</Dependency>
<Dependency>exiv2-libs</Dependency>
<Dependency>kactivities</Dependency>
<Dependency>libcanberra</Dependency>
<Dependency>openexr-libs</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>pulseaudio-libs</Dependency>
<Dependency>NetworkManager</Dependency>
<Dependency>icon-theme-hicolor</Dependency>
<Dependency>shared-mime-info</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libgcrypt</Dependency>
<Dependency releaseFrom="5">samba</Dependency>
<Dependency versionFrom="4.14.3">kdelibs</Dependency>
<Dependency versionFrom="4.14.3">kdepimlibs</Dependency>
<Dependency versionFrom="4.14.3">icon-theme-oxygen-png</Dependency>
<Dependency versionFrom="4.14.3">icon-theme-oxygen-index</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/kde4</Path>
<Path fileType="data">/usr/share/mime</Path>
<Path fileType="data">/usr/share/icons</Path>
<Path fileType="data">/usr/share/dbus-1</Path>
<Path fileType="data">/usr/share/ontology</Path>
<Path fileType="data">/usr/share/polkit-1</Path>
<Path fileType="data">/usr/share/autostart</Path>
<Path fileType="data">/usr/share/config.kcfg</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="data">/usr/share/desktop-directories</Path>
</Files>
<AdditionalFiles>
<AdditionalFile target="/usr/lib/kde4/libexec/installdbgsymbols.py" permission="0755" owner="root">pisilinux/installdbgsymbols.py</AdditionalFile>
</AdditionalFiles>
</Package>
<Package>
<Name>kde-runtime-doc</Name>
<IsA>data:doc</IsA>
<Summary>Documentation of kde-runtime package</Summary>
<Description>kde-runtime-doc contains documentation of applications and libraries included in kde-runtime package.</Description>
<RuntimeDependencies>
<Dependency release="current">kde-runtime</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>kde-runtime-devel</Name>
<IsA>library</IsA>
<Summary>Development files for kde-runtime package</Summary>
<RuntimeDependencies>
<Dependency release="current">kde-runtime</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
</Files>
</Package>
<Package>
<Name>kde-sounds</Name>
<IsA>data</IsA>
<Summary>KDE4 System Sounds</Summary>
<Description>kdebase-sounds contains default KDE4 system sounds.</Description>
<RuntimeDependencies>
<Dependency release="current">kde-runtime</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/share/sounds</Path>
</Files>
</Package>
<Package>
<Name>kde-emoticons</Name>
<IsA>data</IsA>
<Summary>KDE4 Emoticons</Summary>
<Description>kdebase-emoticonts contains default KDE4 emoticons.</Description>
<RuntimeDependencies>
<Dependency release="current">kde-runtime</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/share/emoticons</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2015-07-17</Date>
<Version>15.04.3</Version>
<Comment>First Release.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>
desktop/kde/base/kde-runtime/translations.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>kdebase-runtime</Name>
<Summary xml:lang="tr">KDE4 Çalışma Zamanı Gereklilikleri</Summary>
<Description xml:lang="tr">kdebase-runtime diğer KDE uygulamalarının çalışma zamanında ihtiyaç duyduğu uygulama ve veri dosyalarını içermektedir. Pakette; Nepomuk sunucusu, kcmshell4, kwalletd, kio kitaplıkları ve kdesu gibi temel kitaplık ve uygulamalar bulunmaktadır.</Description>
</Source>
<Package>
<Name>kdebase-runtime-doc</Name>
<Summary xml:lang="tr">kdebase-runtime paketiyle ilgili belgeler</Summary>
<Description xml:lang="tr">kdebase-runtime-doc kdebase-runtime paketinden çıkan uygulama ve kitaplıklarla ilgili belgeleri içerir.</Description>
</Package>
<Package>
<Name>kdebase-sounds</Name>
<Summary xml:lang="tr">KDE4 Sistem Sesleri</Summary>
<Description xml:lang="tr">kdebase-sounds öntanımlı KDE4 sistem seslerini içerir.</Description>
</Package>
<Package>
<Name>kdebase-emoticons</Name>
<Summary xml:lang="tr">KDE4 Duygu Simgeleri</Summary>
<Description xml:lang="tr">kdebase-emoticons öntanımlı KDE4 duygu simgelerini (emoticon) içerir.</Description>
</Package>
</PISI>