diff --git a/mingw-w64-attica-qt5/PKGBUILD b/mingw-w64-attica-qt5/PKGBUILD index 32e91ef6c2..5d7773d6fb 100644 --- a/mingw-w64-attica-qt5/PKGBUILD +++ b/mingw-w64-attica-qt5/PKGBUILD @@ -1,22 +1,24 @@ -# $Id$ # Maintainer (ArchLinux): Andrea Scarpino # Maintainer (MSYS2): Ray Donnelly _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "attica" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="A Qt5 library that implements the Open Collaboration Services API (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('fcc0b11620de9d88141fcb36aa2eddc19a78c023a2c753eb9de404271280288d') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('f482b3353926447679829693d7a7e02cd8d4956f67f2c05316d5ab941e6ac808' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -34,7 +36,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -43,12 +46,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } - diff --git a/mingw-w64-breeze-icons-qt5/PKGBUILD b/mingw-w64-breeze-icons-qt5/PKGBUILD index 9f07817c53..e90b3d1635 100644 --- a/mingw-w64-breeze-icons-qt5/PKGBUILD +++ b/mingw-w64-breeze-icons-qt5/PKGBUILD @@ -3,40 +3,25 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "breeze-icons" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Breeze icon themes (mingw-w64-qt5${_namesuff})" license=('LGPL') makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-python-lxml" "unzip") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.zip" - #${_basename}-${pkgver}::git+https://github.com/KDE/breeze-icons.git#tag=v${pkgver} 01-mingw-python-script.patch) -sha256sums=('28ae8a401cac10ef789f9199b8934b77c19d4fc00989662d8bb72cc188894516' +sha256sums=('9c32a2a6c0222db8ef1193a23db7cc056c093568bacfc342be0e2bb03a7bc955' '2589efa413e5540668eaa6156d415b9e423cba566643aaef449392992bcb46c2') -#noextract=("${_basename}-${pkgver}.tar.xz") prepare() { - # bsdtar fails to extract this on Windows because it includes symlinks - # before the targets. Worse, it has symlinks to symlinks, so extracting - # it twice isn't sufficient. So we must keep trying until everything is - # resolved :(. However, we also enforce hard limit at 32 tries -- if it - # doesn't work after that, it's time to just give up. - #_tries=0 - #while ! /usr/bin/bsdtar xJf "${_basename}-${pkgver}.tar.xz" ; do - # _tries=$(( $_tries + 1 )) - # if (( $_tries == 7 )); then - # echo "Could not extract ${_basename}-${pkgver}.tar.xz after 32 tries. Giving up!" - # exit 1 - # fi - #done - mkdir -p build-${CARCH}${_variant} cd ${_basename}-${pkgver} patch -p1 -i ${srcdir}/01-mingw-python-script.patch @@ -50,20 +35,22 @@ build() { fi _kde_f5_build_env - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ "${_kde_f5_KDE_INSTALL_DIRS[@]}" \ -DBUILD_QCH=OFF \ -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install # KDE apps won't get an icon theme by default on Windows unless it's # provided via /icontheme.rcc diff --git a/mingw-w64-karchive-qt5/PKGBUILD b/mingw-w64-karchive-qt5/PKGBUILD index ad3017502e..04e0045f73 100644 --- a/mingw-w64-karchive-qt5/PKGBUILD +++ b/mingw-w64-karchive-qt5/PKGBUILD @@ -6,21 +6,24 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "karchive" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Qt 5 addon providing access to numerous types of archives (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-zlib" _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-bzip2" _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-xz" _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('0c833c766d2301335490a1b36197bae20b2e45d1350f4f8100e6e00d5502eaab') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('b59821111c9419a746806044e8e0f16bd6be8c8f0eb3938f585aa3cee7dc4c8a' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -38,7 +41,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -47,11 +51,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kcodecs-qt5/PKGBUILD b/mingw-w64-kcodecs-qt5/PKGBUILD index 05f660e2b4..2969776b27 100644 --- a/mingw-w64-kcodecs-qt5/PKGBUILD +++ b/mingw-w64-kcodecs-qt5/PKGBUILD @@ -1,4 +1,3 @@ -# $Id$ # Maintainer (ArchLinux): Andrea Scarpino # Maintainer (MSYS2): Ray Donnelly # Contributor: Zach Bacon @@ -6,18 +5,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kcodecs" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="A collection of methods to manipulate strings using various encodings (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('cf4498c00368cc667910776cf54de02838f17b5f2d0bd48749ec5a2000346327') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('645a52cea3579e56cf9ce74319635e7ca5984be9b064324523144d0a7f5256fc' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -35,7 +37,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -44,11 +47,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kconfig-qt5/PKGBUILD b/mingw-w64-kconfig-qt5/PKGBUILD index 935b561dea..09b4185b7b 100644 --- a/mingw-w64-kconfig-qt5/PKGBUILD +++ b/mingw-w64-kconfig-qt5/PKGBUILD @@ -4,18 +4,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kconfig" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="KConfig provides an advanced configuration system (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('38aa7cabcb042d3f2614d0229f7a4f65952b19b5c7edd78ee2b0401fd6dd4290') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('234fc902d8a005291488def0a6a4b9d8b8500102e05aa2d1cfa3d5b6bb830a89' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -33,7 +36,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -42,11 +46,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kcoreaddons-qt5/PKGBUILD b/mingw-w64-kcoreaddons-qt5/PKGBUILD index 167a8f1950..cc639765a3 100644 --- a/mingw-w64-kcoreaddons-qt5/PKGBUILD +++ b/mingw-w64-kcoreaddons-qt5/PKGBUILD @@ -6,21 +6,24 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kcoreaddons" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Classes built on top of QtCore to perform various tasks (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" optdepends=("${MINGW_PACKAGE_PREFIX}-shared-mime-info: Provides information about file types") groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz" +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig} 001-disable-fam-on-windows.patch) -sha256sums=('9ca2cf82ddc12e27ff73aaefdf616c3eb6552a3a5531f014b5bf52a34a4c73f9' +sha256sums=('12077aac579065ca5ca877aee3bbdce65c52b6d0e9ef8b1fc0e127dd2e7f6843' + 'SKIP' 'cce04ffc4ddc00bbc47625ce2979c2c4011822ae3804561e822be26a8eed8175') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -37,18 +40,20 @@ build() { fi _kde_f5_build_env - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ "${_kde_f5_KDE_INSTALL_DIRS[@]}" \ -DBUILD_QCH=OFF \ -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kdbusaddons-qt5/PKGBUILD b/mingw-w64-kdbusaddons-qt5/PKGBUILD index c5e5f523bd..1daf4db5d2 100644 --- a/mingw-w64-kdbusaddons-qt5/PKGBUILD +++ b/mingw-w64-kdbusaddons-qt5/PKGBUILD @@ -4,18 +4,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kdbusaddons" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Addons for QtDBus (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('25826b091a22d876621dca040ca47ea1ec34119d300be91f19629a82c7f84af1') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('d85285eb765c7a8d0f9e21fe0f8396160f30e6a79651faa88a6e95bd577ddb53' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -33,7 +36,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -42,11 +46,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kdnssd-qt5/PKGBUILD b/mingw-w64-kdnssd-qt5/PKGBUILD index af1b628af1..2d1cb09fd6 100644 --- a/mingw-w64-kdnssd-qt5/PKGBUILD +++ b/mingw-w64-kdnssd-qt5/PKGBUILD @@ -4,18 +4,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kdnssd" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Abstraction to system DNS Service Discovery features (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('3f197cabab50316fdc6852b90a3ec064ba99b2c8289093198c76d21ec03ddc8b') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('2ea760b9276431d72d89a2911b507db8f6c9a3e9a3e0f52b4641511675b50cbb' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -33,7 +36,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -42,11 +46,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kguiaddons-qt5/PKGBUILD b/mingw-w64-kguiaddons-qt5/PKGBUILD index 4b7a3f5dd7..c035cfbdef 100644 --- a/mingw-w64-kguiaddons-qt5/PKGBUILD +++ b/mingw-w64-kguiaddons-qt5/PKGBUILD @@ -4,18 +4,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kguiaddons" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Utilities for graphical user interfaces (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('58aba1bd986020f7b4bde0d35a7b09730716cbdffde734e6d29cc9d18500253b') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('9bb7611bf10250de952e59f2ef682eec28695c7782a7b81970003f3982d5e339' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -33,7 +36,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -42,11 +46,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kholidays-qt5/PKGBUILD b/mingw-w64-kholidays-qt5/PKGBUILD index 2c0a8425a7..c1604c5c8d 100644 --- a/mingw-w64-kholidays-qt5/PKGBUILD +++ b/mingw-w64-kholidays-qt5/PKGBUILD @@ -5,17 +5,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kholidays" epoch=1 -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Library for regional holiday information (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('2ff86514a1165c88fc81b47476c5671b5e840633d3bf04cfe513881e4a0db7e5') +groups=('kf5') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('d6c7a8aad545ead2ae48e65f4eaccef27ff64fffe780bbdabe972cd06eee4b63' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -33,7 +37,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -42,11 +47,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-ki18n-qt5/PKGBUILD b/mingw-w64-ki18n-qt5/PKGBUILD index ee5f7f39da..4e36625ccc 100644 --- a/mingw-w64-ki18n-qt5/PKGBUILD +++ b/mingw-w64-ki18n-qt5/PKGBUILD @@ -4,26 +4,29 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "ki18n" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="KDE Gettext-based UI text internationalization (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-gettext" _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz" +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig} "build-ktranscript-plugin-statically-if-not-shared.patch") -sha256sums=('71f22a4ef4a9e750a1813c9fe37b552d9e053e6e2249079b5908d078160130d3' +sha256sums=('c3996c193a8aa33d9e3bea2c14679c6e5d48ca0a7a560fde77f43132eb6872fa' + 'SKIP' 'fb05bcdf56feec1cae600a10b9706c6573bc9b39becea0e1061b10a65dc68a40') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} cd "${srcdir}"/${_basename}-${pkgver} - patch -p1 < "${srcdir}"/build-ktranscript-plugin-statically-if-not-shared.patch + patch -p1 -i "${srcdir}"/build-ktranscript-plugin-statically-if-not-shared.patch } build() { @@ -34,18 +37,25 @@ build() { fi _kde_f5_build_env - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ "${_kde_f5_KDE_INSTALL_DIRS[@]}" \ -DBUILD_QCH=OFF \ -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install + + local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) + for _f in "${pkgdir}${MINGW_PREFIX}"/lib/cmake/KF5I18n/*.cmake; do + sed -e "s|${PREFIX_WIN}|\$\{_IMPORT_PREFIX\}|g" -i ${_f} + done } diff --git a/mingw-w64-kidletime-qt5/PKGBUILD b/mingw-w64-kidletime-qt5/PKGBUILD index a998a9bc87..f32eb34d1d 100644 --- a/mingw-w64-kidletime-qt5/PKGBUILD +++ b/mingw-w64-kidletime-qt5/PKGBUILD @@ -4,18 +4,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kidletime" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Reporting of idle time of user and system (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('da1a980bec52f00baa20bb1f886fc32392587ffd467404888d3a1cb5897bd200') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('d054e755aefb07b35e369b7fcda56c9e1dac00eeab3e7d6f5038101dfb95aa5b' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -29,18 +32,20 @@ build() { fi _kde_f5_build_env - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ "${_kde_f5_KDE_INSTALL_DIRS[@]}" \ -DBUILD_QCH=OFF \ -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kirigami2-qt5/001-cmake-disable-template.patch b/mingw-w64-kirigami2-qt5/001-cmake-disable-template.patch new file mode 100644 index 0000000000..eaabf63b1f --- /dev/null +++ b/mingw-w64-kirigami2-qt5/001-cmake-disable-template.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,7 +118,7 @@ + + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) + add_subdirectory(src) +-if (NOT ANDROID) ++if (NOT MINGW) + add_subdirectory(templates) + endif() + diff --git a/mingw-w64-kirigami2-qt5/PKGBUILD b/mingw-w64-kirigami2-qt5/PKGBUILD index 2ceae3d0e1..4e34671cc5 100644 --- a/mingw-w64-kirigami2-qt5/PKGBUILD +++ b/mingw-w64-kirigami2-qt5/PKGBUILD @@ -4,21 +4,29 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kirigami2" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="A QtQuick based components set (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('cde28a432e2ce56aae6f29eb557dc838af6846eb7dcba587113f73ebf11fca7d') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig} + "001-cmake-disable-template.patch") +sha256sums=('3541aec3cacbcf9d802ead3a0e1920163aae58b5e5ef121ec6725d0eacc9942a' + 'SKIP' + '07cb813248ce8f0306eacf7ae8f65f0515dbad2681bd06cb962bf9c8ef553d57') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} + + cd ${_basename}-${pkgver} + patch -p1 -i "${srcdir}/001-cmake-disable-template.patch" } build() { @@ -29,18 +37,20 @@ build() { fi _kde_f5_build_env - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ "${_kde_f5_KDE_INSTALL_DIRS[@]}" \ -DBUILD_QCH=OFF \ -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kitemmodels-qt5/PKGBUILD b/mingw-w64-kitemmodels-qt5/PKGBUILD index f589eaf51b..e84206d591 100644 --- a/mingw-w64-kitemmodels-qt5/PKGBUILD +++ b/mingw-w64-kitemmodels-qt5/PKGBUILD @@ -4,18 +4,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kitemmodels" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Models for the Qt Model/View system (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('fb3f4caa2e55ffb5e21ea8f65bcb6ea9b074c54f9dbbce458ba7320d6c50fdb6') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('a04e2e1f92eb5a7bcd3a9456facde31189072c75c1bd1133cdfd1e1a6c4c7730' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -33,7 +36,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -42,11 +46,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kitemviews-qt5/PKGBUILD b/mingw-w64-kitemviews-qt5/PKGBUILD index 35cb30c3d5..0eae3c557a 100644 --- a/mingw-w64-kitemviews-qt5/PKGBUILD +++ b/mingw-w64-kitemviews-qt5/PKGBUILD @@ -4,18 +4,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kitemviews" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Widget addons for Qt Model/View (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('071f2886cfb213c01cfeb26a9c98b26b720ff6928c5db04d4ead9ca34f72cac1') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('3d871282bd575fc983944e362314146b439fd01c743810c152a3b8737b06f09e' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -33,7 +36,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -42,11 +46,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kplotting-qt5/PKGBUILD b/mingw-w64-kplotting-qt5/PKGBUILD index 49d5da7ccd..61b1b16313 100644 --- a/mingw-w64-kplotting-qt5/PKGBUILD +++ b/mingw-w64-kplotting-qt5/PKGBUILD @@ -4,18 +4,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kplotting" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Lightweight plotting framework for Qt (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('55fded2f312d104fe9e22c6baa04fc125dba9bba45db03f02f6811ab3f04a0ae') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('7394b195de3ab20f96787ea7250659ef05f5534fcf58ca7109ec80f16fa6f365' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -33,7 +36,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -42,11 +46,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kwidgetsaddons-qt5/PKGBUILD b/mingw-w64-kwidgetsaddons-qt5/PKGBUILD index 6d47432e72..67fa4d9030 100644 --- a/mingw-w64-kwidgetsaddons-qt5/PKGBUILD +++ b/mingw-w64-kwidgetsaddons-qt5/PKGBUILD @@ -4,18 +4,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kwidgetsaddons" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Addons to QtWidgets (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('9e46a967e7f98f570ab97d231e648770b0c6056a34d8efe0b3201a14f0e17bc0') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('248897e7bfac5735b42aff0cd1f1ec12674a8e11ee4788847a111fd8cd419882' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -33,7 +36,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -42,11 +46,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-kwindowsystem-qt5/PKGBUILD b/mingw-w64-kwindowsystem-qt5/PKGBUILD index fd7cdac76d..a720987ea1 100644 --- a/mingw-w64-kwindowsystem-qt5/PKGBUILD +++ b/mingw-w64-kwindowsystem-qt5/PKGBUILD @@ -4,18 +4,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kwindowsystem" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Access to the windowing system (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('4c180ec41aad90ed83e97db72216913e650b2719946803eec0d6e4cee7aab743') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('6a80e662bc598a69cd32651ce11b501ac903bb8729f4fd45915edf5d270a790e' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -29,18 +32,20 @@ build() { fi _kde_f5_build_env - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ "${_kde_f5_KDE_INSTALL_DIRS[@]}" \ -DBUILD_QCH=OFF \ -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-solid-qt5/PKGBUILD b/mingw-w64-solid-qt5/PKGBUILD index f15198ee59..18b87c5229 100644 --- a/mingw-w64-solid-qt5/PKGBUILD +++ b/mingw-w64-solid-qt5/PKGBUILD @@ -3,18 +3,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "solid" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Hardware integration and detection (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('471bb76ca0971ab945f2270490b1f72300d86b2b36094ac610e5af69df738a77') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('e6faad7b72a8e7572fe854e64293bf6b48f566315cc85eaf2dc6baf999332c48' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -28,18 +31,20 @@ build() { fi _kde_f5_build_env - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ "${_kde_f5_KDE_INSTALL_DIRS[@]}" \ -DBUILD_QCH=OFF \ -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-sonnet-qt5/001-drop-pre-win7-support.patch b/mingw-w64-sonnet-qt5/001-drop-pre-win7-support.patch index 15d2249eb7..1971fd7344 100644 --- a/mingw-w64-sonnet-qt5/001-drop-pre-win7-support.patch +++ b/mingw-w64-sonnet-qt5/001-drop-pre-win7-support.patch @@ -1,22 +1,20 @@ ---- sonnet-5.59.0/src/plugins/voikko/voikkodict.cpp.orig 2019-06-13 19:40:18.347929800 +0300 -+++ sonnet-5.59.0/src/plugins/voikko/voikkodict.cpp 2019-06-13 19:41:02.615461700 +0300 -@@ -25,9 +25,6 @@ +--- a/src/plugins/voikko/voikkodict.cpp ++++ b/src/plugins/voikko/voikkodict.cpp +@@ -12,9 +12,6 @@ #include #include #include -#ifdef Q_IS_WIN -- #include +-#include -#endif #include #include -@@ -60,16 +57,10 @@ - { +@@ -49,14 +46,7 @@ QString directory = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); -- #ifdef Q_OS_WIN -+ #ifdef Q_OS_WIN - // Resolve the windows' Roaming directory manually + #ifdef Q_OS_WIN +- // Resolve the windows' Roaming directory manually - if (QSysInfo::windowsVersion() == QSysInfo::WV_XP || QSysInfo::windowsVersion() == QSysInfo::WV_2003) { - // In Xp Roaming is "/Application Data" - // DataLocation: "/Local Settings/Application Data" @@ -24,9 +22,7 @@ - } else { - directory += QStringLiteral("/../Roaming"); - } -- #endif + directory += QStringLiteral("/../Roaming"); -+ #endif + #endif directory += QStringLiteral("/Sonnet"); - QDir path(directory); diff --git a/mingw-w64-sonnet-qt5/PKGBUILD b/mingw-w64-sonnet-qt5/PKGBUILD index 03a1a7d0b8..50f5806da8 100644 --- a/mingw-w64-sonnet-qt5/PKGBUILD +++ b/mingw-w64-sonnet-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}" "sonnet" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') @@ -11,16 +11,19 @@ pkgdesc="Spell checking framework for Qt (mingw-w64-qt5${_namesuff})" license=('LGPL') makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" "${MINGW_PACKAGE_PREFIX}-hunspell" - "${MINGW_PACKAGE_PREFIX}-aspell") + "${MINGW_PACKAGE_PREFIX}-aspell" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" optdepends=("${MINGW_PACKAGE_PREFIX}-hunspell: spell checking via hunspell" "${MINGW_PACKAGE_PREFIX}-aspell: spell checking via aspell") groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz" +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig} 001-drop-pre-win7-support.patch) -sha256sums=('626055b262b3a43e6e947cf7f0383565324f42d6b24ab07b98c6cf054271c9e0' - '5b93cdeb6c08387509f6454bbadc28da204583ccaa4d1f450e79821ab253e256') +sha256sums=('8e0a9a80a70def5c992c25d50cbeaa38f1655da83e80b6aae8847d77289111c2' + 'SKIP' + '9e546a6881b470f3a1030b45604058525374d0e57839f12dfd25c78397012f61') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -37,18 +40,20 @@ build() { fi _kde_f5_build_env - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ "${_kde_f5_KDE_INSTALL_DIRS[@]}" \ -DBUILD_QCH=OFF \ -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-syntax-highlighting-qt5/PKGBUILD b/mingw-w64-syntax-highlighting-qt5/PKGBUILD index f693e6afe9..0a63b6d072 100644 --- a/mingw-w64-syntax-highlighting-qt5/PKGBUILD +++ b/mingw-w64-syntax-highlighting-qt5/PKGBUILD @@ -3,20 +3,23 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "syntax-highlighting" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Syntax highlighting library using Kate's syntax rules (mingw-w64-qt5${_namesuff})" license=('MIT') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz" +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig} qtcore_include.patch) -sha256sums=('c5db1b9a268fa81a1cf72e83c1b3147e4cf4e043da45d917df0165f42ca0d07f' +sha256sums=('d0bdf6d9f45fa8c84f83d2d97ea0e37b67ec212d7c717cd553ae03ad8c95d3bb' + 'SKIP' 'c69bf49982c29681c8e5caa80dd209eba0cc0e44e56378f9456013048bbab3d5') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -33,18 +36,20 @@ build() { fi _kde_f5_build_env - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ "${_kde_f5_KDE_INSTALL_DIRS[@]}" \ -DBUILD_QCH=OFF \ -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install } diff --git a/mingw-w64-threadweaver-qt5/PKGBUILD b/mingw-w64-threadweaver-qt5/PKGBUILD index 7145105e79..7c706a7c0f 100644 --- a/mingw-w64-threadweaver-qt5/PKGBUILD +++ b/mingw-w64-threadweaver-qt5/PKGBUILD @@ -3,18 +3,21 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "threadweaver" -pkgver=5.75.0 +pkgver=5.82.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="High-level multithreading framework for Qt (mingw-w64-qt5${_namesuff})" license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}") +makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules>=${pkgver}" + "${MINGW_PACKAGE_PREFIX}-ninja") depends=() _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" groups=('kf5') -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz") -sha256sums=('d082f863fb119e2b98c9e01877b2730eedc0b54392449e3cc9bd54d7803d16ff') +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_basename}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('d5da9c6079deef0099f0b84d1fb31a388dc7bf4349dfd08df7baba1632251bdd' + 'SKIP') +validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { mkdir -p build-${CARCH}${_variant} @@ -32,7 +35,8 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=" \ - cmake ../${_basename}-${pkgver} \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ -DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \ -DKDE_INSTALL_LIBDIR=lib \ @@ -41,11 +45,12 @@ build() { -DBUILD_TESTING=OFF \ -DECM_DIR=${MINGW_PREFIX}/share/ECM \ "${extra_config[@]}" \ - -G'MSYS Makefiles' - make + ../${_basename}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd build-${CARCH}${_variant} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install }