Merge pull request #7112 from zrax/kf5t2_574

Update Tier 2 KF5 frameworks to 5.74.0
2020-10-15 10:19:54 +02:00
parent bdd6c4f406 fda6a84c41
commit 83f5af4545
13 changed files with 28 additions and 90 deletions
--- a/mingw-w64-kactivities-qt5/PKGBUILD
+++ b/mingw-w64-kactivities-qt5/PKGBUILD
@@ -4,7 +4,7 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kactivities"
-pkgver=5.68.0
+pkgver=5.74.0
 pkgrel=1
 arch=('any')
 pkgdesc="Runtime and library to organize user work in separate activities (mingw-w64-qt5${_namesuff})"
@@ -18,7 +18,7 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kconfig-qt5${_namesuf
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kwindowsystem-qt5${_namesuff}>=${pkgver}"
 groups=('kf5')
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz")
-sha256sums=('1853135feb6adfec252e6fab0b1472450422afd5998a9a31d942e8672fbe7111')
+sha256sums=('da5e23b9a59572852c74e207f3acc00b38ff420008c8dfa5f970b748c2c2ae0e')

 prepare() {
  mkdir -p build-${CARCH}${_variant}
--- a/mingw-w64-kauth-qt5/PKGBUILD
+++ b/mingw-w64-kauth-qt5/PKGBUILD
@@ -5,7 +5,7 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kauth"
-pkgver=5.68.0
+pkgver=5.74.0
 pkgrel=1
 arch=('any')
 pkgdesc="Abstraction to system policy and authentication features (mingw-w64-qt5${_namesuff})"
@@ -16,7 +16,7 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}"
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kcoreaddons-qt5${_namesuff}>=${pkgver}"
 groups=('kf5')
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz")
-sha256sums=('b9a7cd724709ea188852f7656fbeda2dc3cc40cc5d09573049c2680c0edbd41f')
+sha256sums=('e0aa6206c4bf9220d1c4882b8b77f9cf9202646b64b8a249a60a9d4b272e3bfc')

 prepare() {
  mkdir -p build-${CARCH}${_variant}
--- a/mingw-w64-kcompletion-qt5/PKGBUILD
+++ b/mingw-w64-kcompletion-qt5/PKGBUILD
@@ -4,7 +4,7 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kcompletion"
-pkgver=5.68.0
+pkgver=5.74.0
 pkgrel=1
 arch=('any')
 pkgdesc="Text completion helpers and widgets for Qt (mingw-w64-qt5${_namesuff})"
@@ -16,7 +16,7 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kconfig-qt5${_namesuf
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kwidgetsaddons-qt5${_namesuff}>=${pkgver}"
 groups=('kf5')
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz")
-sha256sums=('642d68b4c472e11a8861a61238297633be288bfd72c13547707754f1ae2be33a')
+sha256sums=('5bec7f31bab8eb724bfb01690bd1585b43eccca4e37c80cc3729af2f7c7b2875')

 prepare() {
  mkdir -p build-${CARCH}${_variant}
--- a/mingw-w64-kcrash-qt5/PKGBUILD
+++ b/mingw-w64-kcrash-qt5/PKGBUILD
@@ -6,7 +6,7 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kcrash"
-pkgver=5.68.0
+pkgver=5.74.0
 pkgrel=1
 arch=('any')
 pkgdesc="Support for application crash analysis and bug report from apps (mingw-w64-qt5${_namesuff})"
@@ -18,7 +18,7 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kcoreaddons-qt5${_nam
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kwindowsystem-qt5${_namesuff}>=${pkgver}"
 groups=('kf5')
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz")
-sha256sums=('60daf2cee87c652619b098b688edce6f993c7960783159cd8be9d9145df29f7f')
+sha256sums=('4aaffaed77c0aebf7f68183ed2256173a35c7200be1e99984cbfd9c9f332b07f')

 prepare() {
  mkdir -p build-${CARCH}${_variant}
--- a/mingw-w64-kdoctools-qt5/PKGBUILD
+++ b/mingw-w64-kdoctools-qt5/PKGBUILD
@@ -4,7 +4,7 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kdoctools"
-pkgver=5.68.0
+pkgver=5.74.0
 pkgrel=1
 arch=('any')
 pkgdesc="KF5 documentation framework using docbook (mingw-w64-qt5${_namesuff})"
@@ -20,7 +20,7 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-karchive-qt5${_namesu
 groups=('kf5')
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"
        catalog_path.patch)
-sha256sums=('93f5bee9dfaacacacfbeb3e915b192b5e645c1d01057b0cea4081c9ae5285670'
+sha256sums=('4b54e7a7fb1328ceb4c0a95d620f226c8d8401f93ef28f165e37783b0ce3054e'
            '7dafde4dd5a202c82b3e88480c0c80a045845f9bf35576e061a54a7fc2d31303')

 prepare() {
--- a/mingw-w64-kfilemetadata-qt5/PKGBUILD
+++ b/mingw-w64-kfilemetadata-qt5/PKGBUILD
@@ -4,8 +4,8 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kfilemetadata"
-pkgver=5.68.0
-pkgrel=3
+pkgver=5.74.0
+pkgrel=1
 arch=('any')
 pkgdesc="A file metadata extraction library (mingw-w64-qt5${_namesuff})"
 license=('LGPL')
@@ -21,7 +21,7 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-taglib"
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-ffmpeg"
 groups=('kf5')
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz")
-sha256sums=('c2a8aee8243efa30fc921b7f50b390b47ee2cf83aa83b125a530a25de6d6fe21')
+sha256sums=('c5fab0101a39265eeb1884522ed548ae106cd434d6313be1fc0bdba4f29dc5a8')

 prepare() {
  mkdir -p build-${CARCH}${_variant}
--- a/mingw-w64-kimageformats-qt5/PKGBUILD
+++ b/mingw-w64-kimageformats-qt5/PKGBUILD
@@ -4,8 +4,8 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kimageformats"
-pkgver=5.68.0
-pkgrel=2
+pkgver=5.74.0
+pkgrel=1
 arch=('any')
 pkgdesc="Plugins to allow QImage to support extra file formats (mingw-w64-qt5${_namesuff})"
 license=('LGPL')
@@ -16,7 +16,7 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-openexr${_namesuff}"
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-karchive-qt5${_namesuff}>=${pkgver}"
 groups=('kf5')
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz")
-sha256sums=('498fab29d19f10f2c91c796134f959b2cf3ce8372087b5eeb62f07e62af85949')
+sha256sums=('732c94512a26ff4c4fcdea46ce26fcd7c700c129188c181115fbb0facac937fe')

 prepare() {
  mkdir -p build-${CARCH}${_variant}
--- a/mingw-w64-kjobwidgets-qt5/PKGBUILD
+++ b/mingw-w64-kjobwidgets-qt5/PKGBUILD
@@ -4,7 +4,7 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kjobwidgets"
-pkgver=5.68.0
+pkgver=5.74.0
 pkgrel=1
 arch=('any')
 pkgdesc="Widgets for tracking KJob instances (mingw-w64-qt5${_namesuff})"
@@ -16,7 +16,7 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kcoreaddons-qt5${_nam
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kwidgetsaddons-qt5${_namesuff}>=${pkgver}"
 groups=('kf5')
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz")
-sha256sums=('a11ba51ed0ab330f9a921cf0a61e604c27d88c1c2ea477a875bc0a0cd228a292')
+sha256sums=('76fd0c9634316b5d18fe9e25e77a5511fd2bddd0beef3d5207aca811718c2299')

 prepare() {
  mkdir -p build-${CARCH}${_variant}
--- a/mingw-w64-knotifications-qt5/001-disable-libsnoretoast.patch
+++ b/mingw-w64-knotifications-qt5/001-disable-libsnoretoast.patch
@@ -1,58 +0,0 @@
--- knotifications-5.68.0/CMakeLists.txt.orig	2020-03-16 13:39:50.651741000 +0300
-+++ knotifications-5.68.0/CMakeLists.txt	2020-03-16 13:40:02.529150800 +0300
-@@ -71,13 +71,15 @@
- if(APPLE)
-    find_package(Qt5MacExtras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
- endif()
- if (WIN32)
-+    if (MSVC)
-     find_package(LibSnoreToast REQUIRED)
-     set_package_properties(LibSnoreToast PROPERTIES TYPE REQUIRED
-                             PURPOSE     "for the Windows Toast Notifications"
-                             DESCRIPTION "A command line application, capable of creating
-                                         Windows Toast notifications on Windows (>=)8 "
-     )
-+    endif()
-     find_package(Qt5Network REQUIRED)
- endif()
- 
-@@ -92,7 +92,7 @@
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
- 
-if (NOT WIN32 AND NOT ANDROID)
-+if (NOT MSVC AND NOT ANDROID)
-     find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus)
-     find_package(Canberra)
-     set_package_properties(Canberra PROPERTIES
--- knotifications-5.68.0/src/CMakeLists.txt.orig	2020-03-16 13:40:13.420211200 +0300
-+++ knotifications-5.68.0/src/CMakeLists.txt	2020-03-16 13:40:25.758616100 +0300
-@@ -42,7 +42,7 @@
-     list(APPEND knotifications_SRCS notifybyandroid.cpp knotifications.qrc)
- endif()
- 
-if (WIN32)
-+if (MSVC)
-   list(APPEND knotifications_SRCS notifybysnore.cpp)
- endif ()
- 
--- knotifications-5.68.0/src/knotificationmanager.cpp.orig	2020-03-16 13:59:00.157166400 +0300
-+++ knotifications-5.68.0/src/knotificationmanager.cpp	2020-03-16 13:59:16.455129200 +0300
-@@ -42,7 +42,7 @@
- #include "notifybyandroid.h"
- #elif defined(Q_OS_MACOS)
- #include "notifybymacosnotificationcenter.h"
-#elif defined(Q_OS_WIN)
-+#elif defined(Q_OS_WIN) && defined(_MSC_VER)
- #include "notifybysnore.h"
- #else
- #include "notifybypopup.h"
-@@ -137,7 +137,7 @@
-     if (action == QLatin1String("Popup")) {
- #if defined(Q_OS_ANDROID)
-             plugin = new NotifyByAndroid(this);
-#elif defined(Q_OS_WIN)
-+#elif defined(Q_OS_WIN) && defined(_MSC_VER)
-             plugin = new NotifyBySnore(this);
- #elif defined(Q_OS_MACOS)
-             plugin = new NotifyByMacOSNotificationCenter(this);
--- a/mingw-w64-knotifications-qt5/PKGBUILD
+++ b/mingw-w64-knotifications-qt5/PKGBUILD
@@ -4,7 +4,7 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "knotifications"
-pkgver=5.68.0
+pkgver=5.74.0
 pkgrel=1
 arch=('any')
 pkgdesc="Abstraction for system notifications (mingw-w64-qt5${_namesuff})"
@@ -13,21 +13,16 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}")
 depends=()
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}"
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-phonon-qt5${_namesuff}"
-_kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kcodecs-qt5${_namesuff}>=${pkgver}"
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kconfig-qt5${_namesuff}>=${pkgver}"
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kcoreaddons-qt5${_namesuff}>=${pkgver}"
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kwindowsystem-qt5${_namesuff}>=${pkgver}"
 #_kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-snoretoast"
 groups=('kf5')
-source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"
-        001-disable-libsnoretoast.patch)
-sha256sums=('646bd3bac073fbf4f19f9047360325c933751d605cf1311f4c922d7457fbda51'
-            'aac41418d42c6ae0ded844d297162e920e155cad94c2378cd8c6d933e0b42bd6')
+source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz")
+sha256sums=('cbf41ef923a5af6fb5964c8d46a5c52eed023e6c6e8e3e8b74079ff41307927c')

 prepare() {
  mkdir -p build-${CARCH}${_variant}
-  cd ${_basename}-${pkgver}
-  patch -p1 -i ${srcdir}/001-disable-libsnoretoast.patch
 }

 build() {
@@ -45,6 +40,7 @@ build() {
    -DBUILD_TESTING=OFF \
    -DECM_DIR=${MINGW_PREFIX}/share/ECM \
    "${extra_config[@]}" \
+    -DWITH_SNORETOAST=OFF \
    -G'MSYS Makefiles'
  make
 }
--- a/mingw-w64-kpackage-qt5/PKGBUILD
+++ b/mingw-w64-kpackage-qt5/PKGBUILD
@@ -4,7 +4,7 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kpackage"
-pkgver=5.68.0
+pkgver=5.74.0
 pkgrel=1
 arch=('any')
 pkgdesc="Framework that lets applications manage user installable packages of non-binary assets (mingw-w64-qt5${_namesuff})"
@@ -17,7 +17,7 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-ki18n-qt5${_namesuff}
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kcoreaddons-qt5${_namesuff}>=${pkgver}"
 groups=('kf5')
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz")
-sha256sums=('49727d89f1ca7ee504397d6e8b5cd25c26cd0061596b26d8ab2b64e3987d2d16')
+sha256sums=('b5616d265b2f404b3bc8e389644185d66bf59a685ab40bbf646d36c3f56ff6ae')

 prepare() {
  mkdir -p build-${CARCH}${_variant}
--- a/mingw-w64-kunitconversion-qt5/PKGBUILD
+++ b/mingw-w64-kunitconversion-qt5/PKGBUILD
@@ -4,7 +4,7 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kunitconversion"
-pkgver=5.68.0
+pkgver=5.74.0
 pkgrel=1
 arch=('any')
 pkgdesc="Abstraction to system DNS Service Discovery features (mingw-w64-qt5${_namesuff})"
@@ -15,7 +15,7 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}"
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-ki18n-qt5${_namesuff}>=${pkgver}"
 groups=('kf5')
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz")
-sha256sums=('39ec06e2439306ce5b5efe5fe972d201e8c8e5fda634652cdc01c58427574adb')
+sha256sums=('55a6cc919bea7e09582709c11bcce33c51bd714f1846c941ccbf240a15cad959')

 prepare() {
  mkdir -p build-${CARCH}${_variant}
--- a/mingw-w64-syndication-qt5/PKGBUILD
+++ b/mingw-w64-syndication-qt5/PKGBUILD
@@ -3,7 +3,7 @@
 _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "syndication"
-pkgver=5.68.0
+pkgver=5.74.0
 pkgrel=1
 arch=('any')
 pkgdesc="RSS/Atom parser library (mingw-w64-qt5${_namesuff})"
@@ -14,7 +14,7 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}"
 _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kcodecs-qt5${_namesuff}>=${pkgver}"
 groups=('kf5')
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz")
-sha256sums=('0715fc1b7312b5081521b781d0878d88cc70dcb77272ee173cecca03cc221fd3')
+sha256sums=('b4049d28a956fb4783f44262a01dec66067b3f7eb45040eef2939f7b06941ca8')

 prepare() {
  mkdir -p build-${CARCH}${_variant}