diff --git a/mingw-w64-kdiff3/PKGBUILD b/mingw-w64-kdiff3/PKGBUILD index 2975369440..7206ebbc53 100644 --- a/mingw-w64-kdiff3/PKGBUILD +++ b/mingw-w64-kdiff3/PKGBUILD @@ -1,14 +1,13 @@ # Maintainer: Konstantin Podsvirov -_variant=-${KF5_VARIANT:-shared} -source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 +source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks _realname=kdiff3 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.11.0 +pkgver=1.11.1 pkgrel=1 arch=('any') -mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') +mingw_arch=('ucrt64' 'clang64' 'clangarm64') msys2_references=( 'archlinux: kdiff3' ) @@ -18,51 +17,50 @@ license=('GPL') pkgdesc="A file comparator/merge tool (mingw-w64)" groups=("${MINGW_PACKAGE_PREFIX}-kde-applications" "${MINGW_PACKAGE_PREFIX}-kdesdk") -depends=("${MINGW_PACKAGE_PREFIX}-kconfig-qt5" - "${MINGW_PACKAGE_PREFIX}-kcoreaddons-qt5" - "${MINGW_PACKAGE_PREFIX}-kconfigwidgets-qt5" - "${MINGW_PACKAGE_PREFIX}-kcrash-qt5" - "${MINGW_PACKAGE_PREFIX}-ki18n-qt5" - "${MINGW_PACKAGE_PREFIX}-kio-qt5" - "${MINGW_PACKAGE_PREFIX}-kwidgetsaddons-qt5" - "${MINGW_PACKAGE_PREFIX}-kxmlgui-qt5" - "${MINGW_PACKAGE_PREFIX}-qt5-base") +depends=("${MINGW_PACKAGE_PREFIX}-kconfig" + "${MINGW_PACKAGE_PREFIX}-kcoreaddons" + "${MINGW_PACKAGE_PREFIX}-kconfigwidgets" + "${MINGW_PACKAGE_PREFIX}-kcrash" + "${MINGW_PACKAGE_PREFIX}-ki18n" + "${MINGW_PACKAGE_PREFIX}-kio" + "${MINGW_PACKAGE_PREFIX}-kwidgetsaddons" + "${MINGW_PACKAGE_PREFIX}-kxmlgui" + "${MINGW_PACKAGE_PREFIX}-qt6-5compat" + "${MINGW_PACKAGE_PREFIX}-qt6-base") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-extra-cmake-modules" - "${MINGW_PACKAGE_PREFIX}-kdoctools-qt5${_namesuff}") + "${MINGW_PACKAGE_PREFIX}-kdoctools") source=("https://download.kde.org/stable/${_realname}/${_realname}-${pkgver}.tar.xz"{,.sig}) -sha256sums=('3bf37954ca19a365f37b558b574c8fbd366719c087d7b821788d3efad0c44851' +sha256sums=('30f14a5ab6e0d55116829178d827654c30e8421c04fe9700d3ce67a530846298' 'SKIP') validpgpkeys=(EE56D710885D36FB1E4D21F3F442B36D614B06BC) # Michael Reeves build() { - [[ -d "${srcdir}/build-${MSYSTEM}${_variant}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}${_variant}" - mkdir -p "${srcdir}/build-${MSYSTEM}${_variant}" && cd "${srcdir}/build-${MSYSTEM}${_variant}" - - local -a extra_config - - if [ "${_variant}" = "-static" ]; then - extra_config+=( -DBUILD_SHARED_LIBS=NO ) + declare -a _extra_config + if check_option "debug" "n"; then + _extra_config+=("-DCMAKE_BUILD_TYPE=Release") + else + _extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi - _kde_f5_build_env - ${MINGW_PREFIX}/bin/cmake.exe \ - -G"Ninja" \ - -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \ - "${_kde_f5_KDE_INSTALL_DIRS[@]}" \ - -DBUILD_TESTING=OFF \ - -DECM_DIR=${MINGW_PREFIX}/share/ECM \ - "${extra_config[@]}" \ - ../${_realname}-${pkgver} + _kde_build_env + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G"Ninja" \ + -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ + "${_KDE_INSTALL_DIRS[@]}" \ + -DBUILD_TESTING=OFF \ + -DBUILD_WITH_QT6=ON \ + "${_extra_config[@]}" \ + -S "${_realname}-${pkgver}" \ + -B "build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/cmake.exe --build . + "${MINGW_PREFIX}"/bin/cmake.exe --build "build-${MSYSTEM}" } package() { - cd "${srcdir}/build-${MSYSTEM}${_variant}" - - DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install . + DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install "build-${MSYSTEM}" }