diff --git a/desktop/kde/base/kde-runtime/actions.py b/desktop/kde/base/kde-runtime/actions.py deleted file mode 100644 index ed1049bb5d..0000000000 --- a/desktop/kde/base/kde-runtime/actions.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/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") diff --git a/desktop/kde/base/kde-runtime/comar/package.py b/desktop/kde/base/kde-runtime/comar/package.py deleted file mode 100644 index 60020734ed..0000000000 --- a/desktop/kde/base/kde-runtime/comar/package.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/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") \ No newline at end of file diff --git a/desktop/kde/base/kde-runtime/files/0006-phonon-Fix-PulseAudio-card-profile-list.patch b/desktop/kde/base/kde-runtime/files/0006-phonon-Fix-PulseAudio-card-profile-list.patch deleted file mode 100644 index 56d3ab2e17..0000000000 --- a/desktop/kde/base/kde-runtime/files/0006-phonon-Fix-PulseAudio-card-profile-list.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 47c9fcc4400d19adcf7e7929d3d105764403d30b Mon Sep 17 00:00:00 2001 -From: Colin Guthrie -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 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 - diff --git a/desktop/kde/base/kde-runtime/files/pisilinux/disable-logout-sound.diff b/desktop/kde/base/kde-runtime/files/pisilinux/disable-logout-sound.diff deleted file mode 100644 index bd7f633af2..0000000000 --- a/desktop/kde/base/kde-runtime/files/pisilinux/disable-logout-sound.diff +++ /dev/null @@ -1,12 +0,0 @@ -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] diff --git a/desktop/kde/base/kde-runtime/files/pisilinux/disable-nepomuk-popups.diff b/desktop/kde/base/kde-runtime/files/pisilinux/disable-nepomuk-popups.diff deleted file mode 100644 index c0a34524c5..0000000000 --- a/desktop/kde/base/kde-runtime/files/pisilinux/disable-nepomuk-popups.diff +++ /dev/null @@ -1,37 +0,0 @@ -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= diff --git a/desktop/kde/base/kde-runtime/files/pisilinux/fix-kglobalaccel-sandbox-violation.diff b/desktop/kde/base/kde-runtime/files/pisilinux/fix-kglobalaccel-sandbox-violation.diff deleted file mode 100644 index 4ab4fd7942..0000000000 --- a/desktop/kde/base/kde-runtime/files/pisilinux/fix-kglobalaccel-sandbox-violation.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- 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) -- diff --git a/desktop/kde/base/kde-runtime/files/pisilinux/installdbgsymbols.py b/desktop/kde/base/kde-runtime/files/pisilinux/installdbgsymbols.py deleted file mode 100644 index f54e7ec4d3..0000000000 --- a/desktop/kde/base/kde-runtime/files/pisilinux/installdbgsymbols.py +++ /dev/null @@ -1,69 +0,0 @@ -#!/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))) diff --git a/desktop/kde/base/kde-runtime/files/pisilinux/pisiwallpaper.patch b/desktop/kde/base/kde-runtime/files/pisilinux/pisiwallpaper.patch deleted file mode 100644 index 0b782f6b06..0000000000 --- a/desktop/kde/base/kde-runtime/files/pisilinux/pisiwallpaper.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 diff --git a/desktop/kde/base/kde-runtime/files/pisilinux/strigi-systray-config.diff b/desktop/kde/base/kde-runtime/files/pisilinux/strigi-systray-config.diff deleted file mode 100644 index 7736236c18..0000000000 --- a/desktop/kde/base/kde-runtime/files/pisilinux/strigi-systray-config.diff +++ /dev/null @@ -1,46 +0,0 @@ -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 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() ), diff --git a/desktop/kde/base/kde-runtime/files/pisilinux/take-home-partition-freespace-into-account-in-trash.diff b/desktop/kde/base/kde-runtime/files/pisilinux/take-home-partition-freespace-into-account-in-trash.diff deleted file mode 100644 index 774dc3b964..0000000000 --- a/desktop/kde/base/kde-runtime/files/pisilinux/take-home-partition-freespace-into-account-in-trash.diff +++ /dev/null @@ -1,98 +0,0 @@ -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 - - #include -+#include -+#include - #include - - 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; - } diff --git a/desktop/kde/base/kde-runtime/files/pisilinux/use-utf8-knetattach.diff b/desktop/kde/base/kde-runtime/files/pisilinux/use-utf8-knetattach.diff deleted file mode 100644 index a9d012734f..0000000000 --- a/desktop/kde/base/kde-runtime/files/pisilinux/use-utf8-knetattach.diff +++ /dev/null @@ -1,19 +0,0 @@ -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() diff --git a/desktop/kde/base/kde-runtime/files/suse/kdesu-symbol-lookup-workaround.diff b/desktop/kde/base/kde-runtime/files/suse/kdesu-symbol-lookup-workaround.diff deleted file mode 100644 index 29d80d3b3d..0000000000 --- a/desktop/kde/base/kde-runtime/files/suse/kdesu-symbol-lookup-workaround.diff +++ /dev/null @@ -1,38 +0,0 @@ -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) diff --git a/desktop/kde/base/kde-runtime/files/suse/phonon-always-forget.diff b/desktop/kde/base/kde-runtime/files/suse/phonon-always-forget.diff deleted file mode 100644 index f22e7172f4..0000000000 --- a/desktop/kde/base/kde-runtime/files/suse/phonon-always-forget.diff +++ /dev/null @@ -1,30 +0,0 @@ -Subject: Use the KDE configuration tool for Compiz instead of the Gtk one -From: Jaroslaw Zachwieja -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)) { diff --git a/desktop/kde/base/kde-runtime/files/ubuntu/03_disable_usr_lib_install_rpath.diff b/desktop/kde/base/kde-runtime/files/ubuntu/03_disable_usr_lib_install_rpath.diff deleted file mode 100644 index d04916980b..0000000000 --- a/desktop/kde/base/kde-runtime/files/ubuntu/03_disable_usr_lib_install_rpath.diff +++ /dev/null @@ -1,21 +0,0 @@ -Author: George Kiagiadakis -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) - diff --git a/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_01_nodisplay_knetattach.diff b/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_01_nodisplay_knetattach.diff deleted file mode 100644 index 0a48785fce..0000000000 --- a/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_01_nodisplay_knetattach.diff +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_03_knetattach_use_sftp.diff b/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_03_knetattach_use_sftp.diff deleted file mode 100644 index 5685060dab..0000000000 --- a/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_03_knetattach_use_sftp.diff +++ /dev/null @@ -1,13 +0,0 @@ -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"); diff --git a/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_07_oxygenify_knetattach_icon.diff b/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_07_oxygenify_knetattach_icon.diff deleted file mode 100644 index 3a328fad01..0000000000 --- a/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_07_oxygenify_knetattach_icon.diff +++ /dev/null @@ -1,26 +0,0 @@ -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 diff --git a/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_89_strigi_ram_detection.diff b/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_89_strigi_ram_detection.diff deleted file mode 100644 index ff43e3fbe3..0000000000 --- a/desktop/kde/base/kde-runtime/files/ubuntu/kubuntu_89_strigi_ram_detection.diff +++ /dev/null @@ -1,81 +0,0 @@ ---- a/nepomuk/server/servicecontroller.cpp -+++ b/nepomuk/server/servicecontroller.cpp -@@ -30,6 +30,8 @@ - #include - #include - -+// Added by Kubuntu Strigi-RAM patch -+#include - - 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 @@ - sesame2 - - -+ -+ true -+ - diff --git a/desktop/kde/base/kde-runtime/pspec.xml b/desktop/kde/base/kde-runtime/pspec.xml deleted file mode 100644 index 0a9b9b58a9..0000000000 --- a/desktop/kde/base/kde-runtime/pspec.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - kde-runtime - http://www.kde.org - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:gui - KDE4 Runtime Requirements - 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. - http://download.kde.org/stable/applications/15.04.3/src/kde-runtime-15.04.3.tar.xz - - webp-devel - docbook-xsl - qca2-devel - exiv2-devel - gpgme-devel - phonon-devel - attica-devel - openexr-devel - openslp-devel - alsa-lib-devel - xine-lib-devel - qt-webkit-devel - libXcursor-devel - libcanberra-devel - kactivities-devel - libjpeg-turbo-devel - libssh-devel - NetworkManager-devel - pulseaudio-libs-devel - shared-mime-info - libX11-devel - libgcc - libgcrypt-devel - samba-devel - kdelibs-devel - kdepimlibs-devel - - - - - - - - - - kde-runtime - app:gui - - qt - webp - gpgme - attica - phonon - libssh - alsa-lib - qt-webkit - libXcursor - exiv2-libs - kactivities - libcanberra - openexr-libs - libjpeg-turbo - pulseaudio-libs - NetworkManager - icon-theme-hicolor - shared-mime-info - libX11 - libgcc - libgcrypt - samba - kdelibs - kdepimlibs - icon-theme-oxygen-png - icon-theme-oxygen-index - - - /etc - /usr/lib - /usr/share/man - /usr/bin - /usr/share/kde4 - /usr/share/mime - /usr/share/icons - /usr/share/dbus-1 - /usr/share/ontology - /usr/share/polkit-1 - /usr/share/autostart - /usr/share/config.kcfg - /usr/share/applications - /usr/share/locale - /usr/share/desktop-directories - - - pisilinux/installdbgsymbols.py - - - - - kde-runtime-doc - data:doc - Documentation of kde-runtime package - kde-runtime-doc contains documentation of applications and libraries included in kde-runtime package. - - kde-runtime - - - /usr/share/doc - - - - - kde-runtime-devel - library - Development files for kde-runtime package - - kde-runtime - - - /usr/include - - - - - kde-sounds - data - KDE4 System Sounds - kdebase-sounds contains default KDE4 system sounds. - - kde-runtime - - - /usr/share/sounds - - - - - kde-emoticons - data - KDE4 Emoticons - kdebase-emoticonts contains default KDE4 emoticons. - - kde-runtime - - - /usr/share/emoticons - - - - - - 2015-07-17 - 15.04.3 - First Release. - Stefan Gronewold(groni) - groni@pisilinux.org - - - diff --git a/desktop/kde/base/kde-runtime/translations.xml b/desktop/kde/base/kde-runtime/translations.xml deleted file mode 100644 index f88c456f2f..0000000000 --- a/desktop/kde/base/kde-runtime/translations.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - kdebase-runtime - KDE4 Çalışma Zamanı Gereklilikleri - 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. - - - - kdebase-runtime-doc - kdebase-runtime paketiyle ilgili belgeler - kdebase-runtime-doc kdebase-runtime paketinden çıkan uygulama ve kitaplıklarla ilgili belgeleri içerir. - - - - kdebase-sounds - KDE4 Sistem Sesleri - kdebase-sounds öntanımlı KDE4 sistem seslerini içerir. - - - - kdebase-emoticons - KDE4 Duygu Simgeleri - kdebase-emoticons öntanımlı KDE4 duygu simgelerini (emoticon) içerir. - - diff --git a/desktop/kde/graphics/libkdcraw/pspec.xml b/desktop/kde/graphics/libkdcraw/pspec.xml index 73381cf728..47a0efb879 100644 --- a/desktop/kde/graphics/libkdcraw/pspec.xml +++ b/desktop/kde/graphics/libkdcraw/pspec.xml @@ -12,7 +12,7 @@ library A C++ interface around LibRaw library libkdcraw is a C++ interface around LibRaw library used to decode RAW picture files. - http://download.kde.org/unstable/applications/15.07.90/src/libkdcraw-15.07.90_20150715.tar.xz + http://source.pisilinux.org/1.0/libkdcraw-15.07.90_20150715.tar.xz qt5-base-devel kdoctools-devel