From 2ceb6f3abca081464614cf99a42ae76c396c8f26 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Thu, 15 Aug 2019 16:05:09 +0000 Subject: user/[KDE Applications]: Bump to 19.08.0 --- user/analitza/APKBUILD | 4 +- user/ark/APKBUILD | 4 +- user/artikulate/APKBUILD | 17 +-- user/artikulate/inappropriate-qt.patch | 22 ++++ user/baloo-widgets/APKBUILD | 11 +- user/baloo-widgets/frameworks.patch | 25 ++++- user/baloo-widgets/revert.patch | 37 +++++++ user/blinken/APKBUILD | 4 +- user/bomber/APKBUILD | 12 +-- user/bomber/ridiculous-qt.patch | 11 ++ user/bovo/APKBUILD | 4 +- user/cantor/APKBUILD | 4 +- user/dolphin/APKBUILD | 13 ++- user/dolphin/baloo.patch | 53 ++++++++++ user/dolphin/frameworks.patch | 2 +- user/dragonplayer/APKBUILD | 4 +- user/ffmpegthumbs/APKBUILD | 4 +- user/granatier/APKBUILD | 4 +- user/gwenview/APKBUILD | 4 +- user/juk/APKBUILD | 4 +- user/kalgebra/APKBUILD | 4 +- user/kalzium/APKBUILD | 4 +- user/kanagram/APKBUILD | 4 +- user/kapman/APKBUILD | 4 +- user/kate/APKBUILD | 4 +- user/katomic/APKBUILD | 4 +- user/kblackbox/APKBUILD | 4 +- user/kblocks/APKBUILD | 4 +- user/kbounce/APKBUILD | 4 +- user/kbreakout/APKBUILD | 4 +- user/kbruch/APKBUILD | 4 +- user/kcachegrind/APKBUILD | 4 +- user/kcalc/APKBUILD | 6 +- user/kcharselect/APKBUILD | 4 +- user/kcolorchooser/APKBUILD | 4 +- user/kde-education/APKBUILD | 2 +- user/kde-games/APKBUILD | 2 +- user/kde-graphics/APKBUILD | 2 +- user/kde-multimedia/APKBUILD | 2 +- user/kde-system/APKBUILD | 2 +- user/kde-utilities/APKBUILD | 2 +- user/kdegraphics-thumbnailers/APKBUILD | 4 +- user/kdenlive/APKBUILD | 4 +- user/kdf/APKBUILD | 4 +- user/kdiamond/APKBUILD | 12 +-- user/kdiamond/ridiculous-qt.patch | 11 ++ user/kfilemetadata/APKBUILD | 9 +- user/kfilemetadata/add-mimeutils.patch | 186 +++++++++++++++++++++++++++++++++ user/kfind/APKBUILD | 4 +- user/kfloppy/APKBUILD | 4 +- user/kfourinline/APKBUILD | 4 +- user/kgeography/APKBUILD | 4 +- user/kget/APKBUILD | 12 +-- user/kget/kf5.patch | 11 ++ user/kgoldrunner/APKBUILD | 4 +- user/kgpg/APKBUILD | 4 +- user/khangman/APKBUILD | 4 +- user/khelpcenter/APKBUILD | 12 +-- user/kig/APKBUILD | 4 +- user/kigo/APKBUILD | 4 +- user/killbots/APKBUILD | 4 +- user/kio-extras/APKBUILD | 4 +- user/kiriki/APKBUILD | 4 +- user/kiten/APKBUILD | 4 +- user/kjumpingcube/APKBUILD | 4 +- user/kleopatra/APKBUILD | 6 +- user/kleopatra/qt5.9.patch | 19 +++- user/klettres/APKBUILD | 4 +- user/klickety/APKBUILD | 4 +- user/klines/APKBUILD | 4 +- user/kmag/APKBUILD | 4 +- user/kmahjongg/APKBUILD | 4 +- user/kmime/APKBUILD | 6 +- user/kmime/egregious-versions.patch | 4 +- user/kmines/APKBUILD | 4 +- user/kmix/APKBUILD | 4 +- user/kmousetool/APKBUILD | 4 +- user/kmplot/APKBUILD | 4 +- user/knavalbattle/APKBUILD | 4 +- user/knetwalk/APKBUILD | 4 +- user/kolf/APKBUILD | 4 +- user/kollision/APKBUILD | 4 +- user/kolourpaint/APKBUILD | 4 +- user/konquest/APKBUILD | 4 +- user/konsole/APKBUILD | 4 +- user/kpat/APKBUILD | 4 +- user/kpimtextedit/APKBUILD | 6 +- user/kpimtextedit/qt5.9.patch | 25 ++++- user/krdc/APKBUILD | 4 +- user/kreversi/APKBUILD | 4 +- user/krfb/APKBUILD | 4 +- user/kruler/APKBUILD | 4 +- user/kshisen/APKBUILD | 4 +- user/ksirk/APKBUILD | 4 +- user/ksnakeduel/APKBUILD | 12 +-- user/ksnakeduel/ridiculous-qt.patch | 11 ++ user/kspaceduel/APKBUILD | 4 +- user/ksquares/APKBUILD | 4 +- user/ksudoku/APKBUILD | 4 +- user/ksystemlog/APKBUILD | 4 +- user/kteatime/APKBUILD | 4 +- user/ktimer/APKBUILD | 4 +- user/ktouch/APKBUILD | 9 +- user/ktuberling/APKBUILD | 4 +- user/kturtle/APKBUILD | 4 +- user/kubrick/APKBUILD | 4 +- user/kwalletmanager/APKBUILD | 4 +- user/kwave/APKBUILD | 4 +- user/kwordquiz/APKBUILD | 4 +- user/libkdcraw/APKBUILD | 4 +- user/libkdegames/APKBUILD | 4 +- user/libkeduvocdocument/APKBUILD | 4 +- user/libkexiv2/APKBUILD | 9 +- user/libkipi/APKBUILD | 4 +- user/libkleo/APKBUILD | 6 +- user/libkleo/egregious-versions.patch | 16 ++- user/libkmahjongg/APKBUILD | 4 +- user/libksane/APKBUILD | 4 +- user/lskat/APKBUILD | 4 +- user/marble/APKBUILD | 4 +- user/minuet/APKBUILD | 4 +- user/okular/APKBUILD | 13 ++- user/okular/pt-doc-fix.patch | 11 ++ user/palapeli/APKBUILD | 4 +- user/rocs/APKBUILD | 4 +- user/spectacle/APKBUILD | 12 +-- user/spectacle/kconfig.patch | 40 +++++++ user/step/APKBUILD | 4 +- user/umbrello/APKBUILD | 4 +- 129 files changed, 739 insertions(+), 296 deletions(-) create mode 100644 user/artikulate/inappropriate-qt.patch create mode 100644 user/baloo-widgets/revert.patch create mode 100644 user/bomber/ridiculous-qt.patch create mode 100644 user/dolphin/baloo.patch create mode 100644 user/kdiamond/ridiculous-qt.patch create mode 100644 user/kfilemetadata/add-mimeutils.patch create mode 100644 user/kget/kf5.patch create mode 100644 user/ksnakeduel/ridiculous-qt.patch create mode 100644 user/okular/pt-doc-fix.patch create mode 100644 user/spectacle/kconfig.patch diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index 4fb7b3e08..60f7905ef 100644 --- a/user/analitza/APKBUILD +++ b/user/analitza/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=analitza -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="28518afdc0050494247c874c401160dc6e1246c7bab4cf3f36e4db5d1759292721db0dd0d5dca7a949d27d34f61aeefecca63c1fae195aa3ff6b9f3cfbaf1c5a analitza-19.04.3.tar.xz" +sha512sums="cef8eef841feb1223e2bfbc4168efe3f6a7cf7d28936ff601047255cfe30df4385250a13b1ba78bb90a8e9677ea8e77a31a3c3025006bbdc17eb6e86d81dc1be analitza-19.08.0.tar.xz" diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index 968650a22..8bc274cd5 100644 --- a/user/ark/APKBUILD +++ b/user/ark/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=ark -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dc41f8daea7c63f93725cd1dada978fde68c7e7c659840014fe3ccc32a8e9e7013f495590cd5344d68001cbba81f527ec368829b4ff1577f71d5de268cd0b459 ark-19.04.3.tar.xz" +sha512sums="3a594d951e9f8c128e67fa6caa508f67b5831cc553b683acab9ec60254318f4ac2fc30e70a27d93d98f7eddc217fc377dcef7d9f5780728a0ab15843b0400e2e ark-19.08.0.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index be64c9b58..9e99cafe4 100644 --- a/user/artikulate/APKBUILD +++ b/user/artikulate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=artikulate -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -9,13 +9,14 @@ arch="all" license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev - kdoctools-dev ki18n-dev kconfig-dev kcrash-dev knewstuff-dev - kxmlgui-dev karchive-dev qt5-qtmultimedia-dev" + karchive-dev kconfig-dev kcrash-dev kdoctools-dev ki18n-dev + kirigami2-dev knewstuff-dev kxmlgui-dev qt5-qtmultimedia-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/artikulate-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/artikulate-$pkgver.tar.xz + inappropriate-qt.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,19 +27,19 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_TESTING=OFF \ ${CMAKE_CROSSOPTS} make } check() { - cd "$builddir" # TestCourseFiles needs X11 CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E TestCourseFiles } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b61cb3514839c9d6af09f8be950528ff08cab827c27e338cf92972aee7f8811032113f0fc8fe1b5cabe11b4ba689c7d10870a90fdb830c32fc565c879adfc939 artikulate-19.04.3.tar.xz" +sha512sums="dbd4cd9069c81e51053b6b90b6fbd089ee9594d5d9ba1ff4c87aee5f0f1f4931847438b7546eea54293fce1746d6c1bf69080c8519a76b83ce3c7149c5c79393 artikulate-19.08.0.tar.xz +dd9a912f7499fee5a7d737f987ba97856e373d48d944d45fb2cfaf192bc5c79f05dc530f0ca62d5982ef86dcf1479211186657ecef0450c07a43527bd66eb7c8 inappropriate-qt.patch" diff --git a/user/artikulate/inappropriate-qt.patch b/user/artikulate/inappropriate-qt.patch new file mode 100644 index 000000000..fe88499bd --- /dev/null +++ b/user/artikulate/inappropriate-qt.patch @@ -0,0 +1,22 @@ +--- artikulate-19.08.0/CMakeLists.txt.old 2019-08-09 00:13:40.000000000 +0000 ++++ artikulate-19.08.0/CMakeLists.txt 2019-08-15 12:16:43.965261084 +0000 +@@ -42,7 +42,7 @@ + include(FeatureSummary) + include(GenerateExportHeader) + +-find_package(Qt5 5.10 REQUIRED COMPONENTS ++find_package(Qt5 5.9.7 REQUIRED COMPONENTS + Widgets + Sql + XmlPatterns +--- artikulate-19.08.0/CMakeLists.txt.old 2019-08-15 12:17:13.502105634 +0000 ++++ artikulate-19.08.0/CMakeLists.txt 2019-08-15 12:17:51.957997353 +0000 +@@ -51,7 +51,7 @@ + QuickWidgets + Test + ) +-find_package(KF5 5.57 REQUIRED COMPONENTS ++find_package(KF5 5.54 REQUIRED COMPONENTS + Archive + Config + Crash 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 # Maintainer: A. Wilcox 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; +- +- 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(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; diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index 4091f2427..84186f75c 100644 --- a/user/blinken/APKBUILD +++ b/user/blinken/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=blinken -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bb66c895eb8adbc74a7ba2904e036a4cac0332129600837097e9bce5eeb967e17a61a4d3fdc6fa5bd1849387ed13f2aa6f4a814fdbdd7a623b96380bd8844e6c blinken-19.04.3.tar.xz" +sha512sums="524b629cdcaa3707740718678e478adede43ec0f9d6ef57d84482bd0e2dc790da39c7bdc99c8125cc7f78111049330366d1393973e8272e8cf58876b6677654c blinken-19.08.0.tar.xz" diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index 32fb6ba5b..7f81e4cdc 100644 --- a/user/bomber/APKBUILD +++ b/user/bomber/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=bomber -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -12,10 +12,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev ki18n-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/bomber-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/bomber-$pkgver.tar.xz + ridiculous-qt.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,13 +32,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="6be4a23149d91f63b0d124bcf467be3d034e7d8ac5dcf3fce1b93fa17d389b2f902729d628f434bceea0fa09bb068677b051b0406415ce080bfd7764ae02402f bomber-19.04.3.tar.xz" +sha512sums="0bd3a6746e59875c6e14f7df1deb5f07a7db8f29a401a39e58b358ff78f1304243e28fcabc798cb9b7ed03fa5edef9d7f8c3c6257cef3d39f61a76b28345cdea bomber-19.08.0.tar.xz +160ae239dae8ad3504b622660bb92a3b08dd1abf37161ce2d1c23ada5558f763a64a8fd9cbc25fd4a8946e274bde97df91fcb39742ba9a551ea397e1f81c51d4 ridiculous-qt.patch" diff --git a/user/bomber/ridiculous-qt.patch b/user/bomber/ridiculous-qt.patch new file mode 100644 index 000000000..bad38045a --- /dev/null +++ b/user/bomber/ridiculous-qt.patch @@ -0,0 +1,11 @@ +--- bomber-19.08.0/CMakeLists.txt.old 2019-08-09 00:27:09.000000000 +0000 ++++ bomber-19.08.0/CMakeLists.txt 2019-08-15 13:01:55.633395788 +0000 +@@ -7,7 +7,7 @@ + cmake_minimum_required (VERSION 3.5 FATAL_ERROR) + project(bomber VERSION ${KDE_APPLICATIONS_VERSION}) + +-set (QT_MIN_VERSION "5.10.0") ++set (QT_MIN_VERSION "5.9.7") + set (KF5_MIN_VERSION "5.46.0") + + find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index 9bbf79504..0a723c03a 100644 --- a/user/bovo/APKBUILD +++ b/user/bovo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=bovo -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d51178341443b1ed6e70d91c2bef38ed7befe925250e8ea17841f1af5687acd29133103c433ed3ddb8a1a280daced6518823847ae66bf6474a22e3b13b1aa9f0 bovo-19.04.3.tar.xz" +sha512sums="d0829acc26414224351da2dc21d2960bbb1e881b14fbb7715ada7a397586a79165c9c4cfc8dea4fbafbbbd7f0240d462e5213f262da8466c4ea11897d9e0a500 bovo-19.08.0.tar.xz" diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index bf25c6e5f..dc33e9de3 100644 --- a/user/cantor/APKBUILD +++ b/user/cantor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=cantor -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="KDE worksheet interface for popular mathematical applications" url="https://edu.kde.org/cantor/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bfbb598e7fb4c61bddad0ef91802107a268121493146e7105d0c41450e3803b26b40363cc8fa69990f309aadb3bfefacb3fbb7dda75a3f274d70506c53d79ad4 cantor-19.04.3.tar.xz" +sha512sums="ed40d123211b7f1585affcd88fa9549d15ebcda3fa23cdbb6ea7fc932eb79b3d84428cc0552350644faebded17088887d0e3dcda5635c4ac69df56be395a63a1 cantor-19.08.0.tar.xz" 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 # Maintainer: A. Wilcox 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 KBalooRolesProvider::roleValues(const Baloo::File& f + { + QHash values; + ++ QMapIterator it(file.properties()); ++ while (it.hasNext()) { ++ it.next(); +- using entry = std::pair; +- +- 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(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 diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index 6fb76cc3b..0d10e8bbe 100644 --- a/user/dragonplayer/APKBUILD +++ b/user/dragonplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=dragonplayer -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Multimedia player with a focus on simplicity" url="https://www.kde.org/applications/multimedia/dragonplayer/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="610edb284bc73908ff9d143d6b58d0c75d88bb8cb0fb8d82df2a9419690d1c782f815fae73c0907e1c5260180e09710a6bbfbe5371e317c03ab6a9832f62673a dragon-19.04.3.tar.xz" +sha512sums="1f9c410e314f075b4d73af68893d25dd406f222c34f62f0d57af96371a4e2cbcdbdd04a3684974435172c3a343fef45639e6a80a1729b1ab02d5829d08d46ed0 dragon-19.08.0.tar.xz" diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD index 9ffd39c42..c0bf64a41 100644 --- a/user/ffmpegthumbs/APKBUILD +++ b/user/ffmpegthumbs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=ffmpegthumbs -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="KDE video thumbnail system using FFmpeg" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="472c064b2af7b5dc58929db6ecdd396bb739bb6e90be0b51d1bc5caa824608f8ec39ee135b9950849c7f6c8f56aeb4211a5e1594d9332d454d76ae6bbfe2d325 ffmpegthumbs-19.04.3.tar.xz" +sha512sums="ca0ed1631d7cb9af049e1328269a9b01ee442c514d400ea5836b4b7bbbc003ee3d1b3fe9c07c2a6cd99a02cc4caf251f7b6c11be0eb08fd9dfba08aa9e4847d6 ffmpegthumbs-19.08.0.tar.xz" diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index e3a67ba50..847e712c7 100644 --- a/user/granatier/APKBUILD +++ b/user/granatier/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=granatier -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cb1646c4492695c81210e53efe415391733a0626c9a60d499faf38ed165da345569905af1ae28f35447e328b9b732a362f005a35f46ab46532f869f6df12ad7d granatier-19.04.3.tar.xz" +sha512sums="069d76b3c466a7d13ab657acabd0088033933bb8fd9ed155a260fd2b26dbe44d8609d665059bb987ad9eb6db96d5452c1b72dc86428af6d278952764e676f67a granatier-19.08.0.tar.xz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index 92ecae330..84b2cd8d4 100644 --- a/user/gwenview/APKBUILD +++ b/user/gwenview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=gwenview -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=2 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="03368de984dba8125d7cb1c49fb643bc313684621bf3e06ffc34258591673fdb180769657a5318412acc68c33b219df04148a8b4271640adca621a844f3b8103 gwenview-19.04.3.tar.xz" +sha512sums="4ca7b39d2e149ffe9bdb1234e264ea3bbeeaca0125462ffe7f79b1653448df44596bab69d4ad61df2d73d4ec8777cb61054da7c6d7badb11ee96560f8b105b49 gwenview-19.08.0.tar.xz" diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index 91bcdb144..146944946 100644 --- a/user/juk/APKBUILD +++ b/user/juk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=juk -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f89a872d2bd7efe8bc900e9bb1dfe00f0d857c8557e79ead6a842fa5258c748c3205ecb211b74fe3135c7f14f9f924796c975e674d09b34b3e896b07837b189f juk-19.04.3.tar.xz" +sha512sums="c769cec1ba54b6ea00a73012d84b3a6aee80bc31f496f895e345fab8c9e451fcc49b80094798804b18889b732801d6aec030de541cddea634d57d28045884b12 juk-19.08.0.tar.xz" diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index 0ae93f033..5c2ef4d5f 100644 --- a/user/kalgebra/APKBUILD +++ b/user/kalgebra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kalgebra -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Graph calculator and plotter" url="https://www.kde.org/applications/education/kalgebra/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ac9e1be9a63b81495d62f4c3d705b661377ef1a118d900543cb7415a90985aa5dfee2a81421184892bece0da81f9a139afcf73f552550e1867a30cf81d553b98 kalgebra-19.04.3.tar.xz" +sha512sums="3d5c5ecb8746378333537eca96d6cf409cfecc35fcb71cd6ffbca2bc489e196f28a9a153590b1111c4928084660120c374242ee3020c0b58071dbceb241c3188 kalgebra-19.08.0.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index 058e41098..708b40b76 100644 --- a/user/kalzium/APKBUILD +++ b/user/kalzium/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kalzium -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Periodic table of elements (PSE) with calculators" url="https://www.kde.org/applications/education/kalzium/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="405f5102b7e8326aca4934167f34fcdc0770132ed93bda1d5069b42503bdd4cf8c9b1b080632a776a38625deca0ee1d9cbf20858b64ae1083d6ab160f94d1146 kalzium-19.04.3.tar.xz" +sha512sums="042f6613c2f8312db4a9268f27d040d9a885739d3dd3e47536e465ee94080634e4851721464be8025bf0f381f215bdc89980a5bcfed7439010360cfade02da1f kalzium-19.08.0.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index 6db4a4b46..808d95bb3 100644 --- a/user/kanagram/APKBUILD +++ b/user/kanagram/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kanagram -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Letter order (anagram) game" url="https://www.kde.org/applications/education/kanagram/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dbdccbcb01f76dd5143d9844e80b9bc992a2334e55e5d7a70009cb6bb3ff83be3dae77e3d091eb2f2d1c44a45f73ef40eebea9bda836eb117e86760de4747246 kanagram-19.04.3.tar.xz" +sha512sums="763e905f536e82b36566ec5ee142bf3f4f11a7ebd08ef53558d244035a1260fa579662ef685bf1317bb0160a93a0391913d9cf46ef93c7cae4fb95bc39b2dcf7 kanagram-19.08.0.tar.xz" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index 649c15cd9..20ea0639c 100644 --- a/user/kapman/APKBUILD +++ b/user/kapman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kapman -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="048b4de4c7168c21a6f43d98c3e6cf286c2625909f2ab23c8ab8e993c1bc106c5426a749e9620e76267642238ea23a4d910c860ca10fcc706d5276b5773b6aa9 kapman-19.04.3.tar.xz" +sha512sums="82ad6875c0b15376033a5afc52f6d566707de669f78e956fa2deb975f5f0b073ced58cb46c08c93f8b05868f1438b7ac4ed74aa4522af63cf8fb32f105b2af2c kapman-19.08.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index 3bf7ed20f..67650d6f1 100644 --- a/user/kate/APKBUILD +++ b/user/kate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kate -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -92,4 +92,4 @@ kwrite_lang() { done } -sha512sums="57ea4a527307dd45818b7e3f1b59ac346f5e82090b01fb010d4e3e31d00eda9c1b8e554ab203c3320fa073fbd65e775e27375f254f05f2dee512a32ef09bc218 kate-19.04.3.tar.xz" +sha512sums="5fea2010fd18585ebc8fc99e01a5815655f835a9a03528f236eefe3995977013d0610cf525bf99d8ae307ee3d9b107d0dae1491cb9ce1a46ac0f92de90da6d28 kate-19.08.0.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index 28cfcd688..ed8c225e3 100644 --- a/user/katomic/APKBUILD +++ b/user/katomic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=katomic -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7a65cca9f49004d594b58aa911d46dd8e749da30e1f014804e89d62e95f669584c21064cb902cc1a6e7511c70467216b51f5142fc7f4dcafadb935d2c663e48d katomic-19.04.3.tar.xz" +sha512sums="93dfa19358cc582857e18982144da887ba4369ab1413cec4a1a17cac673219b983ba16be4c78f60651590e42ef8b76a266ac72ea91c39e017f2201006518e301 katomic-19.08.0.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index ef0b44167..0cc5b4aad 100644 --- a/user/kblackbox/APKBUILD +++ b/user/kblackbox/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kblackbox -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dd9d30ef96bba4e586dada72351f306cd601ccafc9f94ad75dcc334733fc8059a8b78abac3b022fb23b6910d859ccbf38b81fb1e8a9d1f23b68f25021efeecda kblackbox-19.04.3.tar.xz" +sha512sums="2ec6c30e4b58386db45baf44f072a5805563c85d3f30ab7ade222e4012f1c025c2f339436888f0b8b309e91e9ed744c7b3a5db76304837dba8f28d2f0780070d kblackbox-19.08.0.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index ed2b16374..0fea5720c 100644 --- a/user/kblocks/APKBUILD +++ b/user/kblocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kblocks -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6b8e904cb9ad0b4ef30e3272f8c9d75f34e6377130a31adfd384f43b7a651994a375a4fd7db9d7159025edd45fbc705c181056cebff287d68877269840a6b180 kblocks-19.04.3.tar.xz" +sha512sums="b99b590a4fcd0b04fbe7763b05d90e78ab35f1a7e2938d7043d132b4060c22b98c0bb067e677416517dbddbee4c71edd1c8be76fb563fa03c5d5b50113bd7e2e kblocks-19.08.0.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index 53510ec1a..e6c2e7eb0 100644 --- a/user/kbounce/APKBUILD +++ b/user/kbounce/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kbounce -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e92ac3614d0b1802cf6d66d18c92af15874937093b1de58b64e7eca2af935b4d0e19369a2eadb8345a7e5eaa546b6c1557745b89eefe9a7a64619dd0cd6d0d10 kbounce-19.04.3.tar.xz" +sha512sums="2cd3d911bc6bda60cbcbb11de1bbb48faa90a42a7cd32361b40bf05334bc2b2abf346cf91bfcf9fe5a85d1b135e0e4f01bee4b8ef9063f764edd1cba28b96e30 kbounce-19.08.0.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index 170242547..f5b1a632a 100644 --- a/user/kbreakout/APKBUILD +++ b/user/kbreakout/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kbreakout -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b48a024afaa7fb70043583cf5842fc7ce56e43e3b6f60515f70d8144b9a168009431b5e6b9391aa4c0cbd40a0c6b3ca9ddcc68d741d0849c854896f125c19c28 kbreakout-19.04.3.tar.xz" +sha512sums="e3fe508b82d804b4f5468e097e1da36cf0a4bcde4706c4b80fae2cd8295cdc2632d13e6d856c3638d70e1bb1d1a8a4d5e8f4662a69ba18c96f5306ae6d318d56 kbreakout-19.08.0.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index 0f266dca0..42fa92c2f 100644 --- a/user/kbruch/APKBUILD +++ b/user/kbruch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kbruch -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Practice calculating percentages and fractions" url="https://www.kde.org/applications/education/kbruch/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fecc34e6a829b49396d527d397879d491e746fa261b7d08ce9b2d8f2002278297928ce7070d9139aa919b6bd2630c740c24a2f720430ca24b26c8e9fa19b84c0 kbruch-19.04.3.tar.xz" +sha512sums="da21c2c96dc0949acd9aae14c34d6f38c8daf5df304e00e7bc742fcc009d47689ef53a0f3843f22a6a89f8efa21ccc6a849e7cbd18036d21bafc94f1e77712e1 kbruch-19.08.0.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD index 2b849136a..a3b376dc3 100644 --- a/user/kcachegrind/APKBUILD +++ b/user/kcachegrind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kcachegrind -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Profile data visualisation tool and call graph viewer" url="https://kcachegrind.github.io/html/Home.html" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a49212d7b3667a7da028e48e03813bb985c08ff6e533bc572e884a297780d9107e8c5496433728d2d590b7ba9a8141f6e3a33c6e6443c1c62ba86af1787cfa0c kcachegrind-19.04.3.tar.xz" +sha512sums="3f86c1ec245f69cb36021498166ea3c05919131fd5b26507642702242801c96923040407dd3eafa6a1878ed227c8c66c0425c5252912237c6f3502995d448dc4 kcachegrind-19.08.0.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index 042a67ea2..528924830 100644 --- a/user/kcalc/APKBUILD +++ b/user/kcalc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kcalc -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -10,7 +10,7 @@ license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev ki18n-dev kconfigwidgets-dev kdoctools-dev kguiaddons-dev kinit-dev kxmlgui-dev - knotifications-dev gmp-dev" + knotifications-dev gmp-dev mpfr-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/kcalc-$pkgver.tar.xz" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7751ac0ce76aaf99d237c39deb9d25c058c43edb1ef31f03a8d222477d3ae32e2bbae9ce6ac5251f4a981ba25309481af40cbddebfce5ad71d9aee9568bda5bb kcalc-19.04.3.tar.xz" +sha512sums="4d07c3ddc07f0226f00b4f5bf76b042a4ee13dbfbd208f50c01c22a1580436207e1e5d7ee315c1359b740fee200e7f1b3738f38056745a2a64062de4876057a3 kcalc-19.08.0.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index d57ce1a81..fb76c343c 100644 --- a/user/kcharselect/APKBUILD +++ b/user/kcharselect/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kcharselect -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7909a5fe140da1026ad4ce96ae5932d7b20a6894c56f4088445a2fea3bb52d2da9014d76bbaac45b6f503985474ca1b84c2e6764fc5b5ac2e0f5c58f383f9c9d kcharselect-19.04.3.tar.xz" +sha512sums="1428e1a88ce4de91fb151c6acf70ef073d6c68be0d8690a41dc0f1606a065f0f326ccfa9eeeda4bd642249690bf46b0181a63e5d81957c916e801698d3bf77f3 kcharselect-19.08.0.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index 13615be29..47d57341c 100644 --- a/user/kcolorchooser/APKBUILD +++ b/user/kcolorchooser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kcolorchooser -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Simple application to choose a colour from the screen" url="https://www.kde.org/applications/graphics/kcolorchooser/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="99ffc055bfb69cf8ad686442afa6a4e0d6aef0ef345f1cdc590b1a4f569b545e2fd05b6f794ec57e1fa7a210d893122a733c048b12ecaad3b93156d1db01e682 kcolorchooser-19.04.3.tar.xz" +sha512sums="12fd9829707ef004f61fc21bffb65d50830f445d470b83228d53a3cdd992256e1b6e6d9b462dd56041934d8d018e32a24b943d902e99ab63c1f4c8a9a1b061a8 kcolorchooser-19.08.0.tar.xz" diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index 5169b35bb..e5db786a6 100644 --- a/user/kde-education/APKBUILD +++ b/user/kde-education/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kde-education -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD index fb7a008e0..598abed8f 100644 --- a/user/kde-games/APKBUILD +++ b/user/kde-games/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kde-games -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="The KDE games collection" url="https://www.kde.org/applications/games/" diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD index 1e3e03588..81286dd65 100644 --- a/user/kde-graphics/APKBUILD +++ b/user/kde-graphics/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kde-graphics -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Graphics software from the KDE Software Collection" url="https://www.kde.org/applications/graphics/" diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD index 47d8d4111..a01fd7d0e 100644 --- a/user/kde-multimedia/APKBUILD +++ b/user/kde-multimedia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kde-multimedia -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Multimedia software from the KDE Software Collection" url="https://www.kde.org/applications/multimedia/" diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index d8e1ebfc3..82a97290e 100644 --- a/user/kde-system/APKBUILD +++ b/user/kde-system/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kde-system -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="System utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/system/" diff --git a/user/kde-utilities/APKBUILD b/user/kde-utilities/APKBUILD index 3c5ae0eeb..2914c46b4 100644 --- a/user/kde-utilities/APKBUILD +++ b/user/kde-utilities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kde-utilities -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Desktop utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/utilities/" diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD index 604c1fd9e..fe5d9ac88 100644 --- a/user/kdegraphics-thumbnailers/APKBUILD +++ b/user/kdegraphics-thumbnailers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kdegraphics-thumbnailers -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="KDE thumbnailing sofware" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c2b4168b2f5e24ca1d2dc9bdb32bd04d04340d735efb4b6e7ce60cf31fb0eb58aba5aa192eddb76546527aab1fc9b1d28efc568c0b9fbfbc838a07428a7baacd kdegraphics-thumbnailers-19.04.3.tar.xz" +sha512sums="7eb27cc6132a80e25be61fa87d70157f6863424aa9586886e51969a0c1d089c0c6558c6ccb7cea6c6f1182cc720cfc46802120cdfc5253318f5dc8633a78c982 kdegraphics-thumbnailers-19.08.0.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index d9a05af5a..8e1f507cd 100644 --- a/user/kdenlive/APKBUILD +++ b/user/kdenlive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kdenlive -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" @@ -48,4 +48,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de8d7147a2d5f3b70bb1fe3f5e73acd3e3fe6289415c9fb68a5b4850e43ae55ac9e00d6143e1c717c5efc4e634be84626a2bbfcd460deee39e5638002f043aa3 kdenlive-19.04.3.tar.xz" +sha512sums="7d4cef7af14735476481b29849d4e5decd6b618af2249736a842eec1470a99abce77fdde499e43dd15cc644a0ea639a5aeb42d62eb4f5f99ccdf153980f4d631 kdenlive-19.08.0.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index 0746eb6cf..596cdf0e0 100644 --- a/user/kdf/APKBUILD +++ b/user/kdf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kdf -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="45a4f51677abaf105166129196c8369a2bf91d1b27d2321d959f23c9b97d2c8a888bfd252e7c839311af32508d0b6549bc326a1bd3b08ec924db751f87abe996 kdf-19.04.3.tar.xz" +sha512sums="ab3540220e18f55889ac71723c18526b8c7a1a65beb847f6c5afd81f54294e6f718c0f98c662e4618f59a56bf6f6a217b314609f129e6f97a4c605179a351f41 kdf-19.08.0.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index 03b3d2691..76d596f51 100644 --- a/user/kdiamond/APKBUILD +++ b/user/kdiamond/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kdiamond -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -13,10 +13,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev ki18n-dev kconfigwidgets-dev kxmlgui-dev knotifications-dev knotifyconfig-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kdiamond-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/kdiamond-$pkgver.tar.xz + ridiculous-qt.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,13 +33,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="04888283d7efeff81e9b5354fd8b1ee64e66100a36d247182781a40c74b73c3ce485c54f2e3d840297d5863a37eb2b8e849316b8acfbda6447608ebdc86f5c87 kdiamond-19.04.3.tar.xz" +sha512sums="2215cb386ee8617e8d88df8f31782de9e36ccf7680c8f59e6215ddaa86e403a222d778a6a2e2f15f26543a9d9ec3986e5a5448d034b810de1b210bad2f8dc6fd kdiamond-19.08.0.tar.xz +b29c091b45376fa83192b0cd2876de7323648caa597e610c3d13d883ee0df269e9aa9e5367469e0d787a147ade590e6cd1b2c04162da0e8405220067d4e44129 ridiculous-qt.patch" diff --git a/user/kdiamond/ridiculous-qt.patch b/user/kdiamond/ridiculous-qt.patch new file mode 100644 index 000000000..8e042f59a --- /dev/null +++ b/user/kdiamond/ridiculous-qt.patch @@ -0,0 +1,11 @@ +--- kdiamond-19.08.0/CMakeLists.txt.old 2019-08-09 00:27:58.000000000 +0000 ++++ kdiamond-19.08.0/CMakeLists.txt 2019-08-15 12:36:41.785854337 +0000 +@@ -1,7 +1,7 @@ + cmake_minimum_required (VERSION 3.5 FATAL_ERROR) + project(kdiamond) + +-set (QT_MIN_VERSION "5.10.0") ++set (QT_MIN_VERSION "5.9.0") + set (KF5_MIN_VERSION "5.46.0") + + find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index c772977b2..b3437d091 100644 --- a/user/kfilemetadata/APKBUILD +++ b/user/kfilemetadata/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox pkgname=kfilemetadata pkgver=5.54.0 -pkgrel=2 +pkgrel=3 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" arch="all" @@ -15,10 +15,10 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kfilemetadata-$pkgver.tar.xz add-formatting-fn.patch + add-mimeutils.patch " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -35,14 +35,13 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } sha512sums="bfa8287e5c8df363908a441419d377d33ea2cd93a4fc69fc47c69da80ad0e3a80e60f26b4856c3d3e04128e6ac59b214ee0613e37dda29f2537f502789bd4801 kfilemetadata-5.54.0.tar.xz -f6d8b9fe9353fdf380d073b8a7dfa4dd8c822a64c1a978dbe8ce13d0f8327d3af5d314be41f9cecc32afb19896711452289b78e09b6fffb010d8c89843ebc4e0 add-formatting-fn.patch" +f6d8b9fe9353fdf380d073b8a7dfa4dd8c822a64c1a978dbe8ce13d0f8327d3af5d314be41f9cecc32afb19896711452289b78e09b6fffb010d8c89843ebc4e0 add-formatting-fn.patch +c94c57b7dacfdf35c19db10f6a4b2724673fc542adac3dde57ac34cb4f09d063fd37404343d265075a88a397d3543da038b6b5832f481de3b05640279ef19a8c add-mimeutils.patch" diff --git a/user/kfilemetadata/add-mimeutils.patch b/user/kfilemetadata/add-mimeutils.patch new file mode 100644 index 000000000..5ea2cef37 --- /dev/null +++ b/user/kfilemetadata/add-mimeutils.patch @@ -0,0 +1,186 @@ +From 69c25514cf6a08ceaaacbc4092cc02ff40853228 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +Date: Mon, 25 Mar 2019 17:40:41 +0100 +Subject: Add helper function to determine mime type based on content and + extension + +Summary: +The QMimeDatabase::MatchDefault only falls back to content matching +if the extension is not known. This fails for e.g. Matroska files, where +the content allows to distinguish between audio and video files. + +CCBUG: 403902 + +Reviewers: #baloo, #frameworks, astippich, ngraham, poboiko + +Reviewed By: #baloo, astippich, ngraham + +Subscribers: kde-frameworks-devel + +Tags: #frameworks, #baloo + +Differential Revision: https://phabricator.kde.org/D20045 +--- + src/CMakeLists.txt | 1 + + src/mimeutils.cpp | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/mimeutils.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 106 insertions(+) + create mode 100644 src/mimeutils.cpp + create mode 100644 src/mimeutils.h + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c3cbe8c..fc4ce19 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -14,6 +14,7 @@ set(KF5FileMetaData_SRCS + writercollection.cpp + externalwriter.cpp + formatstrings.cpp ++ mimeutils.cpp + ) + ecm_qt_declare_logging_category(KF5FileMetaData_SRCS HEADER kfilemetadata_debug.h IDENTIFIER KFILEMETADATA_LOG CATEGORY_NAME kf5.kfilemetadata) + +diff --git a/src/mimeutils.cpp b/src/mimeutils.cpp +new file mode 100644 +index 0000000..7ea4dc8 +--- /dev/null ++++ b/src/mimeutils.cpp +@@ -0,0 +1,50 @@ ++/* ++ * This file is part of KFileMetaData ++ * Copyright (C) 2019 Stefan Brüns ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++#include "mimeutils.h" ++ ++namespace KFileMetaData { ++namespace MimeUtils { ++ ++QMimeType strictMimeType(const QString& filePath, const QMimeDatabase& db) ++{ ++ auto extensionMimes = db.mimeTypesForFileName(filePath); ++ auto contentMime = db.mimeTypeForFile(filePath, QMimeDatabase::MatchContent); ++ ++ if (extensionMimes.contains(contentMime)) { ++ // content based mime type is one of the types for the file extension, e.g.: ++ // *.ogg -> [ audio/ogg, audio/x-vorbis+ogg, ...] ++ // content -> audio/x-vorbis+ogg ++ return contentMime; ++ } ++ ++ for (auto mime : extensionMimes) { ++ // check if the content is generic and the extension is more specific, e.g.: ++ // *.mkv -> [ video/matroska ] ++ // content -> application/matroska ++ if (mime.inherits(contentMime.name())) { ++ return mime; ++ } ++ } ++ // content mime type does not match the extension, trust the content ++ return contentMime; ++} ++ ++}} // namespace KFileMetaData::MimeUtils +diff --git a/src/mimeutils.h b/src/mimeutils.h +new file mode 100644 +index 0000000..f33e100 +--- /dev/null ++++ b/src/mimeutils.h +@@ -0,0 +1,55 @@ ++/* ++ * This file is part of KFileMetaData ++ * Copyright (C) 2019 Stefan Brüns ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++#ifndef KFILEMETADATA_MIMEUTILS ++#define KFILEMETADATA_MIMEUTILS ++ ++#include ++#include "kfilemetadata_export.h" ++ ++namespace KFileMetaData ++{ ++namespace MimeUtils ++{ ++ ++/** ++ * Returns the mimetype for a file ++ * ++ * The function uses both content and filename to determine the ++ * \c QMimeType. In case the extension mimetype is more specific ++ * than the content mimetype, and the first inherits the latter, ++ * the extension mimetype is preferred. ++ * If the extension does not match the content, the content has ++ * higher priority. ++ * The file must exist and be readable. ++ * ++ * @since 5.57 ++ * ++ * \sa QMimeDatabase::mimeTypesForFileName ++ * \sa QMimeType::inherits ++ */ ++KFILEMETADATA_EXPORT ++QMimeType strictMimeType(const QString& filePath, const QMimeDatabase& db); ++ ++ ++} // namespace MimeUtils ++} // namespace KFileMetaData ++ ++#endif // KFILEMETADATA_MIMEUTILS +-- +cgit v1.1 + +From b56d0cb5b90baeef2ada6ba0cbaea91506df1270 Mon Sep 17 00:00:00 2001 +From: Alexander Stippich +Date: Wed, 27 Mar 2019 20:41:49 +0100 +Subject: Generate header for new MimeUtils + +--- + src/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index fc4ce19..73bf7d0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -75,6 +75,7 @@ ecm_generate_headers(KF5FileMetaData_CamelCase_HEADERS + WriterPlugin + WriterCollection + EmbeddedImageData ++ MimeUtils + + PREFIX kfilemetadata + REQUIRED_HEADERS KF5FileMetaData_HEADERS +-- +cgit v1.1 + diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index 94fee4a3a..23cde7e1a 100644 --- a/user/kfind/APKBUILD +++ b/user/kfind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kfind -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f42f9f70dfc8aaeb2c1554b999eb18a73167c5d66ddfb8ae2334f8823c85565d8a2d460801b7da9e204244a386d8809ee9ae47865ea0958ab824befd7bd6db6c kfind-19.04.3.tar.xz" +sha512sums="8df128f61af4066b5d2bd78731e37d160faa321f1b5823d04d84ecf8af35e02959273ba3af2591c064c440fcb364d9368ac372bcda704996cb37fd6a168b43a8 kfind-19.08.0.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index 51518dc27..92e1dd47b 100644 --- a/user/kfloppy/APKBUILD +++ b/user/kfloppy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kfloppy -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59a466b82321d021343446c8a7e8c2e6479c1fe74644dd008cf65c44cd0ab7ce414a6d377c73299949b7f32d2341895a8b8c62fa5a1aeff707d44995284e26bc kfloppy-19.04.3.tar.xz" +sha512sums="63a9da751f87c8a68e6f434dacac64728981a496b43675dfcf975fd150af9cb1b70b45390075cd665aa76c5e831879a5c18bae66f7bcf6f4e6d3d08e7e8fcc41 kfloppy-19.08.0.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index bc87f57a1..890758e96 100644 --- a/user/kfourinline/APKBUILD +++ b/user/kfourinline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kfourinline -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e08e11ad0e97bb88f2180fc72a02f73892614002dd0b2b1de307a4827850d0091cc82195b23d90ebf85579d40a934ce85172233a1bc3338b9511a40fe7ed5fd1 kfourinline-19.04.3.tar.xz" +sha512sums="b561a85daf31a7dbe97dea15a0dc92031a15df02926e43a443679a741ddc605fbde5bdf526755a30604da7714859359866b2ab8f7f0b0e6f05db7518b8c01ada kfourinline-19.08.0.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index 0fac8784d..23998cf3c 100644 --- a/user/kgeography/APKBUILD +++ b/user/kgeography/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kgeography -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Geography learning tool and trainer" url="https://www.kde.org/applications/education/kgeography/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="623b315371f3d627da25dad22452e058077fd0eb29ebdad14ff76e5db60c6b9c14058ce3560607760f217b32d1cb27dc50e2771bcf41f75faecde4a9ac0b35f0 kgeography-19.04.3.tar.xz" +sha512sums="92583c1b7e07b1bb8d99ff1631f7be64c7d63c176d96bb2f72e230a830ec1470b014c32b3d0b8ac34a0666f0aa5b4ad9bb97869e01623f581bc066a46ef5581e kgeography-19.08.0.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index e75b2a7ba..32dab2ddd 100644 --- a/user/kget/APKBUILD +++ b/user/kget/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kget -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" @@ -15,10 +15,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev solid-dev ktextwidgets-dev kwallet-dev kwidgetsaddons-dev kxmlgui-dev kwindowsystem-dev gpgme-dev qca-dev boost-dev libktorrent-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kget-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/kget-$pkgver.tar.xz + kf5.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,13 +35,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c7779f1dc2e4eb81f763026844c547e7d16e12d62428c62dde2077a2220a2bf79688bd04db3b359e775ab704ef1c9dfd4dfb8ccc41ece53fb51dbca28fbd6a0e kget-19.04.3.tar.xz" +sha512sums="65f843d626f5164e2c391bae222079c8208a4df5d654a570dad852c30ecbf68323afcf4cbb988e15f0c03fd016f50fbede2a51d182c292a14e945fece3ef572f kget-19.08.0.tar.xz +d66fb3988aa26c2cb9e243ef446679e715cb3bd10ee8cb1b0b39a68d424ab9fca71428fa0c6004a1671093201e71e371331b069d6bb0325d0e7b936a9b95a73c kf5.patch" diff --git a/user/kget/kf5.patch b/user/kget/kf5.patch new file mode 100644 index 000000000..0630603d3 --- /dev/null +++ b/user/kget/kf5.patch @@ -0,0 +1,11 @@ +--- kget-19.08.0/CMakeLists.txt.old 2019-08-09 00:42:54.000000000 +0000 ++++ kget-19.08.0/CMakeLists.txt 2019-08-15 15:24:02.319818769 +0000 +@@ -8,7 +8,7 @@ + + project(kget VERSION ${KDE_APPLICATIONS_VERSION}) + +-set(KF5_VERSION "5.55.0") ++set(KF5_VERSION "5.54.0") + set(REQUIRED_QT_VERSION "5.7.0") + + find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE) diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index a8197b26e..8a24940fd 100644 --- a/user/kgoldrunner/APKBUILD +++ b/user/kgoldrunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kgoldrunner -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="153346ec5a55ba6ea5a695a5fe575a24463975555fefc1a7e90538fd86c40965a6c41553ddf67136c18d71b2d5f70c16f44f0564e976365eaa03940a44d36eb7 kgoldrunner-19.04.3.tar.xz" +sha512sums="59243aeca07bc191f5dbf367cce8ccdc765dd6dca147df690e7110bcaa023d7f76eb26b33f33bf39746f3bdf4abe4699e8f16c12d10444d26b69321a1f0166ba kgoldrunner-19.08.0.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index 8067f4c95..73d9409eb 100644 --- a/user/kgpg/APKBUILD +++ b/user/kgpg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kgpg -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b9062896b9f90c52535ada3fe66a7b4f21054e229829217b1d8b2df00571ac483c0c0eee464e996b4f66edc3c2fd56e2f73fa76824f679eaf8fe69d3f200f1a9 kgpg-19.04.3.tar.xz" +sha512sums="a90a78556bbe26279917b55f582d3bb9d8376aec7f70e55ff10ed9f6a769d77ee2d2bd6ab1ef4c9aec27d20a098bd6d8c0e37db2fe57af8ad781ceb7493c1bc6 kgpg-19.08.0.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index b0a89fb49..240cad137 100644 --- a/user/khangman/APKBUILD +++ b/user/khangman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=khangman -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="986f2628ca9c5c6393ad0b563ee422375f7b888a9f3549ce32ebca61b831fdc124b48afcd293ba1308c2f8242199ccdbebe04ca934f5f1395e55761cef0d5198 khangman-19.04.3.tar.xz" +sha512sums="99a93c9bc815a31ad03e76c7862909b42951507f44c440d61e353afa706f88580e85343566cb38d2633ffd320583e7399e9c4b431d10ba8e3509822972a25b4c khangman-19.08.0.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index e5f758d39..1b991a2e0 100644 --- a/user/khelpcenter/APKBUILD +++ b/user/khelpcenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=khelpcenter -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -14,12 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev xapian-core-dev libxml2-dev" subpackages="$pkgname-doc $pkgname-lang" install_if="plasma-desktop docs" -source="https://download.kde.org/stable/applications/$pkgver/src/khelpcenter-$pkgver.tar.xz - es-doc-fix.patch - " +source="https://download.kde.org/stable/applications/$pkgver/src/khelpcenter-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -35,14 +32,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="33534097fa8c318a24fd34c173ae7ac9f739363fd4e0a148582984b8ae36e481dd5065d1306f570fead503c7b85ca03d4890d7bbcf102c50b6614d4536775c09 khelpcenter-19.04.3.tar.xz -4d7e286b7130547d7f26e11a0e5a40d20530e08cf657ff24d31cbc7b110628f564e513e5922a5cffc82d0830731ab03b07820884542292b3c03c7519617a20a3 es-doc-fix.patch" +sha512sums="e14b61a8a77bc300d0aed5ec6e4f14a7288cd7418beb6e3751326bff366bf0f68fdbd7083ce8c4f1d4f743139b05fce2625763b8703ba3373ca8cb553dd0ad1e khelpcenter-19.08.0.tar.xz" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index c9378671d..e44b2a97b 100644 --- a/user/kig/APKBUILD +++ b/user/kig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kig -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Interactive geometry learning and exploration tool" url=" https://www.kde.org/applications/education/kig/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ade87a3138e017a954fb9a7610e3032e61bf0b275973b5cba2ee0c254abf0d86446a4663e288cfb8bb294f69edbbf80a9993f3eca52f845edec5462f440e4624 kig-19.04.3.tar.xz" +sha512sums="b08c5b795b9e570ae0380c04bfeb1dcbc6b670a585ce5dcc70710cc8e914766f57d0561dffb8e6ca69a5a56ef734d41d9e59049340a73034f3f52801597df458 kig-19.08.0.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index 827aa78db..1733a2d81 100644 --- a/user/kigo/APKBUILD +++ b/user/kigo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kigo -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fd18e7e0a2f8962d4a0474fe63306281c807eb38b886f59a7d1146f18fb52fc0fee5dfa3f1bef5aa67f7974d699ff4b0b0ce77aabab78b060337cad274e9015b kigo-19.04.3.tar.xz" +sha512sums="9deb21a6e16e47ba77eaefb5f79ae3db8cde22ca2d77f7334ca027ae9432af908398f6ddf98bf028cfa5fa3fcdebfb82429171149bc7e03c55028984fc0b5eee kigo-19.08.0.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index f31ee3da7..bff752525 100644 --- a/user/killbots/APKBUILD +++ b/user/killbots/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=killbots -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af0263e9f5494aae44a170dbefe8001700dec3cb8d9f74516f7cbd9136acf6bbd8368aa97d76bacf6af9823b064974a7cb06e82e9e1d6a7d19b6ba2981fda923 killbots-19.04.3.tar.xz" +sha512sums="dd02cb050c065cfd3af0efa850c9ddce6ab852d96254a861e924321df6c316f0803ab6abe6c6d61dd7aa254653a625a973f52889381346a0e4229eac09693044 killbots-19.08.0.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index ad091c105..1644caa71 100644 --- a/user/kio-extras/APKBUILD +++ b/user/kio-extras/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kio-extras -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="68b9218ef86c4aabbf9d6df21da087b954469494fe50061d2e61da7d3a121da5afe9da967281626b0f17c19e7b5078a789c29dc08dbc37196a07a67660951ad2 kio-extras-19.04.3.tar.xz" +sha512sums="61687ee7f57f880e0e205267643292a19581985b4fd42936d0cc10999306754d1f30f9ab1a7494844f53742956007520811149ffacc27273985ed44c666c6766 kio-extras-19.08.0.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index 2d51bc8fa..1719a6f64 100644 --- a/user/kiriki/APKBUILD +++ b/user/kiriki/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kiriki -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1ebc3d076d05d3ea199f703d8aa9a7fed89d2e83b9080672dc227f94ca6c42cd7057d965e4e88dad4c3ba3e12c4958c96790f31177fefa0624dd25eca4517045 kiriki-19.04.3.tar.xz" +sha512sums="bddae10f0d934d39b652d7b5b37858297fc63263ec2dc5d5d1bb473a88bf6608d56e117032f55117077bc70b4f0dc8dd48c1ac5c19e088b6f9d5bff31ffb8d49 kiriki-19.08.0.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index 9021b2639..2302c1791 100644 --- a/user/kiten/APKBUILD +++ b/user/kiten/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kiten -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Japanese reference and study tool" url="https://www.kde.org/applications/education/kiten/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="18d24ca0457d36d2c6bcc5c90a14c63f60612962a241d62afba67ca9e649a10d1a45ff1c906e480986a6e8e202d239e00978d7e340d5c77e8591da886ea568f3 kiten-19.04.3.tar.xz" +sha512sums="998016a0e61185efa4d9b2a8c50b803ede5c36ab71ad1ab6cff3693fe6c6709432d04a3ea92c8a5e247e7fa13c9b7572e96a0919b812130675059debe3ba12b8 kiten-19.08.0.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index 475e3cc7c..47c5af9ea 100644 --- a/user/kjumpingcube/APKBUILD +++ b/user/kjumpingcube/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kjumpingcube -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7d9f5e55b4a3f9eb685d51be84905f27c41d03200a33b4a6f3f44f634ab40f18f1aa68a087d93ab7ce8526733e2523d22ffd91fb86e788d704264cb81d637e3e kjumpingcube-19.04.3.tar.xz" +sha512sums="9260b5fe328a217d78426811e889bfc533a8d1f0d7537fb05d3d8b27bd85a3bd705de134a7b70cf028dc911045fdf2674b32c4e506383d5d979f5d9b5411d0c4 kjumpingcube-19.08.0.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index 168f783ce..8544f53a8 100644 --- a/user/kleopatra/APKBUILD +++ b/user/kleopatra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kleopatra -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cf55cb118f7f966e02f635f0a2412eb497e557f729aa1dbdb86839a49fd733f117119ca493b590a1e3ebc36de17c2a9467eef16d6377ffe27e7c3acb63094e4a kleopatra-19.04.3.tar.xz -10b52477c42e8683528a2b429777d37d0b711d2e1c47ff5caab9a5a3db8e8653263de73ab60eee02fd5594b59c7207667a3a83bb709a39326ac0fe452424c12f qt5.9.patch" +sha512sums="f154e3b03c581a391ce6647e5c1e7c116e73368971fa325c132f4bd890f225c4ac95379c59c70cf538285820be9d93b92631ca51303cac00df80f0a838b7a8d0 kleopatra-19.08.0.tar.xz +ecd9a044202d66d9cd561301072a4738fbabfb816da64839efeaae14ea479b7e0d3feb956a17a3769ab673ea5e242170b2549358544c736536ac0db582e25e72 qt5.9.patch" diff --git a/user/kleopatra/qt5.9.patch b/user/kleopatra/qt5.9.patch index 25392c9f2..2489ab686 100644 --- a/user/kleopatra/qt5.9.patch +++ b/user/kleopatra/qt5.9.patch @@ -65,12 +65,23 @@ cgit v1.1 option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF) # Standalone build. Find / include everything necessary. --set(KF5_MIN_VERSION "5.56.0") +-set(KF5_MIN_VERSION "5.60.0") +set(KF5_MIN_VERSION "5.54.0") - set(KMIME_VERSION "5.11.3") - set(LIBKLEO_VERSION "5.11.3") --set(QT_REQUIRED_VERSION "5.10.0") + set(KMIME_VERSION "5.12.0") + set(LIBKLEO_VERSION "5.12.0") +-set(QT_REQUIRED_VERSION "5.11.0") +set(QT_REQUIRED_VERSION "5.9.0") set(GPGME_REQUIRED_VERSION "1.8.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) +--- kleopatra-19.08.0/CMakeLists.txt.old 2019-08-15 15:07:20.717152888 +0000 ++++ kleopatra-19.08.0/CMakeLists.txt 2019-08-15 15:09:48.141370261 +0000 +@@ -143,7 +143,7 @@ + add_subdirectory(tests) + add_subdirectory(autotests) + endif() +-install(FILES kleopatra.renamecategories kleopatra.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) ++#install(FILES kleopatra.renamecategories kleopatra.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) + + if(KF5DocTools_FOUND) + add_subdirectory(doc) diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD index f185be585..cf8978e12 100644 --- a/user/klettres/APKBUILD +++ b/user/klettres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=klettres -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Learn alphabets for multiple languages" url="https://www.kde.org/applications/education/klettres/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7bcd0dfa02b93f31ec69e72a74ab75da4f766a03c178c3bb4dda0536a07dd3d921da20b50cfbe722191bf7d7794d9785a931d63c40583da38193b15cf5654dd4 klettres-19.04.3.tar.xz" +sha512sums="2d9fef7673dc2b9623823e14fe96173c5274281e03bfc6bc6fbc8d6dbe29788f43359ec9f13c2a8cfced2e52f71fa9fda71edc152a8689009c3eb2a5b8b142bd klettres-19.08.0.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index 229b84f1b..6854844bc 100644 --- a/user/klickety/APKBUILD +++ b/user/klickety/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=klickety -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9fc2c5ccdbb9a90d9c6a8fdcf7fb97e064dc40ba8f47c10296f09f1b3d15971c9b83c9f8d613588d331b56e2f0540593400e30981b52090e4eb4b1941ba4ef30 klickety-19.04.3.tar.xz" +sha512sums="4b4fa6df65f998765e6973416c4928cc8862448f933d7fca88ab51048c44ad486b902104b8128220c99bce23ea83b618f50a9c511a5ba8066715cef027ff1874 klickety-19.08.0.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index 394e6125b..bd602936c 100644 --- a/user/klines/APKBUILD +++ b/user/klines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=klines -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="08062210b9dd0b47b3a9cbb022579752a72bd509e5f4e9d32242442b01f3e14eea1a0fd22cb77feddb98e82e5615dcb36830e0cf87767622ad25b5613a25aa56 klines-19.04.3.tar.xz" +sha512sums="8404c230869f10e1815f40b02166d108a8720bd7c64799cb4a54afd2526a25b7af68eb998fb591e7e31a29fc9cc3d21ecb54ba5086eb035f84749ad4ec193fe4 klines-19.08.0.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index 6f4037cca..7e35a891a 100644 --- a/user/kmag/APKBUILD +++ b/user/kmag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kmag -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d246e747601719934fcb217e111a9672f77dbfc51e965e6943cb2451524ffeb425c422f15ea67fa35ebf218a0085e0e61a4551546af73c623889afba333158b2 kmag-19.04.3.tar.xz" +sha512sums="dec8a5c863ba6e9cedaa1f1953841533adc3accf2270441e5e5c7ac217822eb23908fb0000c98a7fd967a8d25c47285455d365f3aa106a294c0bcd7678f7d6b3 kmag-19.08.0.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 2cbd3cea5..317fb3035 100644 --- a/user/kmahjongg/APKBUILD +++ b/user/kmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kmahjongg -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7fb13e7d8381f352e23e3723340b9e80a73219b291105ad8226b8b891433bc7ffabc27dff2adb3854314d62fc5de9b82a0afb98a050ee2749c63e97b68d8a484 kmahjongg-19.04.3.tar.xz" +sha512sums="980afbd2be31944c37634a2a574662fabac0db1404a2c45b21397e5d6b605e34cd55d5585d684ac18976f0bbe91f92368bcbb2099156949b2688cbc0ae2b34fa kmahjongg-19.08.0.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index eca4d3c3c..d5074ccae 100644 --- a/user/kmime/APKBUILD +++ b/user/kmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kmime -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3a8402634960cd021083227e1069e0936a5ee4b179edb65ea7a29a1f5542cddb9c1ba8b8475df8091aaa6495c36ae7a689f01a4ab36b66790f5a2907cc167add kmime-19.04.3.tar.xz -b5f04ab4f7ed60bde1eeb50141c5b51a4f285d7b125d834559419d56039c1d540a8d44f508801ae9ac2c6d91c3841d4e64c3856e2c5bfa33eb64175dc9b5c608 egregious-versions.patch" +sha512sums="90f5b049c8a7e1a4b283ebda982b6a92296591544f8bd8f50f4e57daa99e9aca0821ca2df3b4a2baf7649c2982c8c340c0c65c2005d854eca747c3fa437d14be kmime-19.08.0.tar.xz +ae8e5836cefbf19f2aa5c775e3189a24b558840799c93fefc4d3863567d152bd14a2597241fcf0967d134cefedcf2c258f75f3c3bda4ec2cd2623f81a9c37c9f egregious-versions.patch" diff --git a/user/kmime/egregious-versions.patch b/user/kmime/egregious-versions.patch index af0411338..49b8f8024 100644 --- a/user/kmime/egregious-versions.patch +++ b/user/kmime/egregious-versions.patch @@ -8,7 +8,7 @@ This is only done to keep in sync with the rest of KDE PIM. project(KMime VERSION ${PIM_VERSION}) # ECM setup --set(KF5_MIN_VERSION "5.56.0") +-set(KF5_MIN_VERSION "5.60.0") +set(KF5_MIN_VERSION "5.54.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) @@ -17,7 +17,7 @@ This is only done to keep in sync with the rest of KDE PIM. set(KMIME_LIB_VERSION ${PIM_VERSION}) --set(QT_REQUIRED_VERSION "5.10.0") +-set(QT_REQUIRED_VERSION "5.11.0") +set(QT_REQUIRED_VERSION "5.9.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core) diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 876d4f2db..9a201f144 100644 --- a/user/kmines/APKBUILD +++ b/user/kmines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kmines -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cb5a7a15656c89b8a19a9b80295f6f5c187f281b1d98fcc5dd7e3d7aeeb878b2c3278819ee209e05c2e56e19619c9356927e443094378fe89208e5c927c29696 kmines-19.04.3.tar.xz" +sha512sums="23c8225081897dd8c3cdd4431c782c5caa9f0464a88b09b142514d5d7e67542b56f1303b730a4eaf9f59eb4aaee929f290d32d13babbda836ae26874de2eae0b kmines-19.08.0.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index a9513e3a9..507b53b13 100644 --- a/user/kmix/APKBUILD +++ b/user/kmix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kmix -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3f432d999c8db2866d490123f349db3d2450e956400ddcecb4aa7e50aff63947c8e607f579feb0b3ee76965a59b2fbd7cd9f9eba913c3f55adaed46cd83744f5 kmix-19.04.3.tar.xz" +sha512sums="a2d7793cd9a8ee456287b484f7dca5abc04868728f1073bddc3d75b75a754d62b923464d2a2ea4d01e7dc7a825cf30f06ca067948d2b457987bc763b0fc1be1f kmix-19.08.0.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index 94a5eeb72..dd905aef2 100644 --- a/user/kmousetool/APKBUILD +++ b/user/kmousetool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kmousetool -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af3663d88b700805a8caed928d5337a4248f3a51847d303c8c13ba9836f60ab11d93598ceeba69fcbb41ed59e777a3d6f911d2197ed6ae028e4cc47070bfaa96 kmousetool-19.04.3.tar.xz" +sha512sums="5bbb2a0894f8c4921c4b1cb13c0007adb4baa8dc6afa0411016aa993ec567b7610138eb0ec2a93e702a7de2009cf2e8e9ed173bd5a75c5dd79ddbc3c3e256212 kmousetool-19.08.0.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index 4e2becb2a..6501731b1 100644 --- a/user/kmplot/APKBUILD +++ b/user/kmplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kmplot -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="afb63178f5a871b3f52e56927a3d636729cecd485c29dca661256f6e73c506ed615ff619c22043ed5b714f3ba9216fc55ae63208e4117aa0de7ffeef0261fbfe kmplot-19.04.3.tar.xz" +sha512sums="2f2f43e361293220614d600c1276c2b7ab48799ffdc0f753a303f7c44ff32138d82ffdac2afe03a1b154b651bd1f9ce4c12c689f9594647b6660370544615813 kmplot-19.08.0.tar.xz" diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD index 569fef81a..f4e21d334 100644 --- a/user/knavalbattle/APKBUILD +++ b/user/knavalbattle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=knavalbattle -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Ship sinking game from KDE" url="https://www.kde.org/applications/games/knavalbattle/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fbc6559c602982b218c555bdbd621975fbfd9867e3f3d19792c49dcf7ee4979a066436fa2eebf248b2105072747b199ce7128dfd78c45b06c82626cdd6c9d2aa knavalbattle-19.04.3.tar.xz" +sha512sums="3a890a6ed16783bd985bc50f5045ddc0c99190dc9a8970f75db8ed8e70a297327a68898f67b537e32d39fcd2dfea7041fd938f911b42e19b809873ebda3657c1 knavalbattle-19.08.0.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index 2e2821119..a93ed9859 100644 --- a/user/knetwalk/APKBUILD +++ b/user/knetwalk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=knetwalk -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fcf1e6da9c1a1a0bd3eafe28c67599608d0f4ac8ebb14dc8ece86b4aa0a22d8287f00c1a770344f60bf91d6d75030e810baf60dc1b6e837530d6f9c353cf774d knetwalk-19.04.3.tar.xz" +sha512sums="ce33b798f6e6ff5828d654e608b540dcc8858994d7c540bc61c03bea98d595d11adf823fa916676ec82d7291c3bb4e71bccea3acf6ee3b020a9fb8b35cbe568f knetwalk-19.08.0.tar.xz" diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD index dd729d77d..888f2d1b7 100644 --- a/user/kolf/APKBUILD +++ b/user/kolf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kolf -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="2D miniature golf game from KDE" url="https://www.kde.org/applications/games/kolf/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b8471ada423a2ec0ef1ccbf4d87adee1a91b7cce59b558587b43aaa47b91d8d57d159bda0d64cccc3119129f6f0a1bff1e3e03682678527502ed75bc8876c19b kolf-19.04.3.tar.xz" +sha512sums="be97c5d15a9755d4a915ce6d2f4062c5002d98e09405677cc692f1af0843063d940f162464a1ec3369580ad6fd75d9d136b44b132a7143dc5f811f472bc96dc4 kolf-19.08.0.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index eaffdf551..a6bde2847 100644 --- a/user/kollision/APKBUILD +++ b/user/kollision/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kollision -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5b18ab96f5227f2900dbe5a5255f5e837bb34990661273327eeef53cdba7aed53cdf282f7287ea2fd0fd4849aa3009f96dc3d59bb23459bcf6477d3338ade74a kollision-19.04.3.tar.xz" +sha512sums="2a48c07b94089df9845150b22b58643a94d0e7ba21c7c9654ea6faffcd92ca1a40f3db33371ee09178a71858138c1fef87cb291c95afaefcb2cbe1d09f60f60e kollision-19.08.0.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index 24acb3218..65ed20f8d 100644 --- a/user/kolourpaint/APKBUILD +++ b/user/kolourpaint/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kolourpaint -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Simple painting program for KDE" url="http://kolourpaint.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bc9a5f081cd50b32b651dac12a6d2146f63788dda6cb7c8fe1c8f6ada99d422e13e0f9b512f8fb6e620ce70a63baca0a44bb5a1d94f0f90d3c0c4aed3705332b kolourpaint-19.04.3.tar.xz" +sha512sums="63f0c4947a618e07ba53cb3771cd184957942a000986ab9317b892d076643908705c779658bf6c9b7376afb89122d71c160c851d52dff86231e2fb4852a39c74 kolourpaint-19.08.0.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index 23a0dfd3b..7f48e0d3a 100644 --- a/user/konquest/APKBUILD +++ b/user/konquest/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=konquest -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7a8c0ca2c723e7175dcb1e19c6666e8e219ed96a6ca585cdd8951c375ae28b7aadc19f4527dc1a09faf65786b8661096b05de2b81e1878a4142f1ac0bb0cf8ad konquest-19.04.3.tar.xz" +sha512sums="05d9092058e46e7a484449e633b1cbc7f2ceed36a75265067236a59f88b1d90896f714379dffb984edd03dfc9b21d79d46ddc57fa7c4d1db12b6591725a216e1 konquest-19.08.0.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index 7686fdbed..9ce7e7c5f 100644 --- a/user/konsole/APKBUILD +++ b/user/konsole/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=konsole -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="20ec8ae12268110f00999b9f1197aff667ee2af7d7c2747b4d142c9db48fceaca7c01ab8f12fbc541cfc79eaebcbd704e166610f263c46083ad9fefb3c5da848 konsole-19.04.3.tar.xz" +sha512sums="9f1b17c62236fd28615cc083d5d33b2360e8a9c903d4076628018064b3240b012f6bd719fe1697f7d52c68a14f88fcfc6281986e251b62cf2571fbfdc777a412 konsole-19.08.0.tar.xz" diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index f753b9f68..58ae2d96d 100644 --- a/user/kpat/APKBUILD +++ b/user/kpat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kpat -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="67ea63fc76fe95c10093a4d28575aa22c211312627323409f11c7973992f6afe009dc6d31433b42391f44f3f4930f0a6743d8beb59df1558697c2db5f8303eff kpat-19.04.3.tar.xz" +sha512sums="d6c05dfa62d7beeb1f023221a986dfd0b3520d260ad3cf91eedecd15da662ff9ba8ba3fb0ea9ec08ec02474b1dcbac70757113702b052fb8b55053f83d7fcddb kpat-19.08.0.tar.xz" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index 0c8730571..f5b0ea729 100644 --- a/user/kpimtextedit/APKBUILD +++ b/user/kpimtextedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kpimtextedit -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -46,5 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b8a48b6b6e45ad3ae9d2b0ea7966884cb28850a295b761db430a84da47b52a26e32dd58b1ea5302948812b5169a96ac31281be04753712b144554cfca4bcdeb1 kpimtextedit-19.04.3.tar.xz -13f90299735e145142f969ffb6462b71c1cd85d5503c3902af924388042396526ff8b943229462e0ff7e5030393e5312dd67b8dfc66efec81f4f05ac15f86091 qt5.9.patch" +sha512sums="834922261edc9470e41b8baaf2ecf10fa5b521d0315e5b4cfbba89e0f1f8f3167091cf2c089a83066e4b1cbd0cb193b3e278fdbc80f6fce491d933c9082c9cca kpimtextedit-19.08.0.tar.xz +3cf800dfc537029588a4701faa2dd1fceb9e0b851c7d7675d468414d45dc2c07aadd4eb687a6b8cfeea4068e1e81b2fe2ad3de7c3c183650d43ab13cf20f4645 qt5.9.patch" diff --git a/user/kpimtextedit/qt5.9.patch b/user/kpimtextedit/qt5.9.patch index 50c29e0e0..6ae06c8a0 100644 --- a/user/kpimtextedit/qt5.9.patch +++ b/user/kpimtextedit/qt5.9.patch @@ -33,7 +33,7 @@ cgit v1.1 project(KPimTextEdit VERSION ${PIM_VERSION}) # ECM setup --set(KF5_MIN_VERSION "5.56.0") +-set(KF5_MIN_VERSION "5.60.0") +set(KF5_MIN_VERSION "5.54.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) @@ -42,8 +42,29 @@ cgit v1.1 SOVERSION 5 ) --set(QT_REQUIRED_VERSION "5.10.0") +-set(QT_REQUIRED_VERSION "5.11.0") +set(QT_REQUIRED_VERSION "5.9.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Widgets) find_package(Grantlee5 "5.1" CONFIG REQUIRED) set_package_properties(Grantlee5 PROPERTIES +--- kpimtextedit-19.08.0/CMakeLists.txt.old 2019-08-15 14:58:32.623688389 +0000 ++++ kpimtextedit-19.08.0/CMakeLists.txt 2019-08-15 14:59:20.798530990 +0000 +@@ -114,7 +114,7 @@ + COMPONENT Devel + ) + +-install(FILES kpimtextedit.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) ++#install(FILES kpimtextedit.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) + + + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +--- kpimtextedit-19.08.0/CMakeLists.txt.old 2019-08-15 14:59:35.306977776 +0000 ++++ kpimtextedit-19.08.0/CMakeLists.txt 2019-08-15 15:00:30.421077488 +0000 +@@ -68,7 +68,6 @@ + add_definitions(-DTRANSLATION_DOMAIN=\"libkpimtextedit\") + + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +-add_definitions(-DQT_NO_FOREACH) + + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS TextToSpeech) + diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index 8f5498b6a..691ca74e6 100644 --- a/user/krdc/APKBUILD +++ b/user/krdc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=krdc -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="View and control remote desktops (RDP and VNC)" url="https://www.kde.org/applications/internet/krdc/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4a9fc033ea7e5064305624504ce488a404a21f87a56fac582b6fa3f1ca2569fda1af886f1c7f907efe0d7de07432e06c0e19d3a585b285e948a8d80f191bb70d krdc-19.04.3.tar.xz" +sha512sums="b7ac7ea37e64057b242b031ea0e000347b32628fe7b349fac70eb4ceee804a70169ce1736069fd6b8519fe963f6986c2853e4193b543a44e9f57b1fb7197c2b6 krdc-19.08.0.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index 3671f7064..435a51363 100644 --- a/user/kreversi/APKBUILD +++ b/user/kreversi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kreversi -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4641446b39a5dca9e17fe7c38137732c04b9ff1f2ebf36636d4778d27a29ac2e221bbb8e861fffd3bbc08a9ee1e13c4b12be3fc8cb5081614bac29fa1ca1174e kreversi-19.04.3.tar.xz" +sha512sums="69dea62ba598dbd0251bba8939d9d15418b2dd929d069e599eed4fb886aae99a06c8200f22b99a9df7b52306289972d2025ef6ae349c3b96a9cb4494978dc1bc kreversi-19.08.0.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index 214e68004..6014268ab 100644 --- a/user/krfb/APKBUILD +++ b/user/krfb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=krfb -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4334c51d4c0471cb0aa2a226626a49d6a1456e0c2ab8d03bbed99228bf6e61efbb41570e0c3f35310c2994831b2444c57caa6ebfa8739c5747b12a2f378917cf krfb-19.04.3.tar.xz" +sha512sums="442c2d52d577eb9d95949da464d0a1541f24cd6a91aea07aa59c519170bee9729b989fa3678e4ac464f6710b8c384fe9d98d1b430e5250975c58e858033cff4e krfb-19.08.0.tar.xz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index 77d4b896f..c36e3bfbb 100644 --- a/user/kruler/APKBUILD +++ b/user/kruler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kruler -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc4d2b621f8e4aafb742848a3a58da77c3fa5a00ea91d347df588cb8f9da69a0c92028133e5f87243b2fa148318a47b213d392f8fe8da5a0ce876e4146502511 kruler-19.04.3.tar.xz" +sha512sums="ccee65f0d4915f3ad6ab3eb394edb294ca7dc8707e11be7548aaf907a6fd8d161f8c316ffe9910491e5b3f9c65be9a5f538618d9d7d372e8776788c9270591f4 kruler-19.08.0.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index 6c5491031..6f2035e3f 100644 --- a/user/kshisen/APKBUILD +++ b/user/kshisen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kshisen -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5083c2eff12d0b03b44ec9fc2ab8ea1cbf2bc215cef2839f3406cf4a5601371ccfa49b4d493767c9e038fd18abc6091addfbc7100d7bf02cfaf18ea356519a43 kshisen-19.04.3.tar.xz" +sha512sums="ad6e5f2c32c5363371c81b9ddec10d8a33f5bb839625138e067901e1f5729ece17920e9573a75af0b679e772eb9b16780069bf06cf990346ff7ad0294aac97bc kshisen-19.08.0.tar.xz" diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD index a76ff9618..73565f540 100644 --- a/user/ksirk/APKBUILD +++ b/user/ksirk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=ksirk -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Strategy game from KDE" url="https://www.kde.org/applications/games/ksirk/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6cd6da1172ea0d89ebf3ff5bd86d6d4228ee8f43bf8c7577d748be1a1fb47d555bbfdb842647a00a4e57ee7e6c262d83e861b084644b2345a5929984ffc7c3b9 ksirk-19.04.3.tar.xz" +sha512sums="a19fdc310f1481bf4642c4d249ffe59c7a0ab5f921f51feb7debbba5df3317defe08c93df1327a0a5dc570a47b0b27e649cf898d17776f7aac3f73c0bd82e423 ksirk-19.08.0.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index 0d16a38d6..990da0b75 100644 --- a/user/ksnakeduel/APKBUILD +++ b/user/ksnakeduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=ksnakeduel -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -13,10 +13,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kdbusaddons-dev kguiaddons-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ksnakeduel-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/ksnakeduel-$pkgver.tar.xz + ridiculous-qt.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,13 +33,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b56b8aa7223aff96fbddd016bcd907f28786ca65426a4881c4c2432108b8efeaf8b176a3cf803161a4e351d958e0f00580a2e0190766e51401a8b8850e1e1658 ksnakeduel-19.04.3.tar.xz" +sha512sums="91eb1d9b7fdb7350a43282b422df5b66dd5cce636545c41d9d08beb2438d820e034e46bfe61d42ea29fa9ea43b05bb928d349cdc92c1eee857a66eca52e6551b ksnakeduel-19.08.0.tar.xz +8f21639ca5b17f6b0bd5d76c65fb59e29c9e8b6cceb95d2c86795b9f20d6d282926c75e0eaba2b1878a0bd9698c1d7326b549e4a2f8c7802254a1d516672fcbb ridiculous-qt.patch" diff --git a/user/ksnakeduel/ridiculous-qt.patch b/user/ksnakeduel/ridiculous-qt.patch new file mode 100644 index 000000000..14cc95264 --- /dev/null +++ b/user/ksnakeduel/ridiculous-qt.patch @@ -0,0 +1,11 @@ +--- ksnakeduel-19.08.0/CMakeLists.txt.old 2019-08-09 00:30:10.000000000 +0000 ++++ ksnakeduel-19.08.0/CMakeLists.txt 2019-08-15 13:12:41.473994535 +0000 +@@ -1,7 +1,7 @@ + cmake_minimum_required (VERSION 3.5 FATAL_ERROR) + project(ksnakeduel) + +-set (QT_MIN_VERSION "5.10.0") ++set (QT_MIN_VERSION "5.9.0") + set (KF5_MIN_VERSION "5.40.0") + + find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD index d4226bc0d..62e0ef233 100644 --- a/user/kspaceduel/APKBUILD +++ b/user/kspaceduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kspaceduel -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Space arcade game from KDE" url="https://www.kde.org/applications/games/kspaceduel/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3531e124f96616d403684e4be14523f85fc927adf23215f6321eb1c3ba4fa4cf547c5575b700717de84937afab38775e16acb8b69f70ff9b9159d666f0f2b748 kspaceduel-19.04.3.tar.xz" +sha512sums="b364b5da191adfe7adf29b5fc5cafbc5e2236475fbacd69f9368d98054135a29ea65f7bcfc5237c7a1b24d8e2b266ee817d707f3a94f630ca217e554f7eb6372 kspaceduel-19.08.0.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index 688f90dd8..be8dc2b68 100644 --- a/user/ksquares/APKBUILD +++ b/user/ksquares/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=ksquares -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="515f6acbf2cefdee3e9855f2c4c3a1ba7d9ad8b197976968de2364e2baef5ba6a376559ddcd94f58fcd1e9a3f69119a9e5402764d12c9d494c4e5c252aeab6e6 ksquares-19.04.3.tar.xz" +sha512sums="27061110c3f28a8742fe218799d684777c4ccb05cf143203833b14fe32a3e142affb1c0a5d199c5c39b379fc817396ddb5050f4fbd8d3449040eda8fc2d07ce7 ksquares-19.08.0.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index 38f1e1b0b..a76952b07 100644 --- a/user/ksudoku/APKBUILD +++ b/user/ksudoku/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=ksudoku -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0bc73b01a46282913d7f4d74fd6495c6e61c5c4b37a1a9a5c1f3fa0869ae60f06a85fc40a6632af31e74efd9f736acf915cf31d5ca75276cceb0d4355369eaa7 ksudoku-19.04.3.tar.xz" +sha512sums="bdc839e829c5254a7b5687d6de359dca3d16ac1f21ed6141b475c6fe8f96e1baa8ca4c7ea4053599144275fe7f3a2c8c59f81f2b51883c3227451d7df93a54e0 ksudoku-19.08.0.tar.xz" diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index 9a6e7813d..a36f1f8a9 100644 --- a/user/ksystemlog/APKBUILD +++ b/user/ksystemlog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=ksystemlog -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="13654dfc5844b5aaefe209f1bc96198e7552eb42445b2f34bf97e2804f088076f95ef8ea10fa3784f718803af72b5c6ec7833429d86d79b250f1bb732431b4b3 ksystemlog-19.04.3.tar.xz" +sha512sums="e7d42ef42bb2fd20d33e4dc6457e680ffa9ee4ee0dbf6ac7a15f85018392ae9172091c0fe2416bc446c3a592a78fa5bb0b19354e7d0bc05105ef7c9152d82778 ksystemlog-19.08.0.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index 2251a5497..5d1d77854 100644 --- a/user/kteatime/APKBUILD +++ b/user/kteatime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kteatime -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="17275f87d536f1f9f470a8e2e4fdaae08c41e148e4ecabca1ae8b6becbf588cb40183d9395b2c8c3d5ee8d9b51f735c680e7048c5a9e612ec672cbee3848622c kteatime-19.04.3.tar.xz" +sha512sums="10d1d136b5bf6c12401948768fb30aef4075a5207d5b10c13e851dea84010bd43bfecbeba6dd74759083dff6ec63d014014f0e8d7cee8b12ccddbc2fe266aa7a kteatime-19.08.0.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index 8fcb68472..3fb8549c5 100644 --- a/user/ktimer/APKBUILD +++ b/user/ktimer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=ktimer -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ad0cbb37d56251a667aa21742219ce1bdbba8e1a7a11f34947e4d3954d11dd10166b891906a13c99c71436ae9ad824a5bb788826a2d935632af40ece438feb8d ktimer-19.04.3.tar.xz" +sha512sums="b8dbbc6c928690dff3f5dedf42ff0c3e75c0b2fdeb812cc010409de8bab8e95ec1b8477482ef04d45ec44fa575360ee6a1929bc247734edd3f9da6af85f51098 ktimer-19.08.0.tar.xz" diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index 1553b739b..6b90bfc03 100644 --- a/user/ktouch/APKBUILD +++ b/user/ktouch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=ktouch -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -12,12 +12,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdeclarative-dev kdoctools-dev ki18n-dev kitemviews-dev kcmutils-dev ktextwidgets-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev - libx11-dev libxcb-dev libxkbfile-dev" + libx11-dev libxcb-dev libxkbfile-dev qt5-qtquickcontrols2-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/ktouch-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,13 +32,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="499caa202f3e08d85240c0cb2b0099495d37c8c285701d5ac0834fd6a30a78b3988677577c5d21e24bf68a3ee22735b145f340794e5860fdb193c964ded49a34 ktouch-19.04.3.tar.xz" +sha512sums="fac0072441345fa7a85e70817f9f65e73995628f1f92c0bba9ad28bc996fdd997976df3995578ba5b9d34b494d04fde0be3179161b27ad6fc310282bf238623a ktouch-19.08.0.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index f1fef831b..db45c6aae 100644 --- a/user/ktuberling/APKBUILD +++ b/user/ktuberling/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=ktuberling -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aaf7df449745545cc7b9e33683b2a40645811d33710e79ece9c98c78f3b562531581bf99205d0d333f1edf4134a7feb41db2b350bd353c9e74a5cf2cd6b890a4 ktuberling-19.04.3.tar.xz +sha512sums="9822d9f58692d248493a7b9f7e4bdb033ca28444261820c303e7ec8eca16e2827ae6bcd244c5890e9fc289daf2ba726d5ffd7255cb897dab167efd665fec6b62 ktuberling-19.08.0.tar.xz a8c723302d141ff74a10cc38245524d59a51d476159c2ac46a1694747ddcb078abc42cea80cf5a5d3910c96c0c90fb7dbf82786496f03b4438a23a736a784e76 frameworks.patch" diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index af072302e..93a6a2966 100644 --- a/user/kturtle/APKBUILD +++ b/user/kturtle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kturtle -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f5c376175856b2e8a851da51bb7fd49bf6efb17040ff8b6b2cf799156fddc22736f595b3caaf462694264a072b2c7ce93fa68bed286bc61cb6da7ce8a48977fb kturtle-19.04.3.tar.xz" +sha512sums="e9de0110bcbc14aeb5ab76d7d8aaa204712c66bdbc21b4960f4b78d16a5459fa6fffdd7e16bf0e8e735ca417c34f68925b0e8eb7f9328aa7ec065d76745fba86 kturtle-19.08.0.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index 520c74c0d..92142001b 100644 --- a/user/kubrick/APKBUILD +++ b/user/kubrick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kubrick -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3dc5cf9dbe93198558449941c6b973cc288fe7c4b4cb4b34134176afe417232934eb35588a538aa55224b982f69413837164564682411ffbb6908c7b53ac3811 kubrick-19.04.3.tar.xz" +sha512sums="c6f8acbd325d255bafe83bd4f00a385c154987c11d3da48f48edaae162415f4f1a749a8f74b894b8b865be7ed4acd9e758034c7a47b982b7916980baa3a07f0a kubrick-19.08.0.tar.xz" diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index d56fcc36f..c7c4df7c1 100644 --- a/user/kwalletmanager/APKBUILD +++ b/user/kwalletmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kwalletmanager -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager5" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="517c69c4a45c0ac9f330670d6b6f2eaf5454ac9f1b2292bafb851d035fe0c85cbe1d7de02254db5f6a1b260a06ad1a95621106c8c07da0b7e35c6d75709e8597 kwalletmanager-19.04.3.tar.xz" +sha512sums="b8221ee4e082e4ea7bf32499dcf435d29de752f683da2c71599c006c5e29b68128fe35cb9b39bf9f96191cf3403373be96ea30e7de4462e2ce3fe81f16bc02d8 kwalletmanager-19.08.0.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index d47f3c5ae..0004d278c 100644 --- a/user/kwave/APKBUILD +++ b/user/kwave/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kwave -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Sound editor built for KDE" url="http://kwave.sourceforge.net/" @@ -47,6 +47,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9f3c6a058c652164d610f53ec36f1dd4d1c255b99c71684d8c19357ddf3c74dbc66288d47292866f88ed81ef72aa440f07534f55c7b2d34093f6c2c58a9a86a7 kwave-19.04.3.tar.xz +sha512sums="66b7707a4ff0757c166b8ea56f2681258b7c0b501ccd9e2bb9f7b6fd826a396e24bf50c3eaadfb41a3a59bc3b96ff35230b105f2a7bd52a07249b6e8a7d91ff4 kwave-19.08.0.tar.xz 63afd083727fd28436c2a8071429ba95fe4342c11669a4e27afc30b8a088b981f284fcff13861d5ef01a6f97152b25eec1fbeb303c9bdd76707e44ff5978dab8 es-doc-fix.patch 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index 7532912f1..b9d7c8b8d 100644 --- a/user/kwordquiz/APKBUILD +++ b/user/kwordquiz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kwordquiz -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Flash card trainer for KDE" url="https://www.kde.org/applications/education/kwordquiz/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="83ae3b4e34de6d0491203f008dab358c23f34301e7d10904f1bb2230a01541102d554c9aa4204160a372ef96e404285dbcb2d9f8a1c25ea7a6ae6fa5007afbc3 kwordquiz-19.04.3.tar.xz" +sha512sums="7299bbf3f573a92fe6ef0ddc5515bca1c9c7a08189e41493a2f9f0a941d8ee1de6137a34285f635ebec1a57b0583bc8a621af2c53aafb6cfa07e4a9872bd946d kwordquiz-19.08.0.tar.xz" diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD index 44fdee8dd..1544525fd 100644 --- a/user/libkdcraw/APKBUILD +++ b/user/libkdcraw/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=libkdcraw -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="RAW image file format support for KDE" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="354415fd02353f083d699e4bb69a007871bc09d59cb4ad9397c89675dd5a204ec21841b156ab20afb646de3c8c79119bc2867666cafde9f1d3f66847dbaf8b4d libkdcraw-19.04.3.tar.xz" +sha512sums="04a46cc06373e7bbac7fca24cffc3a34bdf382615152bce2ce263c99c47421be60a567be5e170f2096ee2d09e54312ad40a3613a6b4e0a5d6600383c23d9db5e libkdcraw-19.08.0.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index 7daf0e0c6..787073ad0 100644 --- a/user/libkdegames/APKBUILD +++ b/user/libkdegames/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=libkdegames -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -63,4 +63,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="3d918f7e3662321fd8422f39099fd2d97bede3531c2943ef0f28628e6319876cf60a06342f98e60ea69ce069cce9a5f35a82f20f44b51793dd09a231c533d00b libkdegames-19.04.3.tar.xz" +sha512sums="4596fa69729f742a2c621993020e11056762daae0dad15dbfc4b09e559a6ec5dd551ea0e13a731337f7c09aba99b9d062c98a2de0a988845d813fa709b38bf2e libkdegames-19.08.0.tar.xz" diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index 8d633a44c..61580cff9 100644 --- a/user/libkeduvocdocument/APKBUILD +++ b/user/libkeduvocdocument/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=libkeduvocdocument -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="575a673cfcb8aaa73bbe20741f4c9c903df3a194fbab5d9fa98c0ade53c789c3e0926d9b71540d2e812268edb4601a84092baad14d340189e218ca8bd2e008f5 libkeduvocdocument-19.04.3.tar.xz" +sha512sums="82eedb6b4fde4c75cd97e96532f158510b446056bfd5c96766f72e731718c4d62157bc4862e11d1d50a19e6a782d57cf5661f689c57eab6c65fab54b79b77973 libkeduvocdocument-19.08.0.tar.xz" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index b482bcbdf..7486460ce 100644 --- a/user/libkexiv2/APKBUILD +++ b/user/libkexiv2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=libkexiv2 -pkgver=19.04.3 -pkgrel=1 +pkgver=19.08.0 +pkgrel=0 pkgdesc="KDE integration with Exiv2 EXIF data library" url="https://www.KDE.org/" arch="all" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev" source="https://download.kde.org/stable/applications/$pkgver/src/libkexiv2-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9e59a9c4d5975bf1744cf5ee8ec65ff1e81fd60a338025debb4d0e1670bd9c4c2d42043e0ce5497770024ef08a169861d7c2b509a274c5aa8722783b49abf525 libkexiv2-19.04.3.tar.xz" +sha512sums="5fcbf637b40607e6244dea2672571ff9fa80363e178964e4e118f41b3c5cf2866b9e0fc2a47a9d3dd957dfee770068adbd40f9e4fcf84a0dc6a04b56fe1398bd libkexiv2-19.08.0.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index ca37b51e0..4963e89b2 100644 --- a/user/libkipi/APKBUILD +++ b/user/libkipi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=libkipi -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a3e9b2d79b6447f40e57524287e03a16a47f95a64388176bb1823a428ec20ac7f640f2f2e9efb181a376b669559cac648c9a114258b190914e92b3248190e18c libkipi-19.04.3.tar.xz" +sha512sums="7e043f3542fb11fb0f25b4422956b6751d9d20d4ff859c34d1588fb93dda039fdca9774793b773eeec9067ca06ad219e93a4a70c505220e29d7de2c18f37eed8 libkipi-19.08.0.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 17453d5b9..e181b6e6a 100644 --- a/user/libkleo/APKBUILD +++ b/user/libkleo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=libkleo -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="06dd54352f8350abb386e573d06f23520f511c2db4c6b6bfc655b5c0ac34f92b8f5b0020a72122c275df139b8b65142b247940812afcfe563a19aee3204ab403 libkleo-19.04.3.tar.xz -5929e9cd669a4a0ef9e4f4e44caf213ed91963eb6febf9cd2012779f05b20dc0f225df67c40b92d5a86ef048683af55fe34c8be78d795474e3a90296e03755bd egregious-versions.patch" +sha512sums="02bc542ff7f9ecf5741039def5d884d52c4009f98ca9fc27d58b794d2028443a511a71f6080d3e958b4ca72bdb5c10b5537253204118139469f0199f865f1ccf libkleo-19.08.0.tar.xz +57c2c0a2588bd40ccb1c0e197d41087e347126f56761e426198b9e38eab9bd8bc8a1c2344db36fabbc3f714c90912ec3d837fccbe36ac284b4f07d4a41c2dae3 egregious-versions.patch" diff --git a/user/libkleo/egregious-versions.patch b/user/libkleo/egregious-versions.patch index 3fb6e6dea..db713dc6c 100644 --- a/user/libkleo/egregious-versions.patch +++ b/user/libkleo/egregious-versions.patch @@ -6,7 +6,7 @@ libKleo uses no new APIs. project(libkleo VERSION ${PIM_VERSION}) --set(KF5_MIN_VERSION "5.56.0") +-set(KF5_MIN_VERSION "5.60.0") +set(KF5_MIN_VERSION "5.54.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) @@ -15,8 +15,18 @@ libKleo uses no new APIs. set(LIBKLEO_LIB_VERSION ${PIM_VERSION}) --set(QT_REQUIRED_VERSION "5.10.0") +-set(QT_REQUIRED_VERSION "5.11.0") +set(QT_REQUIRED_VERSION "5.9.0") - set(KDEPIMTEXTEDIT_VERSION "5.11.3") + set(KDEPIMTEXTEDIT_VERSION "5.12.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets) +--- libkleo-19.08.0/CMakeLists.txt.old 2019-08-15 15:03:03.464693272 +0000 ++++ libkleo-19.08.0/CMakeLists.txt 2019-08-15 15:05:18.800204812 +0000 +@@ -90,6 +90,6 @@ + + + add_subdirectory(src) +-install(FILES libkleo.renamecategories libkleo.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) ++#install(FILES libkleo.renamecategories libkleo.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) + ki18n_install(po) diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index dcf8fbeb1..636429a5f 100644 --- a/user/libkmahjongg/APKBUILD +++ b/user/libkmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=libkmahjongg -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a03c661cc8d219eb990e87002e493b21f647ea0fab867e13e59faa25319fbd03ce2a02473917584492118d582d845787322af4b075ebf4f19abd2c854b1fbf29 libkmahjongg-19.04.3.tar.xz" +sha512sums="8926e885a0792dc1c0604e0415db9fb02a7e18ddfdd054f56ceb606af6e41b3289f1d9d39aeddd02b95af6614997094c99e2b9c7380e9cdf1415d743c85d527b libkmahjongg-19.08.0.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index e694244b7..204cdce4f 100644 --- a/user/libksane/APKBUILD +++ b/user/libksane/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=libksane -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c86c12e44c934fdbf9fff530286c0b325dd211110325c8cad23da3c7dc6ad2d06fcbaeacf611c35f3bd39d3cfa992e93ba098ba578b8c0ca246295f49b35b695 libksane-19.04.3.tar.xz +sha512sums="66f0bb488f086fd7702008368e094bf420c9fb1540c2a3e6e2b2a932cd299a30d04c87e6def1dcf9e3867452dfb0fc98c2de27b664c170da04d495cec881e558 libksane-19.08.0.tar.xz 60e0e8b073499e932d626a65c5cc23f58d2701921da547733d2736b58c6d412c8d6e782884916390ff16e02183a53ad283712f0bcf2cdcf5a0eb0d7029bb1ba8 frameworks.patch" diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 3fd2e3029..62a60c313 100644 --- a/user/lskat/APKBUILD +++ b/user/lskat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=lskat -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Lieutenant Skat is an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="497729984c2efa01726b54db1c21d868a6f56d01226660b9fc8d4149b259d368596d28c0da88ff8e6056f7ec0bff33456541ce1e0f6bddfdb08d28de42e77ef6 lskat-19.04.3.tar.xz" +sha512sums="bde0b69c99f319dc03c9edcffd2777cb1fe0df2e338174085ea4858a709f19549508fa400ab77d615b8d5842b6e2179b608fd608e6e915ae4c7079110bba9f3b lskat-19.08.0.tar.xz" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index 3f51444e0..76266edc9 100644 --- a/user/marble/APKBUILD +++ b/user/marble/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=marble -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4839ff6466accc920507ba032e7dea45a4fd22b6b93ca2f8d15526f0c8490f86271af0f109232f6f87dd00e090295b4ff17ec17b4592b90f13f26ce08fb2f4f4 marble-19.04.3.tar.xz" +sha512sums="a99decc1d7017dbe3e276d44347c19c10e6fd107e4e0f9178e173eb5b4338ff22d4500cdf8a08984b745a3c695ac41285a3f46bbd0519859c3658c96bd41c15b marble-19.08.0.tar.xz" diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index af6a0b3c1..6f84a8dc4 100644 --- a/user/minuet/APKBUILD +++ b/user/minuet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=minuet -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="96d6fe8634260de1e9b908c239628aed49eed57e3f0587d94a4c6e18318fc98c0db8219a6d58d68ef1bc06ce13032e0ff438511b868e8acb841713a8be966f8b minuet-19.04.3.tar.xz" +sha512sums="bffe36bae1d2f2d39a402f9758cf4a6307909bf8a6d56576c3986c97e3b51088a5e72c5e409188b5039026d6a675881c40177bec143ae78d96a12bdb76c94c38 minuet-19.08.0.tar.xz" diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index c6b8d3199..8cec71ded 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=okular -pkgver=19.04.3 -pkgrel=1 +pkgver=19.08.0 +pkgrel=0 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" arch="all" @@ -18,10 +18,10 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz es-doc-fix.patch + pt-doc-fix.patch " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -37,15 +37,14 @@ build() { } check() { - cd "$builddir" # All other tests require X11 CTEST_OUTPUT_ON_FAILURE=TRUE ctest -R '^shelltest' } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c8d2a79fe00b91f58376937ef57cbc20bc7363d9a046cf05fc34597d36f75009011c63589857270755f294adba5fc88ba980bd5affd08c4751bc9e3b908e3946 okular-19.04.3.tar.xz -d82dd9de666a28ef605d8a81e74851f265be4ccaeaa39a1cdee9eb1db830fcd0d581d01d6e89a1d36b8ea5c9c8113f1016090dc0e9f17070d388166d9e967458 es-doc-fix.patch" +sha512sums="5abebfa223085c6e89e9e1fbb34f340c6888dfdb0415873d86dd5f7e64a3002cb6ba5a859c95eb1e68fe24b3aa29be49ad333acc4811e9360b3ebaa8f79e6934 okular-19.08.0.tar.xz +d82dd9de666a28ef605d8a81e74851f265be4ccaeaa39a1cdee9eb1db830fcd0d581d01d6e89a1d36b8ea5c9c8113f1016090dc0e9f17070d388166d9e967458 es-doc-fix.patch +43daf92826a87b58fbafdaf282af4c2fddbf2a7d8c8c6491418ee962e4bccd6dcbbf8ff36b63f7b1ead181b957ba0f66e08e73c3e755397aafdbf99f3397da1e pt-doc-fix.patch" diff --git a/user/okular/pt-doc-fix.patch b/user/okular/pt-doc-fix.patch new file mode 100644 index 000000000..a761139f6 --- /dev/null +++ b/user/okular/pt-doc-fix.patch @@ -0,0 +1,11 @@ +--- okular-19.08.0/po/pt_BR/docs/okular/index.docbook.old 2019-08-09 00:21:00.000000000 +0000 ++++ okular-19.08.0/po/pt_BR/docs/okular/index.docbook 2019-08-15 14:29:06.782714494 +0000 +@@ -1194,7 +1194,7 @@ + Para remover uma anotação, basta clicar com o &RMB; e selecionar Excluirou selecione uma anotação usando o &LMB; e pressione a tecla ∇. ++>ou selecione uma anotação usando o &LMB; e pressione a tecla Delete. + Ao removê-la, a janela da anotação será fechada, caso esteja aberta. + diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD index 6425491bb..ad7e78132 100644 --- a/user/palapeli/APKBUILD +++ b/user/palapeli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=palapeli -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Jigsaw puzzle game by KDE" url="https://www.kde.org/applications/games/palapeli/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cbf5b6f3a963980795adacb8c1da7c32bc285142a2d4f92d9f0cb34cd69b3c5f9c4d2f51c1f43ef14a088dd86462c86db0676d627bac12182f7d562544554d22 palapeli-19.04.3.tar.xz" +sha512sums="23dae3cfba1429b604a07ab1ddb520910fc2244d34231709a1d06ab53e47df3e18e6260178d6198a019ff592bae665cb588fddb3381d938045cc23559b49f402 palapeli-19.08.0.tar.xz" diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index 352b57c86..551580c5f 100644 --- a/user/rocs/APKBUILD +++ b/user/rocs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=rocs -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8686047f654604312e2228bae7558483fce908f23e980f66c3ef2559f29684d056db20a37207ad05c52badde5debc626f2de7224357a93d78dc84e84737bfe14 rocs-19.04.3.tar.xz" +sha512sums="918fea2a0d63c19e43e05f74b76a75fa9eb1386e26b8f325c200e470290b05c570146a3d98f1e3ca4dd6b564c77f0b8bd12fb3e671863580a8b9bcc952246b54 rocs-19.08.0.tar.xz" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index aedc2d30d..653b3487f 100644 --- a/user/spectacle/APKBUILD +++ b/user/spectacle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=spectacle -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -16,10 +16,10 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz qt5.9.patch + kconfig.patch " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,19 +30,19 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_TESTING=OFF \ ${CMAKE_CROSSOPTS} make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e26b73e8523d65956f6e744ffeb15ed1f63fec2cf2f1352ff5ab0f9c208d30efeb43665592a215dcfc65e0cae201675f5a14a86c23e516b3fcb30902ef71143e spectacle-19.04.3.tar.xz -781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch" +sha512sums="3581db1a0135e0942c3ddddeb8b8bf7d913e0bb45576a5a3982d24793bfab75f9ae66dc40db5708cdcadd950bd977a7c85ad44e20d8c8b50c2cf0e219cb89a97 spectacle-19.08.0.tar.xz +781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch +9119ea6e7662f92a6daa37f16fbc634668cc179b872bc07173227b44821a2ebfbe15f083e3203a4abebd5380fffbb647e506c56466b743a8dd29e798cebd84e3 kconfig.patch" diff --git a/user/spectacle/kconfig.patch b/user/spectacle/kconfig.patch new file mode 100644 index 000000000..2d1860f2e --- /dev/null +++ b/user/spectacle/kconfig.patch @@ -0,0 +1,40 @@ +From cab0844fef8bc6e7491978307245aadf65d64409 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" +Date: Thu, 15 Aug 2019 09:05:28 -0500 +Subject: [PATCH] Define QT_NO_FOREACH only if KConfig > 5.56.0 + +Spectacle cannot be compiled with KConfig <= 5.56.0 otherwise, because +KConfig uses Q_FOREACH in its public headers. + +Tested on: KConfig 5.54.0 / Qt 5.9.7 +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78eae41..79eb869 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,7 +40,7 @@ include(FeatureSummary) + include(ECMQtDeclareLoggingCategory) + include(ECMAddTests) + +-add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH) ++add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII) + + find_package( + Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED +@@ -67,6 +67,10 @@ find_package( + XmlGui + ) + ++if(${KF5Config_VERSION} STRGREATER "5.56.0") ++ add_definitions(-DQT_NO_FOREACH) ++endif() ++ + # optional components + + find_package(KF5Kipi) +-- +2.22.0 + diff --git a/user/step/APKBUILD b/user/step/APKBUILD index 23305835a..d73c5c22d 100644 --- a/user/step/APKBUILD +++ b/user/step/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=step -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d67df9dcd8c84c1358ef0b531808e3515749c255f6fae38a54b5656256bb10ac0b508836ca758baff2b4b3d3f47c736122de29f4f50a7fee72e91e17e08aeca1 step-19.04.3.tar.xz" +sha512sums="f3a7f13117cd99b843b9ef99dc38a50baa50a3757319b74e804688c31abdbe6bc6251afae39d73d4af67b8d82dcda2df42f3c8fa91e5d20e8860fa0430710bff step-19.08.0.tar.xz" diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index e5fd6cebc..4d0afa0b8 100644 --- a/user/umbrello/APKBUILD +++ b/user/umbrello/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=umbrello -pkgver=19.04.3 +pkgver=19.08.0 pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="85add6795409f3ea2ce5b835edc9878ee3bb9f17b52d0dbb56b3230c4ef3b3fd9f4533238112390efd6cfbf33fd084ac8abb759992124926080fb1da64f34b68 umbrello-19.04.3.tar.xz +sha512sums="46f95eba5b5880e1df7bbc952c35fbf93959a03aed4e9b2247e54b1cfcc65388a38c85e596a080c70f750f9ffeff17089e186ed7ea9a4dfb1248ba8118f9ecda umbrello-19.08.0.tar.xz fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch" -- cgit v1.2.3-60-g2f50