recipes-liri: Upgrade sources to latest

* replace liri-materialdecoration by liri-qtintegration * remove liri-platformtheme: repo is gone Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2022-03-11 20:50:10 +01:00
parent 286206dfaf
commit 2bec244395
31 changed files with 68 additions and 138 deletions
--- a/recipes-liri/liri-appcenter/liri-appcenter_git.bb
+++ b/recipes-liri/liri-appcenter/liri-appcenter_git.bb
@@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "flatpak"

 PV = "0.1.0+git${SRCPV}"

-SRCREV = "1611f5ba49dc1e15e3b4f6668934f2d8192b5eee"
+SRCREV = "925e600f5aa44dbec81e6dca9c6194f11bbdf715"
 S = "${WORKDIR}/git"

 DEPENDS += " \
--- a/recipes-liri/liri-browser/liri-browser_git.bb
+++ b/recipes-liri/liri-browser/liri-browser_git.bb
@@ -9,7 +9,7 @@ inherit liri gtk-icon-cache

 PV = "0.0.0+git${SRCPV}"

-SRCREV = "ae9d3d6a7a39ec4a8a2af33ead7d31ecbb2db65c"
+SRCREV = "fe29ad515af121c5326ce84bb968ba27b4499b30"
 S = "${WORKDIR}/git"

 DEPENDS += " \
--- a/recipes-liri/liri-calculator/liri-calculator_git.bb
+++ b/recipes-liri/liri-calculator/liri-calculator_git.bb
@@ -11,7 +11,7 @@ DEPENDS += " \
    liri-fluid \
 "

-SRCREV = "7dae77e72dd6cf1888ee546d8a2d9a2e815b123e"
+SRCREV = "eecda4097027ee4730bb7dd86ec1895091ce4c7f"
 S = "${WORKDIR}/git"
 PV = "1.2.0+git${SRCPV}"

--- a/recipes-liri/liri-cmake-shared/liri-cmake-shared_git.bb
+++ b/recipes-liri/liri-cmake-shared/liri-cmake-shared_git.bb
@@ -10,7 +10,7 @@ inherit liri
 DEPENDS = "cmake-native"

 PV = "1.1.0+git${SRCPV}"
-SRCREV = "044fcc350bda67f9325f43d75e8fbfb74984ee11"
+SRCREV = "7b733575df377452cb8ed6c8291d6678cd0adb41"
 S = "${WORKDIR}/git"

 FILES:${PN}-dev += "${datadir}/LiriCMakeShared"
--- a/recipes-liri/liri-eglfs/liri-eglfs/0001-qeglfskmsgbmscreen-remove-frame-recording-completely.patch
+++ b/recipes-liri/liri-eglfs/liri-eglfs/0001-qeglfskmsgbmscreen-remove-frame-recording-completely.patch
@@ -1,55 +0,0 @@
-From e04f58b58b3fd55786e3bc4ef5e8db10327aee1f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 22 Mar 2019 15:51:42 +0100
-Subject: [PATCH] qeglfskmsgbmscreen: remove frame recording completely
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* Maybe I am paranoid but it is at least questionable what it is good for
-* It seems causes build trouble for at least iMX/vivante [1]
-
-[1] https://github.com/schnitzeltony/meta-qt5-extra/issues/67
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- .../deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp   | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
-index cc09499..dc265f6 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
-+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
-@@ -45,7 +45,6 @@
- #include "qeglfsintegration_p.h"
- 
- #include <QtCore/QLoggingCategory>
-#include <QOpenGLFunctions_3_0>
- 
- #include <QtGui/private/qguiapplication_p.h>
- #include <QtGui/private/qtguiglobal_p.h>
-@@ -428,7 +427,11 @@ void QEglFSKmsGbmScreen::flip()
- 
- void QEglFSKmsGbmScreen::recordFrame(EGLClientBuffer bo, int width, int height)
- {
-    // Create EGL image from BO
-+    Q_UNUSED(bo);
-+    Q_UNUSED(width);
-+    Q_UNUSED(height);
-+    qWarning("Frame recording is not supported on embedded devices!");
-+    /*// Create EGL image from BO
-     EGLImage image = eglCreateImage(display(), nullptr, EGL_NATIVE_PIXMAP_KHR, bo, nullptr);
-     if (image == EGL_NO_IMAGE_KHR) {
-         qCritical("Error creating EGLImage: %s", formatGLError(glGetError()));
-@@ -480,7 +483,7 @@ void QEglFSKmsGbmScreen::recordFrame(EGLClientBuffer bo, int width, int height)
-     // Free resources
-     funcs->glDeleteTextures(1, &texture);
-     funcs->glDeleteFramebuffers(1, &framebuffer);
-    eglDestroyImage(display(), image);
-+    eglDestroyImage(display(), image);*/
- }
- 
- void QEglFSKmsGbmScreen::pageFlipHandler(int fd, unsigned int sequence, unsigned int tv_sec, unsigned int tv_usec, void *user_data)
-- 
-2.20.1
-
--- a/recipes-liri/liri-eglfs/liri-eglfs_git.bb
+++ b/recipes-liri/liri-eglfs/liri-eglfs_git.bb
@@ -19,10 +19,7 @@ DEPENDS += " \
 "

 PV = "0.0.0+git${SRCPV}"
