From c1d7c0afb4043aed1b4556645e543289ed9fc338 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 11 Sep 2023 21:39:23 +0200 Subject: [PATCH] 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) --- passwordmanager/default/PKGBUILD | 2 +- passwordmanager/git/PKGBUILD | 2 +- passwordmanager/qt6/PKGBUILD | 2 +- qtforkawesome/default/PKGBUILD | 2 +- qtforkawesome/doc/PKGBUILD | 2 +- qtforkawesome/git/PKGBUILD | 2 +- qtforkawesome/qt6/PKGBUILD | 2 +- qtutilities/default/PKGBUILD | 4 ++-- qtutilities/doc/PKGBUILD | 2 +- qtutilities/git/PKGBUILD | 2 +- qtutilities/qt6-git/PKGBUILD | 4 ++-- qtutilities/qt6/PKGBUILD | 4 ++-- qtutilities/static-compat/PKGBUILD | 2 +- syncthingtray/default/PKGBUILD | 2 +- syncthingtray/git/PKGBUILD | 2 +- syncthingtray/qt6/PKGBUILD | 2 +- tageditor/default/PKGBUILD | 2 +- tageditor/git/PKGBUILD | 2 +- tageditor/qt6/PKGBUILD | 2 +- videodownloader/default/PKGBUILD | 2 +- videodownloader/git/PKGBUILD | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/passwordmanager/default/PKGBUILD b/passwordmanager/default/PKGBUILD index cde63c0b..fd812d70 100644 --- a/passwordmanager/default/PKGBUILD +++ b/passwordmanager/default/PKGBUILD @@ -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') diff --git a/passwordmanager/git/PKGBUILD b/passwordmanager/git/PKGBUILD index 78e71ade..e3426cec 100644 --- a/passwordmanager/git/PKGBUILD +++ b/passwordmanager/git/PKGBUILD @@ -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}") diff --git a/passwordmanager/qt6/PKGBUILD b/passwordmanager/qt6/PKGBUILD index 38ffc266..51fb7349 100644 --- a/passwordmanager/qt6/PKGBUILD +++ b/passwordmanager/qt6/PKGBUILD @@ -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') diff --git a/qtforkawesome/default/PKGBUILD b/qtforkawesome/default/PKGBUILD index e654b2b7..d9e38bc0 100644 --- a/qtforkawesome/default/PKGBUILD +++ b/qtforkawesome/default/PKGBUILD @@ -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" diff --git a/qtforkawesome/doc/PKGBUILD b/qtforkawesome/doc/PKGBUILD index 9b9108f5..87180703 100644 --- a/qtforkawesome/doc/PKGBUILD +++ b/qtforkawesome/doc/PKGBUILD @@ -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") diff --git a/qtforkawesome/git/PKGBUILD b/qtforkawesome/git/PKGBUILD index 4c14db1c..07964983 100644 --- a/qtforkawesome/git/PKGBUILD +++ b/qtforkawesome/git/PKGBUILD @@ -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" diff --git a/qtforkawesome/qt6/PKGBUILD b/qtforkawesome/qt6/PKGBUILD index 40d205e2..381f35ed 100644 --- a/qtforkawesome/qt6/PKGBUILD +++ b/qtforkawesome/qt6/PKGBUILD @@ -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" diff --git a/qtutilities/default/PKGBUILD b/qtutilities/default/PKGBUILD index 828ef77c..61534880 100644 --- a/qtutilities/default/PKGBUILD +++ b/qtutilities/default/PKGBUILD @@ -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}" diff --git a/qtutilities/doc/PKGBUILD b/qtutilities/doc/PKGBUILD index 07105257..e794fbfd 100644 --- a/qtutilities/doc/PKGBUILD +++ b/qtutilities/doc/PKGBUILD @@ -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') diff --git a/qtutilities/git/PKGBUILD b/qtutilities/git/PKGBUILD index 3c8800ae..304dd52e 100644 --- a/qtutilities/git/PKGBUILD +++ b/qtutilities/git/PKGBUILD @@ -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) diff --git a/qtutilities/qt6-git/PKGBUILD b/qtutilities/qt6-git/PKGBUILD index de6d3c9a..5572d9e3 100644 --- a/qtutilities/qt6-git/PKGBUILD +++ b/qtutilities/qt6-git/PKGBUILD @@ -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}" diff --git a/qtutilities/qt6/PKGBUILD b/qtutilities/qt6/PKGBUILD index 508a3a0f..d416e0e7 100644 --- a/qtutilities/qt6/PKGBUILD +++ b/qtutilities/qt6/PKGBUILD @@ -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}" diff --git a/qtutilities/static-compat/PKGBUILD b/qtutilities/static-compat/PKGBUILD index 34c28638..903a22a6 100644 --- a/qtutilities/static-compat/PKGBUILD +++ b/qtutilities/static-compat/PKGBUILD @@ -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}" diff --git a/syncthingtray/default/PKGBUILD b/syncthingtray/default/PKGBUILD index 9309e292..c8aab5ae 100644 --- a/syncthingtray/default/PKGBUILD +++ b/syncthingtray/default/PKGBUILD @@ -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') diff --git a/syncthingtray/git/PKGBUILD b/syncthingtray/git/PKGBUILD index 47782639..88e88e97 100644 --- a/syncthingtray/git/PKGBUILD +++ b/syncthingtray/git/PKGBUILD @@ -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') diff --git a/syncthingtray/qt6/PKGBUILD b/syncthingtray/qt6/PKGBUILD index c73bef8e..95c95006 100644 --- a/syncthingtray/qt6/PKGBUILD +++ b/syncthingtray/qt6/PKGBUILD @@ -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') diff --git a/tageditor/default/PKGBUILD b/tageditor/default/PKGBUILD index b0ac1a57..acdd9160 100644 --- a/tageditor/default/PKGBUILD +++ b/tageditor/default/PKGBUILD @@ -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}" diff --git a/tageditor/git/PKGBUILD b/tageditor/git/PKGBUILD index d21f1f26..deae2857 100644 --- a/tageditor/git/PKGBUILD +++ b/tageditor/git/PKGBUILD @@ -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}") diff --git a/tageditor/qt6/PKGBUILD b/tageditor/qt6/PKGBUILD index a3f857ae..cd6f73e4 100644 --- a/tageditor/qt6/PKGBUILD +++ b/tageditor/qt6/PKGBUILD @@ -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}" diff --git a/videodownloader/default/PKGBUILD b/videodownloader/default/PKGBUILD index 86276335..5c7f1c0a 100644 --- a/videodownloader/default/PKGBUILD +++ b/videodownloader/default/PKGBUILD @@ -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') diff --git a/videodownloader/git/PKGBUILD b/videodownloader/git/PKGBUILD index 5a402168..a4fc2332 100644 --- a/videodownloader/git/PKGBUILD +++ b/videodownloader/git/PKGBUILD @@ -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}"