diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..04290b4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/kdelibs-4.14.8.tar.xz diff --git a/.kdelibs.metadata b/.kdelibs.metadata new file mode 100644 index 0000000..df304e0 --- /dev/null +++ b/.kdelibs.metadata @@ -0,0 +1 @@ +98b174dbbbef340bcfc11b819405d8e838cac34c SOURCES/kdelibs-4.14.8.tar.xz diff --git a/SOURCES/0002-Trigger-installation-of-missing-components-when-inst.patch b/SOURCES/0002-Trigger-installation-of-missing-components-when-inst.patch new file mode 100644 index 0000000..504f7a3 --- /dev/null +++ b/SOURCES/0002-Trigger-installation-of-missing-components-when-inst.patch @@ -0,0 +1,139 @@ +diff -up kdelibs-4.8.90/plasma/package.cpp.libplasma-pk-0002 kdelibs-4.8.90/plasma/package.cpp +--- kdelibs-4.8.90/plasma/package.cpp.libplasma-pk-0002 2012-06-05 10:47:01.000000000 +0200 ++++ kdelibs-4.8.90/plasma/package.cpp 2012-06-08 15:40:14.219728253 +0200 +@@ -43,8 +43,11 @@ + #include + + #include "authorizationmanager.h" ++#include "dataenginemanager.h" + #include "packagemetadata.h" ++#include "scripting/scriptengine.h" + #include "private/authorizationmanager_p.h" ++#include "private/componentinstaller_p.h" + #include "private/package_p.h" + #include "private/plasmoidservice_p.h" + #include "private/service_p.h" +@@ -580,6 +583,41 @@ bool Package::installPackage(const QStri + // no need to remove the temp dir (which has been successfully moved if it's an archive) + tempdir.setAutoRemove(false); + } ++ // check for missing dependencies ++ QString requiredScriptEngine = meta.implementationApi(); ++ if (!requiredScriptEngine.isEmpty()) { ++ // figure out the component type to query for ++ ComponentTypes componentTypes = static_cast(0); ++ QStringList serviceTypes = meta.serviceType().split(','); ++ if (serviceTypes.contains("Plasma/Applet")) { ++ componentTypes |= AppletComponent; ++ } ++ if (serviceTypes.contains("Plasma/DataEngine")) { ++ componentTypes |= DataEngineComponent; ++ } ++ if (serviceTypes.contains("Plasma/Runner")) { ++ componentTypes |= RunnerComponent; ++ } ++ if (serviceTypes.contains("Plasma/Wallpaper")) { ++ componentTypes |= WallpaperComponent; ++ } ++ if (!knownLanguages(componentTypes).contains(requiredScriptEngine)) { ++ // install the missing script engine ++ // force prompting because the user has just explicitly installed a widget ++ ComponentInstaller::self()->installMissingComponent("scriptengine", requiredScriptEngine, 0, true); ++ } ++ } ++ QStringList requiredDataEngines = meta.requiredDataEngines(); ++ if (!requiredDataEngines.isEmpty()) { ++ QStringList knownDataEngines = DataEngineManager::self()->listAllEngines(meta.application()); ++ foreach (const QString &requiredDataEngine, requiredDataEngines) { ++ if (!knownDataEngines.contains(requiredDataEngine)) { ++ // install the missing data engine ++ // force prompting because the user has just explicitly installed a widget ++ ComponentInstaller::self()->installMissingComponent("dataengine", requiredDataEngine, 0, true); ++ } ++ } ++ } + + if (!servicePrefix.isEmpty()) { + // and now we register it as a service =) +diff -up kdelibs-4.8.90/plasma/packagemetadata.cpp.libplasma-pk-0002 kdelibs-4.8.90/plasma/packagemetadata.cpp +--- kdelibs-4.8.90/plasma/packagemetadata.cpp.libplasma-pk-0002 2012-05-23 01:45:26.000000000 +0200 ++++ kdelibs-4.8.90/plasma/packagemetadata.cpp 2012-06-08 15:24:24.439149182 +0200 +@@ -52,6 +52,7 @@ class PackageMetadataPrivate + QString serviceType; + QString api; + KUrl location; ++ QStringList requiredDataEngines; + }; + + PackageMetadata::PackageMetadata(const PackageMetadata &other) +@@ -108,6 +109,7 @@ void PackageMetadata::write(const QStrin + config.writeEntry("X-KDE-ParentApp", d->app); + config.writeEntry("Type", d->type); + config.writeEntry("X-Plasma-RemoteLocation", d->location); ++ config.writeEntry("X-Plasma-RequiredDataEngines", d->requiredDataEngines); + } + + void PackageMetadata::read(const QString &filename) +@@ -154,6 +156,7 @@ void PackageMetadata::read(const QString + d->app = config.readEntry("X-KDE-ParentApp", d->app); + d->type = config.readEntry("Type", d->type); + d->location = config.readEntry("X-Plasma-RemoteLocation", d->location); ++ d->requiredDataEngines = config.readEntry("X-Plasma-RequiredDataEngines", d->requiredDataEngines); + } + + QString PackageMetadata::name() const +@@ -246,6 +249,11 @@ QString PackageMetadata::implementationA + return d->api; + } + ++QStringList PackageMetadata::requiredDataEngines() const ++{ ++ return d->requiredDataEngines; ++} ++ + void PackageMetadata::setImplementationApi(const QString &api) + { + d->api = api; +@@ -321,6 +329,11 @@ void PackageMetadata::setRemoteLocation( + d->location = location; + } + ++void PackageMetadata::setRequiredDataEngines(const QStringList &requiredDataEngines) ++{ ++ d->requiredDataEngines = requiredDataEngines; ++} ++ + void PackageMetadata::setType(const QString &type) + { + d->type = type; +diff -up kdelibs-4.8.90/plasma/packagemetadata.h.libplasma-pk-0002 kdelibs-4.8.90/plasma/packagemetadata.h +--- kdelibs-4.8.90/plasma/packagemetadata.h.libplasma-pk-0002 2012-05-23 01:45:26.000000000 +0200 ++++ kdelibs-4.8.90/plasma/packagemetadata.h 2012-06-08 15:24:24.481149665 +0200 +@@ -21,6 +21,7 @@ + #define PLASMA_PACKAGEMETADATA_H + + #include ++#include + + #include + +@@ -92,6 +93,7 @@ public: + QString pluginName() const; + QString implementationApi() const; + KUrl remoteLocation() const; ++ QStringList requiredDataEngines() const; + + QString type() const; + +@@ -205,6 +207,11 @@ public: + */ + void setImplementationApi(const QString &api); + ++ /** ++ * Set the required data engines for this package. ++ */ ++ void setRequiredDataEngines(const QStringList &); ++ + private: + PackageMetadataPrivate * const d; + }; diff --git a/SOURCES/0003-Implement-automatic-scanning-of-source-code-for-requ.patch b/SOURCES/0003-Implement-automatic-scanning-of-source-code-for-requ.patch new file mode 100644 index 0000000..dc155f7 --- /dev/null +++ b/SOURCES/0003-Implement-automatic-scanning-of-source-code-for-requ.patch @@ -0,0 +1,346 @@ +From 89e4767148110a5566e463a03b3ed594276b7da0 Mon Sep 17 00:00:00 2001 +Message-Id: <89e4767148110a5566e463a03b3ed594276b7da0.1317166378.git.kevin.kofler@chello.at> +From: Kevin Kofler +Date: Wed, 17 Aug 2011 04:54:37 +0200 +Subject: [PATCH] Implement automatic scanning of source code for required + data engines. + +For packages in scripting languages and distributed through OCS, this is fully +automatic and triggered from Package::installPackage. If an +X-Plasma-RequiredDataEngines entry is present in the .desktop file (even if +empty), the dependency extraction is not run and the explicitly provided +information is trusted instead. + +For native distribution packages, we ship a tool called +plasma-dataengine-depextractor which can be run at any time during the build +process and which adds the dependency information to the relevant .desktop file. + +Authors of plasmoids are encouraged to run plasma-dataengine-depextractor and/or +fill in X-Plasma-RequiredDataEngines manually. (Please note that the list is +expected to be comma-separated.) +--- + plasma/CMakeLists.txt | 15 ++++ + plasma/depextractor/depextractor.cpp | 125 +++++++++++++++++++++++++++++++++ + plasma/package.cpp | 11 +++ + plasma/private/componentinstaller.cpp | 71 +++++++++++++++++++ + plasma/private/componentinstaller_p.h | 17 ++++- + 5 files changed, 238 insertions(+), 1 deletions(-) + +diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt +index f929967..9a760ef 100644 +--- a/plasma/CMakeLists.txt ++++ b/plasma/CMakeLists.txt +@@ -304,6 +304,18 @@ set_target_properties(plasma PROPERTIES + + install(TARGETS plasma EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) + ++if(NOT PLASMA_NO_PACKAGEKIT) ++ # we need a copy of the component installer because libplasma does not export it ++ # plus, this avoids depending on GUI stuff in this command-line utility ++ set(plasma_dataengine_depextractor_SRCS depextractor/depextractor.cpp ++ private/componentinstaller.cpp) ++ kde4_add_executable(plasma-dataengine-depextractor ++ ${plasma_dataengine_depextractor_SRCS}) ++ set_target_properties(plasma-dataengine-depextractor PROPERTIES ++ COMPILE_FLAGS -DPLASMA_COMPONENTINSTALLER_NO_QWIDGET=1) ++ target_link_libraries(plasma-dataengine-depextractor ${KDE4_KDECORE_LIBS}) ++endif(NOT PLASMA_NO_PACKAGEKIT) ++ + + ########### install files ############### + +@@ -460,3 +472,6 @@ install(FILES data/operations/dataengineservice.operations DESTINATION ${DATA_IN + install(FILES data/operations/plasmoidservice.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) + install(FILES data/operations/storage.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) + ++if(NOT PLASMA_NO_PACKAGEKIT) ++ install(TARGETS plasma-dataengine-depextractor DESTINATION ${BIN_INSTALL_DIR}) ++endif(NOT PLASMA_NO_PACKAGEKIT) +diff --git a/plasma/depextractor/depextractor.cpp b/plasma/depextractor/depextractor.cpp +new file mode 100644 +index 0000000..c489de7 +--- /dev/null ++++ b/plasma/depextractor/depextractor.cpp +@@ -0,0 +1,125 @@ ++/* Plasma Data Engine dependency extractor ++ Copyright (C) 2011 Kevin Kofler ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include "private/componentinstaller_p.h" ++ ++static QString scriptingApi(const QString &desktopFile) ++{ ++ KDesktopFile desktop(desktopFile); ++ KConfigGroup desktopGroup = desktop.desktopGroup(); ++ if (desktopGroup.readEntry("X-KDE-ServiceTypes", QStringList()) ++ .contains("Plasma/ScriptEngine") ++ || desktopGroup.readEntry("ServiceTypes", QStringList()) ++ .contains("Plasma/ScriptEngine")) { ++ /* Script engines are always written in C++. Their X-Plasma-API is the ++ API they export, not the language they're written in. */ ++ return QString(); ++ } ++ return desktopGroup.readEntry("X-Plasma-API", QString()); ++} ++ ++static void writeDataEngineDependencies(const QStringList &deps, ++ const QString &desktopFile) ++{ ++ if (!deps.isEmpty()) { ++ KDesktopFile desktop(desktopFile); ++ desktop.desktopGroup().writeEntry("X-Plasma-RequiredDataEngines", deps); ++ } ++} ++ ++int main(int argc, char **argv) ++{ ++ KAboutData aboutData("plasma-dataengine-depextractor", QByteArray(), ++ ki18n("Plasma Data Engine dependency extractor"), ++ "2", ++ ki18n("Plasma Data Engine dependency extractor")); ++ aboutData.addAuthor(ki18n("Kevin Kofler"), ki18n("Author"), ++ "kevin.kofler@chello.at"); ++ ++ KCmdLineArgs::init(argc, argv, &aboutData); ++ KCmdLineOptions options; ++ options.add("+[path]", ++ ki18n("Source path (default: .)")); ++ options.add("+[file]", ++ ki18n(".desktop rel. to path (default: metadata.desktop)") ++ ); ++ KCmdLineArgs::addCmdLineOptions(options); ++ ++ QCoreApplication *app = new QCoreApplication(KCmdLineArgs::qtArgc(), ++ KCmdLineArgs::qtArgv()); ++ ++ KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); ++ ++ int exitCode = 0; ++ ++ QString path, desktopFile; ++ int argCount = args->count(); ++ switch (argCount) { ++ case 0: ++ path = "."; ++ desktopFile = "metadata.desktop"; ++ break; ++ case 1: ++ path = args->arg(0); ++ desktopFile = "metadata.desktop"; ++ break; ++ case 2: ++ path = args->arg(0); ++ desktopFile = args->arg(1); ++ break; ++ default: ++ { ++ QTextStream err(stderr, QIODevice::WriteOnly | QIODevice::Text); ++ err << i18n("Expected at most 2 arguments, but %1 given", argCount) ++ << endl; ++ exitCode = 1; ++ break; ++ } ++ } ++ ++ if (!exitCode) { ++ if (QFileInfo(desktopFile).isRelative()) ++ desktopFile = QDir(path).absoluteFilePath(desktopFile); ++ ++ if (QFileInfo(desktopFile).exists()) { ++ writeDataEngineDependencies(Plasma::ComponentInstaller::self() ++ ->extractDataEngineDependencies( ++ path, ++ scriptingApi(desktopFile)), ++ desktopFile); ++ } else { ++ QTextStream err(stderr, QIODevice::WriteOnly | QIODevice::Text); ++ err << i18n("Desktop file \"%1\" not found", desktopFile) << endl; ++ exitCode = 1; ++ } ++ } ++ ++ args->clear(); ++ delete app; ++ return exitCode; ++} +diff --git a/plasma/package.cpp b/plasma/package.cpp +index 0a45c87..131f204 100644 +--- a/plasma/package.cpp ++++ b/plasma/package.cpp +@@ -631,6 +631,17 @@ bool Package::installPackage(const QString &package, + } + } + QStringList requiredDataEngines = meta.requiredDataEngines(); ++ if (requiredDataEngines.isEmpty()) { ++ // check whether this was explicitly specified as empty ++ QString metaPath = targetName + "/metadata.desktop"; ++ KDesktopFile df(metaPath); ++ KConfigGroup cg = df.desktopGroup(); ++ if (!cg.hasKey("X-Plasma-RequiredDataEngines")) { ++ // not specified at all, try running the dependency extraction ++ requiredDataEngines = ComponentInstaller::self()->extractDataEngineDependencies(targetName, ++ requiredScriptEngine); ++ } ++ } + if (!requiredDataEngines.isEmpty()) { + QStringList knownDataEngines = DataEngineManager::self()->listAllEngines(meta.application()); + foreach (const QString &requiredDataEngine, requiredDataEngines) { +diff --git a/plasma/private/componentinstaller.cpp b/plasma/private/componentinstaller.cpp +index 870667f..087d1c6 100644 +--- a/plasma/private/componentinstaller.cpp ++++ b/plasma/private/componentinstaller.cpp +@@ -28,6 +28,10 @@ + #include + #include + #include ++#include ++#include ++#include ++#include + #endif + + namespace Plasma +@@ -85,9 +89,13 @@ void ComponentInstaller::installMissingComponent(const QString &type, + // We don't check packageKit.isValid() because the service is activated on + // demand, so it will show up as "not valid". + WId wid = 0; ++#ifndef PLASMA_COMPONENTINSTALLER_NO_QWIDGET + if (parent) { + wid = parent->winId(); + } ++#else ++ Q_UNUSED(parent); ++#endif + QStringList resources; + resources.append(searchString); + packageKit.asyncCall(QLatin1String("InstallResources"), (unsigned int) wid, +@@ -100,4 +108,67 @@ void ComponentInstaller::installMissingComponent(const QString &type, + #endif + } + ++QStringList ComponentInstaller::extractDataEngineDependencies(const QString &path, ++ const QString &api) ++{ ++ QStringList deps; ++ ++#ifdef PLASMA_ENABLE_PACKAGEKIT_SUPPORT ++ QStringList nameFilters; ++ QRegExp searchRegExp("dataEngine *\\( *\"([^\"]+)\" *\\)"); ++ if (api.isEmpty()) { ++ // no script engine API, this is native C++ code ++ nameFilters.append("*.cpp"); ++ nameFilters.append("*.cxx"); ++ nameFilters.append("*.cc"); ++ nameFilters.append("*.C"); ++ nameFilters.append("*.h"); ++ nameFilters.append("*.hpp"); ++ nameFilters.append("*.hxx"); ++ nameFilters.append("*.hh"); ++ nameFilters.append("*.H"); ++ } else if (api == "declarativeappletscript") { ++ nameFilters.append("*.qml"); ++ searchRegExp = QRegExp("(?:^\\s*engine:\\s*|dataEngine *\\( *)\"([^\"]+)\""); ++ } else if (api == "javascript") { ++ nameFilters.append("*.js"); ++ } else if (api == "python") { ++ nameFilters.append("*.py"); ++ searchRegExp = QRegExp("dataEngine *\\( *[\'\"]([^\'\"]+)[\'\"] *\\)"); ++ } else if (api == "ruby-script") { ++ nameFilters.append("*.rb"); ++ searchRegExp = QRegExp("dataEngine *\\( *[\'\"]([^\'\"]+)[\'\"] *\\)"); ++ } else { ++ // dependency extraction not supported for this API ++ return deps; ++ } ++ ++ QDirIterator it(path, nameFilters, QDir::Files | QDir::CaseSensitive, ++ QDirIterator::Subdirectories ++ | QDirIterator::FollowSymlinks); ++ while (it.hasNext()) { ++ QFile file(it.next()); ++ file.open(QIODevice::ReadOnly | QIODevice::Text); ++ QTextStream stream(&file); ++ QString line; ++ while (!(line = stream.readLine()).isNull()) { ++ int column = 0; ++ while ((column = searchRegExp.indexIn(line, column)) != -1) { ++ QString dep = searchRegExp.cap(1); ++ if (!deps.contains(dep)) { ++ deps.append(dep); ++ } ++ column += searchRegExp.matchedLength(); ++ } ++ } ++ file.close(); ++ } ++#else ++ Q_UNUSED(path); ++ Q_UNUSED(api); ++#endif ++ ++ return deps; ++} ++ + } // namespace Plasma +diff --git a/plasma/private/componentinstaller_p.h b/plasma/private/componentinstaller_p.h +index f85cbb6..d0d9c75 100644 +--- a/plasma/private/componentinstaller_p.h ++++ b/plasma/private/componentinstaller_p.h +@@ -20,7 +20,7 @@ + #ifndef PLASMA_COMPONENTINSTALLER_H + #define PLASMA_COMPONENTINSTALLER_H + +-class QString; ++#include + class QWidget; + + namespace Plasma +@@ -76,6 +76,21 @@ class ComponentInstaller + void installMissingComponent(const QString &type, const QString &name, + QWidget *parent = 0, bool force = false); + ++ /** ++ * Extracts the list of required data engines from source code. ++ * ++ * If the scripting API is not supported for dependency extraction or ++ * if Plasma was compiled without support for missing component ++ * installation, an empty list of dependencies is returned. ++ * ++ * @param path the path containing the source code ++ * @param api the scripting API used; ++ * if empty (the default), assumes the native C++ API ++ */ ++ QStringList extractDataEngineDependencies(const QString &path, ++ const QString &api ++ = QString()); ++ + private: + /** + * Default constructor. The singleton method self() is the +-- +1.7.6.2 + diff --git a/SOURCES/Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch b/SOURCES/Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch new file mode 100644 index 0000000..985281f --- /dev/null +++ b/SOURCES/Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch @@ -0,0 +1,27 @@ +From 02966e348e37ebf6269aaed238e7ce67fbe958e7 Mon Sep 17 00:00:00 2001 +From: Hrvoje Senjan +Date: Sun, 25 May 2014 00:36:08 +0200 +Subject: [PATCH 1/1] Drop Nepomuk from KParts' LINK_INTERFACE_LIBRARIES + +Nepomuk is only used in a private header, browserrun_p.h, +thus it is not needed as KParts public dependancy +Makes it possible to drop libsoprano-devel from libkde4-devel Requires +--- + kparts/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt +index 2eab2e8..e17ef5e 100644 +--- a/kparts/CMakeLists.txt ++++ b/kparts/CMakeLists.txt +@@ -39,7 +39,6 @@ target_link_libraries(kparts ${KDE4_KDECORE_LIBS} kdeui kio) + target_link_libraries(kparts LINK_INTERFACE_LIBRARIES kio kdeui kdecore ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ) + if(HAVE_NEPOMUK) + target_link_libraries(kparts nepomuk nepomukutils) +- target_link_libraries(kparts LINK_INTERFACE_LIBRARIES nepomuk nepomukutils ) + endif(HAVE_NEPOMUK) + + set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION} +-- +1.9.3 + diff --git a/SOURCES/SOLID_HAL_LEGACY.sh b/SOURCES/SOLID_HAL_LEGACY.sh new file mode 100644 index 0000000..fc27874 --- /dev/null +++ b/SOURCES/SOLID_HAL_LEGACY.sh @@ -0,0 +1,6 @@ + +if [ -z "${SOLID_HAL_LEGACY}" ] ; then + SOLID_HAL_LEGACY=1 + export SOLID_HAL_LEGACY +fi + diff --git a/SOURCES/coding-style-fixes.patch b/SOURCES/coding-style-fixes.patch new file mode 100644 index 0000000..3c1fdba --- /dev/null +++ b/SOURCES/coding-style-fixes.patch @@ -0,0 +1,61 @@ +From 2173580f070e806d4715e13048c697c49ec262e2 Mon Sep 17 00:00:00 2001 +From: Aaron Seigo +Date: Thu, 21 Feb 2013 17:59:58 +0100 +Subject: [PATCH 047/111] coding style fixes + +--- + kdeui/icons/kiconloader.cpp | 27 ++++++++++++--------------- + 1 file changed, 12 insertions(+), 15 deletions(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index 6fed667..dba474d 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -938,32 +938,29 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + } + } + +- foreach (KIconThemeNode *themeNode, links) +- { ++ foreach (KIconThemeNode *themeNode, links) { + QString currentName = name; + +- while (!currentName.isEmpty()) +- { +- ++ while (!currentName.isEmpty()) { + //kDebug(264) << "Looking up" << currentName; + +-// The following code has been commented out because the Qt SVG renderer needs +-// to be improved. If you are going to change/remove some code from this part, +-// please contact me before (ereslibre@kde.org), or kde-core-devel@kde.org. (ereslibre) +- for (int i = 0 ; i < 4 ; i++) +- { ++ for (int i = 0 ; i < 4 ; i++) { + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact); +- if (icon.isValid()) +- return icon; ++ if (icon.isValid()) { ++ break; ++ } + + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest); +- if (icon.isValid()) +- return icon; ++ if (icon.isValid()) { ++ break; ++ } + } ++ //kDebug(264) << "Looking up" << currentName; + +- if (genericFallback) ++ if (genericFallback) { + // we already tested the base name + break; ++ } + + int rindex = currentName.lastIndexOf('-'); + if (rindex > 1) { // > 1 so that we don't split x-content or x-epoc +-- +1.8.1.4 + diff --git a/SOURCES/kdelibs-4.10.0-SOLID_UPNP.patch b/SOURCES/kdelibs-4.10.0-SOLID_UPNP.patch new file mode 100644 index 0000000..4809a85 --- /dev/null +++ b/SOURCES/kdelibs-4.10.0-SOLID_UPNP.patch @@ -0,0 +1,16 @@ +diff -up kdelibs-4.10.0/solid/solid/managerbase.cpp.SOLID_UPNP kdelibs-4.10.0/solid/solid/managerbase.cpp +--- kdelibs-4.10.0/solid/solid/managerbase.cpp.SOLID_UPNP 2013-01-23 15:44:27.000000000 -0600 ++++ kdelibs-4.10.0/solid/solid/managerbase.cpp 2013-01-31 07:48:05.058342162 -0600 +@@ -98,7 +98,11 @@ void Solid::ManagerBasePrivate::loadBack + # endif + + # if defined (HUPNP_FOUND) +- m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0); ++ bool solidUpnpEnabled ++ = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1; ++ if (solidUpnpEnabled) { ++ m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0); ++ } + # endif + } + } diff --git a/SOURCES/kdelibs-4.10.0-branding.patch b/SOURCES/kdelibs-4.10.0-branding.patch new file mode 100644 index 0000000..d760122 --- /dev/null +++ b/SOURCES/kdelibs-4.10.0-branding.patch @@ -0,0 +1,11 @@ +diff -up kdelibs-4.10.0/kio/kio/kprotocolmanager.cpp.branding kdelibs-4.10.0/kio/kio/kprotocolmanager.cpp +--- kdelibs-4.10.0/kio/kio/kprotocolmanager.cpp.branding 2013-01-23 15:44:24.000000000 -0600 ++++ kdelibs-4.10.0/kio/kio/kprotocolmanager.cpp 2013-01-31 07:41:09.248540500 -0600 +@@ -743,6 +743,7 @@ QString KProtocolManager::defaultUserAge + d->useragent += QString::number(KDE::versionMajor()); + d->useragent += QL1C('.'); + d->useragent += QString::number(KDE::versionMinor()); ++ d->useragent += QL1S(" Fedora/@@VERSION_RELEASE@@"); + } + else + { diff --git a/SOURCES/kdelibs-4.10.0-cmake.patch b/SOURCES/kdelibs-4.10.0-cmake.patch new file mode 100644 index 0000000..52f99ae --- /dev/null +++ b/SOURCES/kdelibs-4.10.0-cmake.patch @@ -0,0 +1,11 @@ +diff -up kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake.xxcmake kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake.xxcmake 2013-01-31 07:45:31.958256176 -0600 ++++ kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake 2013-01-31 07:45:31.989255789 -0600 +@@ -955,6 +955,7 @@ endif(WIN32) + # CMake generators if no build type is set. + if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE RelWithDebInfo) ++ set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE}) + endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) + + diff --git a/SOURCES/kdelibs-4.10.0-kde149705.patch b/SOURCES/kdelibs-4.10.0-kde149705.patch new file mode 100644 index 0000000..a7d5179 --- /dev/null +++ b/SOURCES/kdelibs-4.10.0-kde149705.patch @@ -0,0 +1,38 @@ +diff -up kdelibs-4.10.0/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.10.0/kdeui/icons/kicontheme.cpp +--- kdelibs-4.10.0/kdeui/icons/kicontheme.cpp.kde149705 2013-01-23 15:44:19.000000000 -0600 ++++ kdelibs-4.10.0/kdeui/icons/kicontheme.cpp 2013-01-31 07:40:19.163166653 -0600 +@@ -527,7 +527,7 @@ QString KIconTheme::current() + } + + KConfigGroup cg(KGlobal::config(), "Icons"); +- *_theme = cg.readEntry("Theme", defaultThemeName()); ++ *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName())); + if ( *_theme == QLatin1String("hicolor") ) { + *_theme = defaultThemeName(); + } +diff -up kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp +--- kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp.kde149705 2013-01-23 15:44:19.000000000 -0600 ++++ kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp 2013-01-31 07:40:19.163166653 -0600 +@@ -942,7 +942,7 @@ void KGlobalSettings::Private::applyGUIS + if (kde_overrideStyle.isEmpty()) { + const QString &defaultStyle = KStyle::defaultStyle(); + const KConfigGroup pConfig(KGlobal::config(), "General"); +- const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle); ++ const QString &styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle)); + + if (styleStr.isEmpty() || + // check whether we already use the correct style to return then +diff -up kdelibs-4.10.0/kutils/kdeglobals.kcfg.kde149705 kdelibs-4.10.0/kutils/kdeglobals.kcfg +--- kdelibs-4.10.0/kutils/kdeglobals.kcfg.kde149705 2013-01-23 15:44:26.000000000 -0600 ++++ kdelibs-4.10.0/kutils/kdeglobals.kcfg 2013-01-31 07:40:19.164166641 -0600 +@@ -24,6 +24,10 @@ + The name of the widget style, for example "keramik" or "plastik". Without quotes. + keramik + ++ ++ ++ The name of the widget style, for example "oxygen". Without quotes. Defaults to widgetStyle. ++ + + + diff --git a/SOURCES/kdelibs-4.10.0-no_rpath.patch b/SOURCES/kdelibs-4.10.0-no_rpath.patch new file mode 100644 index 0000000..7e4808e --- /dev/null +++ b/SOURCES/kdelibs-4.10.0-no_rpath.patch @@ -0,0 +1,107 @@ +diff -up kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake.no_rpath 2013-01-31 07:47:15.581960702 -0600 ++++ kdelibs-4.10.0/cmake/modules/FindKDE4Internal.cmake 2013-01-31 07:47:15.583960677 -0600 +@@ -1050,7 +1050,7 @@ if (UNIX) + + set(CMAKE_SKIP_BUILD_RPATH FALSE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ++ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) + endif (APPLE) + endif (UNIX) + +diff -up kdelibs-4.10.0/kdewidgets/CMakeLists.txt.no_rpath kdelibs-4.10.0/kdewidgets/CMakeLists.txt +--- kdelibs-4.10.0/kdewidgets/CMakeLists.txt.no_rpath 2013-01-31 07:47:15.556961014 -0600 ++++ kdelibs-4.10.0/kdewidgets/CMakeLists.txt 2013-01-31 07:47:15.583960677 -0600 +@@ -46,14 +46,14 @@ if(QT_QTDESIGNER_FOUND) + kde4_add_plugin(kdewidgets ${kdewidgets_PART_SRCS}) + + target_link_libraries(kdewidgets ${KDE4_KIO_LIBS}) +- if(NOT WIN32) +- set_target_properties(kdewidgets PROPERTIES +- INSTALL_RPATH_USE_LINK_PATH TRUE +- SKIP_BUILD_RPATH TRUE +- BUILD_WITH_INSTALL_RPATH TRUE +- INSTALL_RPATH ${LIB_INSTALL_DIR} +- ) +- endif(NOT WIN32) ++# if(NOT WIN32) ++# set_target_properties(kdewidgets PROPERTIES ++# INSTALL_RPATH_USE_LINK_PATH TRUE ++# SKIP_BUILD_RPATH TRUE ++# BUILD_WITH_INSTALL_RPATH TRUE ++# INSTALL_RPATH ${LIB_INSTALL_DIR} ++# ) ++# endif(NOT WIN32) + + install(TARGETS kdewidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) + +@@ -76,14 +76,14 @@ if(QT_QTDESIGNER_FOUND) + kde4_add_plugin(kdedeprecated ${kdedeprecated_PART_SRCS}) + + target_link_libraries(kdedeprecated ${KDE4_KIO_LIBS}) +- if(NOT WIN32) +- set_target_properties(kdedeprecated PROPERTIES +- INSTALL_RPATH_USE_LINK_PATH TRUE +- SKIP_BUILD_RPATH TRUE +- BUILD_WITH_INSTALL_RPATH TRUE +- INSTALL_RPATH ${LIB_INSTALL_DIR} +- ) +- endif(NOT WIN32) ++# if(NOT WIN32) ++# set_target_properties(kdedeprecated PROPERTIES ++# INSTALL_RPATH_USE_LINK_PATH TRUE ++# SKIP_BUILD_RPATH TRUE ++# BUILD_WITH_INSTALL_RPATH TRUE ++# INSTALL_RPATH ${LIB_INSTALL_DIR} ++# ) ++# endif(NOT WIN32) + + install(TARGETS kdedeprecated DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) + endif(NOT KDE_NO_DEPRECATED) +@@ -111,14 +111,14 @@ if(QT_QTDESIGNER_FOUND) + kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS}) + + target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY}) +- if(NOT WIN32) +- set_target_properties(kdewebkitwidgets PROPERTIES +- INSTALL_RPATH_USE_LINK_PATH TRUE +- SKIP_BUILD_RPATH TRUE +- BUILD_WITH_INSTALL_RPATH TRUE +- INSTALL_RPATH ${LIB_INSTALL_DIR} +- ) +- endif(NOT WIN32) ++# if(NOT WIN32) ++# set_target_properties(kdewebkitwidgets PROPERTIES ++# INSTALL_RPATH_USE_LINK_PATH TRUE ++# SKIP_BUILD_RPATH TRUE ++# BUILD_WITH_INSTALL_RPATH TRUE ++# INSTALL_RPATH ${LIB_INSTALL_DIR} ++# ) ++# endif(NOT WIN32) + + install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) + +@@ -147,14 +147,14 @@ if(QT_QTDESIGNER_FOUND) + kde4_add_plugin(kde3supportwidgets ${kde3supportwidgets_PART_SRCS}) + + target_link_libraries(kde3supportwidgets ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIO_LIBS}) +- if(NOT WIN32) +- set_target_properties(kde3supportwidgets PROPERTIES +- INSTALL_RPATH_USE_LINK_PATH TRUE +- SKIP_BUILD_RPATH TRUE +- BUILD_WITH_INSTALL_RPATH TRUE +- INSTALL_RPATH ${LIB_INSTALL_DIR} +- ) +- endif(NOT WIN32) ++# if(NOT WIN32) ++# set_target_properties(kde3supportwidgets PROPERTIES ++# INSTALL_RPATH_USE_LINK_PATH TRUE ++# SKIP_BUILD_RPATH TRUE ++# BUILD_WITH_INSTALL_RPATH TRUE ++# INSTALL_RPATH ${LIB_INSTALL_DIR} ++# ) ++# endif(NOT WIN32) + + install(TARGETS kde3supportwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) + endif (QT_QT3SUPPORT_FOUND) diff --git a/SOURCES/kdelibs-4.10.0-webkit.patch b/SOURCES/kdelibs-4.10.0-webkit.patch new file mode 100644 index 0000000..1aad529 --- /dev/null +++ b/SOURCES/kdelibs-4.10.0-webkit.patch @@ -0,0 +1,101 @@ +diff -up kdelibs-4.10.0/CMakeLists.txt.webkit kdelibs-4.10.0/CMakeLists.txt +--- kdelibs-4.10.0/CMakeLists.txt.webkit 2013-01-29 22:55:26.000000000 +0100 ++++ kdelibs-4.10.0/CMakeLists.txt 2013-02-28 11:43:57.653616989 +0100 +@@ -328,7 +328,6 @@ if(NOT WINCE) + add_subdirectory( plasma ) + endif(NOT WINCE) + add_subdirectory( kunitconversion ) +-add_subdirectory( kdewebkit ) + add_subdirectory( includes ) + + add_subdirectory( experimental ) +diff -up kdelibs-4.10.0/kdewidgets/CMakeLists.txt.webkit kdelibs-4.10.0/kdewidgets/CMakeLists.txt +--- kdelibs-4.10.0/kdewidgets/CMakeLists.txt.webkit 2013-02-28 11:43:57.589617095 +0100 ++++ kdelibs-4.10.0/kdewidgets/CMakeLists.txt 2013-02-28 11:43:57.654616988 +0100 +@@ -88,41 +88,6 @@ if(QT_QTDESIGNER_FOUND) + install(TARGETS kdedeprecated DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) + endif(NOT KDE_NO_DEPRECATED) + +- +- # kdewebkit widgets +- include_directories( +- ${CMAKE_SOURCE_DIR}/kdewebkit +- ) +- +- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp +- COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets +- MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets4) +- +- set(kdewebkitwidgets_PART_SRCS +- classpreviews.cpp +- ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp +- ) +- +- qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.moc) +- +- +- qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc) +- +- kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS}) +- +- target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY}) +-# if(NOT WIN32) +-# set_target_properties(kdewebkitwidgets PROPERTIES +-# INSTALL_RPATH_USE_LINK_PATH TRUE +-# SKIP_BUILD_RPATH TRUE +-# BUILD_WITH_INSTALL_RPATH TRUE +-# INSTALL_RPATH ${LIB_INSTALL_DIR} +-# ) +-# endif(NOT WIN32) +- +- install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) +- +- + if (QT_QT3SUPPORT_FOUND) + + include_directories( +diff -up kdelibs-4.10.0/plasma/CMakeLists.txt.webkit kdelibs-4.10.0/plasma/CMakeLists.txt +--- kdelibs-4.10.0/plasma/CMakeLists.txt.webkit 2013-02-28 11:43:57.600617077 +0100 ++++ kdelibs-4.10.0/plasma/CMakeLists.txt 2013-02-28 11:47:28.121778200 +0100 +@@ -11,6 +11,8 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL + set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE) + endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) + ++set(PLASMA_NO_KDEWEBKIT TRUE) ++ + if(NOT Q_WS_X11) + set(PLASMA_NO_PACKAGEKIT TRUE) + endif(NOT Q_WS_X11) +@@ -124,7 +126,6 @@ set(plasma_LIB_SRCS + framesvg.cpp + plasma.cpp + popupapplet.cpp +- private/animablegraphicswebview.cpp + private/applethandle.cpp + private/associatedapplicationmanager.cpp + private/componentinstaller.cpp +@@ -214,7 +215,6 @@ set(plasma_LIB_SRCS + widgets/textbrowser.cpp + widgets/treeview.cpp + widgets/textedit.cpp +- widgets/webview.cpp + + #Temporary QtJolie branch + private/qtjolie-branch/qtjolie/abstractadaptor.cpp +@@ -278,7 +278,7 @@ endif(PHONON_FOUND) + + kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS}) + +-target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ++target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY} + ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} + ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS}) + +@@ -430,7 +430,6 @@ install(FILES + widgets/textbrowser.h + widgets/treeview.h + widgets/textedit.h +- widgets/webview.h + DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets COMPONENT Devel) + + install(FILES diff --git a/SOURCES/kdelibs-4.10.0-xdg-menu.patch b/SOURCES/kdelibs-4.10.0-xdg-menu.patch new file mode 100644 index 0000000..b9f7f98 --- /dev/null +++ b/SOURCES/kdelibs-4.10.0-xdg-menu.patch @@ -0,0 +1,75 @@ +diff -up kdelibs-4.10.0/kded/applications.menu.Administration-menu kdelibs-4.10.0/kded/applications.menu +--- kdelibs-4.10.0/kded/applications.menu.Administration-menu 2013-01-23 15:44:19.000000000 -0600 ++++ kdelibs-4.10.0/kded/applications.menu 2013-01-31 07:42:28.173553801 -0600 +@@ -31,29 +31,31 @@ + Core + KDE + ++ X-Red-Hat-Base + + X-SuSE-YaST +- X-KDE-settings-hardware +- X-KDE-settings-accessibility +- X-KDE-settings-components +- X-KDE-settings-desktop +- X-KDE-settings-looknfeel +- X-KDE-settings-network +- X-KDE-settings-webbrowsing +- X-KDE-settings-peripherals +- X-KDE-settings-hardware +- X-KDE-settings-power +- X-KDE-settings-security +- X-KDE-settings-sound +- X-KDE-settings-system +- X-KDE-information +- kde-kcm_knetworkconfmodule_ss.desktop +- kde-medianotifications.desktop +- kde-audioencoding.desktop + + + + ++ System Settings ++ SystemConfig.directory ++ ++ ++ System ++ Settings ++ X-Red-Hat-ServerConfig ++ ++ ++ ++ Server ++ ServerConfig.directory ++ ++ X-Red-Hat-ServerConfig ++ ++ ++ ++ + Development + kde-development.directory + +@@ -369,7 +371,11 @@ + Settingsmenu + kde-settingsmenu.directory + +- Settings ++ ++ Settings ++ System ++ X-Red-Hat-ServerConfig ++ + + + +@@ -378,7 +384,9 @@ + + + System ++ Settings + X-KDE-More ++ X-Red-Hat-ServerConfig + + + diff --git a/SOURCES/kdelibs-4.10.5-cmake-multilib.patch b/SOURCES/kdelibs-4.10.5-cmake-multilib.patch new file mode 100644 index 0000000..62f0523 --- /dev/null +++ b/SOURCES/kdelibs-4.10.5-cmake-multilib.patch @@ -0,0 +1,23 @@ +--- kdelibs-4.10.5/CreateKDELibsDependenciesFile.cmake.multilib 2014-01-08 17:30:42.270885255 +0100 ++++ kdelibs-4.10.5/CreateKDELibsDependenciesFile.cmake 2014-01-08 17:30:49.082868267 +0100 +@@ -57,13 +57,18 @@ make_install_path_absolute(KDE4_DBUS_SER + make_install_path_absolute(KDE4_SERVICES_INSTALL_DIR ${SERVICES_INSTALL_DIR}) + make_install_path_absolute(KDE4_SERVICETYPES_INSTALL_DIR ${SERVICETYPES_INSTALL_DIR}) + ++STRING(REGEX REPLACE "/lib64" "/lib" KDE4_LIB_INSTALL_DIR_STRIPPED ${KDE4_LIB_INSTALL_DIR}) ++STRING(REGEX REPLACE "/lib64" "/lib" KDE4_IMPORTS_INSTALL_DIR_STRIPPED ${KDE4_IMPORTS_INSTALL_DIR}) ++STRING(REGEX REPLACE "/lib" "/lib\${LIB_SUFFIX}" KDE4_LIB_INSTALL_DIR_EXTENDED ${KDE4_LIB_INSTALL_DIR_STRIPPED}) ++STRING(REGEX REPLACE "/lib" "/lib\${LIB_SUFFIX}" KDE4_IMPORTS_INSTALL_DIR_EXTENDED ${KDE4_IMPORTS_INSTALL_DIR_STRIPPED}) ++ + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake " + if (NOT KDE4_INSTALL_DIR) + set(KDE4_INSTALL_DIR \"${CMAKE_INSTALL_PREFIX}\") + endif (NOT KDE4_INSTALL_DIR) + +-set(KDE4_LIB_INSTALL_DIR \"${KDE4_LIB_INSTALL_DIR}\") +-set(KDE4_IMPORTS_INSTALL_DIR \"${KDE4_IMPORTS_INSTALL_DIR}\") ++set(KDE4_LIB_INSTALL_DIR \"${KDE4_LIB_INSTALL_DIR_EXTENDED}\") ++set(KDE4_IMPORTS_INSTALL_DIR \"${KDE4_IMPORTS_INSTALL_DIR_EXTENDED}\") + set(KDE4_LIBEXEC_INSTALL_DIR \"${KDE4_LIBEXEC_INSTALL_DIR}\") + set(KDE4_INCLUDE_INSTALL_DIR \"${KDE4_INCLUDE_INSTALL_DIR}\") + set(KDE4_BIN_INSTALL_DIR \"${KDE4_BIN_INSTALL_DIR}\") diff --git a/SOURCES/kdelibs-4.10.5-kpac-relro.patch b/SOURCES/kdelibs-4.10.5-kpac-relro.patch new file mode 100644 index 0000000..1a01457 --- /dev/null +++ b/SOURCES/kdelibs-4.10.5-kpac-relro.patch @@ -0,0 +1,10 @@ +--- kdelibs-4.10.5/kio/misc/kpac/CMakeLists.txt.relro 2014-01-08 17:30:13.109957977 +0100 ++++ kdelibs-4.10.5/kio/misc/kpac/CMakeLists.txt 2014-01-08 17:30:16.124950458 +0100 +@@ -40,6 +40,7 @@ install(TARGETS kded_proxyscout DESTINA + set(kpac_dhcp_helper_SRCS kpac_dhcp_helper.c) + + kde4_add_executable(kpac_dhcp_helper NOGUI ${kpac_dhcp_helper_SRCS}) ++SET_TARGET_PROPERTIES(kpac_dhcp_helper PROPERTIES LINK_FLAGS "-Wl,-z,relro,-z,now") + + if (HAVE_NSL_LIBRARY) + # Assume Solaris diff --git a/SOURCES/kdelibs-4.10.5-type-punning.patch b/SOURCES/kdelibs-4.10.5-type-punning.patch new file mode 100644 index 0000000..78b4f44 --- /dev/null +++ b/SOURCES/kdelibs-4.10.5-type-punning.patch @@ -0,0 +1,32 @@ +--- ./kdelibs-4.10.5/kimgio/CMakeLists.txt 2014-01-24 16:40:49.341274501 +0100 ++++ ./kdelibs-4.10.5/kimgio/CMakeLists.txt 2014-01-24 16:41:14.783208049 +0100 +@@ -75,6 +75,7 @@ install(TARGETS kimg_xcf DESTINATION ${ + ################################## + + set(kimg_dds_LIB_SRCS dds.cpp) ++set_property(SOURCE dds.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -fno-strict-aliasing ") + kde4_add_plugin(kimg_dds ${kimg_dds_LIB_SRCS}) + target_link_libraries(kimg_dds ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) + +--- ./kdelibs-4.10.5/kdeui/CMakeLists.txt 2014-01-24 16:41:31.938163283 +0100 ++++ ./kdelibs-4.10.5/kdeui/CMakeLists.txt 2014-01-24 16:41:56.394099521 +0100 +@@ -298,6 +298,8 @@ set(kdeui_LIB_SRCS + xmlgui/kxmlguiversionhandler.cpp + ) + ++set_property(SOURCE util/kcrash.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -fno-strict-aliasing ") ++ + if(NOT KDE_NO_DEPRECATED) + set(kdeui_LIB_SRCS + ${kdeui_LIB_SRCS} +--- ./kdelibs-4.10.5/kdecore/CMakeLists.txt 2014-01-24 16:37:45.921751058 +0100 ++++ ./kdelibs-4.10.5/kdecore/CMakeLists.txt 2014-01-24 16:40:17.417357991 +0100 +@@ -292,6 +292,8 @@ set(kdecore_LIB_SRCS + sonnet/globals.cpp + ) + ++set_property(SOURCE services/kmimetyperepository.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -fno-strict-aliasing ") ++ + if (NOT KDECORE_NO_KDE3SUPPORT) + set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} + network/k3socketdevice.cpp # must be before the rest of network/, for enable-final diff --git a/SOURCES/kdelibs-4.11.3-arm.patch b/SOURCES/kdelibs-4.11.3-arm.patch new file mode 100644 index 0000000..b812e55 --- /dev/null +++ b/SOURCES/kdelibs-4.11.3-arm.patch @@ -0,0 +1,15 @@ +diff -up kdelibs-4.11.3/plasma/corona.cpp.than kdelibs-4.11.3/plasma/corona.cpp +--- kdelibs-4.11.3/plasma/corona.cpp.than 2013-12-02 16:46:19.542820822 +0100 ++++ kdelibs-4.11.3/plasma/corona.cpp 2013-12-02 17:53:04.919830893 +0100 +@@ -388,7 +388,11 @@ void Corona::addOffscreenWidget(QGraphic + } + + d->offscreenWidgets[i] = widget; ++#if defined(arm) || defined(__arm__) ++ widget->setPos((-i - 1) * 2000, -2000); ++#else + widget->setPos((-i - 1) * QWIDGETSIZE_MAX, -QWIDGETSIZE_MAX); ++#endif + + QGraphicsWidget *pw = widget->parentWidget(); + widget->setParentItem(0); diff --git a/SOURCES/kdelibs-4.11.3-klauncher-no-glib.patch b/SOURCES/kdelibs-4.11.3-klauncher-no-glib.patch new file mode 100644 index 0000000..bdc209c --- /dev/null +++ b/SOURCES/kdelibs-4.11.3-klauncher-no-glib.patch @@ -0,0 +1,25 @@ +diff -ur kdelibs-4.11.3/kinit/klauncher_main.cpp kdelibs-4.11.3-klauncher-no-glib/kinit/klauncher_main.cpp +--- kdelibs-4.11.3/kinit/klauncher_main.cpp 2013-06-28 19:03:41.000000000 +0200 ++++ kdelibs-4.11.3-klauncher-no-glib/kinit/klauncher_main.cpp 2013-12-09 00:32:12.000000000 +0100 +@@ -75,10 +75,21 @@ + // WABA: Make sure not to enable session management. + putenv(strdup("SESSION_MANAGER=")); + ++ // Disable the GLib event loop (rh#983110) ++ bool wasQtNoGlibSet = (getenv("QT_NO_GLIB") != 0); ++ if (!wasQtNoGlibSet) { ++ setenv("QT_NO_GLIB", "1", true); ++ } ++ + // We need a QCoreApplication to get a DBus event loop + QCoreApplication app(argc, argv); + app.setApplicationName( componentData.componentName() ); + ++ // Now get rid of QT_NO_GLIB again so launched processes don't inherit it ++ if (!wasQtNoGlibSet) { ++ unsetenv("QT_NO_GLIB"); ++ } ++ + int maxTry = 3; + while(true) + { diff --git a/SOURCES/kdelibs-4.11.3-libexecdir.patch b/SOURCES/kdelibs-4.11.3-libexecdir.patch new file mode 100644 index 0000000..627dad7 --- /dev/null +++ b/SOURCES/kdelibs-4.11.3-libexecdir.patch @@ -0,0 +1,54 @@ +diff -up kdelibs-4.11.3/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.11.3/kdecore/kernel/kstandarddirs.cpp +--- kdelibs-4.11.3/kdecore/kernel/kstandarddirs.cpp.libexecdir 2013-06-28 12:03:40.883340083 -0500 ++++ kdelibs-4.11.3/kdecore/kernel/kstandarddirs.cpp 2013-11-01 15:44:00.780783690 -0500 +@@ -1871,7 +1871,7 @@ void KStandardDirs::addKDEDefaults() + addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true); + index+=2; + } +- addResourceType("exe", "lib", "kde4/libexec", true ); ++ addResourceType("exe", 0, "libexec/kde4", true ); + + addResourceDir("home", QDir::homePath(), false); + +diff -up kdelibs-4.11.3/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.11.3/kdecore/kernel/kstandarddirs_unix.cpp +--- kdelibs-4.11.3/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2013-06-28 12:03:40.884340190 -0500 ++++ kdelibs-4.11.3/kdecore/kernel/kstandarddirs_unix.cpp 2013-11-01 15:44:00.782783770 -0500 +@@ -63,7 +63,7 @@ QString KStandardDirs::installPath(const + if (strcmp("lib", type) == 0) + return QFile::decodeName(LIB_INSTALL_DIR "/"); + if (strcmp("libexec", type) == 0) +- return QFile::decodeName(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/"); ++ return QFile::decodeName(LIBEXEC_INSTALL_DIR "/"); + if (strcmp("locale", type) == 0) + return QFile::decodeName(LOCALE_INSTALL_DIR "/"); + break; +diff -up kdelibs-4.11.3/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.11.3/kdecore/tests/kstandarddirstest.cpp +--- kdelibs-4.11.3/kdecore/tests/kstandarddirstest.cpp.libexecdir 2013-11-01 10:45:56.409145508 -0500 ++++ kdelibs-4.11.3/kdecore/tests/kstandarddirstest.cpp 2013-11-01 15:50:20.473658147 -0500 +@@ -96,8 +96,9 @@ void KStandarddirsTest::testFindResource + #define KIOSLAVE "bin/kioslave.exe" + #else + #define EXT "" +-#define KIOSLAVE "kde4/libexec/kioslave" ++#define KIOSLAVE "libexec/kde4/kioslave" + #endif ++ + const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT ); + QVERIFY( !bin.isEmpty() ); + QVERIFY( bin.endsWith( KIOSLAVE ) ); +@@ -248,11 +249,13 @@ void KStandarddirsTest::testFindExe() + // findExe with a result in libexec + const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" ); + QVERIFY( !lnusertemp.isEmpty() ); +- QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY ) ); ++ QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY ) ++ || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT, PATH_SENSITIVITY ) ); + + // locate("exe") with a result in libexec + const QString locateExeResult = KGlobal::dirs()->locate("exe", "lnusertemp"); +- QVERIFY(locateExeResult.endsWith("lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY)); ++ QVERIFY(locateExeResult.endsWith("lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY) ++ || locateExeResult.endsWith("libexec/kde4/lnusertemp" EXT, PATH_SENSITIVITY) ); + + // findExe with relative path + const QString pwd = QDir::currentPath(); diff --git a/SOURCES/kdelibs-4.11.97-kstandarddirs.patch b/SOURCES/kdelibs-4.11.97-kstandarddirs.patch new file mode 100644 index 0000000..f6b8ecd --- /dev/null +++ b/SOURCES/kdelibs-4.11.97-kstandarddirs.patch @@ -0,0 +1,25 @@ +diff -up kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp.kstandarddirs kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp +--- kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp.kstandarddirs 2013-11-30 21:24:01.637163800 -0600 ++++ kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp 2013-11-30 21:35:27.166292739 -0600 +@@ -1149,7 +1149,8 @@ QStringList KStandardDirs::KStandardDirs + pit != prefixList->end(); + ++pit) + { +- if((*pit).compare(installprefix, cs) != 0 || installdir.isEmpty()) ++ // "exe" never has a custom install path, and the check triggers a false positive due to the libexecdir patch ++ if((*pit).compare(installprefix, cs) != 0 || installdir.isEmpty() || !strcmp("exe", type)) + { + for (QStringList::ConstIterator it = dirs.constBegin(); + it != dirs.constEnd(); ++it) +@@ -1163,6 +1164,11 @@ QStringList KStandardDirs::KStandardDirs + if ((local || testdir.exists()) && !candidates.contains(path, cs)) + candidates.append(path); + } ++ // special-case "config" (forward porting Chris Cheney's ++ // hack) - we want /etc/kde after the local config paths ++ // and before the ones in /usr (including kde-profile) ++ if (local && !strcmp("config", type)) ++ candidates.append(QLatin1String("/etc/kde/")); + local = false; + } + else diff --git a/SOURCES/kdelibs-4.12.90-dot.patch b/SOURCES/kdelibs-4.12.90-dot.patch new file mode 100644 index 0000000..fed6713 --- /dev/null +++ b/SOURCES/kdelibs-4.12.90-dot.patch @@ -0,0 +1,12 @@ +diff -up kdelibs-4.12.90/doc/common/Doxyfile.global.dot kdelibs-4.12.90/doc/common/Doxyfile.global +--- kdelibs-4.12.90/doc/common/Doxyfile.global.dot 2014-03-17 13:15:23.252517997 -0500 ++++ kdelibs-4.12.90/doc/common/Doxyfile.global 2014-03-17 13:16:02.472100942 -0500 +@@ -1360,7 +1360,7 @@ HIDE_UNDOC_RELATIONS = NO + # toolkit from AT&T and Lucent Bell Labs. The other options in this section + # have no effect if this option is set to NO (the default) + +-HAVE_DOT = YES ++HAVE_DOT = NO + + # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. + # The default size is 10pt. diff --git a/SOURCES/kdelibs-4.13.2-invokeTerminal.patch b/SOURCES/kdelibs-4.13.2-invokeTerminal.patch new file mode 100644 index 0000000..33141c5 --- /dev/null +++ b/SOURCES/kdelibs-4.13.2-invokeTerminal.patch @@ -0,0 +1,34 @@ +diff --git a/kdecore/kernel/ktoolinvocation_x11.cpp b/kdecore/kernel/ktoolinvocation_x11.cpp +index 5168f2f..ed2a9ab 100644 +--- a/kdecore/kernel/ktoolinvocation_x11.cpp ++++ b/kdecore/kernel/ktoolinvocation_x11.cpp +@@ -405,18 +405,20 @@ void KToolInvocation::invokeTerminal(const QString &command, + QStringList cmdTokens = KShell::splitArgs(exec); + QString cmd = cmdTokens.takeFirst(); + +- if (exec == QLatin1String("konsole") && !workdir.isEmpty()) { +- cmdTokens << QString::fromLatin1("--workdir"); +- cmdTokens << workdir; +- // For other terminals like xterm, we'll simply change the working +- // directory before launching them, see below. ++ if (exec == QLatin1String("konsole")) { ++ cmdTokens += QString::fromLatin1("--nofork"); ++ ++ if (!workdir.isEmpty()) { ++ cmdTokens << QString::fromLatin1("--workdir"); ++ cmdTokens << workdir; ++ // For other terminals like xterm, we'll simply change the working ++ // directory before launching them, see below. ++ } + } + +- QString error; +- if (self()->startServiceInternal("kdeinit_exec_with_workdir", +- cmd, cmdTokens, &error, 0, NULL, startup_id, false, workdir)) { ++ if (!QProcess::startDetached(cmd, cmdTokens)) { + KMessage::message(KMessage::Error, +- i18n("Could not launch the terminal client:\n\n%1", error), ++ i18n("Could not launch the terminal client"), + i18n("Could not launch Terminal Client")); + } + } diff --git a/SOURCES/kdelibs-4.3.4-bz#587016.patch b/SOURCES/kdelibs-4.3.4-bz#587016.patch new file mode 100644 index 0000000..71d3726 --- /dev/null +++ b/SOURCES/kdelibs-4.3.4-bz#587016.patch @@ -0,0 +1,72 @@ +diff --git a/khtml/khtml_printsettings.cpp b/khtml/khtml_printsettings.cpp +index 37cdb38..ab47a8e 100644 +--- a/khtml/khtml_printsettings.cpp ++++ b/khtml/khtml_printsettings.cpp +@@ -106,5 +106,19 @@ bool KHTMLPrintSettings::printHeader() + return m_printheader->isChecked(); + } + ++void KHTMLPrintSettings::setprintFriendly(bool b) ++{ ++ m_printfriendly->setChecked(b); ++} ++ ++void KHTMLPrintSettings::setprintImages(bool b) ++{ ++ m_printimages->setChecked(b); ++} ++ ++void KHTMLPrintSettings::setprintHeader(bool b) ++{ ++ m_printheader->setChecked(b); ++} + + #include "khtml_printsettings.moc" +diff --git a/khtml/khtml_printsettings.h b/khtml/khtml_printsettings.h +index 0ed825e..562ace8 100644 +--- a/khtml/khtml_printsettings.h ++++ b/khtml/khtml_printsettings.h +@@ -35,6 +35,10 @@ public: + bool printImages(); + bool printHeader(); + ++ void setprintFriendly(bool); ++ void setprintImages(bool); ++ void setprintHeader(bool); ++ + private: + QCheckBox *m_printfriendly; + QCheckBox *m_printimages; +diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp +index 1ac2339..6c9750e 100644 +--- a/khtml/khtmlview.cpp ++++ b/khtml/khtmlview.cpp +@@ -3031,6 +3031,14 @@ void KHTMLView::print(bool quick) + if(!root) return; + + QPointer printSettings(new KHTMLPrintSettings); //XXX: doesn't save settings between prints like this ++ ++ // read print settings ++ KSharedConfigPtr config = KGlobal::config(); ++ KConfigGroup group(config, "KHTML Print Settings"); ++ printSettings->setprintFriendly(group.readEntry("PrintFriendly", true)); ++ printSettings->setprintImages(group.readEntry("PrintImages", true)); ++ printSettings->setprintHeader(group.readEntry("PrintHeader", true)); ++ + const QPointerDeleter settingsDeleter(printSettings); //the printdialog takes ownership of the settings widget, thus this workaround to avoid double deletion + QPrinter printer; + QPointer dialog = KdePrint::createPrintDialog(&printer, KdePrint::SystemSelectsPages, QList() << printSettings.data(), this); +@@ -3042,6 +3050,13 @@ void KHTMLView::print(bool quick) + docname = KStringHandler::csqueeze(docname, 80); + + if(quick || (dialog->exec() && dialog)) { /*'this' and thus dialog might have been deleted while exec()!*/ ++ // write HTML settings ++ KSharedConfigPtr config = KGlobal::config(); ++ KConfigGroup group(config, "KHTML Print Settings"); ++ group.writeEntry("PrintFriendly", printSettings->printFriendly()); ++ group.writeEntry("PrintImages", printSettings->printImages()); ++ group.writeEntry("PrintHeader", printSettings->printHeader()); ++ + viewport()->setCursor( Qt::WaitCursor ); // only viewport(), no QApplication::, otherwise we get the busy cursor in kdeprint's dialogs + // set up KPrinter + printer.setFullPage(false); diff --git a/SOURCES/kdelibs-4.3.90-install_all_css.patch b/SOURCES/kdelibs-4.3.90-install_all_css.patch new file mode 100644 index 0000000..71325fb --- /dev/null +++ b/SOURCES/kdelibs-4.3.90-install_all_css.patch @@ -0,0 +1,12 @@ +diff -up kdelibs-4.3.90/doc/common/CMakeLists.txt.all-css kdelibs-4.3.90/doc/common/CMakeLists.txt +--- kdelibs-4.3.90/doc/common/CMakeLists.txt.all-css 2010-01-06 10:58:53.000000000 -0600 ++++ kdelibs-4.3.90/doc/common/CMakeLists.txt 2010-01-06 13:33:35.920884922 -0600 +@@ -8,6 +8,8 @@ install(FILES + kde-docs.css + doxygen.css + tabs.css ++ kde.css flat.css print.css ++ Doxyfile.global + header.html + footer.html + mainheader.html diff --git a/SOURCES/kdelibs-4.7.0-knewstuff2_gpg2.patch b/SOURCES/kdelibs-4.7.0-knewstuff2_gpg2.patch new file mode 100644 index 0000000..35a5e8e --- /dev/null +++ b/SOURCES/kdelibs-4.7.0-knewstuff2_gpg2.patch @@ -0,0 +1,60 @@ +diff -up kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp.knewstuff2_gpg2 kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp +--- kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp.knewstuff2_gpg2 2011-05-20 15:24:54.000000000 -0500 ++++ kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp 2011-09-06 11:29:18.939251150 -0500 +@@ -36,9 +36,20 @@ + #include + #include + #include ++#include + + using namespace KNS; + ++static QString gpgExecutable() ++{ ++ QString gpgExe = KStandardDirs::findExe( "gpg" ); ++ if ( gpgExe.isEmpty() ) ++ gpgExe = KStandardDirs::findExe( "gpg2" ); ++ if ( gpgExe.isEmpty() ) ++ return QLatin1String( "gpg" ); ++ return gpgExe; ++} ++ + Security::Security() + { + m_keysRead = false; +@@ -61,7 +72,7 @@ void Security::readKeys() + m_runMode = List; + m_keys.clear(); + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << gpgExecutable() + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -87,7 +98,7 @@ void Security::readSecretKeys() + } + m_runMode = ListSecret; + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << gpgExecutable() + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -260,7 +271,7 @@ void Security::slotCheckValidity() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << gpgExecutable() + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" +@@ -342,7 +353,7 @@ void Security::slotSignFile() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << gpgExecutable() + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" diff --git a/SOURCES/kdelibs-4.7.2-kjs-s390.patch b/SOURCES/kdelibs-4.7.2-kjs-s390.patch new file mode 100644 index 0000000..e813515 --- /dev/null +++ b/SOURCES/kdelibs-4.7.2-kjs-s390.patch @@ -0,0 +1,22 @@ +diff -up kdelibs-4.7.2/kjs/wtf/Platform.h.me kdelibs-4.7.2/kjs/wtf/Platform.h +--- kdelibs-4.7.2/kjs/wtf/Platform.h.me 2011-12-06 10:10:08.372356038 -0500 ++++ kdelibs-4.7.2/kjs/wtf/Platform.h 2011-12-06 10:48:51.962357831 -0500 +@@ -97,6 +97,18 @@ + + /* CPU */ + ++/* PLATFORM(S390X) - S390X 64-bit */ ++#if defined(__s390x__) ++#define WTF_PLATFORM_S390X 1 ++#define WTF_PLATFORM_BIG_ENDIAN 1 ++#endif ++ ++/* PLATFORM(S390) - S390 32-bit */ ++#if defined(__s390__) ++#define WTF_PLATFORM_S390 1 ++#define WTF_PLATFORM_BIG_ENDIAN 1 ++#endif ++ + /* PLATFORM(PPC) */ + #if defined(__ppc__) \ + || defined(__PPC__) \ diff --git a/SOURCES/kdelibs-4.8.4-kjs-locale.patch b/SOURCES/kdelibs-4.8.4-kjs-locale.patch new file mode 100644 index 0000000..74ba0f9 --- /dev/null +++ b/SOURCES/kdelibs-4.8.4-kjs-locale.patch @@ -0,0 +1,18 @@ +diff -up kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp.me kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp +--- kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp.me 2012-06-06 22:49:52.542044112 +0200 ++++ kdelibs-4.8.4/khtml/ecma/kjs_navigator.cpp 2012-07-12 11:52:50.973049316 +0200 +@@ -261,7 +261,13 @@ JSValue *Navigator::getValueProperty(Exe + case BrowserLanguage: + case Language: + case UserLanguage: +- return jsString(KGlobal::locale()->language()); ++ { ++ QString l = KGlobal::locale()->language(); ++ if ( l.contains(QLatin1Char('_')) ) ++ return jsString(l.replace(QLatin1Char('_'), QLatin1Char('-'))); ++ else ++ return jsString(l + QLatin1Char('-') + KGlobal::locale()->country().toUpper()); ++ } + case UserAgent: + return jsString(userAgent); + case Platform: diff --git a/SOURCES/kdelibs-4.9.3-kcm_ssl.patch b/SOURCES/kdelibs-4.9.3-kcm_ssl.patch new file mode 100644 index 0000000..b0d3f44 --- /dev/null +++ b/SOURCES/kdelibs-4.9.3-kcm_ssl.patch @@ -0,0 +1,12 @@ +diff -up kdelibs-4.9.3/kio/kssl/kcm/cacertificatespage.cpp.orig kdelibs-4.9.3/kio/kssl/kcm/cacertificatespage.cpp +--- kdelibs-4.9.3/kio/kssl/kcm/cacertificatespage.cpp.orig 2012-11-29 15:37:07.458858688 +0100 ++++ kdelibs-4.9.3/kio/kssl/kcm/cacertificatespage.cpp 2012-11-29 13:52:05.243926802 +0100 +@@ -291,7 +291,7 @@ void CaCertificatesPage::removeSelection + void CaCertificatesPage::addCertificateClicked() + { + QStringList certFiles +- = KFileDialog::getOpenFileNames(KUrl(), QLatin1String("application/x-x509-ca-cert"), ++ = KFileDialog::getOpenFileNames(KUrl(), QLatin1String("*.pem *.cert *.crt *.der"), + this, i18n("Pick Certificates")); + + QList certs; diff --git a/SOURCES/kdelibs-4.9.95-parallel_devel.patch b/SOURCES/kdelibs-4.9.95-parallel_devel.patch new file mode 100644 index 0000000..97979db --- /dev/null +++ b/SOURCES/kdelibs-4.9.95-parallel_devel.patch @@ -0,0 +1,253 @@ +diff -up kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2012-12-18 02:26:38.000000000 -0600 ++++ kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake 2012-12-19 15:21:37.963466601 -0600 +@@ -38,10 +38,10 @@ + # The following variables are defined for the various tools required to + # compile KDE software: + # +-# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable ++# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable + # KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead + # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable +-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable ++# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable + # + # The following variables point to the location of the KDE libraries, + # but shouldn't be used directly: +@@ -191,7 +191,7 @@ + # relative path to the file. + # + # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets) +-# Use this to add widget description files for the makekdewidgets code generator ++# Use this to add widget description files for the makekdewidgets4 code generator + # for Qt Designer plugins. + # + # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) +@@ -509,31 +509,31 @@ if (_kdeBootStrapping) + set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) + # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC + if (NOT WINCE) +- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) ++ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 ) + set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) + else (NOT WINCE) +- set(KDE4_KCFGC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) ++ set(KDE4_KCFGC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 ) + set(KDE4_MEINPROC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/meinproc4 ) + endif(NOT WINCE) + + set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) + set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen ) +- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets ) ++ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 ) + else (WIN32) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) +- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler${CMAKE_EXECUTABLE_SUFFIX}.shell ) ++ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4${CMAKE_EXECUTABLE_SUFFIX}.shell ) + set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen${CMAKE_EXECUTABLE_SUFFIX}.shell ) + set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4${CMAKE_EXECUTABLE_SUFFIX}.shell ) +- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets${CMAKE_EXECUTABLE_SUFFIX}.shell ) ++ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4${CMAKE_EXECUTABLE_SUFFIX}.shell ) + endif (WIN32) + + set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) + + + # when building kdelibs, make the kcfg rules depend on the binaries... +- set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) ++ set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4) + set( _KDE4_KAUTH_POLICY_GEN_EXECUTABLE_DEP kauth-policy-gen) +- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) ++ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4) + set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) + + set(KDE4_INSTALLED_VERSION_OK TRUE) +@@ -582,7 +582,8 @@ else (_kdeBootStrapping) + + # KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake, + # use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables +- set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} ) ++ set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel ) ++ link_directories("${KDE4_LIB_DIR}") + set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} ) + + +@@ -596,18 +597,18 @@ else (_kdeBootStrapping) + + # get the build CONFIGURATIONS which were exported in this file, and use just the first + # of them to get the location of the installed executables +- get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS ) ++ get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS ) + list(GET _importedConfigurations 0 _firstConfig) + + if(NOT WINCE) +- get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig}) ++ get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${_firstConfig}) + get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${_firstConfig}) + else(NOT WINCE) +- set(KDE4_KCFGC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) ++ set(KDE4_KCFGC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 ) + set(KDE4_MEINPROC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/meinproc4 ) + endif(NOT WINCE) + get_target_property(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${KDE4_TARGET_PREFIX}kauth-policy-gen LOCATION_${_firstConfig}) +- get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${_firstConfig}) ++ get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4 LOCATION_${_firstConfig}) + + # allow searching cmake modules in all given kde install locations (KDEDIRS based) + execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) +@@ -934,7 +935,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY + set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} + "${KDE4_BIN_INSTALL_DIR}" ) + +-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} ++set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel" ++ ${CMAKE_SYSTEM_LIBRARY_PATH} + "${KDE4_LIB_INSTALL_DIR}" ) + + # under Windows dlls may be also installed in bin/ +@@ -1363,9 +1365,9 @@ macro (KDE4_PRINT_RESULTS) + endif (NOT _kdeBootStrapping) + + if(KDE4_KCFGC_EXECUTABLE) +- message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") ++ message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}") + else(KDE4_KCFGC_EXECUTABLE) +- message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") ++ message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor") + endif(KDE4_KCFGC_EXECUTABLE) + + if(AUTOMOC4_EXECUTABLE) +@@ -1384,7 +1386,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K + endif (NOT KDE4_INSTALLED_VERSION_OK) + + if (NOT KDE4_KCFGC_EXECUTABLE) +- message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler") ++ message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4") + endif (NOT KDE4_KCFGC_EXECUTABLE) + + message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs") +diff -up kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh +--- kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2012-12-17 08:14:16.000000000 -0600 ++++ kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh 2012-12-19 15:21:37.963466601 -0600 +@@ -2,9 +2,9 @@ + # Generates and cleans KConfigXT source code during a API dox build + # + +-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler" ++kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4" + if test -z "$kcfg_compiler"; then +- echo "kconfig_compiler not found!" ++ echo "kconfig_compiler4 not found!" + exit 1; + fi + +diff -up kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl +--- kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2012-12-17 08:14:16.000000000 -0600 ++++ kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl 2012-12-19 15:21:37.963466601 -0600 +@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; + + $kcfgc = $file . "c"; + +-$cmd = "./kconfig_compiler $file $kcfgc"; ++$cmd = "./kconfig_compiler4 $file $kcfgc"; + + #print "CMD $cmd\n"; + + if ( system( $cmd ) != 0 ) { +- print STDERR "Unable to run kconfig_compiler\n"; ++ print STDERR "Unable to run kconfig_compiler4\n"; + exit 1; + } + +diff -up kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt +--- kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600 ++++ kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt 2012-12-19 15:21:37.964466589 -0600 +@@ -11,13 +11,13 @@ + set(kconfig_compiler_SRCS kconfig_compiler.cpp) + + +- kde4_add_executable(kconfig_compiler NOGUI ${kconfig_compiler_SRCS}) ++ kde4_add_executable(kconfig_compiler4 NOGUI ${kconfig_compiler_SRCS}) + +- target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) ++ target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) + + # "export" this target too so we can use the LOCATION property of the imported target in + # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex +- install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) ++ install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) + + + # # export this binary for cross-compilation +diff -up kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt +--- kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600 ++++ kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt 2012-12-19 15:21:37.964466589 -0600 +@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h + COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc +- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler) ++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4) + + # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) + qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) +diff -up kdelibs-4.9.95/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdewidgets/CMakeLists.txt +--- kdelibs-4.9.95/kdewidgets/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600 ++++ kdelibs-4.9.95/kdewidgets/CMakeLists.txt 2012-12-19 15:21:37.964466589 -0600 +@@ -14,24 +14,24 @@ include_directories( + set(makekdewidgets_SRCS makekdewidgets.cpp ) + + +-kde4_add_executable(makekdewidgets NOGUI ${makekdewidgets_SRCS}) ++kde4_add_executable(makekdewidgets4 NOGUI ${makekdewidgets_SRCS}) + +-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} ) ++target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} ) + + # "export" this target too so we can use the LOCATION property of the imported target in + # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex +-install(TARGETS makekdewidgets EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) ++install(TARGETS makekdewidgets4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) + + + ########### next target ############### + + if(QT_QTDESIGNER_FOUND) + # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH) +- get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT) ++ get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT) + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp + COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets +- MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets) ++ MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4) + + set(kdewidgets_PART_SRCS + classpreviews.cpp +@@ -61,7 +61,7 @@ if(QT_QTDESIGNER_FOUND) + if(NOT KDE_NO_DEPRECATED) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdedeprecated.cpp + COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdedeprecated.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdedeprecated.widgets +- MAIN_DEPENDENCY kdedeprecated.widgets DEPENDS makekdewidgets) ++ MAIN_DEPENDENCY kdedeprecated.widgets DEPENDS makekdewidgets4) + + set(kdedeprecated_PART_SRCS + classpreviews.cpp +@@ -96,7 +96,7 @@ if(QT_QTDESIGNER_FOUND) + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp + COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets +- MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets) ++ MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets4) + + set(kdewebkitwidgets_PART_SRCS + classpreviews.cpp +@@ -132,7 +132,7 @@ if(QT_QTDESIGNER_FOUND) + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp + COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets +- MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets) ++ MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets4) + + set(kde3supportwidgets_PART_SRCS + classpreviews.cpp diff --git a/SOURCES/kdelibs-4.x-abrt.patch b/SOURCES/kdelibs-4.x-abrt.patch new file mode 100644 index 0000000..9014382 --- /dev/null +++ b/SOURCES/kdelibs-4.x-abrt.patch @@ -0,0 +1,12 @@ +diff -up kdelibs-4.10.0/kdeui/kernel/kapplication.cpp.me kdelibs-4.10.0/kdeui/kernel/kapplication.cpp +--- kdelibs-4.10.0/kdeui/kernel/kapplication.cpp.me 2013-02-28 15:24:41.194954639 +0100 ++++ kdelibs-4.10.0/kdeui/kernel/kapplication.cpp 2013-02-28 15:40:44.546470405 +0100 +@@ -853,7 +853,7 @@ void KApplicationPrivate::parseCommandLi + if (!nocrashhandler && args->isSet("crashhandler")) + { + // enable drkonqi +- KCrash::setDrKonqiEnabled(true); ++ KCrash::setDrKonqiEnabled(false); + } + // Always set the app name, can be usefuls for apps that call setEmergencySaveFunction or enable AutoRestart + KCrash::setApplicationName(args->appName()); diff --git a/SOURCES/kdelibs-CVE-2019-14744-kconfig-malicious-desktop-files.patch b/SOURCES/kdelibs-CVE-2019-14744-kconfig-malicious-desktop-files.patch new file mode 100644 index 0000000..9aa4b6d --- /dev/null +++ b/SOURCES/kdelibs-CVE-2019-14744-kconfig-malicious-desktop-files.patch @@ -0,0 +1,85 @@ +diff --git a/kdecore/config/kconfig.cpp b/kdecore/config/kconfig.cpp +index 7ea26a5..b30584b 100644 +--- a/kdecore/config/kconfig.cpp ++++ b/kdecore/config/kconfig.cpp +@@ -160,37 +160,7 @@ QString KConfigPrivate::expandString(const QString& value) + int nDollarPos = aValue.indexOf( QLatin1Char('$') ); + while( nDollarPos != -1 && nDollarPos+1 < aValue.length()) { + // there is at least one $ +- if( aValue[nDollarPos+1] == QLatin1Char('(') ) { +- int nEndPos = nDollarPos+1; +- // the next character is not $ +- while ( (nEndPos <= aValue.length()) && (aValue[nEndPos]!=QLatin1Char(')')) ) +- nEndPos++; +- nEndPos++; +- QString cmd = aValue.mid( nDollarPos+2, nEndPos-nDollarPos-3 ); +- +- QString result; +- QByteArray oldpath = qgetenv( "PATH" ); +- QByteArray newpath; +- if (KGlobal::hasMainComponent()) { +- newpath = QFile::encodeName(KGlobal::dirs()->resourceDirs("exe").join(QChar::fromLatin1(KPATH_SEPARATOR))); +- if (!newpath.isEmpty() && !oldpath.isEmpty()) +- newpath += KPATH_SEPARATOR; +- } +- newpath += oldpath; +- setenv( "PATH", newpath, 1/*overwrite*/ ); +-// FIXME: wince does not have pipes +-#ifndef _WIN32_WCE +- FILE *fs = popen(QFile::encodeName(cmd).data(), "r"); +- if (fs) { +- QTextStream ts(fs, QIODevice::ReadOnly); +- result = ts.readAll().trimmed(); +- pclose(fs); +- } +-#endif +- setenv( "PATH", oldpath, 1/*overwrite*/ ); +- aValue.replace( nDollarPos, nEndPos-nDollarPos, result ); +- nDollarPos += result.length(); +- } else if( aValue[nDollarPos+1] != QLatin1Char('$') ) { ++ if( aValue[nDollarPos+1] != QLatin1Char('$') ) { + int nEndPos = nDollarPos+1; + // the next character is not $ + QString aVarName; +diff --git a/kdecore/doc/README.kiosk b/kdecore/doc/README.kiosk +index b95002d..e4da590 100644 +--- a/kdecore/doc/README.kiosk ++++ b/kdecore/doc/README.kiosk +@@ -639,19 +639,6 @@ the $USER environment variable. The user will not be able to change this entry. + The following syntax is also supported: + Name[$ei]=${USER} + +- +-Shell Commands in KDE config files. +-=================================== +- +-Since KDE-3.1 arbitrary entries in configuration files can contain shell +-commands. This way the value of a configuration entry can be determined +-dynamically at runtime. In order to use this the entry must be marked +-with [$e]. +- +-Example: +-Host[$e]=$(hostname) +- +- + KDE Kiosk Application API + ========================== + +diff --git a/kdecore/tests/kconfigtest.cpp b/kdecore/tests/kconfigtest.cpp +index 78e6ad1..37ea3c2 100644 +--- a/kdecore/tests/kconfigtest.cpp ++++ b/kdecore/tests/kconfigtest.cpp +@@ -479,12 +479,8 @@ void KConfigTest::testPath() + QCOMPARE(group.readPathEntry("withBraces", QString()), QString("file://" + HOMEPATH) ); + QVERIFY(group.hasKey("URL")); + QCOMPARE(group.readEntry("URL", QString()), QString("file://" + HOMEPATH) ); +-#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC) +- // I don't know if this will work on windows +- // This test hangs on OS X + QVERIFY(group.hasKey("hostname")); +- QCOMPARE(group.readEntry("hostname", QString()), QHostInfo::localHostName()); +-#endif ++ QCOMPARE(group.readEntry("hostname", QString()), QString("(hostname)")); // the $ got removed because empty var name + QVERIFY(group.hasKey("noeol")); + QCOMPARE(group.readEntry("noeol", QString()), QString("foo")); + } diff --git a/SOURCES/kdelibs-handle-case-sensitive-mime-types.patch b/SOURCES/kdelibs-handle-case-sensitive-mime-types.patch new file mode 100644 index 0000000..f3db08e --- /dev/null +++ b/SOURCES/kdelibs-handle-case-sensitive-mime-types.patch @@ -0,0 +1,13 @@ +diff --git a/kdecore/services/kmimetyperepository.cpp b/kdecore/services/kmimetyperepository.cpp +index f56f48e..65860f7 100644 +--- a/kdecore/services/kmimetyperepository.cpp ++++ b/kdecore/services/kmimetyperepository.cpp +@@ -58,7 +58,7 @@ KMimeTypeRepository::~KMimeTypeRepository() + + KMimeType::Ptr KMimeTypeRepository::findMimeTypeByName(const QString &_name, KMimeType::FindByNameOption options) + { +- QString name = _name; ++ QString name = _name.toLower(); + if (options & KMimeType::ResolveAliases) { + name = canonicalName(name); + } diff --git a/SOURCES/kdelibs-kauth-CVE-2017-8422.patch b/SOURCES/kdelibs-kauth-CVE-2017-8422.patch new file mode 100644 index 0000000..d3b5e71 --- /dev/null +++ b/SOURCES/kdelibs-kauth-CVE-2017-8422.patch @@ -0,0 +1,200 @@ +From 264e97625abe2e0334f97de17f6ffb52582888ab Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 10 May 2017 10:06:07 +0200 +Subject: Verify that whoever is calling us is actually who he says he is + +CVE-2017-8422 +--- + kdecore/auth/AuthBackend.cpp | 5 ++++ + kdecore/auth/AuthBackend.h | 7 ++++++ + kdecore/auth/backends/dbus/DBusHelperProxy.cpp | 27 ++++++++++++++++++++-- + kdecore/auth/backends/dbus/DBusHelperProxy.h | 6 ++++- + .../auth/backends/policykit/PolicyKitBackend.cpp | 5 ++++ + kdecore/auth/backends/policykit/PolicyKitBackend.h | 1 + + kdecore/auth/backends/polkit-1/Polkit1Backend.cpp | 5 ++++ + kdecore/auth/backends/polkit-1/Polkit1Backend.h | 1 + + 8 files changed, 54 insertions(+), 3 deletions(-) + +diff --git a/kdecore/auth/AuthBackend.cpp b/kdecore/auth/AuthBackend.cpp +index c953b81..0ba4650 100644 +--- a/kdecore/auth/AuthBackend.cpp ++++ b/kdecore/auth/AuthBackend.cpp +@@ -54,6 +54,11 @@ void AuthBackend::setCapabilities(AuthBackend::Capabilities capabilities) + d->capabilities = capabilities; + } + ++AuthBackend::ExtraCallerIDVerificationMethod AuthBackend::extraCallerIDVerificationMethod() const ++{ ++ return NoExtraCallerIDVerificationMethod; ++} ++ + bool AuthBackend::actionExists(const QString& action) + { + Q_UNUSED(action); +diff --git a/kdecore/auth/AuthBackend.h b/kdecore/auth/AuthBackend.h +index a86732e..6f4b1bc 100644 +--- a/kdecore/auth/AuthBackend.h ++++ b/kdecore/auth/AuthBackend.h +@@ -43,6 +43,12 @@ public: + }; + Q_DECLARE_FLAGS(Capabilities, Capability) + ++ enum ExtraCallerIDVerificationMethod { ++ NoExtraCallerIDVerificationMethod, ++ VerifyAgainstDBusServiceName, ++ VerifyAgainstDBusServicePid, ++ }; ++ + AuthBackend(); + virtual ~AuthBackend(); + virtual void setupAction(const QString &action) = 0; +@@ -50,6 +56,7 @@ public: + virtual Action::AuthStatus authorizeAction(const QString &action) = 0; + virtual Action::AuthStatus actionStatus(const QString &action) = 0; + virtual QByteArray callerID() const = 0; ++ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const; + virtual bool isCallerAuthorized(const QString &action, QByteArray callerID) = 0; + virtual bool actionExists(const QString &action); + +diff --git a/kdecore/auth/backends/dbus/DBusHelperProxy.cpp b/kdecore/auth/backends/dbus/DBusHelperProxy.cpp +index 9557a0f..ca59f1c 100644 +--- a/kdecore/auth/backends/dbus/DBusHelperProxy.cpp ++++ b/kdecore/auth/backends/dbus/DBusHelperProxy.cpp +@@ -271,6 +271,29 @@ void DBusHelperProxy::performActions(QByteArray blob, const QByteArray &callerID + } + } + ++bool DBusHelperProxy::isCallerAuthorized(const QString &action, const QByteArray &callerID) ++{ ++ // Check the caller is really who it says it is ++ switch (BackendsManager::authBackend()->extraCallerIDVerificationMethod()) { ++ case AuthBackend::NoExtraCallerIDVerificationMethod: ++ break; ++ ++ case AuthBackend::VerifyAgainstDBusServiceName: ++ if (message().service().toUtf8() != callerID) { ++ return false; ++ } ++ break; ++ ++ case AuthBackend::VerifyAgainstDBusServicePid: ++ if (connection().interface()->servicePid(message().service()).value() != callerID.toUInt()) { ++ return false; ++ } ++ break; ++ } ++ ++ return BackendsManager::authBackend()->isCallerAuthorized(action, callerID); ++} ++ + QByteArray DBusHelperProxy::performAction(const QString &action, const QByteArray &callerID, QByteArray arguments) + { + if (!responder) { +@@ -295,7 +318,7 @@ QByteArray DBusHelperProxy::performAction(const QString &action, const QByteArra + QTimer *timer = responder->property("__KAuth_Helper_Shutdown_Timer").value(); + timer->stop(); + +- if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) { ++ if (isCallerAuthorized(action, callerID)) { + QString slotname = action; + if (slotname.startsWith(m_name + QLatin1Char('.'))) { + slotname = slotname.right(slotname.length() - m_name.length() - 1); +@@ -338,7 +361,7 @@ uint DBusHelperProxy::authorizeAction(const QString& action, const QByteArray& c + QTimer *timer = responder->property("__KAuth_Helper_Shutdown_Timer").value(); + timer->stop(); + +- if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) { ++ if (isCallerAuthorized(action, callerID)) { + retVal = static_cast(Action::Authorized); + } else { + retVal = static_cast(Action::Denied); +diff --git a/kdecore/auth/backends/dbus/DBusHelperProxy.h b/kdecore/auth/backends/dbus/DBusHelperProxy.h +index 455cf51..264f6cc 100644 +--- a/kdecore/auth/backends/dbus/DBusHelperProxy.h ++++ b/kdecore/auth/backends/dbus/DBusHelperProxy.h +@@ -21,6 +21,7 @@ + #ifndef DBUS_HELPER_PROXY_H + #define DBUS_HELPER_PROXY_H + ++#include + #include + #include "HelperProxy.h" + #include "kauthactionreply.h" +@@ -28,7 +29,7 @@ + namespace KAuth + { + +-class DBusHelperProxy : public HelperProxy ++class DBusHelperProxy : public HelperProxy, protected QDBusContext + { + Q_OBJECT + Q_INTERFACES(KAuth::HelperProxy) +@@ -73,6 +74,9 @@ signals: + + private slots: + void remoteSignalReceived(int type, const QString &action, QByteArray blob); ++ ++private: ++ bool isCallerAuthorized(const QString &action, const QByteArray &callerID); + }; + + } // namespace Auth +diff --git a/kdecore/auth/backends/policykit/PolicyKitBackend.cpp b/kdecore/auth/backends/policykit/PolicyKitBackend.cpp +index 3be97f2..9d041d1 100644 +--- a/kdecore/auth/backends/policykit/PolicyKitBackend.cpp ++++ b/kdecore/auth/backends/policykit/PolicyKitBackend.cpp +@@ -78,6 +78,11 @@ QByteArray PolicyKitBackend::callerID() const + return a; + } + ++AuthBackend::ExtraCallerIDVerificationMethod Polkit1Backend::extraCallerIDVerificationMethod() const ++{ ++ return VerifyAgainstDBusServicePid; ++} ++ + bool PolicyKitBackend::isCallerAuthorized(const QString &action, QByteArray callerID) + { + QDataStream s(&callerID, QIODevice::ReadOnly); +diff --git a/kdecore/auth/backends/policykit/PolicyKitBackend.h b/kdecore/auth/backends/policykit/PolicyKitBackend.h +index 7154e93..0d3d8f9 100644 +--- a/kdecore/auth/backends/policykit/PolicyKitBackend.h ++++ b/kdecore/auth/backends/policykit/PolicyKitBackend.h +@@ -40,6 +40,7 @@ public: + virtual Action::AuthStatus authorizeAction(const QString&); + virtual Action::AuthStatus actionStatus(const QString&); + virtual QByteArray callerID() const; ++ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const; + virtual bool isCallerAuthorized(const QString &action, QByteArray callerID); + + private Q_SLOTS: +diff --git a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp +index 732d2cb..63c0e1e 100644 +--- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp ++++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp +@@ -163,6 +163,11 @@ QByteArray Polkit1Backend::callerID() const + return QDBusConnection::systemBus().baseService().toUtf8(); + } + ++AuthBackend::ExtraCallerIDVerificationMethod Polkit1Backend::extraCallerIDVerificationMethod() const ++{ ++ return VerifyAgainstDBusServiceName; ++} ++ + bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID) + { + PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID)); +diff --git a/kdecore/auth/backends/polkit-1/Polkit1Backend.h b/kdecore/auth/backends/polkit-1/Polkit1Backend.h +index 18ed1a2..d579da2 100644 +--- a/kdecore/auth/backends/polkit-1/Polkit1Backend.h ++++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.h +@@ -48,6 +48,7 @@ public: + virtual Action::AuthStatus authorizeAction(const QString&); + virtual Action::AuthStatus actionStatus(const QString&); + virtual QByteArray callerID() const; ++ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const; + virtual bool isCallerAuthorized(const QString &action, QByteArray callerID); + virtual bool actionExists(const QString& action); + +-- +cgit v0.11.2 + diff --git a/SOURCES/kdelibs-kdebug288410.patch b/SOURCES/kdelibs-kdebug288410.patch new file mode 100644 index 0000000..fc80f84 --- /dev/null +++ b/SOURCES/kdelibs-kdebug288410.patch @@ -0,0 +1,44 @@ +diff --git a/solid/solid/backends/upower/upowerbattery.cpp b/solid/solid/backends/upower/upowerbattery.cpp +index 7b5bdc4..8bd9343 100644 +--- a/solid/solid/backends/upower/upowerbattery.cpp ++++ b/solid/solid/backends/upower/upowerbattery.cpp +@@ -123,6 +123,7 @@ Solid::Battery::ChargeState Battery::chargeState() const + void Battery::slotChanged() + { + if (m_device) { ++ const QString udi = m_device.data()->udi(); + const int old_chargePercent = m_chargePercent; + const int old_capacity = m_capacity; + const Solid::Battery::ChargeState old_chargeState = m_chargeState; +@@ -132,26 +133,26 @@ void Battery::slotChanged() + + if (old_chargePercent != m_chargePercent) + { +- emit chargePercentChanged(m_chargePercent, m_device.data()->udi()); ++ emit chargePercentChanged(m_chargePercent, udi); + } + + if (old_capacity != m_capacity) { +- emit capacityChanged(m_capacity, m_device.data()->udi()); ++ emit capacityChanged(m_capacity, udi); + } + + if (old_chargeState != m_chargeState) + { +- emit chargeStateChanged(m_chargeState, m_device.data()->udi()); ++ emit chargeStateChanged(m_chargeState, udi); + } + + if (old_isPlugged != m_isPlugged) + { +- emit plugStateChanged(m_isPlugged, m_device.data()->udi()); ++ emit plugStateChanged(m_isPlugged, udi); + } + + if (old_isPowerSupply != m_isPowerSupply) + { +- emit powerSupplyStateChanged(m_isPowerSupply, m_device.data()->udi()); ++ emit powerSupplyStateChanged(m_isPowerSupply, udi); + } + } + } diff --git a/SOURCES/kdelibs-solid_qt_no_debug_output.patch b/SOURCES/kdelibs-solid_qt_no_debug_output.patch new file mode 100644 index 0000000..197e53a --- /dev/null +++ b/SOURCES/kdelibs-solid_qt_no_debug_output.patch @@ -0,0 +1,42 @@ +diff -up kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp +--- kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600 ++++ kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp 2012-12-12 16:18:25.817495558 -0600 +@@ -340,9 +340,11 @@ bool StorageAccess::requestPassphrase() + returnService, m_lastReturnObject, + wId, appId); + m_passphraseRequested = reply.isValid(); ++#ifndef QT_NO_DEBUG_STREAM + if (!m_passphraseRequested) { + qWarning() << "Failed to call the SolidUiServer, D-Bus said:" << reply.error(); + } ++#endif + return m_passphraseRequested; + } + +diff -up kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp +--- kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600 ++++ kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp 2012-12-12 16:17:36.922022895 -0600 +@@ -341,9 +341,10 @@ bool StorageAccess::requestPassphrase() + QDBusReply reply = soliduiserver.call("showPassphraseDialog", udi, returnService, + m_lastReturnObject, wId, appId); + m_passphraseRequested = reply.isValid(); ++#ifndef QT_NO_DEBUG_STREAM + if (!m_passphraseRequested) + qWarning() << "Failed to call the SolidUiServer, D-Bus said:" << reply.error(); +- ++#endif + return m_passphraseRequested; + } + +diff -up kdelibs-4.9.90/solid/solid/CMakeLists.txt.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/CMakeLists.txt +--- kdelibs-4.9.90/solid/solid/CMakeLists.txt.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600 ++++ kdelibs-4.9.90/solid/solid/CMakeLists.txt 2012-12-12 16:17:36.922022895 -0600 +@@ -268,7 +268,7 @@ if(NOT WIN32 AND NOT APPLE) + + if ( WITH_SOLID_UDISKS2 ) + message(STATUS "Building Solid UDisks2 backend." ) +- add_definitions(-DWITH_SOLID_UDISKS2) ++ add_definitions(-DWITH_SOLID_UDISKS2 -DQT_NO_DEBUG_OUTPUT) + set(solid_LIB_SRCS ${solid_LIB_SRCS} + backends/udisks2/udisksmanager.cpp + backends/udisks2/udisksdevice.cpp diff --git a/SOURCES/macros.kdelibs4 b/SOURCES/macros.kdelibs4 new file mode 100644 index 0000000..719302e --- /dev/null +++ b/SOURCES/macros.kdelibs4 @@ -0,0 +1,14 @@ +%kdelibs4 @@NAME@@ +%kdelibs4_epoch @@EPOCH@@ +%kdelibs4_version @@VERSION@@ +%kdelibs4_evr @@EVR@@ + +%kdelibs4_requires \ +Requires: kdelibs4%{?_isa} >= %{kdelibs4_version} \ +%{nil} + +%kde_applications_version @@KDE_APPLICATIONS_VERSION@@ + +%kde_runtime_requires \ +Requires: kde-runtime >= 4.10.5 \ +%{nil} diff --git a/SOURCES/return-application-icons-properly.patch b/SOURCES/return-application-icons-properly.patch new file mode 100644 index 0000000..961d021 --- /dev/null +++ b/SOURCES/return-application-icons-properly.patch @@ -0,0 +1,55 @@ +From 613c951a1157df0d8a907a155a5eaa706816d5f9 Mon Sep 17 00:00:00 2001 +From: Aaron Seigo +Date: Thu, 21 Feb 2013 17:58:11 +0100 +Subject: return application icons properly + +BUG:315578 +--- + kdeui/icons/kiconloader.cpp | 31 ++++++++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index f65e941..6fed667 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -909,7 +909,36 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + const char * const ext[4] = { ".png", ".svgz", ".svg", ".xpm" }; + bool genericFallback = name.endsWith(QLatin1String("-x-generic")); + +- foreach(KIconThemeNode *themeNode, links) ++ // Do two passes through themeNodes. ++ // ++ // The first pass looks for an exact match in each themeNode one after the other. ++ // If one is found and it is an app icon then return that icon. ++ // ++ // In the next pass (assuming the first pass failed), it looks for exact matches ++ // and then generic fallbacks in each themeNode one after the other ++ // ++ // The reasoning is that application icons should always match exactly, all other ++ // icons may fallback. Since we do not know what the context is here when we start ++ // looking for it, we can only go by the path found. ++ foreach (KIconThemeNode *themeNode, links) { ++ for (int i = 0 ; i < 4 ; i++) { ++ icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchExact); ++ if (icon.isValid()) { ++ break; ++ } ++ ++ icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchBest); ++ if (icon.isValid()) { ++ break; ++ } ++ } ++ ++ if (icon.isValid() && icon.path.contains("/apps/")) { ++ return icon; ++ } ++ } ++ ++ foreach (KIconThemeNode *themeNode, links) + { + QString currentName = name; + +-- +1.8.1.4 + diff --git a/SOURCES/return-not-break.-copy-paste-error.patch b/SOURCES/return-not-break.-copy-paste-error.patch new file mode 100644 index 0000000..b62818e --- /dev/null +++ b/SOURCES/return-not-break.-copy-paste-error.patch @@ -0,0 +1,31 @@ +From 0edfd42151ad57322a10a24ab4971b638e220e6e Mon Sep 17 00:00:00 2001 +From: Aaron Seigo +Date: Thu, 21 Feb 2013 18:14:54 +0100 +Subject: [PATCH 049/111] return, not break. copy/paste error + +--- + kdeui/icons/kiconloader.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index dba474d..ce6aeea 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -947,12 +947,12 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + for (int i = 0 ; i < 4 ; i++) { + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact); + if (icon.isValid()) { +- break; ++ return icon; + } + + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest); + if (icon.isValid()) { +- break; ++ return icon; + } + } + //kDebug(264) << "Looking up" << currentName; +-- +1.8.1.4 + diff --git a/SOURCES/solid-upower-0.99.patch b/SOURCES/solid-upower-0.99.patch new file mode 100644 index 0000000..7850dca --- /dev/null +++ b/SOURCES/solid-upower-0.99.patch @@ -0,0 +1,67 @@ +diff --git a/solid/solid/backends/upower/upowerdevice.cpp b/solid/solid/backends/upower/upowerdevice.cpp +index 94f59bf..7c70a31 100644 +--- a/solid/solid/backends/upower/upowerdevice.cpp ++++ b/solid/solid/backends/upower/upowerdevice.cpp +@@ -1,6 +1,6 @@ + /* + Copyright 2010 Michael Zanetti +- Copyright 2010 Lukas Tinkl ++ Copyright 2010-2015 Lukas Tinkl + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + using namespace Solid::Backends::UPower; + +@@ -44,11 +45,16 @@ UPowerDevice::UPowerDevice(const QString &udi) + , m_udi(udi) + { + if (m_device.isValid()) { +- connect(&m_device, SIGNAL(Changed()), this, SLOT(slotChanged())); ++ if (m_device.metaObject()->indexOfSignal("Changed()") != -1) { ++ connect(&m_device, SIGNAL(Changed()), this, SLOT(slotChanged())); ++ } else { ++ // for UPower >= 0.99.0, missing Changed() signal ++ QDBusConnection::systemBus().connect(UP_DBUS_SERVICE, m_udi, "org.freedesktop.DBus.Properties", "PropertiesChanged", this, ++ SLOT(onPropertiesChanged(QString,QVariantMap,QStringList))); ++ } + +- // for UPower >= 0.99.0, missing Changed() signal +- QDBusConnection::systemBus().connect(UP_DBUS_SERVICE, m_udi, "org.freedesktop.DBus.Properties", "PropertiesChanged", this, +- SLOT(onPropertiesChanged(QString,QVariantMap,QStringList))); ++ QDBusConnection::systemBus().connect("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", "PrepareForSleep", ++ this, SLOT(login1Resuming(bool))); + } + } + +@@ -238,3 +244,13 @@ void UPowerDevice::slotChanged() + m_cache.clear(); + emit changed(); + } ++ ++void UPowerDevice::login1Resuming(bool active) ++{ ++ if (!active) { ++ QDBusReply refreshCall = m_device.asyncCall("Refresh"); ++ if (refreshCall.isValid()) { ++ slotChanged(); ++ } ++ } ++} +diff --git a/solid/solid/backends/upower/upowerdevice.h b/solid/solid/backends/upower/upowerdevice.h +index 805b9b2..7694d05 100644 +--- a/solid/solid/backends/upower/upowerdevice.h ++++ b/solid/solid/backends/upower/upowerdevice.h +@@ -64,6 +64,7 @@ Q_SIGNALS: + private Q_SLOTS: + void onPropertiesChanged(const QString &ifaceName, const QVariantMap &changedProps, const QStringList &invalidatedProps); + void slotChanged(); ++ void login1Resuming(bool active); + + private: + QString batteryTechnology() const; diff --git a/SOURCES/turn-the-packagekit-support-feature-off-by-default.patch b/SOURCES/turn-the-packagekit-support-feature-off-by-default.patch new file mode 100644 index 0000000..57c1856 --- /dev/null +++ b/SOURCES/turn-the-packagekit-support-feature-off-by-default.patch @@ -0,0 +1,35 @@ +From e87117d7074b112f46a7c9ebc66422c581c64fc1 Mon Sep 17 00:00:00 2001 +From: Aaron Seigo +Date: Wed, 5 Jun 2013 15:26:47 +0200 +Subject: [PATCH] turn the packagekit support feature off by default + +it only works on fedora, there is no way to tell the dialog to not show +again. these are fixable, but they aren't fixed yet and may not be for +a while and i'd rather not annoy people for the lifetime of 4.11 +--- + plasma/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt +index 674550d..eeda974 100644 +--- a/plasma/CMakeLists.txt ++++ b/plasma/CMakeLists.txt +@@ -6,14 +6,11 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) + set(PLASMA_NO_KNEWSTUFF TRUE) + set(PLASMA_NO_SOLID TRUE) + set(PLASMA_NO_KIO TRUE) +- set(PLASMA_NO_PACKAGEKIT TRUE) + set(PLASMA_NO_KUTILS TRUE) + set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE) + endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) + +-if(NOT Q_WS_X11) +- set(PLASMA_NO_PACKAGEKIT TRUE) +-endif(NOT Q_WS_X11) ++set(PLASMA_NO_PACKAGEKIT TRUE) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR} + ${KDE4_KDECORE_INCLUDES} +-- +1.8.3.1 + diff --git a/SPECS/kdelibs.spec b/SPECS/kdelibs.spec new file mode 100644 index 0000000..3b04ebc --- /dev/null +++ b/SPECS/kdelibs.spec @@ -0,0 +1,2307 @@ +%define attica_ver 0.4.2 +%define dbusmenu_qt_ver 0.9.0 +%define phonon_ver 4.6.0 +%define qt4_ver 4.8.1 +%define shared_desktop_ontologies_ver 0.10.0 +%define soprano_ver 2.8.0 +%define strigi_ver 0.7.0 +%define apidocs 1 +%if 0%{?epel} || 0%{?fedora} +%define webkit 1 +%endif +%if 0%{?fedora} +%define herqq 1 +%endif +# to build/include QCH apidocs or not (currently broken) +#define apidocs_qch 1 +%if 0%{?rhel} > 6 || 0%{?fedora} > 17 +%define udisks udisks2 +%define udisks2 1 +%else +%define udisks udisks +%endif +%if 0%{?rhel} == 6 +%define hal 1 +%else +%define upower 1 +%endif + +%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver}) +%global shared_desktop_ontologies_version %(pkg-config --modversion shared-desktop-ontologies 2>/dev/null || echo %{shared_desktop_ontologies_ver}) +%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver}) +%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver}) +%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver}) +%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) + +# trim changelog included in binary rpms +%global _changelog_trimtime %(date +%s -d "1 year ago") + +%define __jar_repack %{nil} + +Summary: KDE Libraries +# shipped with kde applications, version... +%global apps_version 15.04.1 +Version: 4.14.8 +Release: 12%{?dist} + +Name: kdelibs +Epoch: 6 +Obsoletes: kdelibs4 < %{version}-%{release} +Provides: kdelibs4 = %{version}-%{release} +%{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}} + +# http://techbase.kde.org/Policies/Licensing_Policy +License: LGPLv2+ +URL: http://www.kde.org/ +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable +%else +%global stable stable +%endif +Source0: http://download.kde.org/%{stable}/applications/%{apps_version}/src/kdelibs-%{version}.tar.xz + +Source1: macros.kdelibs4 + +Source10: SOLID_HAL_LEGACY.sh + +BuildRequires: kde4-macros(api) >= 2 +BuildRequires: kde-filesystem >= 4-23 +# for the RPM dependency generators +BuildRequires: kde-settings +BuildRequires: docbook-dtds docbook-style-xsl +Requires: ca-certificates +Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version} +Requires: docbook-dtds docbook-style-xsl +Requires: hicolor-icon-theme +Requires: kde-filesystem >= 4-23 +Requires: kde-settings +%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: hunspell +Requires: media-player-info +# beware of possible bootstrapping problems +# moved back to kde-runtime +#Requires: oxygen-icon-theme >= %{version} +Requires: phonon%{?_isa} >= %{phonon_version} +Requires: shared-mime-info +Requires: strigi-libs%{?_isa} >= %{strigi_version} +%if ! 0%{?nepomuk} +Requires: shared-desktop-ontologies >= %{shared_desktop_ontologies_version} +Requires: soprano%{?_isa} >= %{soprano_version} +%endif + + +# make kdelibs-devel parallel-installable with kdelibs3-devel +Patch0: kdelibs-4.9.95-parallel_devel.patch + +# fix http://bugs.kde.org/149705 +Patch2: kdelibs-4.10.0-kde149705.patch + +# install all .css files and Doxyfile.global in kdelibs-common to build +# kdepimlibs-apidocs against +Patch8: kdelibs-4.3.90-install_all_css.patch + +# add Fedora/V-R to KHTML UA string +Patch9: kdelibs-4.10.0-branding.patch + +# adds the Administration menu from redhat-menus which equals System + Settings +# This prevents the stuff getting listed twice, under both System and Settings. +Patch12: kdelibs-4.10.0-xdg-menu.patch + +# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec +Patch14: kdelibs-4.11.3-libexecdir.patch + +# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir} +Patch18: kdelibs-4.11.97-kstandarddirs.patch + +# set build type +Patch20: kdelibs-4.10.0-cmake.patch + +# die rpath die, since we're using standard paths, we can avoid +# this extra hassle (even though cmake is *supposed* to not add standard +# paths (like /usr/lib64) already! With this, we can drop +# -DCMAKE_SKIP_RPATH:BOOL=ON (finally) +Patch27: kdelibs-4.10.0-no_rpath.patch + +## libplasma PackageKit integration +# Trigger installation of missing components when installing a package. +# https://git.reviewboard.kde.org/r/102291/ +Patch41: 0002-Trigger-installation-of-missing-components-when-inst.patch + +# Implement automatic scanning of source code for required data engines. +# https://git.reviewboard.kde.org/r/102350/ +Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch + +# limit solid qDebug spam +# http://bugzilla.redhat.com/882731 +# TODO: could make uptreamable and conditional only on Release-type builds +Patch49: kdelibs-solid_qt_no_debug_output.patch + +## upstreamable +# knewstuff2 variant of: +# https://git.reviewboard.kde.org/r/102439/ +Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch + +# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default) +Patch52: kdelibs-4.10.0-SOLID_UPNP.patch + +# add s390/s390x support in kjs +Patch53: kdelibs-4.7.2-kjs-s390.patch + +# return valid locale (RFC 1766) +Patch54: kdelibs-4.8.4-kjs-locale.patch + +# borrow from opensuse +# https://build-test.opensuse.org/package/view_file/home:coolo:test/kdelibs4/0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch +Patch55: Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch + +# candidate fix for: kde deamon crash on wakeup +# https://bugs.kde.org/show_bug.cgi?id=288410 +Patch56: kdelibs-kdebug288410.patch + +# make filter working, TODO: upstream? -- rex +Patch59: kdelibs-4.9.3-kcm_ssl.patch + +# disable dot to reduce apidoc size +Patch61: kdelibs-4.12.90-dot.patch + +# make kpac dhcp helper full relro +Patch62: kdelibs-4.10.5-kpac-relro.patch + +# make cmake generated files multilib friendly +Patch63: kdelibs-4.10.5-cmake-multilib.patch + +# disable strict aliasing for type punned sources +Patch64: kdelibs-4.10.5-type-punning.patch + +# workaround for bz#969524 on arm +Patch65: kdelibs-4.11.3-arm.patch + +# set QT_NO_GLIB in klauncher_main.cpp as a possible fix/workaround for #983110 +Patch66: kdelibs-4.11.3-klauncher-no-glib.patch + +# opening a terminal in Konqueror / Dolphin does not inherit environment variables +Patch67: kdelibs-4.13.2-invokeTerminal.patch + +# *.macroEnabled mime types wrongly case-sensitively mismatched against /usr/share/mime/application/*.macroenabled.*.xml +Patch68: kdelibs-handle-case-sensitive-mime-types.patch + +## upstream +# 4.14 branch + +# revert these commits for +#https://bugs.kde.org/315578 +# for now, causes regression, +#https://bugs.kde.org/317138 +Patch090: return-not-break.-copy-paste-error.patch +Patch091: coding-style-fixes.patch +Patch092: return-application-icons-properly.patch + +# revert disabling of packagekit +Patch093: turn-the-packagekit-support-feature-off-by-default.patch + +## security fix +# Bug 1452068 - CVE-2017-8422 kdelibs: kauth: service invoking dbus is not properly checked and allows local privilege escalation +Patch80: kdelibs-kauth-CVE-2017-8422.patch +Patch81: kdelibs-CVE-2019-14744-kconfig-malicious-desktop-files.patch + +# rhel patches +Patch100: solid-upower-0.99.patch +Patch101: kdelibs-4.3.4-bz#587016.patch + +# disable webkit +Patch300: kdelibs-4.10.0-webkit.patch + +# set abrt default +Patch301: kdelibs-4.x-abrt.patch + +# kmailservice/ktelnetservice moved here +Conflicts: kdelibs3 < 3.5.10-42 + +BuildRequires: qt4-devel >= %{qt4_ver} +%if 0%{?webkit} +BuildRequires: pkgconfig(QtWebKit) +%endif +%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} +Requires: xdg-utils +Requires: redhat-menus +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +BuildRequires: automoc4 >= 0.9.88 +BuildRequires: bison flex +BuildRequires: bzip2-devel +BuildRequires: cmake >= 2.8.9 +BuildRequires: cups-devel cups +BuildRequires: gettext-devel +BuildRequires: giflib-devel +BuildRequires: grantlee-devel +%if 0%{?herqq} +BuildRequires: herqq-devel +%endif +BuildRequires: krb5-devel +BuildRequires: libacl-devel libattr-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libutempter-devel +# strictly only a runtime dependency, but makes cmake happier at buildtime too -- rex +BuildRequires: media-player-info +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(avahi-core) +BuildRequires: pkgconfig(dbusmenu-qt) +BuildRequires: pkgconfig(enchant) +BuildRequires: pkgconfig(gamin) +BuildRequires: pkgconfig(jasper) +BuildRequires: pkgconfig(libattica) >= %{attica_ver} +BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libstreams) >= %{strigi_ver} +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(OpenEXR) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(phonon) >= %{phonon_ver} +BuildRequires: pkgconfig(polkit-qt-1) +BuildRequires: pkgconfig(qca2) +BuildRequires: pkgconfig(shared-desktop-ontologies) >= %{shared_desktop_ontologies_ver} +BuildRequires: pkgconfig(shared-mime-info) +BuildRequires: pkgconfig(soprano) >= %{soprano_ver} +BuildRequires: pkgconfig(zlib) +# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) +%define x_deps pkgconfig(sm) pkgconfig(xcomposite) pkgconfig(xdamage) pkgconfig(xkbfile) pkgconfig(xpm) pkgconfig(xproto) pkgconfig(xscrnsaver) pkgconfig(xtst) pkgconfig(xv) pkgconfig(xxf86misc) +%{?x_deps:BuildRequires: %{x_deps}} + +%{?udisks:Requires: %{udisks}} +%{?upower:Requires: upower} +%if 0%{?hal:1} +BuildRequires: hal-devel +Requires: hal-storage-addon +%endif + +%if 0%{?apidocs} +BuildRequires: docbook-dtds +BuildRequires: doxygen +BuildRequires: graphviz +# should probably do something about removing this one, it's quite huge'ish -- Rex +BuildRequires: qt4-doc +%endif + +%if 0%{?tests} +%global _kde4_build_tests -DKDE4_BUILD_TESTS:BOOL=ON +# %%%check +BuildRequires: dbus-x11 xorg-x11-server-Xvfb +%endif + +Provides: katepart = %{version}-%{release} +Provides: katepart%{?_isa} = %{version}-%{release} +Provides: kross(javascript) = %{version}-%{release} +Provides: kross(qtscript) = %{version}-%{release} + +%if 0%{?rhel} && 0%{?rhel} < 8 +Provides: kdelibs-experimental = %{version}-%{release} +Obsoletes: kdelibs-experimental < 4.3.75 +%endif + +%description +Libraries for KDE 4. + +%package common +Summary: Common files for KDE 3 and KDE 4 libraries +# some files moved kdebase-runtime -> here +Conflicts: kdebase-runtime < 4.5.80 +%description common +This package includes the common files for the KDE 3 and KDE 4 libraries. + +%package devel +Summary: Header files for compiling KDE 4 applications +Provides: plasma-devel = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-ktexteditor%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: kdelibs4-devel < %{version}-%{release} +Provides: kdelibs4-devel = %{version}-%{release} +Provides: kdelibs4-devel%{?_isa} = %{version}-%{release} +%if 0%{?rhel} && 0%{?rhel} < 8 +Conflicts: kdebase-workspace-devel < 4.3.80 +Obsoletes: kdelibs-experimental-devel < 4.3.75 +Provides: kdelibs-experimental-devel = %{version}-%{release} +%endif +Requires: automoc4 >= 0.9.88 +Requires: cmake >= 2.8.9 +Requires: pkgconfig(libattica) >= %{attica_ver} +Requires: pkgconfig(openssl) +Requires: pkgconfig(phonon) +%if ! 0%{?nepomuk} +# considered part of nepomuk-devel +Provides: nepomuk-devel = %{version}-%{release} +Requires: pkgconfig(shared-desktop-ontologies) pkgconfig(soprano) +Requires: qt4-devel +%if 0%{?webkit} +Requires: pkgconfig(QtWebKit) +%endif +%endif +%{?x_deps:Requires: %{x_deps}} + +%description devel +This package includes the header files you will need to compile +applications for KDE 4. + +## TODO: split out ktexteditor-devel bits too? -- rex +%package ktexteditor +Summary: KDE4 Text Editor component library +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%if ! 0%{?bootstrap} +Requires: kate-part%{?_isa} +%endif +%description ktexteditor +%{summary} + +%package webkit +Summary: KDE WebKit support library +# upgrade path, when -webkit subpkg landed +Obsoletes: kdelibs < 6:4.13.2-6 +Provides: kdelibs4-webkit = %{version}-%{release} +%{?_isa:Provides: kdelibs4-webkit%{?_isa} = %{version}-%{release}} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%description webkit +%{summary}. + +%package webkit-devel +Summary: Development files for KDE WebKit support library +# upgrade path, when -webkit subpkg landed +Obsoletes: kdelibs-devel < 6:4.13.2-6 +Provides: kdelibs4-webkit-devel = %{version}-%{release} +%{?_isa:Provides: kdelibs4-webkit-devel%{?_isa} = %{version}-%{release}} +Requires: %{name}-webkit%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pkgconfig(QtWebKit) +%description webkit-devel +%{summary}. + +%package apidocs +Summary: KDE 4 API documentation +Requires: kde-filesystem +Provides: kdelibs4-apidocs = %{version}-%{release} +BuildArch: noarch + +%description apidocs +This package includes the KDE 4 API documentation in HTML +format for easy browsing. + +%package apidocs-qch +Summary: KDE 4 API documentation for Qt Assistant +# Directory ownership (%{_qt4_docdir}/qch) +Requires: qt4 +Provides: kdelibs4-apidocs-qch = %{version}-%{release} +BuildArch: noarch + +%description apidocs-qch +This package includes the KDE 4 API documentation in Qt Assistant QCH +format for use with the Qt 4 Assistant or KDevelop 4. + + +%prep +%setup -q -n kdelibs-%{version} + +%patch0 -p1 -b .parallel_devel +%patch2 -p1 -b .kde149705 +%patch8 -p1 -b .install_all_css +%patch9 -p1 -b .branding +# add release version as part of branding (suggested by cailon) +sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp +%patch12 -p1 -b .Administration-menu +%patch14 -p1 -b .libexecdir +%patch18 -p1 -b .kstandarddirs +%patch20 -p1 -b .xxcmake +%patch27 -p1 -b .no_rpath + +# libplasma PackageKit integration +%patch41 -p1 -b .libplasma-pk-0002 +%patch42 -p1 -b .libplasma-pk-0003 + +%if "%{?udisks}" == "udisks2" +%patch49 -p1 -b .solid_qt_no_debug_output +%endif + +# upstreamable patches +%patch50 -p1 -b .knewstuff2_gpg2 +%patch52 -p1 -b .SOLID_UPNP +%patch53 -p1 -b .kjs-s390 +%patch54 -p1 -b .kjs-locale +%patch55 -p1 -b .Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES +%patch56 -p1 -b .kdebug288410 +%patch59 -p1 -b .filter +%patch61 -p1 -b .dot +%patch62 -p1 -b .relro +%patch63 -p1 -b .multilib +%patch64 -p2 -b .type_pun +%patch65 -p1 -b .arm-plasma +%patch66 -p1 -b .klauncher-no-glib +%patch67 -p1 -b .invokeTerminal +%patch68 -p1 -b .handle-case-sensitive-mime-types + +# upstream patches +%patch090 -p1 -R -b .return-not-break.-copy-paste-error +%patch091 -p1 -R -b .coding-style-fixes.patch +%patch092 -p1 -R -b .return-application-icons-properly +%patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default + +# security fixes +%patch80 -p1 -b .kdelibs-kauth-CVE-2017-8422 +%patch81 -p1 -b .CVE-2019-14744-kconfig-malicious-desktop-files + +# rhel patches +%patch100 -p1 -b .solid-upower099 +%patch101 -p1 -b .kdelibs-4.3.4-bz#587016 +%if ! 0%{?webkit} +%patch300 -p1 -b .webkit +%endif +%if 0%{?rhel} +%patch301 -p1 -b .abrt +%endif + + +%build +export CXXFLAGS="$CXXFLAGS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS" +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake_kde4} \ + -DHUPNP_ENABLED:BOOL=ON \ + -DKAUTH_BACKEND:STRING="PolkitQt-1" \ + -DKDE_DISTRIBUTION_TEXT="%{version}-%{release}%{?fedora: Fedora}%{?rhel: Red Hat Enterprise Linux}" \ + %{?udisks2:-DWITH_SOLID_UDISKS2:BOOL=ON} \ + .. +popd + +make %{?_smp_mflags} -C %{_target_platform} + +# build apidocs +%if 0%{?apidocs} +export QTDOCDIR="%{?_qt4_docdir}%{?!_qt4_docdir:%(pkg-config --variable=docdir Qt)}" +%if 0%{?apidocs_qch} +export PROJECT_NAME="%{name}" +export PROJECT_VERSION="%{version}%{?alphatag}" +doc/api/doxygen.sh --qhppages . +%else +doc/api/doxygen.sh . +%endif +%endif + + +%install +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + +# see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings +mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \ + %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu + +# create/own stuff +# see http://bugzilla.redhat.com/483318 +mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin +# own fake mimetype dirs (#907667) +mkdir -p %{buildroot}%{_datadir}/mime/all + +## use ca-certificates' ca-bundle.crt, symlink as what most other +## distros do these days (http://bugzilla.redhat.com/521902) +if [ -f %{buildroot}%{_kde4_appsdir}/kssl/ca-bundle.crt -a \ + -f /etc/pki/tls/certs/ca-bundle.crt ]; then + ln -sf /etc/pki/tls/certs/ca-bundle.crt \ + %{buildroot}%{_kde4_appsdir}/kssl/ca-bundle.crt +fi + +# move devel symlinks +mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel +pushd %{buildroot}%{_kde4_libdir} +for i in lib*.so +do + case "$i" in + libkdeinit4_*.so) + ;; + *) + linktarget=`readlink "$i"` + rm -f "$i" + ln -sf "../../$linktarget" "kde4/devel/$i" + ;; + esac +done +popd + +# fix Sonnet documentation multilib conflict +bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2 +sed -i -e 's!!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache +bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache + +# install apidocs and generator script +install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh + +%if 0%{?apidocs} +mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en +cp -a kdelibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs +find %{buildroot}%{_kde4_docdir}/HTML/en/ -name 'installdox' -exec rm -fv {} ';' +rm -vf %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*.tmp \ + %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/index.qhp \ + %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*/html/index.qhp + +%if 0%{?apidocs_qch} +mkdir -p %{buildroot}%{_qt4_docdir}/qch +for i in %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*/qch +do + mv -f "$i"/* %{buildroot}%{_qt4_docdir}/qch/ + rmdir "$i" +done +%endif +%endif + +#the targets are different for each arch, evaluated all at once +mv "%{buildroot}%{_kde4_appsdir}/cmake/modules/KDELibs4LibraryTargets-release.cmake" \ + "%{buildroot}%{_kde4_appsdir}/cmake/modules/KDELibs4LibraryTargets-%{_arch}.cmake" + +%if 0%{?hal:1} +install -p -m644 -D %{SOURCE10} %{buildroot}/etc/kde/env/SOLID_HAL_LEGACY.sh +%endif + +# this gets installed conditionally if using cmake < 2.8.12.1 +# let's just simplify matters and make it unconditional +rm -fv %{buildroot}%{_mandir}/man1/kdecmake.1* + +# rpm macros +install -p -m644 -D %{SOURCE1} \ + %{buildroot}%{rpm_macros_dir}/macros.kdelibs4 +sed -i \ + -e "s|@@NAME@@|%{name}|g" \ + -e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \ + -e "s|@@VERSION@@|%{version}|g" \ + -e "s|@@EVR@@|%{?epoch:%{epoch:}}%{version}-%{release}|g" \ + -e "s|@@KDE_APPLICATIONS_VERSION@@|%{apps_version}|g" \ + %{buildroot}%{rpm_macros_dir}/macros.kdelibs4 + + +%check +%if 0%{?tests} +time xvfb-run -a dbus-launch --exit-with-session make -C %{_target_platform}/ test ARGS="--output-on-failure" ||: +%endif + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/mime/packages &> /dev/null || : + +%postun +/sbin/ldconfig ||: +if [ $1 -eq 0 ] ; then + touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : + update-desktop-database -q &> /dev/null + touch --no-create %{_datadir}/mime/packages &> /dev/null || : + update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +fi + +%posttrans + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : +update-desktop-database -q &> /dev/null +update-mime-database %{_datadir}/mime &> /dev/null || : + +%files +%doc AUTHORS README TODO +%doc COPYING.LIB +%if 0%{?hal:1} +/etc/kde/env/SOLID_HAL_LEGACY.sh +%endif +%{rpm_macros_dir}/macros.kdelibs4 +%{_kde4_bindir}/checkXML +%{_kde4_bindir}/kbuildsycoca4 +%{_kde4_bindir}/kcookiejar4 +%{_kde4_bindir}/kde4-config +%{_kde4_bindir}/kded4 +%{_kde4_bindir}/kdeinit4 +%{_kde4_bindir}/kdeinit4_shutdown +%{_kde4_bindir}/kdeinit4_wrapper +%{_kde4_bindir}/kfilemetadatareader +%{_kde4_bindir}/kjs +%{_kde4_bindir}/kjscmd +%{_kde4_bindir}/kmailservice +%{_kde4_bindir}/kross +%{_kde4_bindir}/kshell4 +%{_kde4_bindir}/ktelnetservice +%{_kde4_bindir}/kunittestmodrunner +%{_kde4_bindir}/kwrapper4 +%{_kde4_bindir}/nepomuk-rcgen +%{_kde4_bindir}/meinproc4 +%{_kde4_bindir}/meinproc4_simple +%{_kde4_appsdir}/kauth/ +%{_kde4_appsdir}/kcharselect/ +%{_kde4_appsdir}/kcm_componentchooser/ +%{_kde4_appsdir}/kconf_update/ +%{_kde4_appsdir}/kdewidgets/ +%{_kde4_appsdir}/khtml/ +%{_kde4_appsdir}/kjava/ +%{_kde4_appsdir}/knewstuff/ +%{_kde4_appsdir}/ksgmltools2/ +%{_kde4_appsdir}/kssl/ +%{_kde4_appsdir}/LICENSES/ +%{_kde4_appsdir}/plasma/ +%{_kde4_appsdir}/proxyscout/ +%{_kde4_configdir}/accept-languages.codes +%{_kde4_configdir}/khtmlrc +%{_kde4_configdir}/plasmoids.knsrc +%{_datadir}/dbus-1/interfaces/* +%{_sysconfdir}/dbus-1/system.d/* +%{_kde4_datadir}/applications/kde4/kmailservice.desktop +%{_kde4_datadir}/applications/kde4/ktelnetservice.desktop +%{_datadir}/mime/packages/kde.xml +%dir %{_datadir}/mime/all +%{_kde4_sharedir}/kde4/services/* +%{_kde4_sharedir}/kde4/servicetypes/* +%{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_docdir}/HTML/en/sonnet/ +%{_kde4_docdir}/HTML/en/kioslave/ +%{_kde4_libdir}/libkcmutils.so.4* +%{_kde4_libdir}/libkde3support.so.4* +%{_kde4_libdir}/libkdeclarative.so.5* +%{_kde4_libdir}/libkdecore.so.5* +%{_kde4_libdir}/libkdefakes.so.5* +%{_kde4_libdir}/libkdesu.so.5* +%{_kde4_libdir}/libkdeui.so.5* +%{_kde4_libdir}/libkdnssd.so.4* +%{_kde4_libdir}/libkemoticons.so.4* +%{_kde4_libdir}/libkfile.so.4* +%{_kde4_libdir}/libkhtml.so.5* +%{_kde4_libdir}/libkidletime.so.4* +%{_kde4_libdir}/libkimproxy.so.4* +%{_kde4_libdir}/libkio.so.5* +%{_kde4_libdir}/libkjsapi.so.4* +%{_kde4_libdir}/libkjsembed.so.4* +%{_kde4_libdir}/libkjs.so.4* +%{_kde4_libdir}/libkmediaplayer.so.4* +%{_kde4_libdir}/libknewstuff2.so.4* +%{_kde4_libdir}/libknewstuff3.so.4* +%{_kde4_libdir}/libknotifyconfig.so.4* +%{_kde4_libdir}/libkntlm.so.4* +%{_kde4_libdir}/libkparts.so.4* +%{_kde4_libdir}/libkprintutils.so.4* +%{_kde4_libdir}/libkpty.so.4* +%{_kde4_libdir}/libkrosscore.so.4* +%{_kde4_libdir}/libkrossui.so.4* +%{_kde4_libdir}/libkunitconversion.so.4* +%{_kde4_libdir}/libkunittest.so.4* +%{_kde4_libdir}/libkutils.so.4* +%{_kde4_libdir}/libnepomukquery.so.4* +%{_kde4_libdir}/libnepomuk.so.4* +%{_kde4_libdir}/libnepomukutils.so.4* +%{_kde4_libdir}/libplasma.so.3* +%{_kde4_libdir}/libsolid.so.4* +%{_kde4_libdir}/libthreadweaver.so.4* +%{_kde4_libdir}/libkdeinit4_*.so +%{_kde4_libdir}/kconf_update_bin/ +%dir %{_kde4_libdir}/kde4/ +%{_kde4_libdir}/kde4/*.so +%{_kde4_libexecdir}/filesharelist +%{_kde4_libexecdir}/fileshareset +%{_kde4_libexecdir}/kauth-policy-gen +%{_kde4_libexecdir}/kconf_update +%{_kde4_libexecdir}/kdesu_stub +%{_kde4_libexecdir}/kio_http_cache_cleaner +%{_kde4_libexecdir}/kioslave +%{_kde4_libexecdir}/klauncher +# see kio/misc/kpac/README.wpad +%attr(4755,root,root) %{_kde4_libexecdir}/kpac_dhcp_helper +%{_kde4_libexecdir}/ksendbugmail +%{_kde4_libexecdir}/lnusertemp +%{_kde4_libexecdir}/start_kdeinit +%{_kde4_libexecdir}/start_kdeinit_wrapper +%dir %{_kde4_libdir}/kde4/plugins/ +%dir %{_kde4_libdir}/kde4/plugins/designer/ +%{_kde4_libdir}/kde4/plugins/designer/kde3supportwidgets.so +%{_kde4_libdir}/kde4/plugins/designer/kdedeprecated.so +%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.so +%{_kde4_libdir}/kde4/plugins/imageformats/ +%{_kde4_libdir}/kde4/plugins/kauth/ +%{_kde4_libdir}/kde4/plugins/script/ +%{_kde4_sysconfdir}/xdg/menus/*.menu +%{_mandir}/man1/checkXML.1* +%{_mandir}/man1/kde4-config.1* +%{_mandir}/man1/kjs.1* +%{_mandir}/man1/kjscmd.1* +%{_mandir}/man1/kross.1* +%{_mandir}/man7/kdeoptions.7* +%{_mandir}/man7/qtoptions.7* +%{_mandir}/man8/kbuildsycoca4.8* +%{_mandir}/man8/kcookiejar4.8* +%{_mandir}/man8/kded4.8* +%{_mandir}/man8/kdeinit4.8* +%{_mandir}/man8/meinproc4.8* + +%if 0%{?webkit} +%post webkit -p /sbin/ldconfig +%postun webkit -p /sbin/ldconfig + +%files webkit +%{_kde4_libdir}/libkdewebkit.so.5* +%{_kde4_libdir}/kde4/plugins/designer/kdewebkitwidgets.so +%endif + + +%files common +%{_kde4_bindir}/preparetips +%{_kde4_configdir}/colors/ +%{_kde4_configdir}/ksslcalist +%{_kde4_configdir}/kdebug.areas +%{_kde4_configdir}/kdebugrc +%{_kde4_configdir}/ui/ +%{_kde4_appsdir}/kdeui/ +%{_kde4_docdir}/HTML/en/common/ +%{_kde4_datadir}/locale/all_languages +%{_kde4_datadir}/locale/en_US/entry.desktop + +%files devel +%doc KDE4PORTING.html +%{_mandir}/man1/makekdewidgets.1* +%{_mandir}/man1/kconfig_compiler.1* +%{_mandir}/man1/preparetips.1* +%{_kde4_bindir}/kconfig_compiler4 +%{_kde4_bindir}/makekdewidgets4 +%{_kde4_bindir}/plasma-dataengine-depextractor +%{_kde4_bindir}/kde4-doxygen.sh +%{_kde4_appsdir}/cmake/ +%{_kde4_includedir}/* +%{_kde4_libdir}/cmake/KDeclarative/ +%{_kde4_libdir}/kde4/devel/ + +%if 0%{?webkit} +%exclude %{_kde4_includedir}/kdewebkit_export.h +%exclude %{_kde4_includedir}/kgraphicswebview.h +%exclude %{_kde4_includedir}/kwebpage.h +%exclude %{_kde4_includedir}/kwebpluginfactory.h +%exclude %{_kde4_includedir}/kwebview.h +%exclude %{_kde4_includedir}/kwebwallet.h +%exclude %{_kde4_libdir}/kde4/devel/libkdewebkit.so + +%files webkit-devel +%{_kde4_includedir}/kdewebkit_export.h +%{_kde4_includedir}/kgraphicswebview.h +%{_kde4_includedir}/kwebpage.h +%{_kde4_includedir}/kwebpluginfactory.h +%{_kde4_includedir}/kwebview.h +%{_kde4_includedir}/kwebwallet.h +%{_kde4_libdir}/kde4/devel/libkdewebkit.so +%endif + +%post ktexteditor -p /sbin/ldconfig +%postun ktexteditor -p /sbin/ldconfig + +%files ktexteditor +%{_kde4_libdir}/libktexteditor.so.4* + + +%if 0%{?apidocs} +%files apidocs +%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ + +%if 0%{?apidocs_qch} +%files apidocs-qch +%{_qt4_docdir}/qch/*.qch +%endif +%endif + + +%changelog +* Wed Aug 14 2019 Jan Grulich - 6:4.14.8-12 +- Bump build due to z-stream fix + Resolves: bz#1740737 + +* Thu Aug 08 2019 Jan Grulich - 6:4.14.8-11 +- KConfig: malicious .desktop files would execute code + Resolves: bz#1738782 + +* Thu Jun 06 2019 Jan Grulich - 6:4.14.8-10 +- Do not fork konsole process when opening terminal from apps using dolphin-part + Resolves: bz#1710362 + +* Wed Jun 05 2019 Jan Grulich - 6:4.14.8-9 +- Do not fork konsole process when opening terminal from apps using dolphin-part + Resolves: bz#1710362 + +* Mon Apr 29 2019 Jan Grulich - 6:4.14.8-8 +- Disable JAR repack script to avoid multilib regression + Resolves: bz#1542864 + +* Mon Feb 11 2019 Jan Grulich - 6:4.14.8-7 +- Handle case-sensitive mime types + Resolves: bz#1542864 + +* Thu May 18 2017 Jan Grulich - 6:4.14.8-6 +- KAuth: verify that whoever is calling us is actually who he says he is (CVE-2017-8422) + Resolves: CVE-2017-8422 + +* Tue Feb 02 2016 Jan Grulich - 6:4.14.8-5 +- Fix required kde-runtime version in macros.kdelibs4 + Resolves: bz#1289241 + +* Tue Jul 21 2015 Jan Grulich - 6:4.14.8-4 +- Restore old patch for proper restoring of print setting + Resolves: bz#1197804 + +* Fri Jun 05 2015 Jan Grulich - 6:4.14.8-3 +- Drop nepomuk subpackages + +* Wed May 27 2015 Jan Grulich - 6:4.14.8-2 +- Rebuild, we need also aarch64 build + +* Mon May 25 2015 Jan Grulich - 6:4.14.8-1 +- Re-base to 4.14.8 (sync with F21) + +* Mon Apr 13 2015 Lukáš Tinkl - 6:4.10.5-7 +- Resolves: #1202801 - Backport patch to with upower 1.0 API + +* Tue Jan 28 2014 Daniel Mach - 6:4.10.5-6 +- Mass rebuild 2014-01-24 + +* Wed Jan 08 2014 Martin Briza - 4.10.5-5 +- fixed a typo in Summary +- removed an unused patch +- Resolves: #884052 + +* Wed Jan 08 2014 Martin Briza - 4.10.5-4 +- use a better way to figure out if lib or lib64 should be used +- use -fno-strict-aliasing for type punned source files +- Resolves: #884052 + +* Wed Jan 08 2014 Martin Briza - 4.10.5-3 +- make kpac_dhcp_helper full relro +- set the variables in the generated cmake files to contain both 64b and 32b paths +- hide "command not found" for one pkg-config invocation in the spec +- fix macro expansion in the spec changelog +- Resolves: #884052 + +* Fri Dec 27 2013 Daniel Mach - 6:4.10.5-2 +- Mass rebuild 2013-12-27 + +* Sun Jun 30 2013 Than Ngo - 4.10.5-1 +- 4.10.5 + +* Sat Jun 01 2013 Rex Dieter - 6:4.10.4-1 +- 4.10.4 + +* Thu May 09 2013 Rex Dieter - 6:4.10.3-2 +- pull in a few upstream fixes, including a couple minor security issues +- Crash in DialogShadows::Private::freeX11Pixmaps() (kde#319137) + +* Mon May 06 2013 Than Ngo - 6:4.10.1-1 +- 4.10.3 + +* Tue Apr 30 2013 Than Ngo - 6:4.10.2-4 +- drop old kdelibs-4.1.72-no-cache-kdeglobals-paths.patch + +* Wed Apr 24 2013 Rex Dieter 6:4.10.2-3 +- fix/workaround plasma-desktop crash (kde#318806) +- respin FindSamba patch + +* Tue Apr 16 2013 Rex Dieter 6:4.10.2-2 +- revert upstream commit wrt icon inheritance, for now, to avoid regression (kde#317138) + +* Sat Mar 30 2013 Rex Dieter 6:4.10.2-1 +- 4.10.2 + +* Thu Mar 21 2013 Rex Dieter 6:4.10.1-3 +- lower strigi min version +- BR: cmake >= 2.8.9 +- minor tweaks for el6 (hal!) + +* Sun Mar 10 2013 Rex Dieter 6:4.10.1-2 +- rebuild (OpenEXR) + +* Sat Mar 02 2013 Rex Dieter - 6:4.10.1-1 +- 4.10.1 + +* Thu Feb 28 2013 Than Ngo - 6:4.10.0-4 +- rhel condition: + adapt webkit patch + abrt by default + disable dot to reduce doc size + +* Thu Feb 07 2013 Lukáš Tinkl 6:4.10.0-3 +- complete kdelibs-udisks2_2_stage.patch + +* Tue Feb 05 2013 Rex Dieter 6:4.10.0-2 +- kdelibs-udisks2_2_stage.patch (fix for some phones/mtp-device detection) + +* Thu Jan 31 2013 Rex Dieter - 6:4.10.0-1 +- 4.10.0 + +* Sat Jan 19 2013 Rex Dieter - 6:4.9.98-1 +- 4.9.98 + +* Fri Jan 18 2013 Adam Tkac - 6:4.9.97-2 +- rebuild due to "jpeg8-ABI" feature drop + +* Thu Jan 03 2013 Rex Dieter - 6:4.9.97-1 +- 4.9.97 + +* Sat Dec 29 2012 Rex Dieter 6:4.9.95-3 +- FindKdcraw.cmake fixes(kde#311936) + +* Thu Dec 20 2012 Rex Dieter 6:4.9.95-2 +- Conflicts: kdelibs3 < 3.5.10-42 + +* Wed Dec 19 2012 Rex Dieter - 6:4.9.95-1 +- 4.9.95 + +* Thu Dec 13 2012 Rex Dieter 6:4.9.90-4 +- prune/fix changelog + +* Wed Dec 12 2012 Rex Dieter 6:4.9.90-3 +- fix udisks2 conditional, so -DWITH_SOLID_UDISKS2:BOOL=ON really gets set + +* Wed Dec 12 2012 Rex Dieter - 6:4.9.90-2 +- sync with latest solid/udisks2 upstream bits +- Debug output in kdelibs-udisks2-backend.patch should be disabled (#882731) + +* Mon Dec 03 2012 Rex Dieter 6:4.9.90-1 +- 4.9.90 (4.10beta2) + +* Mon Dec 03 2012 Than Ngo - 6:4.9.4-1 +- 4.9.4 +- update udisks2 backend patch to fix ghost devices + +* Fri Nov 30 2012 Dan Vrátil - 6:4.9.3-7 +- update udisks2 backend patch + +* Thu Nov 29 2012 Than Ngo - 6:4.9.3-6 +- fix file filter + +* Thu Nov 29 2012 Lukáš Tinkl 6:4.9.3-5 +- update udisks2 backend patch + +* Fri Nov 23 2012 Jan Grulich 6:4.9.3-4 +- Fix previous patch + +* Fri Nov 23 2012 Jan Grulich 6:4.9.3-3 +- Resolves: bz#877021 + +* Fri Nov 02 2012 Rex Dieter 6:4.9.3-2 +- (re)enable apidocs + +* Fri Nov 02 2012 Rex Dieter 6:4.9.3-1 +- 4.9.3 + +* Wed Oct 31 2012 Than Ngo - 6:4.9.2-11 +- Resolves: CVE-2012-4514 + +* Wed Oct 31 2012 Than Ngo - 6:4.9.2-10 +- Resolves: bz#871541, CVE-2012-4515 + +* Mon Oct 29 2012 Lukáš Tinkl 6:4.9.2-9 +- Resolves #868530 - cache information about solid device in 'Places' + panel in open/save dialog +- update solid/udisks2 backend, switch to cmake-define + +* Thu Oct 25 2012 Dan Vrátil 6:4.9.2-8 +- Resolves #868530 - cache information about solid device in 'Places' + panel in open/save dialog + +* Wed Oct 24 2012 Rex Dieter 6:4.9.2-7 +- rebuild (libjpeg-turbo v8) + +* Mon Oct 08 2012 Rex Dieter 6:4.9.2-6 +- cmake/python3 love (kde#275919) + +* Thu Oct 04 2012 Rex Dieter 6:4.9.2-5 +- multilib conflict /usr/share/doc/HTML/en/sonnet/index.cache.bz2 (#862388) + +* Thu Oct 04 2012 Than Ngo - 6:4.9.2-4 +- revert kde#108510, kde#183534 + +* Tue Oct 02 2012 Rex Dieter 6:4.9.2-3 +- patch FindSamba.cmake to use pkg-config hints (#862169) + +* Sat Sep 29 2012 Rex Dieter 6:4.9.2-2 +- respin + +* Fri Sep 28 2012 Rex Dieter - 6:4.9.2-1 +- 4.9.2 + +* Wed Sep 26 2012 Rex Dieter 6:4.9.1-5 +- respin FindKipi.cmake patch (kde#307213) + +* Sat Sep 22 2012 Kevin Kofler - 6:4.9.1-4 +- actually enable Solid udisks2 backend (restore patch hunks lost in 4.9.1-2) +- backport FindKipi.cmake from Digikam SC 3.0.0-beta1 for libkipi 2 (kde#307213) + +* Wed Sep 19 2012 Lukas Tinkl - 6:4.9.1-3 +- Resolves #690123 - solid-udisks: Constant spinning of DVD drive when + selecting dolphin + +* Tue Sep 04 2012 Lukas Tinkl - 6:4.9.1-2 +- rebase udisks2 backend against KDE/4.10 branch + +* Mon Sep 03 2012 Than Ngo - 6:4.9.1-1 +- 4.9.1 + +* Wed Aug 29 2012 Rex Dieter 6:4.9.0-4 +- Can't safely remove a USB removable hard drive (#852196) + +* Sun Aug 12 2012 Rex Dieter - 6:4.9.0-3 +- drop .spec cruft +- Requires: media-player-info + +* Thu Aug 02 2012 Rex Dieter 6:4.9.0-2 +- respin + +* Thu Jul 26 2012 Lukas Tinkl - 6:4.9.0-1 +- 4.9.0 + +* Sun Jul 22 2012 Kevin Kofler - 6:4.8.97-7 +- revert "-devel: move only conflicting lib symlinks to kde4/devel" (#842142) + +* Sat Jul 21 2012 Rex Dieter - 6:4.8.97-6 +- -devel: move only conflicting lib symlinks to kde4/devel +- drop old Conflicts/Obsoletes + +* Wed Jul 18 2012 Lukas Tinkl - 6:4.8.97-5 +- respin the udisks2 backend patch +- fix k3b not recognizing any CD/DVD burning device + +* Fri Jul 13 2012 Rex Dieter - 6:4.8.97-4 +- CD drive tray goes back in after 'Eject' when dolphin is running (kde#296657, #811609) + +* Thu Jul 12 2012 Rex Dieter - 6:4.8.97-3 +- provide /usr/bin/kmailservice (#773414) + +* Thu Jul 12 2012 Than Ngo - 6:4.8.97-2 +- fix kjs to return valid lang (RFC 1766) + +* Wed Jul 11 2012 Rex Dieter - 6:4.8.97-1 +- 4.8.97 + +* Wed Jun 27 2012 Lukas Tinkl - 6:4.8.95-2 +- respin the udisks2 backend patch +- Resolves #835107 - Unable to eject optical media using "Device + notifier" + +* Wed Jun 27 2012 Radek Novacek - 6:4.8.95-1 +- 4.8.95 + +* Tue Jun 26 2012 Lukáš Tinkl - 6:4.8.90-4 +- update the udisks2 backend patch + + +* Wed Jun 20 2012 Rex Dieter 6:4.8.90-3 +- rebuild (attica) + +* Sat Jun 09 2012 Rex Dieter 6:4.8.90-2 +- rebuild + +* Fri Jun 08 2012 Jaroslav Reznik - 6:4.8.90-1 +- 4.8.90 + +* Fri Jun 01 2012 Jaroslav Reznik - 6:4.8.80-2 +- respin + +* Fri May 25 2012 Jaroslav Reznik - 6:4.8.80-1 +- 4.8.80 + +* Fri May 25 2012 Rex Dieter +- 6:4.8.3-4 +- include upstream kmessagewidget fixes +- apply kdeclarative-install-location.patch + +* Thu May 24 2012 Lukas Tinkl - 6:4.8.3-3 +- update the udisks2 backend patch, fixing some bugs with storage drives + +* Thu May 03 2012 Than Ngo - 6:4.8.3-2 +- add rhel/fedora condition + +* Mon Apr 30 2012 Jaroslav Reznik - 6:4.8.3-1 +- 4.8.3 +- remove cmake implicit link directories patch +- remove adblock filter patch +- add kdeclarative install location patch + +* Mon Apr 16 2012 Rex Dieter 6:4.8.2-4 +- enable udisks2, +Requires: udisks2 on f18+ too + +* Mon Apr 16 2012 Lukas Tinkl - 6:4.8.2-3 +- add udisks2 Solid backend plus RHEL conditional + +* Thu Apr 12 2012 Than Ngo - 6:4.8.2-2 +- Load/Update filter lists only when AdBlock is enabled + +* Fri Mar 30 2012 Jaroslav Reznik - 6:4.8.2-1 +- 4.8.2 + +* Thu Mar 22 2012 Jaroslav Reznik 6:4.8.1-3 +- Sonnet crash due to unitialized value access (kde#295615, rhbz#805010) + +* Tue Mar 13 2012 Rex Dieter 6:4.8.1-2 +- Nepomuk::Resource[Data|Watcher] thread-safety (kde#295474) + +* Mon Mar 05 2012 Radek Novacek 6:4.8.1-1 +- 4.8.1 +- Drop upstreamed patches + +* Tue Feb 28 2012 Fedora Release Engineering - 6:4.8.0-5 +- Rebuilt for c++ ABI breakage + +* Sat Feb 18 2012 Rex Dieter 4.8.0-4 +- don't set rpath on multiarch dirs (kde review request #103422) + +* Fri Feb 10 2012 Petr Pisar - 6:4.8.0-3 +- Rebuild against PCRE 8.30 + +* Sat Feb 04 2012 Rex Dieter 6:4.8.0-2 +- fix KDE_VERSION_STRING (kde#293204) + +* Thu Jan 19 2012 Jaroslav Reznik - 6:4.8.0-1 +- 4.8.0 + +* Wed Jan 04 2012 Radek Novacek - 6:4.7.97-1 +- 4.7.97 + +* Sat Dec 31 2011 Rex Dieter 6:4.7.95-2 +- rebuild (attica) + +* Wed Dec 21 2011 Radek Novacek - 6:4.7.95-1 +- 4.7.95 +- drop patch for Plasma::PackageMetadata::read: Match the behavior of KService. + +* Tue Dec 06 2011 Than Ngo - 4.7.90-2 +- add ss390/s390x support in kjs + +* Sat Dec 03 2011 Rex Dieter 4.7.90-1 +- 4.7.90 + +* Thu Dec 01 2011 Rex Dieter 4.7.80-3 +- disable solid/upnp by default, set env SOLID_UPNP=1 to re-enable (#754530, #758008, kde#259472) + +* Tue Nov 29 2011 Rex Dieter 4.7.80-2 +- drop kactivities conditional + +* Fri Nov 18 2011 Jaroslav Reznik 4.7.80-1 +- 4.7.80 (beta 1) + +* Wed Nov 16 2011 Rex Dieter 4.7.3-5 +- restore halectomy patch (sans fstab-removing pieces) + +* Mon Nov 14 2011 Rex Dieter 4.7.3-4 +- solid hardware does not detect NFS drives, halectomy related (#751879) + +* Mon Nov 07 2011 Than Ngo - 4.7.3-3 +- CVE-2010-0046, security issue in khtml + +* Fri Nov 04 2011 Rex Dieter 4.7.3-2 +- no_libkactivities + +* Sat Oct 29 2011 Rex Dieter 4.7.3-1 +- 4.7.3 + +* Thu Oct 27 2011 Rex Dieter 4.7.2-5 +- omit knotify hack, fix in qt instead + +* Wed Oct 26 2011 Rex Dieter 4.7.2-4 +- fix knotify, workaround Qt 4.8 QUrl.toLocalFile behavior change (#749213) + +* Tue Oct 25 2011 Rex Dieter 4.7.2-3 +- no_libkactivities toggle, -devel: Provides: libkactivities-devel + +* Sun Oct 09 2011 Rex Dieter 4.7.2-2 +- upstream nepomuk_unicode patch + +* Tue Oct 04 2011 Rex Dieter 4.7.2-1 +- 4.7.2 + +* Tue Oct 04 2011 Lukas Tinkl - 4.7.1-6 +- Resolves #743056 - CVE-2011-3365 kdelibs: input validation failure in KSSL + +* Wed Sep 28 2011 Rex Dieter 4.7.1-5 +- -devel: s/pkgconfig(attica)/pkgconfig(libattica)/ + +* Tue Sep 27 2011 Kevin Kofler 4.7.1-4 +- updated Plasma data engine dependency extraction patch: + - added support for declarativeappletscript QML code + - plasma-dataengine-depextractor command-line tool: + - make sure we pass an absolute path to KDesktopFile + - autodetect the API/language used, drop --api command-line argument + +* Thu Sep 22 2011 Rex Dieter 4.7.1-3 +- pkgconfig-style deps +- move kde4_appsdir/kdewidgets to main pkg (pairs with kdewidgets designer plugin) + +* Fri Sep 02 2011 Than Ngo - 4.7.1-1 +- 4.7.1 + +* Tue Aug 30 2011 Than Ngo - 4.7.0-5 +- clean up fedora conditonals + +* Mon Aug 22 2011 Kevin Kofler 4.7.0-4 +- fix Plasma::PackageMetadata::read to match the behavior of KService + +* Sun Aug 21 2011 Kevin Kofler 4.7.0-3 +- backport my GSoC 2011 patches for libplasma PackageKit integration (F17+) +- package plasma-dataengine-depextractor in -devel (F17+) + +* Sun Aug 21 2011 Kevin Kofler 4.7.0-2 +- rebuild for the RPM dependency generators for Plasma (GSoC 2011) +- add BuildRequires: kde-settings to pick up the above + +* Tue Jul 26 2011 Jaroslav Reznik 4.7.0-1 +- 4.7.0 + +* Mon Jul 25 2011 Kevin Kofler 4.6.95-11 +- fix KHTML form completion regression (kde#277457, patch by Andrea Iacovitti) + +* Fri Jul 22 2011 Rex Dieter 4.6.95-10 +- drop kate + +* Thu Jul 21 2011 Rex Dieter 4.6.95-4 +- rebuild (qt48) + +* Wed Jul 20 2011 Jaroslav Reznik 4.6.95-3 +- add Herqq dependency for Solid's UPnP support + +* Fri Jul 08 2011 Rex Dieter 4.6.95-2 +- drop upstreamed qt48 patch +- Provides: katepart + +* Fri Jul 08 2011 Jaroslav Reznik 4.6.95-1 +- 4.6.95 (rc2) + +* Thu Jun 30 2011 Rex Dieter 4.6.90-4 +- drop unneeded kstatusnotify_dbus_leak.patch (upstream fixed better) + +* Wed Jun 29 2011 Rex Dieter 4.6.90-3 +- fix %%shared_desktop_ontologies_ver(sion) usage +- upstream kdoctools/docbook patch (#690124) + +* Tue Jun 28 2011 Rex Dieter 4.6.90-2 +- move oxygen-icons-theme dep (back) to kdebase-runtime + +* Mon Jun 27 2011 Than Ngo - 4.6.90-1 +- 4.6.90 (rc1) + +* Tue Jun 14 2011 Rex Dieter 4.6.80-5 +- KStatusNotifierItem leaks D-Bus connections (#667787, kde#261180) + +* Sun Jun 12 2011 Kevin Kofler 4.6.80-4 +- rebuild for new qtwebkit (in an attempt to fix KWebPage crash) + +* Thu Jun 02 2011 Rex Dieter 4.6.80-3 +- up min versions of phonon, shared-desktop-ontologies, soprano + +* Thu Jun 02 2011 Kevin Kofler 4.6.80-2 +- fix KConfigXT KComboBox for Qt 4.8 TP1 (upstream patch) + +* Fri May 27 2011 Jaroslav Reznik 4.6.80-1 +- 4.6.80 (beta1) + +* Tue May 24 2011 Kevin Kofler 4.6.3-5 +- fix kio regression causing requests submitted twice (#707146, kde#272466) + +* Mon May 16 2011 Rex Dieter 4.6.3-4.1 +- Requires: oxygen-icon-theme >= 4.6.2 + +* Tue May 10 2011 Kevin Kofler 4.6.3-4 +- Apply the xdg-menu patch everywhere again (#703531) +- Requires: redhat-menus (proper fix for #701693) + +* Sun May 08 2011 Rex Dieter 4.6.3-3 +- Plasma crash in KiconLoader (kde258706) + +* Tue May 03 2011 Kevin Kofler 4.6.3-2 +- Drop xdg-menu patch on F15+ (#701693) + +* Thu Apr 28 2011 Rex Dieter 4.6.3-1 +- 4.6.3 + +* Mon Apr 25 2011 Rex Dieter 4.6.2-3 +- Adjust uri/ mimetypes to use newer x-scheme-handler/ (#587573) + +* Tue Apr 19 2011 Rex Dieter 4.6.2-2 +- Solid::Networking::status() returning Solid::Networking::Status::Unknown (kde#270538) + +* Wed Apr 06 2011 Jaroslav Reznik 4.6.2-1 +- 4.6.2 + +* Wed Mar 23 2011 Rex Dieter 4.6.1-5 +- Constant spinning of cd/dvd drive ... (#690123, kde#264487) + +* Fri Mar 11 2011 Kevin Kofler - 4.6.1-4 +- use upstream patch for #682300 (kde#267770), my previous one didn't work + +* Fri Mar 11 2011 Kevin Kofler - 4.6.1-3 +- set the plugin path in KApplication, don't rely on QT_PLUGIN_PATH being set, + fixes kpackagekitsmarticon not getting themed (#682300, kde#267770) + +* Tue Mar 08 2011 Rex Dieter 4.6.1-2 +- Dolphin shows no files... (kde#267709) + +* Sat Feb 26 2011 Rex Dieter 4.6.1-1 +- 4.6.1 + +* Mon Feb 21 2011 Jaroslav Reznik - 4.6.0-4 +- Fix plasma logout crash (kde#264076) + +* Mon Feb 07 2011 Fedora Release Engineering - 6:4.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 25 2011 Kevin Kofler - 4.6.0-2 +- Conflicts with old versions of kdevplatform, kdevelop, kile, rkward to force + their upgrade to compatible versions + +* Fri Jan 21 2011 Jaroslav Reznik - 4.6.0-1 +- 4.6.0 + +* Tue Jan 18 2011 Rex Dieter - 4.5.95-2 +- Unowned /usr/lib*/kde4/plugins/{gui_platform,styles} dirs (#645059) + +* Wed Jan 05 2011 Jaroslav Reznik - 4.5.95-1 +- 4.5.95 (4.6rc2) + +* Mon Jan 03 2011 Lukas Tinkl - 4.5.90-3 +- update the halectomy patch to also omit the fstab backend + (may interfere with the udisks backend, causing deadlocks, cf kdebug#261359) + +* Thu Dec 23 2010 Rex Dieter 4.5.90-2 +- build hal-free (ltinkl) + +* Wed Dec 22 2010 Rex Dieter 4.5.90-1 +- 4.5.90 (4.6rc1) + +* Fri Dec 17 2010 Jaroslav Reznik - 4.5.85-5 +- rebuild for polkit-qt-1-0.99.0 (soname 1.99.0) + +* Fri Dec 10 2010 Rex Dieter - 4.5.85-4 +- -common: Conflicts: kdebase-runtime < 4.5.80 +- drop some old pre-f13 era Conflicts + +* Fri Dec 10 2010 Kevin Kofler - 4.5.85-3 +- fix FindQt4.cmake when there's also qt3-devel installed (#661996) + +* Wed Dec 08 2010 Thomas Janssen 4.5.85-2 +- respun upstream tarball + +* Fri Dec 03 2010 Thomas Janssen 4.5.85-1 +- 4.5.85 (4.6beta2) + +* Fri Nov 26 2010 Rex Dieter 4.5.80-7 +- move udisks/upower dep to main pkg (from -devel) + +* Wed Nov 24 2010 Lukas Tinkl - 4.5.80-6 +- explicitely require udisks/upower now that we depend on them + +* Tue Nov 23 2010 Kevin Kofler - 4.5.80-5 +- respun tarball (again), includes fix-build patch + +* Tue Nov 23 2010 Kevin Kofler - 4.5.80-4 +- respun tarball +- fix build failure triggered by "build fix" (patch by Jonathan Riddell) + +* Mon Nov 22 2010 Lukas Tinkl - 4.5.80-3 +- don't build Solid HAL backend, rely on udisks/upower/udev only + (aka project HALsectomy) + +* Sat Nov 20 2010 Rex Dieter - 4.5.80-2 +- squash more rpath's + +* Sat Nov 20 2010 Rex Dieter - 4.5.80-1 +- 4.5.80 (4.6beta1) + +* Mon Nov 15 2010 Rex Dieter - 4.5.3-3 +- Closing a konsolepart shell crashes (kde#256652) + +* Fri Nov 05 2010 Thomas janssen 4.5.3-2 +- rebuild for new libxml2 + +* Fri Oct 29 2010 Than Ngo - 4.5.3-1 +- 4.5.3 + +* Fri Oct 15 2010 Rex Dieter - 4.5.2-7 +- backport configChanged() for wallpaper + +* Fri Oct 15 2010 Rex Dieter - 4.5.2-6 +- kio/krun patch so kde services can open urls directly too + +* Fri Oct 08 2010 Rex Dieter - 4.5.2-5 +- switching comic in comic applet crashes plasma (kde#253387,rh#640619) + +* Thu Oct 07 2010 Than Ngo - 4.5.2-4 +- kde253294, KMail and Kopete download and open https url instead of only opening + +* Tue Oct 05 2010 Lukas Tinkl - 4.5.2-3 +- tarball respin + +* Fri Oct 01 2010 Rex Dieter 4.5.2-2 +- rebuild (phonon) + +* Fri Oct 01 2010 Rex Dieter 4.5.2-1 +- 4.5.2 + +* Fri Sep 10 2010 Thomas Janssen 4.5.1-4 +- backport patches to fix a crashing kdevelop (kde 4.5.1 only) + +* Fri Aug 27 2010 Kevin Kofler - 4.5.1-3 +- make building -apidocs-qch optional and disable it by default until fixed + +* Fri Aug 27 2010 Rex Dieter - 4.5.1-2 +- -apidocs : exclude installdox + +* Fri Aug 27 2010 Jaroslav Reznik - 4.5.1-1 +- 4.5.1 +- use gpg2 in knewstuff (kde#249152) + +* Thu Aug 26 2010 Rex Dieter - 4.5.0-6 +- use ca-certificates' ca-bundle.crt (#521902) + +* Wed Aug 18 2010 Kevin Kofler - 4.5.0-5 +- fix packaging of QCH apidocs + +* Wed Aug 18 2010 Kevin Kofler - 4.5.0-4 +- package QCH apidocs (-apidocs-qch noarch subpackage) + +* Wed Aug 18 2010 Kevin Kofler - 4.5.0-3 +- generate QCH apidocs (try 1) + +* Tue Aug 10 2010 Rex Dieter - 4.5.0-2 +- (Build)Requires: qt4(-devel) >= 4.6.3 +- dbusmenu_qt_ver 0.5.2, soprano_ver 4.5.0 + +* Tue Aug 03 2010 Than Ngo - 4.5.0-1 +- 4.5.0 + +* Sun Jul 25 2010 Rex Dieter - 6:4.4.95-1 +- 4.5 RC3 (4.4.95) + +* Wed Jul 21 2010 Than Ngo - 6:4.4.92-4 +- (Build)Requires: qt4(-devel) >= 4.7.0 +- drop icon-name-qt47 patch + +* Fri Jul 16 2010 Rex Dieter - 6:4.4.92-3 +- Requires: oxygen-icon-theme (ensures default fallback is present) + +* Wed Jul 07 2010 Rex Dieter - 6:4.4.92-2 +- tarball respin + +* Wed Jul 07 2010 Rex Dieter - 6:4.4.92-1 +- 4.5 RC2 (4.4.92) + +* Fri Jun 25 2010 Jaroslav Reznik - 6:4.4.90-1 +- 4.5 RC1 (4.4.90) + +* Thu Jun 17 2010 Rex Dieter - 6:4.4.85-3 +- Plasma crash on startup (kde#241298) + +* Tue Jun 08 2010 Jaroslav Reznik - 6:4.4.85-2 +- (Build)Requires: docbook-dtds, docbook-style-xsl +- drop fedora < 12 conditionals + +* Mon Jun 07 2010 Jaroslav Reznik - 6:4.4.85-1 +- 4.5 Beta 2 (4.4.85) + +* Tue May 25 2010 Rex Dieter - 6:4.4.80-3 +- Blur shadow around widgets does not smoothly fade out (kde#235620) + +* Sun May 23 2010 Rex Dieter - 6:4.4.80-2 +- own %%{_kde4_libdir}/plugins/{gui_platform,styles} + +* Fri May 21 2010 Jaroslav Reznik - 6:4.4.80-1 +- 4.5 Beta 1 (4.4.80) +- BuildRequires: dbusmenu-qt-devel + +* Sun May 16 2010 Rex Dieter 6:4.4.3-5 +- Web proxy auto-discovery (WPAD) fails (#592658) + +* Sat May 08 2010 Rex Dieter 6:4.4.3-4 +- -devel: Req: qt4-webkit-devel + +* Sat May 08 2010 Rex Dieter 6:4.4.3-3 +- BR: qt4-webkit-devel + +* Wed May 05 2010 Than Ngo - 6:4.4.3-2 +- respin + +* Fri Apr 30 2010 Jaroslav Reznik - 6:4.4.3-1 +- 4.4.3 + +* Sun Apr 25 2010 Rex Dieter - 6:4.4.2-5 +- rebuild (soprano) + +* Sat Apr 24 2010 Rex Dieter - 6:4.4.2-4 +- fix kidletime (kde#231628,kde#227279,kde#218468) +- kate part ignores japanese input from input method (#585242,kde#206455) + +* Thu Apr 15 2010 Rex Dieter - 6:4.4.2-3 +- cleanup/fix webkitkde Obsoletes a bit more (#582469) +- (Build)Requies: cmake >= 2.6.4 + +* Fri Apr 09 2010 Rex Dieter - 6:4.4.2-2 +- Obsoletes: webkitkde < 0.0.6 (#576634) + +* Mon Mar 29 2010 Lukas Tinkl - 6:4.4.2-1 +- 4.4.2 + +* Thu Mar 25 2010 Rex Dieter 6:4.4.1-10 +- drop BR: openssh-clients subversion + +* Thu Mar 25 2010 Rex Dieter 6:4.4.1-9 +- refresh kdelibs-4.4.2-kpixmapcache.patch + +* Wed Mar 24 2010 Rex Dieter 6:4.4.1-8 +- Obsoletes: webkitkde (#576634) + +* Sat Mar 20 2010 Rex Dieter 6:4.4.1-7 +- KDE default in noisy debug mode to stdout/stderr (kde#227089) +- backport trunk/ fix building against qt-4.7 + +* Wed Mar 17 2010 Lukas Tinkl - 6:4.4.1-6 +- fix crash in KPixmapCache (bug#568389) + +* Tue Mar 09 2010 Rex Dieter - 6:4.4.1-5 +- rebuild (soprano) + +* Tue Mar 09 2010 Rex Dieter - 6:4.4.1-4 +- Requires: hal (for solid) +- drop Requires: dbus-x11 (it's already Req'd in kdebase-workspace) +- drop Requires: coreutils grep (F-12+) +- make Requires: kdelibs-common versioned + +* Sun Feb 28 2010 Rex Dieter - 6:4.4.1-3 +- put back CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE to avoid + %%_libdir/kde/devel rpaths (#568495) + +* Sun Feb 28 2010 Rex Dieter - 6:4.4.1-2 +- update no_rpath patch, revert back to + CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE (#568495) + +* Sat Feb 27 2010 Rex Dieter - 6:4.4.1-1 +- 4.4.1 + +* Fri Feb 19 2010 Rex Dieter - 6:4.4.0-9 +- -devel: Provides: nepomuk-devel, Requires: soprano-devel + +* Tue Feb 16 2010 Than Ngo - 6:4.4.0-8 +- krunner crash patch (kde#227118) +- plasma crash patch (kde#226823) + +* Sat Feb 13 2010 Kevin Kofler - 6:4.4.0-7 +- rebuild for new kde-filesystem in F13, fixes kde4-config --libsuffix (#564712) + +* Sat Feb 13 2010 Rex Dieter - 6:4.4.0-6 +- nepomuk_memleak patch + +* Fri Feb 12 2010 Rex Dieter - 6:4.4.0-5 +- khtml_scrolling patch +- drop khtml_svg_no_var_tracking_assignments patch + +* Tue Feb 09 2010 Rex Dieter - 6:4.4.0-4 +- depend on version of phonon,strigi,soprano built against + +* Tue Feb 09 2010 Rex Dieter - 6:4.4.0-3 +- respin + +* Mon Feb 08 2010 Rex Dieter - 6:4.4.0-2 +- respin + +* Fri Feb 05 2010 Than Ngo - 6:4.4.0-1 +- 4.4.0 + +* Tue Feb 02 2010 Rex Dieter - 4.3.98-4 +- -apidocs: build as normal noarch subpkg + +* Tue Feb 02 2010 Rex Dieter - 4.3.98-3 +- respin no_rpath patch, add LIB_INSTALL_DIR rpath only if not in + CMAKE_SYSTEM_LIBRARY_PATH. added some status messages to help debug. + +* Mon Feb 01 2010 Rex Dieter - 4.3.98-2 +- no_rpath patch, goodbye -DCMAKE_SKIP_RPATH:BOOL=ON, it's been fun + +* Sun Jan 31 2010 Rex Dieter - 4.3.98-1 +- KDE 4.3.98 (4.4rc3) + +* Wed Jan 27 2010 Rex Dieter - 4.3.95-3 +- patch for kde4-config --kde-version option (kde#224540) + +* Tue Jan 26 2010 Rex Dieter - 4.3.95-2 +- -devel: Obsoletes: webkitkde-devel + +* Wed Jan 20 2010 Lukas Tinkl - 4.3.95-1 +- KDE 4.3.95 (4.4rc2) + +* Thu Jan 14 2010 Rex Dieter - 4.3.90-6 +- use %%_polkit_qt_policydir +- strigi_ver 0.7.1 + +* Mon Jan 11 2010 Jaroslav Reznik - 4.3.90-5 +- hopefully correct kauth fix (old polkit cmake module is broken) + +* Fri Jan 08 2010 Jaroslav Reznik - 4.3.90-4 +- fix kauth polkit policies installation + +* Thu Jan 07 2010 Rex Dieter - 4.3.90-3 +- bump min polkit-qt version(s) + +* Wed Jan 06 2010 Rex Dieter - 4.3.90-2 +- -devel: Requires: shared-desktop-ontologies-devel + +* Wed Jan 06 2010 Rex Dieter - 4.3.90-1 +- 4.3.90 (4.4rc1) +- drop openssl patch (no longer needed since bug #429846 fixed) + +* Tue Jan 05 2010 Jaroslav Reznik - 4.3.85-7 +- PolkitQt rebuild + +* Sun Dec 27 2009 Rex Dieter - 4.3.85-6 +- Conflicts: kdebase-workspace(-libs,-devel) < 4.3.80 + +* Sat Dec 26 2009 Rex Dieter - 4.3.85-5 +- move kdecmake,makekdewidgets manpages to -devel (#549947) + +* Sat Dec 19 2009 Rex Dieter - 4.3.85-4 +- tarball respin + +* Fri Dec 18 2009 Rex Dieter - 4.3.85-3 +- -devel: Requires: attica-devel + +* Fri Dec 18 2009 Rex Dieter - 4.3.85-2 +- plasma_scrollwidget patch + +* Fri Dec 18 2009 Rex Dieter - 4.3.85-1 +- 4.3.85 (4.4 beta2) + +* Wed Dec 16 2009 Jaroslav Reznik - 4.3.80-5 +- Repositioning the KDE Brand (#547361) + +* Wed Dec 09 2009 Rex Dieter - 4.3.80-4 +- BR: attica-devel shared-desktop-ontologies-devel +- phonon_ver 4.3.80 +- soprano_ver 2.3.70 + +* Fri Dec 04 2009 Than Ngo - 4.3.80-3 +- respin + +* Thu Dec 03 2009 Kevin Kofler - 4.3.80-2 +- BR polkit-qt-devel +- fix the build of the KAuth PolkitQt-1 backend (upstream patch) + +* Tue Dec 01 2009 Ben Boeckel - 4.3.80-1 +- KDE 4.4 beta1 (4.3.80) + +* Wed Nov 25 2009 Rex Dieter - 4.3.75-0.2.svn1048496 +- -devel: Provides: kdelibs4-devel%%{?_isa} ... +- Obsoletes: kdelibs-experimental(-devel) < 4.3.75 + +* Fri Nov 20 2009 Ben Boeckel - 4.3.75-0.1.svn1048496 +- Update to 4.3.75 snapshot + +* Wed Nov 18 2009 Rex Dieter - 4.3.3-6 +- rebuild (for qt-4.6.0-rc1, f13+) +- fix/revert soprano_ver change in -5 + +* Mon Nov 16 2009 Than Ngo - 4.3.3-5 +- fix conditional + +* Fri Nov 13 2009 Rex Dieter - 4.3.3-4 +- kubuntu_80_kaction_qt_keys.diff (#475247) +- soprano_ver 2.3.1 + +* Fri Nov 13 2009 Than Ngo - 4.3.3-3 +- rhel cleanup, fix conditional for RHEL + +* Fri Nov 06 2009 Kevin Kofler - 4.3.3-2 +- backport adFilteredBy API from trunk, required to build konq-plugins-4.3.3 +- BR flex and bison for the Solid predicate parser +- fix build of fakes.c due to missing #include + +* Fri Oct 30 2009 Rex Dieter - 4.3.3-1 +- 4.3.3 + +* Mon Oct 12 2009 Lukáš Tinkl - 4.3.2-4 +- khtml kpart crasher nr. 2 (rev.1033984) + +* Thu Oct 08 2009 Rex Dieter - 4.3.2-3 +- khtml kpart crasher (kde #207173/209876) + +* Wed Oct 07 2009 Than Ngo - 4.3.2-2 +- fix a deadlock in KLocale + +* Mon Oct 05 2009 Than Ngo - 4.3.2-1 +- 4.3.2 + +* Wed Sep 23 2009 Rex Dieter - 4.3.1-7 +- move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+) + +* Mon Sep 21 2009 Than Ngo - 4.3.1-6 +- use abrt for RHEL + +* Sat Sep 19 2009 Rex Dieter - 4.3.1-5 +- groupdav connect to egroupware failed (kde#186763) + +* Fri Sep 18 2009 Kevin Kofler - 4.3.1-4 +- ship kde4-doxygen.sh only in -devel (fix duplicate file) + +* Fri Sep 04 2009 Than Ngo - 4.3.1-3 +- security fix for -CVE-2009-2702 + +* Wed Sep 02 2009 Ben Boeckel - 4.3.1-2 +- Patch for kde#160679 + +* Fri Aug 28 2009 Than Ngo - 4.3.1-1 +- 4.3.1 +- openssl-1.0 build fixes + +* Wed Aug 26 2009 Rex Dieter - 4.3.0-8 +- BR: xz-devel + +* Sun Aug 23 2009 Rex Dieter - 4.3.0-7 +- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds) + +* Wed Aug 19 2009 Lukáš Tinkl - 4.3.0-6 +- fix crash when editting toolbars (kdebug:200815) + +* Tue Aug 18 2009 Lukáš Tinkl - 4.3.0.5 +- fix KDE bug #19538, copy file after rename uses old file name + +* Mon Aug 17 2009 Lukáš Tinkl - 4.3.0-4 +- fix unmounting devices +- fix copying URLs to clipboard (kdebug:170608) + +* Fri Aug 14 2009 Rex Dieter - 4.3.0-3 +- kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539) + +* Wed Aug 05 2009 Rex Dieter - 4.3.0-2 +- microblog crashes plasma on show friends toggle (kdebug#202550) +- khtml crasher (kdebug#199557) + +* Thu Jul 30 2009 Than Ngo - 4.3.0-1 +- 4.3.0 + +* Wed Jul 29 2009 Rex Dieter - 4.2.98-4 +- -devel: Conflicts: kdebase-runtime < 4.2.90, kdebase-workspace-devel < 4.2.90 + +* Sun Jul 26 2009 Kevin Kofler - 4.2.98-3 +- fix CVE-2009-2537 - select length DoS +- fix CVE-2009-1725 - crash, possible ACE in numeric character references +- fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes) +- fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling +- fix minimum strigi version (0.7, not 0.7.0, RPM thinks 0.7 < 0.7.0) + +* Fri Jul 24 2009 Lukáš Tinkl - 4.2.98-2 +- respun tarball, to fix KIO HTTP redirects +- fix phonon/strigi versions + +* Wed Jul 22 2009 Than Ngo - 4.2.98-1 +- 4.3rc3 + +* Thu Jul 16 2009 Rex Dieter - 4.2.96-2 +- soprano_ver 2.3.0 +- License: LGPLv2+ + +* Fri Jul 10 2009 Than Ngo - 4.2.96-1 +- 4.3rc2 + +* Wed Jul 08 2009 Kevin Kofler - 4.2.95-4 +- fix CMake dependency in parallel_devel patch (#510259, CHIKAMA Masaki) + +* Fri Jul 03 2009 Rex Dieter - 4.2.95-3 +- plasma animation crasher (kdebug#198338) + +* Fri Jul 03 2009 Rex Dieter - 4.2.95-2 +- up min versions, phonon, strigi, soprano (#509511) + +* Thu Jun 25 2009 Than Ngo - 4.2.95-1 +- 4.3 rc1 + +* Wed Jun 03 2009 Rex Dieter 4.2.90-1 +- KDE-4.3 beta2 (4.2.90) + +* Tue May 12 2009 Than Ngo 4.2.85-1 +- KDE-4.3 beta1 (4.2.85) +- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809) + +* Wed Apr 29 2009 Rex Dieter - 4.2.2-14 +- -devel: Provides: kdelibs4-devel%%{?_isa} ... + +* Tue Apr 28 2009 Lukáš Tinkl - 4.2.2-13 +- upstream patch to fix GCC4.4 crashes in kjs + (kdebug:189809) + +* Fri Apr 24 2009 Kevin Kofler - 4.2.2-12 +- drop the PopupApplet configuration backports (#495998) for now, kconf_update + does not work as expected for Plasma + +* Thu Apr 23 2009 Kevin Kofler - 4.2.2-11 +- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP) + +* Thu Apr 23 2009 Kevin Kofler - 4.2.2-10 +- fix the kconf_update scriptlet for #495998 (broken .upd syntax) + +* Tue Apr 21 2009 Than Ngo - 4.2.2-9 +- don't let plasma appear over screensaver + +* Mon Apr 20 2009 Kevin Kofler 4.2.2-8 +- fix Plasma PopupApplet configuration interfering with weather applet (#495998) + +* Sun Apr 19 2009 Rex Dieter 4.2.2-7 +- fix and simplify the child struct disposal (kde#180785) + +* Sat Apr 18 2009 Rex Dieter 4.2.2-6 +- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370) + +* Fri Apr 10 2009 Rex Dieter 4.2.2-5 +- fix bidi-related hangs in khtml (kde#189161) + +* Wed Apr 08 2009 Than Ngo - 4.2.2-4 +- upstream patch fix ReadOnlyPart crash for non-local file + +* Tue Apr 07 2009 Than Ngo - 4.2.2-3 +- fix kickoff focus issue + +* Tue Apr 07 2009 Than Ngo - 4.2.2-2 +- upstream patch to fix kio_http issue + +* Wed Apr 1 2009 Lukáš Tinkl - 4.2.2-1 +- KDE 4.2.2 + +* Mon Mar 23 2009 Rex Dieter - 4.2.1-9 +- scriptlet optimization + +* Thu Mar 19 2009 Rex Dieter - 4.2.1-8 +- Provides: kdelibs4%%{?_isa} ... (#491082) + +* Wed Mar 18 2009 Rex Dieter 4.2.1-7 +- Provides: kross(javascript) kross(qtscript) (#490586) + +* Thu Mar 12 2009 Than Ngo - 4.2.1-6 +- apply patch to fix encoding for Qt-4.5.0 + +* Mon Mar 09 2009 Than Ngo - 4.2.1-5 +- apply patch to fix issue in CSS style that causes konqueror shows a blank page + +* Thu Mar 05 2009 Rex Dieter - 4.2.1-4 +- move designer plugins to main/runtime (#487622) + +* Sun Mar 01 2009 Than Ngo - 4.2.1-2 +- respin + +* Fri Feb 27 2009 Than Ngo - 4.2.1-1 +- 4.2.1 + +* Thu Feb 26 2009 Than Ngo 4.2.0-17 +- fix build issue against gcc44 + +* Wed Feb 25 2009 Than Ngo - 4.2.0-16 +- fix files conflicts with 3.5.x + +* Tue Feb 24 2009 Kevin Kofler - 4.2.0-15 +- fix crash in ~KMainWindow triggered by sending messages in KNode (kde#182322) + +* Mon Feb 23 2009 Rex Dieter - 4.2.0-14 +- (Build)Req: soprano(-devel) >= 2.2 +- devel: drop Req: zlib-devel libutempter-devel + +* Wed Feb 18 2009 Kevin Kofler - 4.2.0-13 +- disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968) + +* Thu Feb 12 2009 Than Ngo - 4.2.0-11 +- make plasma work better with Qt 4.5 (when built against Qt 4.5) +- add gcc44-workaround + +* Fri Feb 06 2009 Than Ngo - 4.2.0-10 +- Fix duplicated applications in the K menu and in keditfiletype + +* Thu Feb 05 2009 Rex Dieter 4.2.0-9 +- ssl/proxy patch (kde#179934) + +* Sat Jan 31 2009 Rex Dieter 4.2.0-8 +- unowned dirs (#483315,#483318) + +* Fri Jan 30 2009 Rex Dieter 4.2.0-7 +- kded/kdirwatch patch (kde#182472) + +* Fri Jan 30 2009 Lukáš Tinkl 4.2.0-6 +- Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, + otherwise it can result in confusion and data loss (overwriting files with files + that don't exist). kdebug:118593 +- Fix "klauncher hangs when kdeinit4 dies" -- this happened because + klauncher was doing a blocking read forever. +- Repair klauncher support for unique-applications like konsole. + kdebug:162729, kdebug:75492 + +* Fri Jan 30 2009 Kevin Kofler - 4.2.0-5 +- reenable PolicyKit and NTFS workarounds + +* Mon Jan 26 2009 Rex Dieter - 4.2.0-4 +- revert Requires: qt4%%{_isa} + +* Mon Jan 26 2009 Rex Dieter - 4.2.0-3 +- respun tarball + +* Mon Jan 26 2009 Rex Dieter - 4.2.0-2 +- plasma-on-screensaver-security patch +- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0 +- Requires: strigi-libs >= 0.6.3 +- use %%{?_isa} to avoid potential multilib heartbreak + +* Thu Jan 22 2009 Than Ngo - 4.2.0-1 +- 4.2.0 + +* Fri Jan 16 2009 Than Ngo - 4.1.96-9 +- drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed + since new plasma allows to define default wallpaper, new kde-setting + is required +- backport fix from trunk to allow symlinks in wallpaper theme + +* Fri Jan 16 2009 Kevin Kofler - 4.1.96-8 +- rebuild for new OpenSSL + +* Mon Jan 12 2009 Rex Dieter - 4.1.96-7 +- Slight speedup to profile.d/kde.sh (#465370) +- (Build)Req: strigi(-devel) >= 0.6.3 + +* Mon Jan 12 2009 Than Ngo - 4.1.96-6 +- fix a crash (appearing in KSMServer) + +* Sat Jan 10 2009 Than Ngo - 4.1.96-5 +- kdeworkspace cmake files in correct place + +* Fri Jan 09 2009 Rex Dieter - 4.1.96-4 +- bump min deps (cmake, kde-filesystem, phonon) +- kde.(sh|csh): cleanup QT_PLUGIN_PATH handling (#477095) +- Requires: coreutils grep + +* Fri Jan 09 2009 Than Ngo - 4.1.96-3 +- BR soprano >= 2.1.64 + +* Thu Jan 08 2009 Than Ngo - 4.1.96-2 +- kdepim cmake files in correct place + +* Wed Jan 07 2009 Than Ngo - 4.1.96-1 +- 4.2rc1 + +* Fri Dec 19 2008 Kevin Kofler 4.1.85-6 +- add plasma-default-wallpaper libplasma patch from kdebase-workspace-4.1 + +* Tue Dec 16 2008 Rex Dieter 4.1.85-5 +- respun tarball, integrates kde-l10n-systemsettings patch + +* Tue Dec 16 2008 Than Ngo - 4.1.85-4 +- add missing ENTITY systemsettings in pt, that fixes kde-l10 + build breakage + +* Mon Dec 15 2008 Than Ngo - 4.1.85-3 +- add missing ENTITY systemsettings in ru/gl/es/pt, that fixes kde-l10 + build breakage +- rename suffix .xxcmake to avoid install .cmake + +* Sun Dec 14 2008 Kevin Kofler - 4.1.85-2 +- tweak parallel_devel patch to get a -L flag for the symlink directory + +* Thu Dec 11 2008 Than Ngo - 4.1.85-1 +- 4.2beta2 + +* Tue Dec 09 2008 Lorenzo Villani - 6:4.1.82-2 +- rebase parallel devel patch and kde149705 patch + +* Mon Dec 08 2008 Lorenzo Villani - 6:4.1.82-1 +- 4.1.82 + +* Tue Nov 25 2008 Kevin Kofler 4.1.80-5 +- remove workaround BR on phonon-backend-gstreamer, it's ineffective since + phonon now explicitly Requires: phonon-backend-xine and the dependency is no + longer circular anyway +- update parallel_devel patch +- fix minimum strigi version (only 0.5.9 needed) + +* Tue Nov 25 2008 Than Ngo 4.1.80-4 +- respin + +* Thu Nov 20 2008 Rex Dieter 4.1.80-3 +- -devel: Provides: plasma-devel + +* Thu Nov 20 2008 Than Ngo 4.1.80-2 +- merged + +* Thu Nov 20 2008 Lorenzo Villani - 6:4.1.80-1 +- 4.1.80 +- BR strigi 0.60 +- BR cmake 2.6 +- make install/fast +- rebase policykit patch +- rebase cmake patch +- rebase a couple of patches and drop _default_patch_fuzz 2 + +* Wed Nov 12 2008 Than Ngo 4.1.3-1 +- 4.1.3 + +* Fri Nov 07 2008 Rex Dieter 4.1.2-6 +- backport http_cache_cleaner fix (kdebug:172182) + +* Wed Oct 15 2008 Lukáš Tinkl 4.1.2-5 +- backport fix for faulty window resizing (kdebug:172042) + +* Mon Oct 13 2008 Than Ngo 4.1.2-4 +- backport patch to fix crash kded startup crash + +* Wed Oct 08 2008 Than Ngo 4.1.2-3 +- backport fix for google maps + +* Sun Sep 28 2008 Rex Dieter 4.1.2-2 +- make VERBOSE=1 +- respin against new(er) kde-filesystem + +* Thu Sep 25 2008 Rex Dieter 4.1.2-1 +- kde-4.1.2 + +* Fri Sep 19 2008 Kevin Kofler 4.1.1-12 +- make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789) + +* Thu Sep 18 2008 Than Ngo 4.1.1-11 +- apply upstream patch to fix the regression +- drop the kdelibs-4.1.1-bz#461725-regression.patch + +* Thu Sep 18 2008 Lukáš Tinkl 4.1.1-10 +- Fix file association bug, the global mimeapps.list file had priority + over the local one. +- khtml scroll crash fix (kdebug:170880) +- Don't eat text when the emoticons were not installed. This fixes + mail text not being displayed in KMail when kdebase-runtime wasn't + installed. + +* Wed Sep 17 2008 Than Ngo 4.1.1-9 +- #461725, revert the patch to fix the regression + +* Sat Sep 13 2008 Than Ngo 4.1.1-8 +- fix kdelibs-4.1.1-kdeui-widgets-fixes.patch + +* Sat Sep 13 2008 Than Ngo 4.1.1-7 +- remove redundant FEDORA, use CMAKE_BUILD_TYPE=release +- fix install problem with cmake > 2.5 + +* Mon Sep 08 2008 Lukáš Tinkl 4.1.1-6 +- fix crashes in plugin selector +- fix problems in various kdeui widgets + +* Wed Sep 03 2008 Lukáš Tinkl 4.1.1-5 +- fixed crash on setting cookies on empty domains (like the file + system), KDE bug #170147 +- fix URL navigator focus in file dialogs, KDE bug #169497, #170211 + +* Tue Sep 02 2008 Than Ngo 4.1.1-4 +- apply patch to fix regression in khtml + +* Mon Sep 01 2008 Than Ngo 4.1.1-3 +- respun + +* Fri Aug 29 2008 Kevin Kofler 4.1.1-2 +- fix #455130 (kinit crashing in kglobalconfig with no KComponentData) properly +- drop revert-kinit-regression hack (fixes ioslave translations) + +* Fri Aug 29 2008 Than Ngo 4.1.1-1 +- 4.1.1 + +* Fri Aug 29 2008 Kevin Kofler 4.1.0-9 +- -devel: +Requires: libutempter-devel (cmake wants to link it in) + +* Thu Aug 28 2008 Kevin Kofler 4.1.0-8 +- rewrite kstandarddirs patch to fix side effects (#459904 (KDEDIRS), #457633) + +* Mon Aug 25 2008 Than Ngo 4.1.0-7 +- konsole doesn't write to utmp + +* Sat Aug 23 2008 Kevin Kofler 4.1.0-6 +- don't hide KDE 3 KCMs in kde4-applications.menu, not needed with our + OnlyShowIn=KDE3 patch and breaks KDE 3 KCMs (kcmshell, apps) in KDE 4 sessions + +* Sun Aug 10 2008 Kevin Kofler 4.1.0-5 +- fix kcookiejar crash on invalid cookie file from KDE 3 (patch by David Faure) + +* Fri Aug 01 2008 Rex Dieter 4.1.0-4 +- -devel: Requires: phonon-devel >= 4.2 (helps multilib upgrades) +- konq processes never terminate (kde#167826, rh#457526) + +* Wed Jul 30 2008 Rex Dieter 4.1.0-3 +- (Build)Requires: soprano(-devel) >= 2.1 (#456827) + +* Thu Jul 24 2008 Kevin Kofler 4.1.0-2 +- move Sonnet documentation back to the main package +- fix #341751 (Sonnet documentation multilib conflict) properly + +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + +* Sun Jul 20 2008 Kevin Kofler 4.0.99-3 +- fix kstandarddirs patch to always append the installed location last, even if + it is already present earlier in the search path (#456004) + +* Sat Jul 19 2008 Rex Dieter 4.0.99-2 +- use better fedora-buildtype patch from F-9 branch + +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + +* Mon Jul 14 2008 Rex Dieter 4.0.98-4 +- respun tarball + +* Sat Jul 12 2008 Kevin Kofler - 4.0.98-2 +- revert a kinit patch causing an assertion failure in KComponentData (#455130) + +* Thu Jul 10 2008 Rex Dieter 4.0.98-1 +- 4.0.98 +- omit proxy patch (fixed upstream) + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Fri Jun 27 2008 Kevin Kofler - 4.0.83-3 +- fix kstandarddirs patch so /usr/libexec/kde4 is found (#453063) + +* Wed Jun 25 2008 Rex Dieter 4.0.83-2 +- -common: move %{_kde4_docdir}/HTML/en/sonnet/ here (#341751) + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Fri Jun 13 2008 Than Ngo 4.0.82-1 +- 4.0.82 + +* Fri May 30 2008 Than Ngo 4.0.80-2 +- fix #447965, order issue in kde path, thanks to Kevin +- backport patch to check html style version + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 + +* Sat May 24 2008 Rex Dieter - 4.0.72-8 +- revert previous, don't include kde3-compat symlink (here, anyway) + +* Fri May 23 2008 Rex Dieter - 4.0.72-7 +- -common: provide %%_datadir/apps/kdeui for kde3 apps (#447965) + +* Thu May 22 2008 Rex Dieter - 4.0.72-6 +- kstandarddirs hack to search /etc/kde + +* Thu May 22 2008 Kevin Kofler - 4.0.72-5 +- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831) + +* Thu May 15 2008 Kevin Kofler - 4.0.72-4 +- fix proxy support (#443931, kde#155707) +- move %%{_kde4_appsdir}/ksgmltools2/ from -devel to the main package (#446435) + +* Tue May 13 2008 Kevin Kofler - 4.0.72-3 +- drop no longer needed ALSA default device Phonon hack + +* Sun May 4 2008 Kevin Kofler - 4.0.72-2 +- BR new minimum versions of qt4-devel and soprano-devel + +* Fri May 2 2008 Kevin Kofler - 4.0.72-1 +- update to 4.0.72 (4.1 alpha 1) +- parallel_devel patch ported by Lorenzo Villani +- update file list (Lorenzo Villani) +- drop upstreamed khtml-security, kconfig_sync_crash and klauncher-crash patches +- update xdg-menu (Administration menu) patch + +* Tue Apr 22 2008 Lukáš Tinkl - 4.0.3-7 +- fix buffer overflow in KHTML's image loader (KDE advisory 20080426-1, + #443766: CVE-2008-1670) + +* Fri Apr 04 2008 Than Ngo - 4.0.3-6 +- apply upstream patch to fix klauncher crash +- fix kconfig_sync_crash patch + +* Fri Apr 4 2008 Rex Dieter 4.0.3-5 +- kconfig_sync_crash patch + +* Thu Apr 3 2008 Lukáš Tinkl 4.0.3-4 +- rebuild for the new %%{_kde4_buildtype} + +* Mon Mar 31 2008 Kevin Kofler 4.0.3-3 +- patch and update file list for _kde4_libexecdir + +* Mon Mar 31 2008 Kevin Kofler 4.0.3-2 +- add Fedora build type (uses -DNDEBUG) + +* Fri Mar 28 2008 Than Ngo 4.0.3-1 +- 4.0.3 +- -apidocs: drop Requires: %%name + +* Fri Mar 28 2008 Than Ngo - 4.0.2-13 +- add Administration menu, bz#439378 + +* Thu Mar 27 2008 Than Ngo 4.0.2-12 +- bz#428212, adapted Kevin Kofler's workaround for Policykit + +* Thu Mar 20 2008 Rex Dieter 4.0.2-11 +- apidocs subpackage should be noarch (#436579) + +* Mon Mar 10 2008 Kevin Kofler 4.0.2-10 +- work around #436725: BR: libtool-ltdl so graphviz gets a valid libltdl + +* Mon Mar 10 2008 Kevin Kofler 4.0.2-9 +- fix kdeglobals not being found in profile (e.g. kde-settings) directory + +* Fri Mar 07 2008 Rex Dieter 4.0.2-8 +- touchup KDE_DISTRIBUTION_TEXT +- add Fedora/V-R to KHTML UA string (thanks caillon) + +* Thu Mar 06 2008 Kevin Kofler 4.0.2-7 +- exclude apidocs from the main package + +* Thu Mar 06 2008 Than Ngo 4.0.2-6 +- apply upstream patch to fix issue in KPropertiesDialog + +* Thu Mar 06 2008 Kevin Kofler 4.0.2-5 +- also install Doxyfile.global in -common to build kdepimlibs-apidocs against + +* Wed Mar 05 2008 Kevin Kofler 4.0.2-4 +- install all .css files in kdelibs-common to build kdepimlibs-apidocs against +- install doxygen.sh as kde4-doxygen.sh in -devel +- build apidocs and put them into an -apidocs subpackage (can be turned off) +- BR doxygen, graphviz and qt4-doc when building apidocs + +* Fri Feb 29 2008 Than Ngo 4.0.2-3 +- rebuilt + +* Fri Feb 29 2008 Kevin Kofler 4.0.2-2 +- drop obsolete kde#149703 patch (fixed upstream by code rewrite) +- drop backports from 4.0.2: objectembed-handling, autostart, kde#771201-khtml + +* Thu Feb 28 2008 Than Ngo 4.0.2-1 +- 4.0.2 + +* Wed Feb 27 2008 Lukáš Tinkl - 4.0.1-8 +- add Fedora branding to the package (#434815) + +* Mon Feb 25 2008 Rex Dieter 4.0.1-7 +- -devel: own %%_kde4_libdir/kde4/plugins (thanks wolfy!) + +* Tue Feb 19 2008 Kevin Kofler 4.0.1-6 +- fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin + +* Mon Feb 18 2008 Rex Dieter 4.0.1-5 +- -devel: include %%_kde4_appsdir/cmake here (#341751) + +* Wed Feb 06 2008 Than Ngo 4.0.1-4 +- upstream patch to make sure that static widget is always at position 0,0 + +* Fri Feb 01 2008 Than Ngo 4.0.1-3 +- upstream patch to fix a regression in handling +- autostart upstream patch + +* Fri Feb 01 2008 Than Ngo 4.0.1-2 +- autostart from XDG_CONFIG_DIRS + +* Wed Jan 30 2008 Rex Dieter 4.0.1-1 +- 4.0.1 + +* Wed Jan 30 2008 Rex Dieter 4.0.0-4 +- omit openssl patch (f9+ #429846) +- respin (qt4) + +* Wed Jan 23 2008 Rex Dieter 4.0.0-3 +- openssl patch + +* Sat Jan 19 2008 Kevin Kofler 4.0.0-2 +- patch K3Spell for hunspell support on F9+ (FeatureDictionary, kde#154561) + +* Mon Jan 07 2008 Than Ngo 4.0.0-1 +- 4.0.0