Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2018-03-24 16:08:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm (Old) and /work/SRC/openSUSE:Factory/.sddm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sddm" Sat Mar 24 16:08:48 2018 rev:31 rq:589945 version:0.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2018-03-20 21:42:40.899871665 +0100 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2018-03-24 16:08:51.445605417 +0100 @@ -1,0 +2,6 @@ +Thu Mar 22 08:56:30 UTC 2018 - [email protected] + +- Add patch to fix build with Qt < 5.10: + * 0001-Fix-build-with-Qt-5.10-Use-QString-instead-of-QLatin.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-Qt-5.10-Use-QString-instead-of-QLatin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.fXt23d/_old 2018-03-24 16:08:52.833555384 +0100 +++ /var/tmp/diff_new_pack.fXt23d/_new 2018-03-24 16:08:52.837555240 +0100 @@ -31,6 +31,7 @@ Patch1: 0001-Don-t-quit-on-SIGHUP.patch Patch2: 0001-greeter-Use-Qt-command-line-parser.patch Patch3: 0001-Fix-platform-detection-for-EnableHiDPI.patch +Patch4: 0001-Fix-build-with-Qt-5.10-Use-QString-instead-of-QLatin.patch # Patch100-?: PATCH-FIX-OPENSUSE # Use openSUSE pam config Patch100: proper_pam.diff ++++++ 0001-Fix-build-with-Qt-5.10-Use-QString-instead-of-QLatin.patch ++++++ >From be2f6c82c67a5511b56af66bfe77970c9f72a8c1 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Thu, 22 Mar 2018 09:54:49 +0100 Subject: [PATCH] Fix build with Qt < 5.10: Use QString instead of QLatin1String QLatin1String only got more QString-like with Qt 5.10, so we can't use those methods. --- src/greeter/GreeterApp.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp index 5181e4e..baeb982 100644 --- a/src/greeter/GreeterApp.cpp +++ b/src/greeter/GreeterApp.cpp @@ -281,24 +281,24 @@ int main(int argc, char **argv) // We set an attribute based on the platform we run on. // We only know the platform after we constructed QGuiApplication // though, so we need to find it out ourselves. - QLatin1String platform; + QString platform; for (int i = 1; i < argc - 1; ++i) { if(qstrcmp(argv[i], "-platform") == 0) { - platform = QLatin1String(argv[i + 1]); + platform = QString::fromUtf8(argv[i + 1]); } } if (platform.isEmpty()) { - platform = QLatin1String(qgetenv("QT_QPA_PLATFORM")); + platform = QString::fromUtf8(qgetenv("QT_QPA_PLATFORM")); } if (platform.isEmpty()) { - platform = QLatin1String("xcb"); + platform = QStringLiteral("xcb"); } // HiDPI bool hiDpiEnabled = false; - if (platform == QLatin1String("xcb")) + if (platform == QStringLiteral("xcb")) hiDpiEnabled = SDDM::mainConfig.X11.EnableHiDPI.get(); - else if (platform.startsWith(QLatin1String("wayland"))) + else if (platform.startsWith(QStringLiteral("wayland"))) hiDpiEnabled = SDDM::mainConfig.Wayland.EnableHiDPI.get(); if (hiDpiEnabled) { qDebug() << "High-DPI autoscaling Enabled"; -- 2.16.2
