From 612218b2703a259e9f15f5ac602dbe08557fa312 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Sun, 10 Feb 2019 16:53:38 +0100 Subject: [PATCH] Use ki18n class --- classes/cmake_kdeapp.bbclass | 3 +-- classes/cmake_plasma.bbclass | 4 +--- recipes-extragear/network/kdeconnect-kde.inc | 1 - recipes-plasma/bluedevil.inc | 1 - recipes-plasma/breeze.inc | 1 - recipes-plasma/discover.inc | 1 - recipes-plasma/kactivitymanagerd.inc | 1 - recipes-plasma/kde-cli-tools.inc | 1 - recipes-plasma/kdecoration.inc | 4 ---- recipes-plasma/kscreen.inc | 1 - recipes-plasma/kscreenlocker.inc | 1 - recipes-plasma/ksysguard.inc | 1 - recipes-plasma/kwin.inc | 1 - recipes-plasma/libksysguard.inc | 1 - recipes-plasma/milou.inc | 1 - recipes-plasma/plasma-integration.inc | 1 - recipes-plasma/plasma-nm.inc | 1 - recipes-plasma/plasma-pa.inc | 1 - recipes-plasma/polkit-kde-agent-1.inc | 1 - recipes-plasma/powerdevil.inc | 1 - recipes-plasma/systemsettings.inc | 1 - recipes-plasma/xdg-desktop-portal-kde.inc | 1 - 22 files changed, 2 insertions(+), 28 deletions(-) diff --git a/classes/cmake_kdeapp.bbclass b/classes/cmake_kdeapp.bbclass index a639d93..6b9c4d6 100644 --- a/classes/cmake_kdeapp.bbclass +++ b/classes/cmake_kdeapp.bbclass @@ -1,6 +1,5 @@ inherit cmake_qt5 -inherit gettext -inherit python3native +inherit ki18n inherit kdoctools EXTRA_OECMAKE += " \ diff --git a/classes/cmake_plasma.bbclass b/classes/cmake_plasma.bbclass index 79a64f4..0689c97 100644 --- a/classes/cmake_plasma.bbclass +++ b/classes/cmake_plasma.bbclass @@ -1,6 +1,5 @@ inherit cmake_qt5 -inherit gettext -inherit python3native +inherit ki18n EXTRA_OECMAKE += " \ -DBUILD_TESTING=OFF \ @@ -9,7 +8,6 @@ EXTRA_OECMAKE += " \ DEPENDS += " \ extra-cmake-modules \ qtbase \ - gettext-native \ " do_configure_prepend() { diff --git a/recipes-extragear/network/kdeconnect-kde.inc b/recipes-extragear/network/kdeconnect-kde.inc index b65a028..30d95ab 100644 --- a/recipes-extragear/network/kdeconnect-kde.inc +++ b/recipes-extragear/network/kdeconnect-kde.inc @@ -7,7 +7,6 @@ PR = "r0" DEPENDS += " \ qtdeclarative \ qca \ - ki18n \ kconfigwidgets \ kdbusaddons \ kiconthemes \ diff --git a/recipes-plasma/bluedevil.inc b/recipes-plasma/bluedevil.inc index 9f7b685..4b89b0f 100644 --- a/recipes-plasma/bluedevil.inc +++ b/recipes-plasma/bluedevil.inc @@ -13,7 +13,6 @@ DEPENDS = " \ kwindowsystem \ kiconthemes \ plasma-framework \ - ki18n \ kio \ bluez-qt \ kded \ diff --git a/recipes-plasma/breeze.inc b/recipes-plasma/breeze.inc index 2c3bb8b..84c8239 100644 --- a/recipes-plasma/breeze.inc +++ b/recipes-plasma/breeze.inc @@ -11,7 +11,6 @@ DEPENDS = " \ kcoreaddons \ kdecoration \ kguiaddons \ - ki18n \ kpackage \ kwayland \ kwindowsystem \ diff --git a/recipes-plasma/discover.inc b/recipes-plasma/discover.inc index 8572c81..8a63a1e 100644 --- a/recipes-plasma/discover.inc +++ b/recipes-plasma/discover.inc @@ -10,7 +10,6 @@ DEPENDS = " \ kconfig \ kcrash \ kdbusaddons \ - ki18n \ karchive \ kdeclarative \ kxmlgui \ diff --git a/recipes-plasma/kactivitymanagerd.inc b/recipes-plasma/kactivitymanagerd.inc index 25b75f5..8220b4b 100644 --- a/recipes-plasma/kactivitymanagerd.inc +++ b/recipes-plasma/kactivitymanagerd.inc @@ -10,7 +10,6 @@ DEPENDS = " \ kcoreaddons \ kdbusaddons \ kglobalaccel \ - ki18n \ kio \ kwindowsystem \ kxmlgui \ diff --git a/recipes-plasma/kde-cli-tools.inc b/recipes-plasma/kde-cli-tools.inc index 19d0ab7..107979d 100644 --- a/recipes-plasma/kde-cli-tools.inc +++ b/recipes-plasma/kde-cli-tools.inc @@ -9,7 +9,6 @@ DEPENDS = " \ kconfig \ kiconthemes \ kinit \ - ki18n \ kcmutils \ kio \ kservice \ diff --git a/recipes-plasma/kdecoration.inc b/recipes-plasma/kdecoration.inc index 96a899f..37f72d5 100644 --- a/recipes-plasma/kdecoration.inc +++ b/recipes-plasma/kdecoration.inc @@ -9,10 +9,6 @@ SRC_URI = " \ " S = "${WORKDIR}/git" -DEPENDS += " \ - ki18n \ -" - inherit cmake_plasma FILES_${PN} += " \ diff --git a/recipes-plasma/kscreen.inc b/recipes-plasma/kscreen.inc index 9d47234..bb06132 100644 --- a/recipes-plasma/kscreen.inc +++ b/recipes-plasma/kscreen.inc @@ -7,7 +7,6 @@ PR = "r0" DEPENDS = " \ qtdeclarative \ kdbusaddons \ - ki18n \ plasma-framework \ kconfigwidgets \ kglobalaccel \ diff --git a/recipes-plasma/kscreenlocker.inc b/recipes-plasma/kscreenlocker.inc index 2d7d3be..6f2b4ca 100644 --- a/recipes-plasma/kscreenlocker.inc +++ b/recipes-plasma/kscreenlocker.inc @@ -10,7 +10,6 @@ DEPENDS = " \ kcrash \ kdeclarative \ kglobalaccel \ - ki18n \ kidletime \ kcmutils \ knotifications \ diff --git a/recipes-plasma/ksysguard.inc b/recipes-plasma/ksysguard.inc index 1f68ddb..d51e123 100644 --- a/recipes-plasma/ksysguard.inc +++ b/recipes-plasma/ksysguard.inc @@ -8,7 +8,6 @@ DEPENDS = " \ kconfig \ kcoreaddons \ kdbusaddons \ - ki18n \ kiconthemes \ kinit \ kitemviews \ diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc index 198fca3..6798801 100644 --- a/recipes-plasma/kwin.inc +++ b/recipes-plasma/kwin.inc @@ -11,7 +11,6 @@ DEPENDS = " \ kconfigwidgets \ kcrash \ kglobalaccel \ - ki18n \ kinit \ knotifications \ kpackage \ diff --git a/recipes-plasma/libksysguard.inc b/recipes-plasma/libksysguard.inc index 274a35f..f3b76e1 100644 --- a/recipes-plasma/libksysguard.inc +++ b/recipes-plasma/libksysguard.inc @@ -7,7 +7,6 @@ PR = "r0" DEPENDS = " \ kcoreaddons \ kconfig \ - ki18n \ kwindowsystem \ kcompletion \ kauth \ diff --git a/recipes-plasma/milou.inc b/recipes-plasma/milou.inc index 410cc97..f36bbe9 100644 --- a/recipes-plasma/milou.inc +++ b/recipes-plasma/milou.inc @@ -7,7 +7,6 @@ PR = "r0" DEPENDS = " \ qtdeclarative \ kcoreaddons \ - ki18n \ kdeclarative \ kservice \ plasma-framework \ diff --git a/recipes-plasma/plasma-integration.inc b/recipes-plasma/plasma-integration.inc index ff10917..2a95d45 100644 --- a/recipes-plasma/plasma-integration.inc +++ b/recipes-plasma/plasma-integration.inc @@ -9,7 +9,6 @@ DEPENDS = " \ qtquickcontrols2 \ kconfig \ kconfigwidgets \ - ki18n \ kiconthemes \ kio \ knotifications \ diff --git a/recipes-plasma/plasma-nm.inc b/recipes-plasma/plasma-nm.inc index bbe4bf0..9faaf9f 100644 --- a/recipes-plasma/plasma-nm.inc +++ b/recipes-plasma/plasma-nm.inc @@ -9,7 +9,6 @@ DEPENDS = " \ qttools \ networkmanager-qt \ modemmanager-qt \ - ki18n \ kwindowsystem \ kservice \ kcompletion \ diff --git a/recipes-plasma/plasma-pa.inc b/recipes-plasma/plasma-pa.inc index e68bd89..34a4679 100644 --- a/recipes-plasma/plasma-pa.inc +++ b/recipes-plasma/plasma-pa.inc @@ -9,7 +9,6 @@ DEPENDS = " \ kcoreaddons \ kdeclarative \ kglobalaccel \ - ki18n \ plasma-framework \ pulseaudio \ libcanberra \ diff --git a/recipes-plasma/polkit-kde-agent-1.inc b/recipes-plasma/polkit-kde-agent-1.inc index 88cdf7a..23d0ebf 100644 --- a/recipes-plasma/polkit-kde-agent-1.inc +++ b/recipes-plasma/polkit-kde-agent-1.inc @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24" PR = "r0" DEPENDS = " \ - ki18n \ kwindowsystem \ kdbusaddons \ kwidgetsaddons \ diff --git a/recipes-plasma/powerdevil.inc b/recipes-plasma/powerdevil.inc index d5e8ce9..3e250cd 100644 --- a/recipes-plasma/powerdevil.inc +++ b/recipes-plasma/powerdevil.inc @@ -12,7 +12,6 @@ DEPENDS = " \ kconfig \ kdbusaddons \ solid \ - ki18n \ kglobalaccel \ kio \ knotifyconfig \ diff --git a/recipes-plasma/systemsettings.inc b/recipes-plasma/systemsettings.inc index fef5b49..11adb1a 100644 --- a/recipes-plasma/systemsettings.inc +++ b/recipes-plasma/systemsettings.inc @@ -7,7 +7,6 @@ PR = "r0" DEPENDS += " \ kitemviews \ kcmutils \ - ki18n \ kio \ kservice \ kiconthemes \ diff --git a/recipes-plasma/xdg-desktop-portal-kde.inc b/recipes-plasma/xdg-desktop-portal-kde.inc index cdb8eb9..2696249 100644 --- a/recipes-plasma/xdg-desktop-portal-kde.inc +++ b/recipes-plasma/xdg-desktop-portal-kde.inc @@ -6,7 +6,6 @@ PR = "r0" DEPENDS += " \ kcoreaddons \ - ki18n \ knotifications \ kwayland \ kwidgetsaddons \