-SRCREV = "127e9b5ce68902ad35bb8ce23be121d8b632e5eb"
-SRC_URI += " \
-    file://0001-qeglfskmsgbmscreen-remove-frame-recording-completely.patch \
-"
+SRCREV = "28334707a13a3f488e4302222c292123645b2333"
 S = "${WORKDIR}/git"

 FILES:${PN} += " \
--- a/recipes-liri/liri-files/liri-files_git.bb
+++ b/recipes-liri/liri-files/liri-files_git.bb
@@ -8,7 +8,7 @@ inherit liri qt5-translation

 PV = "0.2.0+git${SRCPV}"

-SRCREV = "da7e8a98538837a5a35dda10b0609c7654bd8b3d"
+SRCREV = "e30965465f71f9bf45f495a913e452d7d9fe752c"
 S = "${WORKDIR}/git"

 DEPENDS += " \
--- a/recipes-liri/liri-fluid/liri-fluid_git.bb
+++ b/recipes-liri/liri-fluid/liri-fluid_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 inherit liri gtk-icon-cache

 PV = "1.2.0+git${SRCPV}"
-SRCREV = "a99dc04a067abeb9110664f5427e9a701e6744d4"
+SRCREV = "da9434e97898ade0d8c351e7c11861301af242a8"
 S = "${WORKDIR}/git"

 DEPENDS += " \
--- a/recipes-liri/liri-libliri/liri-libliri_git.bb
+++ b/recipes-liri/liri-libliri/liri-libliri_git.bb
@@ -9,7 +9,7 @@ inherit liri

 PV = "0.9.0+git${SRCPV}"

-SRCREV = "ddc3b049db412a89e91a37bd35e0435e76df7adc"
+SRCREV = "f332dbbfbb302d483196d98d669bd9b701941b55"
 S = "${WORKDIR}/git"

 FILES:${PN} += " \
--- a/recipes-liri/liri-materialdecoration/liri-materialdecoration_git.bb
+++ b/recipes-liri/liri-materialdecoration/liri-materialdecoration_git.bb
@@ -1,22 +0,0 @@
-SUMMARY = "Client-side decoration for all Qt-based Wayland clients"
-LICENSE = "LGPL-3.0-only"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-"
-
-inherit liri
-
-# HACK
-# support qtwayland's qwaylanddisplay_p.h find
-# <QtXkbCommonSupport/private/qxkbcommon_p.h>
-# have no idea where to fix properly
-CXXFLAGS += "-I${STAGING_INCDIR}/QtXkbCommonSupport/5.15.2"
-
-PV = "1.1.0+git${SRCPV}"
-
-SRCREV = "6a5de23f2e5162fbee39d16f938473ff970a2ec0"
-S = "${WORKDIR}/git"
-
-FILES:${PN} += " \
-    ${libdir}/plugins \
-"
--- a/recipes-liri/liri-networkmanager/liri-networkmanager_git.bb
+++ b/recipes-liri/liri-networkmanager/liri-networkmanager_git.bb
@@ -8,7 +8,7 @@ inherit liri qt5-translation

 PV = "0.9.0+git${SRCPV}"

