kde5.frameworks: 5.29 -> 5.30

NixOS · Jan 15, 2017 · b0faf21 · b0faf21
1 parent eedd562
commit b0faf21
Show file tree

Hide file tree

Showing 5 changed files with 316 additions and 314 deletions.
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/frameworks/5.29/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.30/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -1,6 +1,8 @@
-{ kdeFramework, lib, ecm, kbookmarks, kcompletion
-, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications, kpackage
-, kwidgetsaddons, libXcursor, qtx11extras
+{
+  kdeFramework, lib,
+  ecm,
+  kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio,
+  knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras
 }:
 
 kdeFramework {
@@ -9,6 +11,6 @@ kdeFramework {
   nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes
-    knotifications kpackage kwidgetsaddons libXcursor qtx11extras
+    knewstuff knotifications kpackage kwidgetsaddons libXcursor qtx11extras
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
@@ -1,8 +1,8 @@
-Index: kpackage-5.18.0/src/kpackage/package.cpp
+Index: kpackage-5.30.0/src/kpackage/package.cpp
 ===================================================================
---- kpackage-5.18.0.orig/src/kpackage/package.cpp
-+++ kpackage-5.18.0/src/kpackage/package.cpp
-@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate()
+--- kpackage-5.30.0.orig/src/kpackage/package.cpp
++++ kpackage-5.30.0/src/kpackage/package.cpp
+@@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate()
      : QSharedData(),
        fallbackPackage(0),
        metadata(0),

diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
@@ -1,21 +1,21 @@
-Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
+Index: kpackage-5.30.0/src/kpackage/packageloader.cpp
 ===================================================================
---- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp
-+++ kpackage-5.18.0/src/kpackage/packageloader.cpp
-@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li
+--- kpackage-5.30.0.orig/src/kpackage/packageloader.cpp
++++ kpackage-5.30.0/src/kpackage/packageloader.cpp
+@@ -238,7 +238,7 @@ QList<KPluginMetaData> PackageLoader::li
          } else {
              //qDebug() << "Not cached";
              // If there's no cache file, fall back to listing the directory
 -            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
 +            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
-             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json");
+             const QStringList nameFilters = { QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop") };
 
              QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
-Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
+Index: kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp
 ===================================================================
---- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp
-+++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
-@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir,
+--- kpackage-5.30.0.orig/src/kpackage/private/packagejobthread.cpp
++++ kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp
+@@ -121,7 +121,7 @@ bool indexDirectory(const QString& dir,
 
      QJsonArray plugins;