Improve dependencies of my Qt-based packages

* Remove `mesa` as dependency; `qt5-base` and `qt6-base` both depend on it
  and none of the projects depend on it directly; official Qt-based
  packages like `qtcreator` also don't depend on `mesa`
* Add `libx11` as dependency of `qtutilities` and variants as it is
  actually used directly by those packages for the capslock detection (even
  though that feature was broken for quite some time)
This commit is contained in:
Martchus 2023-09-11 21:39:23 +02:00
parent a3ed2d0868
commit c1d7c0afb4
21 changed files with 24 additions and 24 deletions

View File

@ -15,7 +15,7 @@ pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
license=('GPL')
depends=('qt5-base' 'libqtutilities.so' 'libpasswordfile.so' 'libc++utilities.so' 'openssl'
'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
makedepends=('cmake' 'ninja' 'qt5-tools' 'mesa' 'kirigami2')
makedepends=('cmake' 'ninja' 'qt5-tools' 'kirigami2')
url="https://github.com/Martchus/${_reponame}"
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('3ccac8a8adc156bbb1fb7995efae7f6f9f816fd706933abe2d5040cc47347a2a')

View File

@ -16,7 +16,7 @@ pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
license=('GPL')
depends=('qt5-base' 'libqtutilities-git.so' 'libpasswordfile-git.so' 'libc++utilities-git.so' 'openssl'
'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'mesa' 'kirigami2')
makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'kirigami2')
optdepends=('kirigami2: Qt Quick GUI')
provides=("${_name}")
conflicts=("${_name}")

View File

@ -17,7 +17,7 @@ pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
license=('GPL')
depends=('qt6-base' 'libqtutilities-qt6.so' 'libpasswordfile.so' 'libc++utilities.so' 'openssl'
'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
makedepends=('cmake' 'ninja' 'qt6-tools' 'clang' 'mesa')
makedepends=('cmake' 'ninja' 'qt6-tools' 'clang')
url="https://github.com/Martchus/${_reponame}"
source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('3ccac8a8adc156bbb1fb7995efae7f6f9f816fd706933abe2d5040cc47347a2a')

View File

@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
pkgdesc='Library that bundles ForkAwesome for use within Qt applications'
license=('GPL')
depends=('qt5-base')
makedepends=('cmake' 'ninja' 'qtutilities' 'mesa' 'perl-yaml-libyaml' 'qt5-declarative')
makedepends=('cmake' 'ninja' 'qtutilities' 'perl-yaml-libyaml' 'qt5-declarative')
optdepends=(
'qt5-declarative: Qt Quick integration'
"$pkgname-doc: API documentation"

View File

@ -13,7 +13,7 @@ pkgrel=1
arch=('any')
pkgdesc='Library that bundles ForkAwesome for use within Qt applications (API documentation)'
license=('GPL')
makedepends=('cmake' 'ninja' 'doxygen' 'graphviz' 'qtutilities' 'mesa' 'qt5-declarative')
makedepends=('cmake' 'ninja' 'doxygen' 'graphviz' 'qtutilities' 'qt5-declarative')
url="https://github.com/Martchus/${_reponame}"
source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz"
"${_reponame_forkawesome}::https://github.com/ForkAwesome/Fork-Awesome/archive/refs/tags/${_pkgver_forkawesome}.tar.gz")

View File

@ -13,7 +13,7 @@ pkgrel=2
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
pkgdesc='Library that bundles ForkAwesome for use within Qt applications'
license=('GPL')
depends=('qt5-base' 'mesa')
depends=('qt5-base')
optdepends=(
'qt5-declarative: Qt Quick integration'
"$_name-doc: API documentation"

View File

@ -15,7 +15,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
pkgdesc='Library that bundles ForkAwesome for use within Qt applications (using Qt 6)'
license=('GPL')
depends=('qt6-base')
makedepends=('cmake' 'ninja' 'perl-yaml-libyaml' 'qtutilities-qt6' 'qt6-declarative' 'clang' 'mesa')
makedepends=('cmake' 'ninja' 'perl-yaml-libyaml' 'qtutilities-qt6' 'qt6-declarative' 'clang')
optdepends=(
'qt6-declarative: Qt Quick integration'
"$_name-doc: API documentation"

View File

@ -10,8 +10,8 @@ pkgrel=1
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models'
license=('GPL')
depends=('libc++utilities.so' 'qt5-base')
makedepends=('cmake' 'ninja' 'qt5-tools' 'mesa')
depends=('libc++utilities.so' 'qt5-base' 'libx11')
makedepends=('cmake' 'ninja' 'qt5-tools')
optdepends=("$pkgname-doc: API documentation")
provides=(libqtutilities.so)
url="https://github.com/Martchus/${_reponame}"

View File

@ -11,7 +11,7 @@ pkgrel=1
arch=('any')
pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (API documentation)'
license=('GPL')
makedepends=('cmake' 'ninja' 'doxygen' 'graphviz' 'c++utilities' 'qt5-tools' 'mesa')
makedepends=('cmake' 'ninja' 'doxygen' 'graphviz' 'c++utilities' 'qt5-tools')
url="https://github.com/Martchus/${_reponame}"
source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('0549044a2762f9054b161df17265f22e49f3cb09f16ac7c73e37363bba3889ab')

View File

@ -11,7 +11,7 @@ pkgrel=2
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models'
license=('GPL')
depends=('libc++utilities-git.so' 'qt5-base' 'mesa')
depends=('libc++utilities-git.so' 'qt5-base' 'libx11')
optdepends=("$_name-doc: API documentation")
makedepends=('cmake' 'git' 'ninja' 'qt5-tools')
provides=(libqtutilities-git.so)

View File

@ -12,8 +12,8 @@ pkgrel=1
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (using Qt 6)'
license=('GPL')
depends=('libc++utilities-git.so' 'qt6-base')
makedepends=('cmake' 'git' 'ninja' 'qt6-tools' 'qt6-declarative' 'clang' 'mesa')
depends=('libc++utilities-git.so' 'qt6-base' 'libx11')
makedepends=('cmake' 'git' 'ninja' 'qt6-tools' 'qt6-declarative' 'clang')
optdepends=("$_name-doc: API documentation")
provides=(libqtutilities-qt6-git.so)
url="https://github.com/Martchus/${_reponame}"

View File

@ -12,8 +12,8 @@ pkgrel=1
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (using Qt 6)'
license=('GPL')
depends=('libc++utilities.so' 'qt6-base')
makedepends=('cmake' 'ninja' 'qt6-tools' 'qt6-declarative' 'clang' 'mesa')
depends=('libc++utilities.so' 'qt6-base' 'libx11')
makedepends=('cmake' 'ninja' 'qt6-tools' 'qt6-declarative' 'clang')
optdepends=("$_name-doc: API documentation")
provides=(libqtutilities-qt6.so)
url="https://github.com/Martchus/${_reponame}"

View File

@ -11,7 +11,7 @@ pkgrel=1
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models'
license=('GPL')
depends=('static-compat-c++utilities' 'static-compat-qt6-base')
depends=('static-compat-c++utilities' 'static-compat-qt6-base' 'static-compat-libx11')
makedepends=('static-compat-cmake' 'ninja' 'static-compat-qt6-tools' 'clang')
optdepends=("$_name-doc: API documentation")
url="https://github.com/Martchus/${_reponame}"

View File

@ -38,7 +38,7 @@ depends=('libqtutilities.so' 'libqtforkawesome.so' 'libc++utilities.so' 'libboos
[[ $_js_provider == qml ]] && depends+=('qt5-declarative')
[[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin')
[[ $_enable_plasmoid ]] && optdepends+=('plasma-workspace: Plasmoid for Plasma 5 desktop')
makedepends=('cmake' 'ninja' 'qt5-tools' 'mesa' 'boost')
makedepends=('cmake' 'ninja' 'qt5-tools' 'boost')
checkdepends=('cppunit' 'syncthing' 'iproute2' 'appstream')
[[ $_enable_kio_plugin ]] && makedepends+=('kio')
[[ $_enable_plasmoid ]] && makedepends+=('plasma-framework' 'extra-cmake-modules')

View File

@ -39,7 +39,7 @@ depends=('libqtutilities-git.so' 'libqtforkawesome-git.so' 'libc++utilities-git.
[[ $_js_provider == qml ]] && depends+=('qt5-declarative')
[[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin')
[[ $_enable_plasmoid ]] && optdepends+=('plasma-workspace: Plasmoid for Plasma 5 desktop')
makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'mesa' 'boost')
makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'boost')
checkdepends=('cppunit' 'syncthing' 'iproute2' 'appstream')
[[ $_enable_kio_plugin ]] && makedepends+=('kio')
[[ $_enable_plasmoid ]] && makedepends+=('plasma-framework' 'extra-cmake-modules')

View File

@ -40,7 +40,7 @@ depends=('libqtutilities-qt6.so' 'libqtforkawesome-qt6.so' 'libc++utilities.so'
[[ $_js_provider == qml ]] && depends+=('qt6-declarative')
[[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin')
[[ $_enable_plasmoid ]] && optdepends+=('plasma-workspace: Plasmoid for Plasma 6 desktop')
makedepends=('cmake' 'ninja' 'qt6-tools' 'qt6-declarative' 'clang' 'mesa' 'boost')
makedepends=('cmake' 'ninja' 'qt6-tools' 'qt6-declarative' 'clang' 'boost')
checkdepends=('cppunit' 'syncthing' 'iproute2' 'appstream')
[[ $_enable_kio_plugin ]] && makedepends+=('kio')
[[ $_enable_plasmoid ]] && makedepends+=('plasma-framework' 'extra-cmake-modules')

View File

@ -25,7 +25,7 @@ depends=('libqtutilities.so' 'libtagparser.so' 'libc++utilities.so' 'desktop-fil
[[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
[[ $_js_provider == script ]] && depends+=('qt5-script')
[[ $_js_provider == qml ]] && depends+=('qt5-declarative')
makedepends=('cmake' 'ninja' 'qt5-tools' 'mesa')
makedepends=('cmake' 'ninja' 'qt5-tools')
[[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson')
checkdepends=('cppunit' 'jq' 'appstream')
url="https://github.com/Martchus/${_reponame}"

View File

@ -26,7 +26,7 @@ depends=('libqtutilities-git.so' 'libtagparser-git.so' 'libc++utilities-git.so'
[[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
[[ $_js_provider == script ]] && depends+=('qt5-script')
[[ $_js_provider == qml ]] && depends+=('qt5-declarative')
makedepends=('cmake' 'qt5-tools' 'git' 'ninja' 'mesa')
makedepends=('cmake' 'qt5-tools' 'git' 'ninja')
[[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson-git')
checkdepends=('cppunit' 'jq' 'appstream')
provides=("${_name}")

View File

@ -27,7 +27,7 @@ depends=('libqtutilities-qt6.so' 'libtagparser.so' 'libc++utilities.so' 'desktop
[[ $_webview_provider == webengine ]] && depends+=('qt6-webengine')
[[ $_js_provider == script ]] && depends+=('qt6-script')
[[ $_js_provider == qml ]] && depends+=('qt6-declarative')
makedepends=('cmake' 'ninja' 'qt6-tools' 'qt6-declarative' 'clang' 'mesa')
makedepends=('cmake' 'ninja' 'qt6-tools' 'qt6-declarative' 'clang')
[[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson')
checkdepends=('cppunit' 'jq' 'appstream')
url="https://github.com/Martchus/${_reponame}"

View File

@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)'
license=('GPL')
depends=('qtutilities' 'openssl' 'desktop-file-utils' 'xdg-utils')
makedepends=('cmake' 'ninja' 'qt5-tools' 'mesa')
makedepends=('cmake' 'ninja' 'qt5-tools')
url="https://github.com/Martchus/${_reponame}"
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('59adbb242250235d0e580fbb858c3eb30c724f5463defc49330015e2233927ed')

View File

@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)'
license=('GPL')
depends=('qtutilities-git' 'openssl' 'desktop-file-utils' 'xdg-utils')
makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'mesa')
makedepends=('cmake' 'ninja' 'qt5-tools' 'git')
provides=("${_name}")
conflicts=("${_name}")
url="https://github.com/Martchus/${_reponame}"