user/[KDE Applications]: Bump to 19.08.0

3 files changed, 60 insertions, 8 deletions

diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD
index c6d728eb4..5b4d650b1 100644
--- a/user/dolphin/APKBUILD
+++ b/user/dolphin/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=dolphin
-pkgver=19.04.3
+pkgver=19.08.0
 pkgrel=0
 pkgdesc="Lightweight desktop file manager"
 url="https://www.kde.org/applications/system/dolphin/"
@@ -14,14 +14,14 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev kinit-dev
 	kbookmarks-dev kconfig-dev kio-dev kparts-dev solid-dev kiconthemes-dev
 	kcompletion-dev ktextwidgets-dev knotifications-dev kcrash-dev
 	baloo-dev kfilemetadata-dev kdelibs4support-dev kactivities-dev
-	baloo-widgets-dev"
+	baloo-widgets-dev ruby-test-unit"
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://download.kde.org/stable/applications/$pkgver/src/dolphin-$pkgver.tar.xz
+	baloo.patch
 	frameworks.patch
 	"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -37,14 +37,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b0838f2ec1e1a22912a1178a262d7cc680dba5f11828bb0dac6bf59bf4c1a2affab912994d4f43adfe299bacd337848d11333996cfdfa54940f8604667e97e3a  dolphin-19.04.3.tar.xz
-4ec4b440f5ed52439152fb6132448e674f8e357413ef1eae339cfefb602a82909bceba85f5f517b51a985e3101d6be42b25bee6a4dd338a190d995deef57c708  frameworks.patch"
+sha512sums="39afe693238b375f81a270d8b28a58c543aaab2a11e59d1c29f0daacbdaf1c43c271aae14104ba574349db2de690cef577d2143487248c86607ec247bc653824  dolphin-19.08.0.tar.xz
+9c61e0fd899d172f1a5e67f9621099c69ce673a1c66cc948dcf3bd74278c8fc206a029d33c56934fb7b42a91191c1259d966d4b39e4208226e9830c9f27ec411  baloo.patch
+08801b4ae25e1f64eeb2b574bc09eed526f0fa570a6c12982db55aa5aa26498191c1a15c73bdb37664204cadd84abe80c9168f298558861010183af9e6c30368  frameworks.patch"
diff --git a/user/dolphin/baloo.patch b/user/dolphin/baloo.patch
new file mode 100644
index 000000000..48efb30ed
--- /dev/null
+++ b/user/dolphin/baloo.patch
@@ -0,0 +1,53 @@
+Subject: Revert "handle maps with multiple or single entries from Baloo"
+
+This reverts commit 36b61838a27df32824c58f383453bb94b730b52c.
+
+diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
+index 469f079..f367154 100644
+--- a/src/kitemviews/private/kbaloorolesprovider.cpp
++++ b/src/kitemviews/private/kbaloorolesprovider.cpp
+@@ -56,34 +56,18 @@ QHash<QByteArray, QVariant> KBalooRolesProvider::roleValues(const Baloo::File& f
+ {
+     QHash<QByteArray, QVariant> values;
+ 
++    QMapIterator<KFileMetaData::Property::Property, QVariant> it(file.properties());
++    while (it.hasNext()) {
++        it.next();
+-    using entry = std::pair<const KFileMetaData::Property::Property&, const QVariant&>;
+-
+-    const auto& propMap = file.properties();
+-    auto rangeBegin = propMap.constKeyValueBegin();
+-
+-    while (rangeBegin != propMap.constKeyValueEnd()) {
+-        auto key = (*rangeBegin).first;
+-        const KFileMetaData::PropertyInfo propertyInfo(key);
+-        const QByteArray role = roleForProperty(propertyInfo.name());
+-
+-        auto rangeEnd = std::find_if(rangeBegin, propMap.constKeyValueEnd(),
+-            [key](const entry& e) { return e.first != key; });
+ 
++        const KFileMetaData::PropertyInfo pi(it.key());
++        const QString property = pi.name();
++        const QByteArray role = roleForProperty(property);
+         if (role.isEmpty() || !roles.contains(role)) {
+-            rangeBegin = rangeEnd;
+             continue;
+         }
+ 
++        values.insert(role, pi.formatAsDisplayString(it.value()));
+-        auto distance = std::distance(rangeBegin, rangeEnd);
+-        if (distance > 1) {
+-            QVariantList list;
+-            list.reserve(static_cast<int>(distance));
+-            std::for_each(rangeBegin, rangeEnd, [&list](const entry& s) { list.append(s.second); });
+-            values.insert(role, propertyInfo.formatAsDisplayString(list));
+-        } else {
+-            values.insert(role, propertyInfo.formatAsDisplayString((*rangeBegin).second));
+-        }
+-        rangeBegin = rangeEnd;
+     }
+ 
+     KFileMetaData::UserMetaData md(file.path());
+-- 
+cgit v1.1
+
diff --git a/user/dolphin/frameworks.patch b/user/dolphin/frameworks.patch
index 3fc7130bb..af57972c0 100644
--- a/user/dolphin/frameworks.patch
+++ b/user/dolphin/frameworks.patch
@@ -4,7 +4,7 @@
  project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
  
  set(QT_MIN_VERSION "5.8.0")
--set(KF5_MIN_VERSION "5.56.0")
+-set(KF5_MIN_VERSION "5.57.0")
 +set(KF5_MIN_VERSION "5.54.0")
  
  # ECM setup