summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2020-10-11 14:59:22 +0200
committerMartchus2020-10-11 14:59:22 +0200
commit0989066bc7f83f96c2d7b3f84cf6b45cbd548b96 (patch)
tree8446ebdc3699a918ccf511e4fd4b3909924b0859
parent996b43b745eb8d28134668755eebde6ac228f4fd (diff)
downloadaur-0989066bc7f83f96c2d7b3f84cf6b45cbd548b96.tar.gz
Update version
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD14
2 files changed, 11 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 70709c7d0a0..be8cdfc0698 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qtutilities
pkgdesc = Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (mingw-w64)
- pkgver = 6.2.1
+ pkgver = 6.3.0
pkgrel = 1
url = https://github.com/Martchus/qtutilities
arch = any
@@ -9,6 +9,7 @@ pkgbase = mingw-w64-qtutilities
makedepends = mingw-w64-gcc
makedepends = mingw-w64-cmake
makedepends = mingw-w64-qt5-tools
+ makedepends = ninja
makedepends = mingw-w64-qt5-base-static
depends = mingw-w64-crt
depends = mingw-w64-qt5-base
@@ -18,7 +19,7 @@ pkgbase = mingw-w64-qtutilities
options = staticlibs
options = !strip
options = !emptydirs
- source = qtutilities-6.2.1.tar.gz::https://github.com/Martchus/qtutilities/archive/v6.2.1.tar.gz
+ source = qtutilities-6.3.0.tar.gz::https://github.com/Martchus/qtutilities/archive/v6.3.0.tar.gz
sha256sums = 5b5fcf7380dde168c9e4e023b66788dd80c72c59a6e1258e2fdff50366280adc
pkgname = mingw-w64-qtutilities
diff --git a/PKGBUILD b/PKGBUILD
index 163bf6126f8..91ff4c78c23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
_reponame=qtutilities
pkgname=mingw-w64-qtutilities
_name=${pkgname#mingw-w64-}
-pkgver=6.2.1
+pkgver=6.3.0
pkgrel=1
arch=('any')
pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (mingw-w64)'
@@ -14,7 +14,7 @@ license=('GPL')
depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-c++utilities')
optdepends=("$_name-doc: API documentation")
checkdepends=('mingw-w64-wine')
-makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools')
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ninja')
url="https://github.com/Martchus/${_reponame}"
source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('5b5fcf7380dde168c9e4e023b66788dd80c72c59a6e1258e2fdff50366280adc')
@@ -48,14 +48,15 @@ build() {
msg2 "${_arch}-${_cfg}"
mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}"
${_arch}-cmake \
+ -G Ninja \
-DCMAKE_BUILD_TYPE:STRING='Release' \
-DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \
-DCONFIGURATION_NAME:STRING="${_cfg}" \
-DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \
- -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \
+ -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \
${_config_flags[$_cfg]} \
../
- make
+ ninja
popd
done
done
@@ -68,7 +69,8 @@ check() {
for _cfg in "${_configurations[@]}"; do
msg2 "${_arch}-${_cfg}"
pushd "build-${_arch}-${_cfg}"
- make WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all QT_QPA_PLATFORM=offscreen check || test "$_cfg" = static
+ export WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all
+ QT_QPA_PLATFORM=offscreen ninja check || test "$_cfg" = static
popd
done
done
@@ -81,7 +83,7 @@ package() {
for _cfg in "${_configurations[@]}"; do
msg2 "${_arch}-${_cfg}"
pushd "build-${_arch}-${_cfg}"
- make DESTDIR="${pkgdir}" install-mingw-w64-strip
+ DESTDIR="${pkgdir}" ninja install-mingw-w64-strip
popd
done
done