Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2023-07-01 23:17:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm (Old) and /work/SRC/openSUSE:Factory/.sddm.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sddm" Sat Jul 1 23:17:21 2023 rev:65 rq:1096111 version:0.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2023-06-29 17:27:23.309928990 +0200 +++ /work/SRC/openSUSE:Factory/.sddm.new.13546/sddm.changes 2023-07-01 23:17:21.506011120 +0200 @@ -1,0 +2,8 @@ +Fri Jun 30 09:37:44 UTC 2023 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patches to allow dropping InputMethod= from 11-kwin_wayland.conf + (boo#1212880): + * 0001-greeter-Look-at-WAYLAND_DISPLAY-for-platform-detecti.patch + * 0002-Ignore-InputMethod-qtvirtualkeyboard-on-wayland.patch + +------------------------------------------------------------------- New: ---- 0001-greeter-Look-at-WAYLAND_DISPLAY-for-platform-detecti.patch 0002-Ignore-InputMethod-qtvirtualkeyboard-on-wayland.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.9l9eEF/_old 2023-07-01 23:17:22.830019057 +0200 +++ /var/tmp/diff_new_pack.9l9eEF/_new 2023-07-01 23:17:22.834019080 +0200 @@ -38,6 +38,9 @@ # Patch0-100: PATCH-FIX-UPSTREAM # https://github.com/sddm/sddm/pull/1746 Patch0: 0001-Session-Parse-.desktop-files-manually-again.patch +# https://github.com/sddm/sddm/pull/1753 +Patch1: 0001-greeter-Look-at-WAYLAND_DISPLAY-for-platform-detecti.patch +Patch2: 0002-Ignore-InputMethod-qtvirtualkeyboard-on-wayland.patch # Patch100-?: PATCH-FIX-OPENSUSE Patch101: 0001-Write-the-daemon-s-PID-to-a-file-on-startup.patch Patch102: 0001-Set-XAUTHLOCALHOSTNAME-in-sessions.patch ++++++ 0001-greeter-Look-at-WAYLAND_DISPLAY-for-platform-detecti.patch ++++++ >From e27b70957505dc7b986ab2fa68219af546c63344 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> Date: Fri, 30 Jun 2023 09:42:58 +0200 Subject: [PATCH 1/2] greeter: Look at WAYLAND_DISPLAY for platform detection When running sddm-greeter manually in a wayland session, it otherwise misdetects that as xcb. --- src/greeter/GreeterApp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp index c2978d6..4e4f653 100644 --- a/src/greeter/GreeterApp.cpp +++ b/src/greeter/GreeterApp.cpp @@ -319,7 +319,7 @@ int main(int argc, char **argv) platform = QString::fromUtf8(qgetenv("QT_QPA_PLATFORM")); } if (platform.isEmpty()) { - platform = QStringLiteral("xcb"); + platform = qEnvironmentVariableIsSet("WAYLAND_DISPLAY") ? QStringLiteral("wayland") : QStringLiteral("xcb"); } // Install message handler -- 2.41.0 ++++++ 0002-Ignore-InputMethod-qtvirtualkeyboard-on-wayland.patch ++++++ >From 07631f2ef00a52d883d0fd47ff7d1e1a6bc6358f Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> Date: Fri, 30 Jun 2023 09:44:37 +0200 Subject: [PATCH 2/2] Ignore InputMethod=qtvirtualkeyboard on wayland Using QT_IM_MODULE=qtvirtualkeyboard in wayland client applications is not supported by Qt, but is sddm's builtin default. Avoid setting that. --- src/greeter/GreeterApp.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp index 4e4f653..01613cc 100644 --- a/src/greeter/GreeterApp.cpp +++ b/src/greeter/GreeterApp.cpp @@ -351,8 +351,14 @@ int main(int argc, char **argv) qputenv("KDE_DEBUG", "1"); // Qt IM module - if (!SDDM::mainConfig.InputMethod.get().isEmpty()) - qputenv("QT_IM_MODULE", SDDM::mainConfig.InputMethod.get().toLocal8Bit().constData()); + QString inputMethod = SDDM::mainConfig.InputMethod.get(); + // Using qtvirtualkeyboard as IM on wayland doesn't really work, + // it has to be done by the compositor instead. + if (platform.startsWith(QStringLiteral("wayland")) && inputMethod == QStringLiteral("qtvirtualkeyboard")) + inputMethod = QString{}; + + if (!inputMethod.isEmpty()) + qputenv("QT_IM_MODULE", inputMethod.toLocal8Bit()); QGuiApplication app(argc, argv); SDDM::SignalHandler s; -- 2.41.0 ++++++ 11-kwin_wayland.conf ++++++ --- /var/tmp/diff_new_pack.9l9eEF/_old 2023-07-01 23:17:22.926019632 +0200 +++ /var/tmp/diff_new_pack.9l9eEF/_new 2023-07-01 23:17:22.930019656 +0200 @@ -1,6 +1,5 @@ [General] GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell -InputMethod= [Wayland] # --locale1 was introduced in kwin 5.27
