user/[KDE Applications]: Bump to 19.08.0

3 files changed, 66 insertions, 7 deletions

diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD
index d481d9196..dc0df497e 100644
--- a/user/baloo-widgets/APKBUILD
+++ b/user/baloo-widgets/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=baloo-widgets
-pkgver=19.04.3
+pkgver=19.08.0
 pkgrel=0
 pkgdesc="Widgets that utilise the Baloo desktop indexing engine"
 url="https://www.KDE.org/"
@@ -15,10 +15,10 @@ makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev
 subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.kde.org/stable/applications/$pkgver/src/baloo-widgets-$pkgver.tar.xz
 	frameworks.patch
+	revert.patch
 	"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -34,14 +34,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="46fffc6722928752c70723d586ad1c8071767a9562f042c1f8b8c9d1faa7962fc659a6c6d5129c20f9c3c86a962ce643f34832d03e01dceb2c2fb9a624b2dbf3  baloo-widgets-19.04.3.tar.xz
-b8de7699919edb1ecc64aa733b8a937fc0c1b06e3e03fc5f2ea1d78ca190a0bdbf4b6011c57de464ad657103981aa337f3a04953da3a02b6c161f47eda5d7372  frameworks.patch"
+sha512sums="16fc7e652a939bc758fee34bc1778dd77ced17708c61b4c247907a0a3372d7df8fee60f6e93df828d46f62972325210edf0c8c3eaf8143fa874f344fe0820c2d  baloo-widgets-19.08.0.tar.xz
+4a89ef01e6b8cbea694745e99b53c9d85a0d4da05e33dd77603312df36e6ee058a9d551e99de831a7e3099699b376cf2caccffd3339a21acc6a8b8170aaaeb05  frameworks.patch
+291f7f99ad6b9d98dafe5e35c9e18ef46d45d5e3b5a5e9aaefa96983519db7306c73815e1ef80b51f69f56802b6fac39532718eb2867a3faee7f1bdfa2c7f64f  revert.patch"
diff --git a/user/baloo-widgets/frameworks.patch b/user/baloo-widgets/frameworks.patch
index 002445bde..f0f993bb5 100644
--- a/user/baloo-widgets/frameworks.patch
+++ b/user/baloo-widgets/frameworks.patch
@@ -4,8 +4,31 @@
  project(baloo-widgets VERSION ${KDE_APPLICATIONS_VERSION})
  
  set(QT_MIN_VERSION "5.8.0")
--set(KF5_MIN_VERSION "5.56.0")
+-set(KF5_MIN_VERSION "5.58.0")
 +set(KF5_MIN_VERSION "5.54.0")
  
  find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH})
+--- baloo-widgets-19.08.0/CMakeLists.txt.old	2019-08-15 12:25:44.456788542 +0000
++++ baloo-widgets-19.08.0/CMakeLists.txt	2019-08-15 15:26:31.843791794 +0000
+@@ -28,8 +28,6 @@
+ include(ECMAddTests)
+ include(CMakePackageConfigHelpers)
+ 
+-add_definitions(-DQT_NO_FOREACH)
+-
+ ecm_setup_version(PROJECT
+                   VARIABLE_PREFIX BALOO_WIDGETS
+                   SOVERSION 5
+--- baloo-widgets-19.08.0/autotests/filemetadatadatedisplaytest.cpp.old	2019-08-09 00:09:30.000000000 +0000
++++ baloo-widgets-19.08.0/autotests/filemetadatadatedisplaytest.cpp	2019-08-15 15:37:50.301115034 +0000
+@@ -53,7 +53,8 @@
+ #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+     struct stat fileStat;
+     struct utimbuf newTimes;
+-    const QByteArray file = QFile::encodeName(filePath);
++    const QByteArray q_file = QFile::encodeName(filePath);
++    const char *file = q_file.constData();
+     stat(file, &fileStat);
+ 
+     newTimes.actime = fileStat.st_atime;
diff --git a/user/baloo-widgets/revert.patch b/user/baloo-widgets/revert.patch
new file mode 100644
index 000000000..cc54adf6f
--- /dev/null
+++ b/user/baloo-widgets/revert.patch
@@ -0,0 +1,37 @@
+--- baloo-widgets-19.08.0/src/filemetadatautil.cpp.old	2019-08-09 00:09:30.000000000 +0000
++++ baloo-widgets-19.08.0/src/filemetadatautil.cpp	2019-08-15 15:31:58.938750148 +0000
+@@ -58,30 +58,10 @@
+ QVariantMap toNamedVariantMap(const KFileMetaData::PropertyMap& propMap)
+ {
+     QVariantMap map;
+-    if (propMap.isEmpty()) {
+-        return map;
+-    }
+-
+-    using entry = std::pair<const KFileMetaData::Property::Property&, const QVariant&>;
+-
+-    auto begin = propMap.constKeyValueBegin();
+-
+-    while (begin != propMap.constKeyValueEnd()) {
+-        auto key = (*begin).first;
+-        KFileMetaData::PropertyInfo property(key);
+-        auto rangeEnd = std::find_if(begin, propMap.constKeyValueEnd(),
+-            [key](const entry& e) { return e.first != key; });
+-
+-        auto distance = std::distance(begin, rangeEnd);
+-        if (distance > 1) {
+-            QVariantList list;
+-            list.reserve(static_cast<int>(distance));
+-            std::for_each(begin, rangeEnd, [&list](const entry& s) { list.append(s.second); });
+-            map.insert(property.name(), list);
+-        } else {
+-            map.insert(property.name(), (*begin).second);
+-        }
+-        begin = rangeEnd;
++    KFileMetaData::PropertyMap::const_iterator it = propMap.constBegin();
++    for (; it != propMap.constEnd(); it++) {
++        KFileMetaData::PropertyInfo pi(it.key());
++        map.insertMulti(pi.name(), it.value());
+     }
+ 
+     return map;