From a096d481e37ec83957c345dad0bae7f6418d4166 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Jan 2019 15:43:33 +0100 Subject: [PATCH] Fix qt5-quickcontrols2 dependency of passwordmanager * It is not optional (unlike kirigami2) when Qt Quick GUI enabled * Not tested yet --- passwordmanager/default/PKGBUILD | 12 ++++++++++-- passwordmanager/git/PKGBUILD | 11 ++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/passwordmanager/default/PKGBUILD b/passwordmanager/default/PKGBUILD index 5e09b7cc..bed8ed7b 100644 --- a/passwordmanager/default/PKGBUILD +++ b/passwordmanager/default/PKGBUILD @@ -3,6 +3,9 @@ # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where # you also find the URL of a binary repository. +# set whether the Qt Quick GUI should be enabled: set to either ON or OFF +_quick_gui=${PASSWORD_MANAGER_QUICK_GUI:-ON} + _reponame=passwordmanager pkgname=passwordmanager pkgver=4.0.0 @@ -12,14 +15,19 @@ pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL' license=('GPL') depends=('qt5-base' 'qtutilities' 'passwordfile' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils') makedepends=('cmake' 'qt5-tools' 'mesa' 'kirigami2') -optdepends=('kirigami2: Qt Quick GUI') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('d55bc5eb4329b7c9568246d9eeb959e64eea9909d460cd9bea12e3cb171f5570') +# add further dependencies for the Qt Quick GUI (only kirigami2 is "pluggable") +if [[ $_quick_gui == ON ]]; then + depends+=('qt5-quickcontrols2') + optdepends+=('kirigami2: Qt Quick GUI') +fi + build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" -DQUICK_GUI=ON + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" -DQUICK_GUI="$_quick_gui" make } diff --git a/passwordmanager/git/PKGBUILD b/passwordmanager/git/PKGBUILD index 40dcd149..2756655d 100644 --- a/passwordmanager/git/PKGBUILD +++ b/passwordmanager/git/PKGBUILD @@ -3,6 +3,9 @@ # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where # you also find the URL of a binary repository. +# set whether the Qt Quick GUI should be enabled: set to either ON or OFF +_quick_gui=${PASSWORD_MANAGER_QUICK_GUI:-ON} + _reponame=passwordmanager pkgname=passwordmanager-git _name=${pkgname%-git} @@ -20,6 +23,12 @@ url="https://github.com/Martchus/${_reponame}" source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git") sha256sums=('SKIP') +# add further dependencies for the Qt Quick GUI (only kirigami2 is "pluggable") +if [[ $_quick_gui == ON ]]; then + depends+=('qt5-quickcontrols2') + optdepends+=('kirigami2: Qt Quick GUI') +fi + pkgver() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}" echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" @@ -27,7 +36,7 @@ pkgver() { build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}" - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" -DQUICK_GUI=ON + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" -DQUICK_GUI="$_quick_gui" make }