-SRCREV = "bcd5806d237da97f5901dc6d29b68f57666e45f6"
+SRCREV = "e451da23d58391c6075f4143ab0d1b7d37ffd65b"
 S = "${WORKDIR}/git"

 DEPENDS += " \
@@ -20,7 +20,7 @@ DEPENDS += " \
 "

 FILES:${PN} += " \
-    ${datadir}/liri-shell/indicators \
+    ${datadir}/liri-shell \
    ${datadir}/liri-settings/modules \
    ${OE_QMAKE_PATH_QML} \
 "
--- a/recipes-liri/liri-platformtheme/liri-platformtheme_git.bb
+++ b/recipes-liri/liri-platformtheme/liri-platformtheme_git.bb
@@ -1,21 +0,0 @@
-SUMMARY = "Qt platform theme plugin for apps integration with Liri "
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = " \
-	file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-"
-
-inherit liri
-
-DEPENDS += " \
-    qtquickcontrols2 \
-    liri-qtgsettings \
-"
-
-PV = "1.0.0+git${SRCPV}"
-
-SRCREV = "fa9bdf9f4efb494e3a5703f33c990013e4d5a99b"
-S = "${WORKDIR}/git"
-
-FILES:${PN} += " \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"
--- a/recipes-liri/liri-player/liri-player_git.bb
+++ b/recipes-liri/liri-player/liri-player_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
 "

-inherit liri mime-xdg
+inherit liri mime-xdg gtk-icon-cache

 DEPENDS += " \
    qtquickcontrols2 \
@@ -12,7 +12,7 @@ DEPENDS += " \
    vlc \
 "

-SRCREV = "04d239f4504daa1ea161d27dab23f6b1b5238f9d"
+SRCREV = "3968ec527d2f3dce60260fb0449ba187b11e7985"
 S = "${WORKDIR}/git"
 PV = "0.0.0+git${SRCPV}"

--- a/recipes-liri/liri-power-manager/liri-power-manager_git.bb
+++ b/recipes-liri/liri-power-manager/liri-power-manager_git.bb
@@ -8,7 +8,7 @@ inherit liri qt5-translation gsettings

 PV = "0.9.0+git${SRCPV}"

-SRCREV = "794ef0dc8a139b62fad277699042232191487186"
+SRCREV = "82662ac5d44e51136300dc6817d95c34eda1ad3a"
 S = "${WORKDIR}/git"
 SRC_URI += "file://0001-batterywatcher-Fix-build-with-KF5-Solid-5.91.0.patch"

--- a/recipes-liri/liri-pulseaudio/liri-pulseaudio_git.bb
+++ b/recipes-liri/liri-pulseaudio/liri-pulseaudio_git.bb
@@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "pulseaudio"

 PV = "0.9.0+git${SRCPV}"

-SRCREV = "d4f3b905ad6c4854c997dfc0afc6beccba64e669"
+SRCREV = "574d361fb904feffcef04625bbf520ded4b23483"
 S = "${WORKDIR}/git"

 DEPENDS += " \
@@ -21,5 +21,6 @@ DEPENDS += " \
 FILES:${PN} += " \
    ${datadir}/liri-shell/indicators \
    ${datadir}/liri-settings/modules \
+    ${datadir}/liri-shell \
    ${OE_QMAKE_PATH_QML} \
 "
--- a/recipes-liri/liri-qml-xwayland/liri-qml-xwayland_git.bb
+++ b/recipes-liri/liri-qml-xwayland/liri-qml-xwayland_git.bb
@@ -9,7 +9,7 @@ inherit liri features_check
 REQUIRED_DISTRO_FEATURES = "wayland"

 PV = "0.10.0+git${SRCPV}"
-SRCREV = "b6a6e6b9f56f573a41472d0a7a004e614400b111"
+SRCREV = "98cb78ac81c18e4123fe6885b46282e5ef8dede0"
 S = "${WORKDIR}/git"

 DEPENDS += " \
--- a/recipes-liri/liri-qtaccountsservice/liri-qtaccountsservice_git.bb
+++ b/recipes-liri/liri-qtaccountsservice/liri-qtaccountsservice_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 inherit liri

 PV = "1.3.0+git${SRCPV}"
-SRCREV = "15ad06ccaf3c74a33a2b0f67438d218cd88cc8d2"
+SRCREV = "e8a99501d0822cda2997b44307396bc5878b82e4"
 S = "${WORKDIR}/git"

 FILES:${PN} += "${OE_QMAKE_PATH_QML}"
