From 46ad42f4a3c9f09510e8e358256560be8e0073ae Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Sat, 14 Aug 2021 08:17:04 +0100 Subject: [PATCH 1/5] serial-studio: update dependencies --- mingw-w64-serial-studio/PKGBUILD | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/mingw-w64-serial-studio/PKGBUILD b/mingw-w64-serial-studio/PKGBUILD index 45e025ee48..3a37806e74 100644 --- a/mingw-w64-serial-studio/PKGBUILD +++ b/mingw-w64-serial-studio/PKGBUILD @@ -4,38 +4,50 @@ _realname=serial-studio pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.0.20 -pkgrel=1 +pkgrel=2 pkgdesc="Serial Studio: Multi-purpose serial data visualization & processing program (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url="https://github.com/Serial-Studio/Serial-Studio" license=('MIT') groups=("${MINGW_PACKAGE_PREFIX}-eda") -depends=("${MINGW_PACKAGE_PREFIX}-qt5") +depends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative" + "${MINGW_PACKAGE_PREFIX}-qt5-svg" + "${MINGW_PACKAGE_PREFIX}-qt5-charts" + "${MINGW_PACKAGE_PREFIX}-qt5-serialport" + "${MINGW_PACKAGE_PREFIX}-qt5-quickcontrols2" + "${MINGW_PACKAGE_PREFIX}-qt5-graphicaleffects") makedepends=( 'git' "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-qt5-tools" ) source=("${_realname}::git+https://github.com/${_realname}/${_realname}#commit=v${pkgver}") sha256sums=('SKIP') -build() { +prepare() { cd "${srcdir}/${_realname}" git submodule update --init --recursive - mkdir build - cd build +} + +build() { + [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}" + mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" + MSYS2_ARG_CONV_EXCL="PREFIX=" \ - qmake PREFIX="${MINGW_PREFIX}" .. + qmake PREFIX="${MINGW_PREFIX}" ../${_realname} + + MSYS2_ARG_CONV_EXCL="--resource-file-mapping=" \ make } check() { - "${srcdir}/${_realname}"/build/release/Serial-Studio.exe --help + ${srcdir}/build-${MSYSTEM}/release/Serial-Studio.exe --help } package() { - cd "${srcdir}/${_realname}"/build + cd ${srcdir}/build-${MSYSTEM} make INSTALL_ROOT="${pkgdir}" install } From b2246189069ba9cbd8d3cf27f29b0065ff3832c2 Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Sat, 14 Aug 2021 08:18:54 +0100 Subject: [PATCH 2/5] wt: update dependencies --- mingw-w64-wt/PKGBUILD | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mingw-w64-wt/PKGBUILD b/mingw-w64-wt/PKGBUILD index b13f122b1b..c71a5d9934 100644 --- a/mingw-w64-wt/PKGBUILD +++ b/mingw-w64-wt/PKGBUILD @@ -4,7 +4,7 @@ _realname=wt pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ library and application server for developing and deploying web applications (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') @@ -18,7 +18,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libharu" "${MINGW_PACKAGE_PREFIX}-harfbuzz" "${MINGW_PACKAGE_PREFIX}-graphicsmagick" - "${MINGW_PACKAGE_PREFIX}-qt5") + "${MINGW_PACKAGE_PREFIX}-qt5-base") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-doxygen" @@ -31,7 +31,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-postgresql" "${MINGW_PACKAGE_PREFIX}-libmariadbclient" - "${MINGW_PACKAGE_PREFIX}-sqlite3") + "${MINGW_PACKAGE_PREFIX}-sqlite3" + "${MINGW_PACKAGE_PREFIX}-qt5-tools") optdepends=("${MINGW_PACKAGE_PREFIX}-openssl: for SSL support in built-in webserver" # "${MINGW_PACKAGE_PREFIX}-fcgi: for FastCGI support" # "${MINGW_PACKAGE_PREFIX}-mysql++: for the hangman example" @@ -60,8 +61,8 @@ prepare() { } build() { - [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}" + [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}" + mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ @@ -79,13 +80,13 @@ build() { -DINSTALL_DOCUMENTATION=ON \ ../${_realname}-${pkgver} - make + cmake --build . } package() { - cd "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MSYSTEM}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --install . install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } From fe7372fe85c52603b3aa2c0c7f4d63e7ea3fcb76 Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Sat, 14 Aug 2021 06:54:25 +0100 Subject: [PATCH 3/5] qca-qt5: update dependencies --- mingw-w64-qca-qt5/PKGBUILD | 22 +++++++++---------- .../qca-mingw-custom-certificates.patch | 18 ++++----------- mingw-w64-qca-qt5/qca-qt5-git-CLANG32.install | 11 ++++++++++ mingw-w64-qca-qt5/qca-qt5-git-CLANG64.install | 11 ++++++++++ ...86.install => qca-qt5-git-MINGW32.install} | 0 ...64.install => qca-qt5-git-MINGW64.install} | 0 mingw-w64-qca-qt5/qca-qt5-git-UCRT64.install | 11 ++++++++++ 7 files changed, 48 insertions(+), 25 deletions(-) create mode 100644 mingw-w64-qca-qt5/qca-qt5-git-CLANG32.install create mode 100644 mingw-w64-qca-qt5/qca-qt5-git-CLANG64.install rename mingw-w64-qca-qt5/{qca-qt5-git-i686.install => qca-qt5-git-MINGW32.install} (100%) rename mingw-w64-qca-qt5/{qca-qt5-git-x86_64.install => qca-qt5-git-MINGW64.install} (100%) create mode 100644 mingw-w64-qca-qt5/qca-qt5-git-UCRT64.install diff --git a/mingw-w64-qca-qt5/PKGBUILD b/mingw-w64-qca-qt5/PKGBUILD index 29bd570689..d3a37a4395 100644 --- a/mingw-w64-qca-qt5/PKGBUILD +++ b/mingw-w64-qca-qt5/PKGBUILD @@ -4,10 +4,10 @@ _realname=qca pkgbase=mingw-w64-${_realname}-qt5 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-qt5" pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Qt Cryptographic Architecture (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url="http://delta.affinix.com/qca/" license=('LGPL') conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-qt5-git") @@ -22,8 +22,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-ca-certificates" "${MINGW_PACKAGE_PREFIX}-libgcrypt" "${MINGW_PACKAGE_PREFIX}-nss" "${MINGW_PACKAGE_PREFIX}-openssl" - "${MINGW_PACKAGE_PREFIX}-qt5") -install=${_realname}-qt5-git-${CARCH}.install + "${MINGW_PACKAGE_PREFIX}-qt5-base") +install=${_realname}-qt5-git-${MSYSTEM}.install source=("https://download.kde.org/stable/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.xz"{,.sig} "cyrus_sasl_linking.patch" "qt5-custom-dirs.patch" @@ -35,7 +35,7 @@ sha256sums=('c13851109abefc4623370989fae3a745bf6b1acb3c2a13a8958539823e974e4b' 'a5eeb6e2c3e884b54dc3837509d1cbde4611623a2888775ddb7e3868b1623e7c' '54b4a38ebb80939dbe6de149e6da8bffb98784c7358ffff4a940c4c9212296b2' 'ba7e835e30306f415168b1f8c31adda7e6c3881c96ad74d0bcb52466113c5ba4' - '57602e5272a079ca1e8f4b4452030094010c7a6b33ed4606e1497cd0b4126717' + '8ed2205a66d5b73ee6e8841610be32fe7295b8759504af4e0c14c8c09d6811d0' '037b615f8b6f609112383b69e6050e7c939b12b0c7c0fa210a58e075c0d1c589') validpgpkeys=('CB9387521E1EE0127DA804843FDBB55084CC5D84') @@ -49,9 +49,9 @@ prepare() { } build() { - [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} - mkdir ${srcdir}/build-${MINGW_CHOST} - cd ${srcdir}/build-${MINGW_CHOST} + [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM} + mkdir ${srcdir}/build-${MSYSTEM} + cd ${srcdir}/build-${MSYSTEM} #QC_CERTSTORE_PATH=${MINGW_PREFIX}/ssl/certs/ca-bundle.crt MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;DQC_CERTSTORE_PATH=" \ @@ -66,10 +66,10 @@ build() { -DQCA_INSTALL_IN_QT_PREFIX=ON \ ../${_realname}-${pkgver}. - make ${MAKEFLAGS} + cmake --build . } package() { - cd ${srcdir}/build-${MINGW_CHOST} - make DESTDIR="${pkgdir}" install + cd ${srcdir}/build-${MSYSTEM} + DESTDIR="${pkgdir}" cmake --install . } diff --git a/mingw-w64-qca-qt5/qca-mingw-custom-certificates.patch b/mingw-w64-qca-qt5/qca-mingw-custom-certificates.patch index f96d67d0b8..9b088680c6 100644 --- a/mingw-w64-qca-qt5/qca-mingw-custom-certificates.patch +++ b/mingw-w64-qca-qt5/qca-mingw-custom-certificates.patch @@ -11,26 +11,16 @@ # USE BUILTIN else() if ( DEFINED ENV{QC_CERTSTORE_PATH} ) -@@ -300,6 +301,8 @@ - endif() +@@ -301,6 +302,9 @@ endforeach (_current_try) endif() + endif() +else() + set(qca_CERTSTORE ${QCA_SYSTEMSTORE_PATH}) - endif() - - if (qca_CERTSTORE) -@@ -316,6 +317,10 @@ - endif() - message(STATUS "certstore path: " ${qca_CERTSTORE}) - add_definitions( -DQCA_SYSTEMSTORE_PATH="${qca_CERTSTORE}" ) -+else() -+message(STATUS "certstore path: " ${QCA_SYSTEMSTORE_PATH}) -+add_definitions( -DQCA_SYSTEMSTORE_PATH="${qca_CERTSTORE}" ) +endif() - - set( private_HEADERS ${qca_INCLUDEDIR}/QtCrypto/qca_plugin.h ${qca_INCLUDEDIR}/QtCrypto/qca_systemstore.h ) + if (qca_CERTSTORE) + message(STATUS "Found system certstore") --- qca/src/CMakeLists.txt.orig 2015-07-16 11:09:16.212688400 +0300 +++ qca/src/CMakeLists.txt 2015-07-16 11:16:34.878817400 +0300 @@ -50,7 +50,7 @@ diff --git a/mingw-w64-qca-qt5/qca-qt5-git-CLANG32.install b/mingw-w64-qca-qt5/qca-qt5-git-CLANG32.install new file mode 100644 index 0000000000..80921bb161 --- /dev/null +++ b/mingw-w64-qca-qt5/qca-qt5-git-CLANG32.install @@ -0,0 +1,11 @@ +post_install() { + local _real_prefix=/clang32 + local _prefix=$(cygpath -wm ${_real_prefix}) + for f in ${_real_prefix}/lib/cmake/Qca-qt5/*.cmake; do + sed -s "s|${_real_prefix}|${_prefix}|g" -i ${f} + done +} + +post_upgrade() { + post_install +} diff --git a/mingw-w64-qca-qt5/qca-qt5-git-CLANG64.install b/mingw-w64-qca-qt5/qca-qt5-git-CLANG64.install new file mode 100644 index 0000000000..9b2c395948 --- /dev/null +++ b/mingw-w64-qca-qt5/qca-qt5-git-CLANG64.install @@ -0,0 +1,11 @@ +post_install() { + local _real_prefix=/clang64 + local _prefix=$(cygpath -wm ${_real_prefix}) + for f in ${_real_prefix}/lib/cmake/Qca-qt5/*.cmake; do + sed -s "s|${_real_prefix}|${_prefix}|g" -i ${f} + done +} + +post_upgrade() { + post_install +} diff --git a/mingw-w64-qca-qt5/qca-qt5-git-i686.install b/mingw-w64-qca-qt5/qca-qt5-git-MINGW32.install similarity index 100% rename from mingw-w64-qca-qt5/qca-qt5-git-i686.install rename to mingw-w64-qca-qt5/qca-qt5-git-MINGW32.install diff --git a/mingw-w64-qca-qt5/qca-qt5-git-x86_64.install b/mingw-w64-qca-qt5/qca-qt5-git-MINGW64.install similarity index 100% rename from mingw-w64-qca-qt5/qca-qt5-git-x86_64.install rename to mingw-w64-qca-qt5/qca-qt5-git-MINGW64.install diff --git a/mingw-w64-qca-qt5/qca-qt5-git-UCRT64.install b/mingw-w64-qca-qt5/qca-qt5-git-UCRT64.install new file mode 100644 index 0000000000..5dc7c600e0 --- /dev/null +++ b/mingw-w64-qca-qt5/qca-qt5-git-UCRT64.install @@ -0,0 +1,11 @@ +post_install() { + local _real_prefix=/ucrt64 + local _prefix=$(cygpath -wm ${_real_prefix}) + for f in ${_real_prefix}/lib/cmake/Qca-qt5/*.cmake; do + sed -s "s|${_real_prefix}|${_prefix}|g" -i ${f} + done +} + +post_upgrade() { + post_install +} From acb155404ee609b01ac14a680aa0b24903b7cc1b Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Sat, 14 Aug 2021 12:24:03 +0100 Subject: [PATCH 4/5] qhttpengine: update dependencies --- mingw-w64-qhttpengine/PKGBUILD | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/mingw-w64-qhttpengine/PKGBUILD b/mingw-w64-qhttpengine/PKGBUILD index ba6cc6c714..ada3aec75a 100644 --- a/mingw-w64-qhttpengine/PKGBUILD +++ b/mingw-w64-qhttpengine/PKGBUILD @@ -4,31 +4,33 @@ _realname=qhttpengine pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="HTTP server for Qt applications (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') license=('MIT') url='https://github.com/nitroshare/qhttpengine' -depends=("${MINGW_PACKAGE_PREFIX}-qt5>=5.4") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake>=3.2" +depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") source=("https://github.com/nitroshare/qhttpengine/archive/${pkgver}.tar.gz") sha256sums=('6505cf889909dc29bab4069116656e7ca5a9e879f04935139439c5691a76c55e') build() { - mkdir ${srcdir}/build-${MINGW_CHOST} - cd ${srcdir}/build-${MINGW_CHOST} + [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM} + mkdir build-${MSYSTEM} && cd build-${MSYSTEM} + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_BUILD_TYPE=Release \ ${srcdir}/${_realname}-${pkgver} - make + + cmake --build . } package() { - cd ${srcdir}/build-${MINGW_CHOST} - make DESTDIR="${pkgdir}" install + cd ${srcdir}/build-${MSYSTEM} + DESTDIR="${pkgdir}" cmake --install . } From 58a5e1135f9fff8365be541ecfd6ac2f8ee063f3 Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Sat, 14 Aug 2021 12:24:25 +0100 Subject: [PATCH 5/5] qmdnsengine: update dependencies --- mingw-w64-qmdnsengine/PKGBUILD | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/mingw-w64-qmdnsengine/PKGBUILD b/mingw-w64-qmdnsengine/PKGBUILD index a5f9e095aa..f6ddd2dc93 100644 --- a/mingw-w64-qmdnsengine/PKGBUILD +++ b/mingw-w64-qmdnsengine/PKGBUILD @@ -4,31 +4,33 @@ _realname=qmdnsengine pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Multicast DNS library for Qt applications" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') license=('MIT') url='https://github.com/nitroshare/qmdnsengine' -depends=("${MINGW_PACKAGE_PREFIX}-qt5>=5.4") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake>=3.2" +depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") source=("https://github.com/nitroshare/qmdnsengine/archive/${pkgver}.tar.gz") sha256sums=('b9a4e86de2afd31224ca2007713a2d9bcc0334358f831a2b83a7161b7d91c614') build() { - mkdir ${srcdir}/build-${MINGW_CHOST} - cd ${srcdir}/build-${MINGW_CHOST} + [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM} + mkdir build-${MSYSTEM} && cd build-${MSYSTEM} + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_BUILD_TYPE=Release \ ${srcdir}/${_realname}-${pkgver} - make + + cmake --build . } package() { - cd ${srcdir}/build-${MINGW_CHOST} - make DESTDIR="${pkgdir}" install + cd ${srcdir}/build-${MSYSTEM} + DESTDIR="${pkgdir}" cmake --install . }