From 98c3f05e07b419212d0f6ba49da7ff81fd62aa58 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 2 Jan 2020 18:08:49 +0000
Subject: user/[KDE System]: Bump to 19.12.0

---
 user/dolphin/APKBUILD         | 13 ++++-------
 user/dolphin/baloo.patch      | 53 -------------------------------------------
 user/dolphin/frameworks.patch | 11 ---------
 3 files changed, 4 insertions(+), 73 deletions(-)
 delete mode 100644 user/dolphin/baloo.patch
 delete mode 100644 user/dolphin/frameworks.patch

(limited to 'user/dolphin')

diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD
index 732b54a1f..dc2a3c5e2 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.08.2
+pkgver=19.12.0
 pkgrel=0
 pkgdesc="Lightweight desktop file manager"
 url="https://www.kde.org/applications/system/dolphin/"
@@ -16,10 +16,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev kinit-dev
 	baloo-dev kfilemetadata-dev kdelibs4support-dev kactivities-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
-	"
+source="https://download.kde.org/stable/release-service/$pkgver/src/dolphin-$pkgver.tar.xz"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
@@ -32,7 +29,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -44,6 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="97ba07fc6e5f7295297149b8377620c0fb9dedec33833671f29e39f8cb4fb78051bd21d7d63b1dfc48126b03195b3eecc831c3882346a86fbb6ff1122996cbbc  dolphin-19.08.2.tar.xz
-9c61e0fd899d172f1a5e67f9621099c69ce673a1c66cc948dcf3bd74278c8fc206a029d33c56934fb7b42a91191c1259d966d4b39e4208226e9830c9f27ec411  baloo.patch
-08801b4ae25e1f64eeb2b574bc09eed526f0fa570a6c12982db55aa5aa26498191c1a15c73bdb37664204cadd84abe80c9168f298558861010183af9e6c30368  frameworks.patch"
+sha512sums="e9f47d8ed9e5b3def97182d9d1600730aa41e69d32aaf49b705fe2542eeda93ec719624e735e5f7d36a1dbf64c58e2a7f177e3ac4daf303ad5a2ba519d03923e  dolphin-19.12.0.tar.xz"
diff --git a/user/dolphin/baloo.patch b/user/dolphin/baloo.patch
deleted file mode 100644
index 48efb30ed..000000000
--- a/user/dolphin/baloo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index af57972c0..000000000
--- a/user/dolphin/frameworks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dolphin-19.04.0/CMakeLists.txt.old	2019-04-12 00:02:11.000000000 +0000
-+++ dolphin-19.04.0/CMakeLists.txt	2019-04-18 20:17:53.396872289 +0000
-@@ -8,7 +8,7 @@
- project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
- 
- set(QT_MIN_VERSION "5.8.0")
--set(KF5_MIN_VERSION "5.57.0")
-+set(KF5_MIN_VERSION "5.54.0")
- 
- # ECM setup
- find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
-- 
cgit v1.2.3-70-g09d2