From 9c23937d98ab082d8a81d69f0992e63ef2f052af Mon Sep 17 00:00:00 2001 From: Aditya Gupta Date: Sat, 6 Jan 2024 03:08:46 +0530 Subject: [PATCH] deps: update dependencies in PKGBUILDs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently trying to install the packages shows these errors: ``` ➜ ~ doas pikaur -Sy heera-git :: Synchronizing package databases... core 128.3 KiB 174 KiB/s 00:01 [##############################################################] 100% extra 8.3 MiB 12.2 MiB/s 00:01 [##############################################################] 100% community is up to date heera-git 3.2 KiB 7.73 KiB/s 00:00 [##############################################################] 100% Reading repository package databases... Reading local package database... :: error: 'heera-git' is NOT installable. error: failed to prepare transaction (could not satisfy dependencies) :: unable to satisfy dependency 'plasma-framework' required by heera-calamares :: unable to satisfy dependency 'kdbusaddons' required by heera-calamares :: unable to satisfy dependency 'kwindowsystem' required by heera-core :: unable to satisfy dependency 'kwindowsystem' required by heera-user-interface :: unable to satisfy dependency 'heera-user-interface' required by heera-dock :: unable to satisfy dependency 'kio' required by heera-system-library :: unable to satisfy dependency 'networkmanager-qt' required by heera-system-library :: unable to satisfy dependency 'kcoreaddons' required by heera-system-library :: unable to satisfy dependency 'modemmanager-qt' required by heera-system-library :: unable to satisfy dependency 'heera-system-library' required by heera-dock :: unable to satisfy dependency 'kwindowsystem' required by heera-dock :: unable to satisfy dependency 'kwindowsystem' required by heera-launcher :: unable to satisfy dependency 'kwindowsystem' required by heera-qt-plugins :: unable to satisfy dependency 'kwindowsystem' required by heera-user-interface :: unable to satisfy dependency 'heera-user-interface' required by heera-settings :: unable to satisfy dependency 'kio' required by heera-system-library :: unable to satisfy dependency 'networkmanager-qt' required by heera-system-library :: unable to satisfy dependency 'kcoreaddons' required by heera-system-library :: unable to satisfy dependency 'modemmanager-qt' required by heera-system-library :: unable to satisfy dependency 'kwindowsystem' required by heera-user-interface ``` These are due to the reason that many kde packages, eg. 'kio5', 'networkmanager-qt5', 'kwindowsystem5' come with kde/qt version at end (5), which was not there earlier. Fix the errors by updating PKGBUILDs to use new versions. Signed-off-by: Aditya Gupta --- heera-calamares/PKGBUILD | 6 ++++-- heera-core/PKGBUILD | 2 +- heera-dock/PKGBUILD | 3 ++- heera-launcher/PKGBUILD | 2 +- heera-qt-plugins/PKGBUILD | 2 +- heera-system-library/PKGBUILD | 3 ++- heera-user-interface/PKGBUILD | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/heera-calamares/PKGBUILD b/heera-calamares/PKGBUILD index a79771b..b728347 100644 --- a/heera-calamares/PKGBUILD +++ b/heera-calamares/PKGBUILD @@ -7,8 +7,10 @@ arch=('x86_64') url="https://github.com/heera-os/heera-calamares.git" license=('GPL3') groups=('heera-git') -depends=('yaml-cpp' 'plasma-framework' 'libpwquality' 'qt5-webengine' 'appstream-qt' 'kdbusaddons') -makedepends=('git' 'cmake' 'extra-cmake-modules' 'ninja' 'boost-libs' 'kpmcore' 'kparts' 'python-pyqt5' 'qt5-tools') +depends=('yaml-cpp' 'plasma-framework5' 'libpwquality' 'qt5-webengine' + 'appstream-qt' 'kdbusaddons5') +makedepends=('git' 'cmake' 'extra-cmake-modules' 'ninja' 'boost-libs' 'kpmcore' + 'kparts' 'python-pyqt5' 'qt5-tools') provides=("${pkgname}") conflicts=("${pkgname}") source=("${pkgname}::git+${url}") diff --git a/heera-core/PKGBUILD b/heera-core/PKGBUILD index bcf5597..bba028e 100644 --- a/heera-core/PKGBUILD +++ b/heera-core/PKGBUILD @@ -7,7 +7,7 @@ arch=('x86_64') url="https://github.com/heera-os/heera-core.git" license=('GPL3') groups=('heera-git') -depends=('qt5-declarative' 'qhotkey' 'polkit-qt5' 'kwindowsystem' 'libpulse' 'libxtst' 'kwin') +depends=('qt5-declarative' 'qhotkey' 'polkit-qt5' 'kwindowsystem5' 'libpulse' 'libxtst' 'kwin') makedepends=('git' 'qt5-quickcontrols2' 'qt5-tools' 'cmake' 'extra-cmake-modules' 'heera-user-interface' 'ninja') provides=("${pkgname}") conflicts=("${pkgname}") diff --git a/heera-dock/PKGBUILD b/heera-dock/PKGBUILD index d86391a..2ccbd80 100644 --- a/heera-dock/PKGBUILD +++ b/heera-dock/PKGBUILD @@ -7,7 +7,8 @@ arch=('x86_64') url="https://github.com/heera-os/heera-dock.git" license=('GPL3') groups=('heera-git') -depends=('heera-user-interface' 'heera-system-library' 'qt5-declarative' 'kwindowsystem') +depends=('heera-user-interface' 'heera-system-library' 'qt5-declarative' + 'kwindowsystem5') makedepends=('git' 'cmake' 'ninja' 'qt5-tools' ) provides=("${pkgname}") conflicts=("${pkgname}") diff --git a/heera-launcher/PKGBUILD b/heera-launcher/PKGBUILD index f288878..434c4a3 100644 --- a/heera-launcher/PKGBUILD +++ b/heera-launcher/PKGBUILD @@ -7,7 +7,7 @@ arch=('x86_64') url="https://github.com/heera-os/heera-launcher.git" license=('GPL3') groups=('heera-git') -depends=('qt5-declarative' 'kwindowsystem') +depends=('qt5-declarative' 'kwindowsystem5') makedepends=('git' 'cmake' 'qt5-tools' 'qt5-quickcontrols2' 'extra-cmake-modules' 'gcc' 'ninja') provides=("${pkgname}") conflicts=("${pkgname}") diff --git a/heera-qt-plugins/PKGBUILD b/heera-qt-plugins/PKGBUILD index 14d2cb4..88c56d4 100644 --- a/heera-qt-plugins/PKGBUILD +++ b/heera-qt-plugins/PKGBUILD @@ -7,7 +7,7 @@ arch=('x86_64') url="https://github.com/heera-os/heera-qt-plugins.git" license=('GPL3') groups=('heera-git') -depends=('libqtxdg' 'libdbusmenu-qt5' 'kwindowsystem' 'qt5-quickcontrols2') +depends=('libqtxdg' 'libdbusmenu-qt5' 'kwindowsystem5' 'qt5-quickcontrols2') makedepends=('git' 'cmake' 'extra-cmake-modules' 'gcc' 'ninja') provides=("${pkgname}") conflicts=("${pkgname}") diff --git a/heera-system-library/PKGBUILD b/heera-system-library/PKGBUILD index dfaa1e7..54f8b46 100644 --- a/heera-system-library/PKGBUILD +++ b/heera-system-library/PKGBUILD @@ -7,7 +7,8 @@ arch=('x86_64') url="https://github.com/heera-os/heera-system-library.git" license=('GPL3') groups=('heera-git') -depends=('libkscreen' 'qt5-quickcontrols2' 'kio' 'networkmanager-qt' 'qt5-sensors' 'kcoreaddons' 'modemmanager-qt') +depends=('libkscreen' 'qt5-quickcontrols2' 'kio5' 'networkmanager-qt5' + 'qt5-sensors' 'kcoreaddons5' 'modemmanager-qt5') makedepends=('git' 'cmake' 'extra-cmake-modules' 'gcc' 'ninja') provides=("${pkgname}") conflicts=("${pkgname}") diff --git a/heera-user-interface/PKGBUILD b/heera-user-interface/PKGBUILD index d3158a6..e7d933d 100644 --- a/heera-user-interface/PKGBUILD +++ b/heera-user-interface/PKGBUILD @@ -7,7 +7,7 @@ arch=('x86_64') url="https://github.com/heera-os/heera-user-interface.git" license=('GPL3') groups=('heera-git') -depends=('qt5-declarative' 'qt5-quickcontrols2' 'kwindowsystem') # libqt5x11extras5-dev libkf5windowsystem-dev qtbase5-private-dev libxcb1-dev libxcb-shape0-dev libxcb-icccm4-dev +depends=('qt5-declarative' 'qt5-quickcontrols2' 'kwindowsystem5') # libqt5x11extras5-dev libkf5windowsystem-dev qtbase5-private-dev libxcb1-dev libxcb-shape0-dev libxcb-icccm4-dev makedepends=('git' 'cmake' 'extra-cmake-modules' 'gcc' 'ninja') provides=("${pkgname}") conflicts=("${pkgname}")