--- a/recipes-liri/liri-qtgsettings/liri-qtgsettings_git.bb
+++ b/recipes-liri/liri-qtgsettings/liri-qtgsettings_git.bb
@@ -9,7 +9,7 @@ inherit liri
 DEPENDS += "glib-2.0"

 PV = "1.3.0+git${SRCPV}"
-SRCREV = "547bc70ad6ddfa57ad91df654f7f2f4819e714ae"
+SRCREV = "7fb2af5b997d2583ffda40872880138b1cb7bcb4"
 S = "${WORKDIR}/git"

 FILES:${PN} += "${OE_QMAKE_PATH_QML}"
--- a/recipes-liri/liri-qtintegration/liri-qtintegration_git.bb
+++ b/recipes-liri/liri-qtintegration/liri-qtintegration_git.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Qt platform theme plugin for apps integration with Liri "
+LICENSE = "LGPL-3.0-only"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+"
+
+DEPENDS = " \
+    liri-qtgsettings \
+    liri-wayland \
+"
+
+inherit liri
+
+PV = "1.0.0+git${SRCPV}"
+
+SRCREV = "1dab05a1e6472956e25de16258ed04aa09dde348"
+S = "${WORKDIR}/git"
+
+FILES:${PN} += " \
+    ${libdir}/plugins \
+"
--- a/recipes-liri/liri-qtudev/liri-qtudev_git.bb
+++ b/recipes-liri/liri-qtudev/liri-qtudev_git.bb
@@ -8,7 +8,7 @@ inherit liri

 PV = "1.1.0+git${SRCPV}"

-SRCREV = "9ec730754fd9db8459debaeb75a47519f9a527e1"
+SRCREV = "dfe043f681beacc561db32c6fa4cb8a0fa9729a2"
 S = "${WORKDIR}/git"

 DEPENDS += " \
--- a/recipes-liri/liri-screencast/liri-screencast_git.bb
+++ b/recipes-liri/liri-screencast/liri-screencast_git.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Screencast tool"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+"
+
+inherit liri qt5-translation
+
+DEPENDS += " \
+    gstreamer1.0 \
+    liri-wayland \
+"
+
+PV = "0.0.0+git${SRCPV}"
+SRCREV = "8518f728bd587c8556fc15e36612bbd3c77cfade"
+S = "${WORKDIR}/git"
--- a/recipes-liri/liri-screenshot/liri-screenshot_git.bb
+++ b/recipes-liri/liri-screenshot/liri-screenshot_git.bb
@@ -12,5 +12,5 @@ DEPENDS += " \
 "

 PV = "0.9.0+git${SRCPV}"
-SRCREV = "2a7dba67156961dc9853799a6c4267ac0419c0bf"
+SRCREV = "fbec8fcf903588987d2f4e3bbf172b8915997a61"
 S = "${WORKDIR}/git"
--- a/recipes-liri/liri-session/liri-session_git.bb
+++ b/recipes-liri/liri-session/liri-session_git.bb
@@ -10,7 +10,7 @@ inherit liri gsettings
 PV = "0.1.0+git${SRCPV}"

 SRC_URI += "file://0001-menu-use-correct-install-variables.patch"
-SRCREV = "2840b1b218afd53f85e9422dd169949d2e06b2ca"
+SRCREV = "f26b173653c52b08b12a88f298e315ad3f8f4931"
 S = "${WORKDIR}/git"

 DEPENDS += " \
@@ -24,4 +24,5 @@ FILES:${PN} += " \
    ${datadir}/wayland-sessions \
    ${systemd_user_unitdir} \
    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML} \
 "
--- a/recipes-liri/liri-settings/liri-settings_git.bb
+++ b/recipes-liri/liri-settings/liri-settings_git.bb
@@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "wayland"

 PV = "0.9.0+git${SRCPV}"

-SRCREV = "58fd88465544fa4b0ce206c5e369eec57c1dbfee"
+SRCREV = "ebf3b0114a0b6d433b41b379d74f4ff0b4e765ae"
 S = "${WORKDIR}/git"

 DEPENDS += " \
@@ -27,7 +27,3 @@ FILES:${PN} += " \
    ${datadir}/liri-settings/modules \
    ${OE_QMAKE_PATH_QML} \
 "
