diff --git a/ci/deps-opensuse-qt6.sh b/ci/deps-opensuse-qt6.sh index 32902904d..8b32a02dc 100755 --- a/ci/deps-opensuse-qt6.sh +++ b/ci/deps-opensuse-qt6.sh @@ -14,7 +14,7 @@ zypper --non-interactive in bison flex git make cmake gcc-c++ zypper --non-interactive in yaml-cpp-devel libpwquality-devel parted-devel python3-devel zypper --non-interactive in libicu-devel libatasmart-devel # Qt6/KF6 dependencies -zypper --non-interactive in qt6-concurrent-devel qt6-gui-devel qt6-linguist-devel qt6-network-devel qt6-svg-devel qt6-declarative-devel -zypper --non-interactive in kf6-kcoreaddons-devel kf6-kdbusaddons-devel kf6-kcrash-devel -zypper --non-interactive in kf6-kparts-devel # Also installs KF5 things -zypper --non-interactive in libpolkit-qt6-1-devel +zypper --non-interactive in "qt6-declarative-devel" "cmake(Qt6Concurrent)" "cmake(Qt6Gui)" "cmake(Qt6Network)" "cmake(Qt6Svg)" "cmake(Qt6Linguist)" +zypper --non-interactive in "cmake(KF6CoreAddons)" "cmake(KF6DBusAddons)" "cmake(KF6Crash)" +zypper --non-interactive in "cmake(KF6Parts)" # Also installs KF5 things +zypper --non-interactive in "cmake(PolkitQt6-1)" diff --git a/ci/deps-opensuse.sh b/ci/deps-opensuse.sh index 7f2bca5f1..d2fe5c3fe 100755 --- a/ci/deps-opensuse.sh +++ b/ci/deps-opensuse.sh @@ -14,12 +14,12 @@ zypper --non-interactive in \ "gcc-c++" zypper --non-interactive in \ "libqt5-qtbase-devel" \ - "libqt5-linguist-devel" \ - "libqt5-qtsvg-devel" \ "libqt5-qtdeclarative-devel" \ - "libqt5-qtwebengine-devel" \ + "cmake(Qt5LinguistTools)" \ + "cmake(Qt5Svg)" \ + "cmake(Qt5WebEngine)" \ + "cmake(PolkitQt5-1)" \ "yaml-cpp-devel" \ - "libpolkit-qt5-1-devel" \ "libpwquality-devel" \ "parted-devel" \ "python-devel" \ @@ -27,14 +27,14 @@ zypper --non-interactive in \ "libboost_python3-devel" zypper --non-interactive in \ "extra-cmake-modules" \ - "kdbusaddons-devel" \ - "kservice-devel" \ - "kpackage-devel" \ - "kparts-devel" \ - "kcrash-devel" \ - "kpmcore-devel" \ - "plasma5-workspace-devel" \ - "plasma-framework-devel" + "cmake(KF5Crash)" \ + "cmake(KF5DBusAddons)" \ + "cmake(KF5Package)" \ + "cmake(KF5Parts)" \ + "cmake(KF5Plasma)" \ + "cmake(KF5Service)" \ + "cmake(KPMcore)" \ + "cmake(LibKWorkspace)" # Additional dependencies zypper --non-interactive in \ libicu-devel \