diff options
Diffstat (limited to 'user/baloo-widgets')
| -rw-r--r-- | user/baloo-widgets/APKBUILD | 13 | ||||
| -rw-r--r-- | user/baloo-widgets/frameworks.patch | 34 | ||||
| -rw-r--r-- | user/baloo-widgets/revert.patch | 37 |
3 files changed, 4 insertions, 80 deletions
diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD index e3004a553..a3965bb28 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.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Widgets that utilise the Baloo desktop indexing engine" url="https://www.KDE.org/" @@ -13,10 +13,7 @@ depends_dev="qt5-qtbase-dev baloo-dev kio-dev" makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kfilemetadata-dev ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/baloo-widgets-$pkgver.tar.xz - frameworks.patch - revert.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/baloo-widgets-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -29,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -41,6 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="08cd7e6ed8655fed179d6ff0f7b9981c386baa914e9b5d0f48ced74eee95fd41cc7b339e831310eba0bb563bed636b0869f4f121a5f413f1d525f2f05aa8f513 baloo-widgets-19.08.2.tar.xz -4a89ef01e6b8cbea694745e99b53c9d85a0d4da05e33dd77603312df36e6ee058a9d551e99de831a7e3099699b376cf2caccffd3339a21acc6a8b8170aaaeb05 frameworks.patch -291f7f99ad6b9d98dafe5e35c9e18ef46d45d5e3b5a5e9aaefa96983519db7306c73815e1ef80b51f69f56802b6fac39532718eb2867a3faee7f1bdfa2c7f64f revert.patch" +sha512sums="25c3cbf25b32f61a9b27f63d8a6ae83c43980778da626232697ec043d01e2c755119ccf51395e8e429c1040e9a0932aa816441052505be7b6cc58444c3fb53f2 baloo-widgets-19.12.0.tar.xz" diff --git a/user/baloo-widgets/frameworks.patch b/user/baloo-widgets/frameworks.patch deleted file mode 100644 index f0f993bb5..000000000 --- a/user/baloo-widgets/frameworks.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- baloo-widgets-19.04.0/CMakeLists.txt.old 2019-04-12 00:13:39.000000000 +0000 -+++ baloo-widgets-19.04.0/CMakeLists.txt 2019-04-19 07:30:31.523838076 +0000 -@@ -8,7 +8,7 @@ - project(baloo-widgets VERSION ${KDE_APPLICATIONS_VERSION}) - - set(QT_MIN_VERSION "5.8.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 deleted file mode 100644 index cc54adf6f..000000000 --- a/user/baloo-widgets/revert.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- 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; |