-
-RREPLACES:${PN} = "hawaii-system-preferences"
-RPROVIDES:${PN} = "hawaii-system-preferences"
-RCONFLICTS:${PN} = "hawaii-system-preferences"
--- a/recipes-liri/liri-shell/liri-shell_git.bb
+++ b/recipes-liri/liri-shell/liri-shell_git.bb
@@ -10,7 +10,7 @@ inherit liri qt5-translation features_check gsettings
 REQUIRED_DISTRO_FEATURES = "wayland pam"

 PV = "0.9.0+git${SRCPV}"
-SRCREV = "463d1b5c033dce5d48a5cc38cfe00c9dbfbcac1c"
+SRCREV = "9171b3f84eb5e2c98e5353a77b9a5024eb68129f"
 S = "${WORKDIR}/git"

 DEPENDS += " \
--- a/recipes-liri/liri-terminal/liri-terminal_git.bb
+++ b/recipes-liri/liri-terminal/liri-terminal_git.bb
@@ -12,7 +12,7 @@ DEPENDS += " \
 "

 PV = "0.2.0+git${SRCPV}"
-SRCREV = "953ce625ba194dd00fd654597bbffb04433405db"
+SRCREV = "025cd4a2ac94ca2fdf05a3c8f571e059331af28b"
 S = "${WORKDIR}/git"

 FILES:${PN} += " \
--- a/recipes-liri/liri-text/liri-text_git.bb
+++ b/recipes-liri/liri-text/liri-text_git.bb
@@ -14,7 +14,7 @@ DEPENDS += " \

 PV = "0.5.0+git${SRCPV}"

-SRCREV = "53a995fae34e5bfd67182cd44f66a50fa81d5d4a"
+SRCREV = "c93d7d67815b6a599d1b62499b4fb82566ecae7a"
 S = "${WORKDIR}/git"

 FILES:${PN} += " \
--- a/recipes-liri/liri-themes/liri-themes_git.bb
+++ b/recipes-liri/liri-themes/liri-themes_git.bb
@@ -8,7 +8,7 @@ inherit liri

 PV = "0.9.0+git${SRCPV}"

-SRCREV = "57b73b4539d8559dd85d371004d3e9484405f4a0"
+SRCREV = "0b1e96b11655eacda5f2de326bc730174604aedc"
 S = "${WORKDIR}/git"

 EXTRA_OECMAKE += " \
--- a/recipes-liri/liri-wallpapers/liri-wallpapers_git.bb
+++ b/recipes-liri/liri-wallpapers/liri-wallpapers_git.bb
@@ -8,11 +8,7 @@ inherit liri

 PV = "0.10.0+git${SRCPV}"

-SRCREV = "c721e5b19467643df31cea4a78db132f5d3f851e"
+SRCREV = "0087dca3273dac17a71eefa122e0ecf7a4dfba02"
 S = "${WORKDIR}/git"

 FILES:${PN} += "${datadir}"
-
-RREPLACES:${PN} = "hawaii-wallpapers"
-RPROVIDES:${PN} = "hawaii-wallpapers"
-RCONFLICTS:${PN} = "hawaii-wallpapers"
--- a/recipes-liri/liri-wayland/liri-wayland_git.bb
+++ b/recipes-liri/liri-wayland/liri-wayland_git.bb
@@ -10,7 +10,7 @@ DEPENDS += " \
    wayland-protocols \
 "

-SRCREV = "3ec6248bef8abbee2f98272ca0aa678450db6a38"
+SRCREV = "5ebaabfa44ee2cd63f0a3969dac93c2f1794d871"
 S = "${WORKDIR}/git"
 PV = "0.0.0+git${SRCPV}"

--- a/recipes-liri/packagegroups/liri-world.bb
+++ b/recipes-liri/packagegroups/liri-world.bb
@@ -14,16 +14,16 @@ RDEPENDS:${PN} = " \
    liri-files \
    liri-fluid \
    liri-libliri \
-    liri-materialdecoration \
    liri-networkmanager \
-    liri-platformtheme \
    liri-player \
    liri-power-manager \
    ${@bb.utils.contains("DISTRO_FEATURES", "pulseaudio", "liri-pulseaudio", "",d)} \
    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "liri-qml-xwayland", "",d)} \
    liri-qtaccountsservice \
+    liri-qtintegration \
    liri-qtgsettings \
    liri-qtudev \
+    liri-screencast \
    liri-screenshot \
    liri-session \
    liri-settings \