From 988a16e2e40f3141a88a041772e09db394c31b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 27 Dec 2018 17:03:22 +0100 Subject: [PATCH] liri-shell: upgrade sources to latest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0001-Install-liri-session-script-as-executable.patch was applied Signed-off-by: Andreas Müller --- ...ll-liri-session-script-as-executable.patch | 31 ------------------- recipes-liri/liri-shell/liri-shell_git.bb | 5 +-- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 recipes-liri/liri-shell/liri-shell/0001-Install-liri-session-script-as-executable.patch diff --git a/recipes-liri/liri-shell/liri-shell/0001-Install-liri-session-script-as-executable.patch b/recipes-liri/liri-shell/liri-shell/0001-Install-liri-session-script-as-executable.patch deleted file mode 100644 index 21c1e4bb..00000000 --- a/recipes-liri/liri-shell/liri-shell/0001-Install-liri-session-script-as-executable.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f0e425864f168dda34cb9f319d969937c563caee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 18 Dec 2018 12:27:31 +0100 -Subject: [PATCH] Install liri-session script as executable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Thanks sddm for doing the right thing (this time) - see [1] - -Upstream-Status: Submitted [2] - -[1] https://github.com/lirios/wayland/issues/47 -[2] https://github.com/lirios/shell/pull/159 - -Signed-off-by: Andreas Müller ---- - src/scripts/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt -index a8d9c10f..d0704b2b 100644 ---- a/src/scripts/CMakeLists.txt -+++ b/src/scripts/CMakeLists.txt -@@ -1,2 +1,2 @@ --install(FILES liri-session -+install(PROGRAMS liri-session - DESTINATION "${INSTALL_BINDIR}") --- -2.14.5 - diff --git a/recipes-liri/liri-shell/liri-shell_git.bb b/recipes-liri/liri-shell/liri-shell_git.bb index 033ec540..50969ce5 100644 --- a/recipes-liri/liri-shell/liri-shell_git.bb +++ b/recipes-liri/liri-shell/liri-shell_git.bb @@ -9,15 +9,12 @@ inherit liri pythonnative distro_features_check gsettings REQUIRED_DISTRO_FEATURES = "wayland pam" -SRC_URI += "file://0001-Install-liri-session-script-as-executable.patch" PV = "0.9.0+git${SRCPV}" -SRCREV = "192e67c93c9acc871539b4e01d4d7c32111f7e93" +SRCREV = "c07d193a7d1009f58cb7561316774521fe55a4ec" S = "${WORKDIR}/git" DEPENDS += " \ - qtwayland-native \ libpam \ - qtwayland \ qtquickcontrols2 \ liri-qtaccountsservice \ liri-qtgsettings \