From 4f511763adb8132cd317283c10f05df97782b992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 10 Jan 2021 19:58:38 +0100 Subject: [PATCH] recipes-liri: inherit qt5-translation explicitly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- classes/liri.bbclass | 2 +- recipes-liri/liri-calculator/liri-calculator_git.bb | 3 +-- recipes-liri/liri-files/liri-files_git.bb | 2 +- recipes-liri/liri-networkmanager/liri-networkmanager_git.bb | 2 +- recipes-liri/liri-power-manager/liri-power-manager_git.bb | 2 +- recipes-liri/liri-pulseaudio/liri-pulseaudio_git.bb | 2 +- recipes-liri/liri-screenshot/liri-screenshot_git.bb | 2 +- recipes-liri/liri-settings/liri-settings_git.bb | 2 +- recipes-liri/liri-shell/liri-shell_git.bb | 2 +- recipes-liri/liri-terminal/liri-terminal_git.bb | 2 +- recipes-liri/liri-text/liri-text_git.bb | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/classes/liri.bbclass b/classes/liri.bbclass index 39300666..ec595af5 100644 --- a/classes/liri.bbclass +++ b/classes/liri.bbclass @@ -13,7 +13,7 @@ DEPENDS += " \ qtwayland \ " -inherit cmake_qt5_extra pkgconfig qt5-translation +inherit cmake_qt5_extra pkgconfig EXTRA_OECMAKE += " \ -DINSTALL_LIBDIR:PATH=${baselib} \ diff --git a/recipes-liri/liri-calculator/liri-calculator_git.bb b/recipes-liri/liri-calculator/liri-calculator_git.bb index 5fc8c68f..34da1f7d 100644 --- a/recipes-liri/liri-calculator/liri-calculator_git.bb +++ b/recipes-liri/liri-calculator/liri-calculator_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=8f0e2cd40e05189ec81232da84bd6e1a \ " -inherit liri gtk-icon-cache +inherit liri qt5-translation gtk-icon-cache DEPENDS += " \ qtquickcontrols2 \ @@ -17,5 +17,4 @@ PV = "1.2.0+git${SRCPV}" FILES_${PN} += " \ ${datadir}/metainfo \ - ${datadir}/icons \ " diff --git a/recipes-liri/liri-files/liri-files_git.bb b/recipes-liri/liri-files/liri-files_git.bb index 35bebe27..75943911 100644 --- a/recipes-liri/liri-files/liri-files_git.bb +++ b/recipes-liri/liri-files/liri-files_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=1ebbd3e34237af26da5dc08a4e440464 \ " -inherit liri +inherit liri qt5-translation PV = "0.2.0+git${SRCPV}" diff --git a/recipes-liri/liri-networkmanager/liri-networkmanager_git.bb b/recipes-liri/liri-networkmanager/liri-networkmanager_git.bb index 08c5b50f..46aea345 100644 --- a/recipes-liri/liri-networkmanager/liri-networkmanager_git.bb +++ b/recipes-liri/liri-networkmanager/liri-networkmanager_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit liri +inherit liri qt5-translation PV = "0.9.0+git${SRCPV}" diff --git a/recipes-liri/liri-power-manager/liri-power-manager_git.bb b/recipes-liri/liri-power-manager/liri-power-manager_git.bb index 7a40e82a..c03d7f6f 100644 --- a/recipes-liri/liri-power-manager/liri-power-manager_git.bb +++ b/recipes-liri/liri-power-manager/liri-power-manager_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit liri gsettings +inherit liri qt5-translation gsettings PV = "0.9.0+git${SRCPV}" diff --git a/recipes-liri/liri-pulseaudio/liri-pulseaudio_git.bb b/recipes-liri/liri-pulseaudio/liri-pulseaudio_git.bb index 966a4e8d..3c316d4b 100644 --- a/recipes-liri/liri-pulseaudio/liri-pulseaudio_git.bb +++ b/recipes-liri/liri-pulseaudio/liri-pulseaudio_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit liri features_check +inherit liri qt5-translation features_check REQUIRED_DISTRO_FEATURES = "pulseaudio" diff --git a/recipes-liri/liri-screenshot/liri-screenshot_git.bb b/recipes-liri/liri-screenshot/liri-screenshot_git.bb index 1ba6dd68..de59d77e 100644 --- a/recipes-liri/liri-screenshot/liri-screenshot_git.bb +++ b/recipes-liri/liri-screenshot/liri-screenshot_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit liri +inherit liri qt5-translation DEPENDS += " \ qtquickcontrols2 \ diff --git a/recipes-liri/liri-settings/liri-settings_git.bb b/recipes-liri/liri-settings/liri-settings_git.bb index dbfe94cf..0e2ff786 100644 --- a/recipes-liri/liri-settings/liri-settings_git.bb +++ b/recipes-liri/liri-settings/liri-settings_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit liri features_check +inherit liri qt5-translation features_check REQUIRED_DISTRO_FEATURES = "wayland" diff --git a/recipes-liri/liri-shell/liri-shell_git.bb b/recipes-liri/liri-shell/liri-shell_git.bb index 125c7f07..3d5fa376 100644 --- a/recipes-liri/liri-shell/liri-shell_git.bb +++ b/recipes-liri/liri-shell/liri-shell_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -inherit liri features_check gsettings +inherit liri qt5-translation features_check gsettings REQUIRED_DISTRO_FEATURES = "wayland pam" diff --git a/recipes-liri/liri-terminal/liri-terminal_git.bb b/recipes-liri/liri-terminal/liri-terminal_git.bb index 617c3c56..192c1592 100644 --- a/recipes-liri/liri-terminal/liri-terminal_git.bb +++ b/recipes-liri/liri-terminal/liri-terminal_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit liri gsettings +inherit liri qt5-translation gsettings DEPENDS += " \ liri-fluid \ diff --git a/recipes-liri/liri-text/liri-text_git.bb b/recipes-liri/liri-text/liri-text_git.bb index c279fbdf..5e0c0627 100644 --- a/recipes-liri/liri-text/liri-text_git.bb +++ b/recipes-liri/liri-text/liri-text_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=7702f203b58979ebbc31bfaeb44f219c \ " -inherit liri gtk-icon-cache mime-xdg +inherit liri qt5-translation gtk-icon-cache mime-xdg DEPENDS += " \ qtquickcontrols2 \