Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2018-05-13 15:56:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm (Old) and /work/SRC/openSUSE:Factory/.sddm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sddm" Sun May 13 15:56:20 2018 rev:34 rq:606133 version:0.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2018-04-30 22:52:02.943544449 +0200 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2018-05-13 15:56:24.373287593 +0200 @@ -1,0 +2,8 @@ +Wed May 9 19:15:48 UTC 2018 - [email protected] + +- Amend patch to also canonicalize desktop session paths (boo#1092251): + * 0003-Leave-duplicate-symlinks-out-of-the-SessionModel.patch +- Add patch to fix build with Qt 5.11: + * 0001-Fix-build-with-Qt-5.11-1024.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-Qt-5.11-1024.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.dw3k3a/_old 2018-05-13 15:56:25.361251541 +0200 +++ /var/tmp/diff_new_pack.dw3k3a/_new 2018-05-13 15:56:25.365251395 +0200 @@ -37,6 +37,7 @@ Patch7: 0003-UserModel-optimize-filtering-out-duplicate-users-995.patch Patch8: 0004-UserModel-fix-filtering-out-duplicate-users-998.patch Patch9: 0005-UserModel-optimize-setting-of-default-user-icon-999.patch +Patch10: 0001-Fix-build-with-Qt-5.11-1024.patch # Not merged yet: https://github.com/sddm/sddm/pull/997 Patch50: 0001-Remove-suffix-for-Wayland-session.patch # Not merged yet: https://github.com/sddm/sddm/pull/1017 ++++++ 0001-Fix-build-with-Qt-5.11-1024.patch ++++++ >From 287e4b11b940140764131a04dfb4afb3a3d8a84d Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Sat, 28 Apr 2018 11:38:32 +0200 Subject: [PATCH] Fix build with Qt 5.11 (#1024) qt5_use_modules was deprecated for quite some time and got finally removed. --- CMakeLists.txt | 2 +- test/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) Index: sddm-0.17.0/CMakeLists.txt =================================================================== --- sddm-0.17.0.orig/CMakeLists.txt +++ sddm-0.17.0/CMakeLists.txt @@ -93,7 +93,7 @@ find_package(XCB REQUIRED) find_package(XKB REQUIRED) # Qt 5 -find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools) +find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test) # find qt5 imports dir get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) Index: sddm-0.17.0/test/CMakeLists.txt =================================================================== --- sddm-0.17.0.orig/test/CMakeLists.txt +++ sddm-0.17.0/test/CMakeLists.txt @@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE) include_directories(../src/common) - set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp) add_executable(ConfigurationTest ${ConfigurationTest_SRCS}) add_test(NAME Configuration COMMAND ConfigurationTest) -qt5_use_modules(ConfigurationTest Test) +target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test) ++++++ 0003-Leave-duplicate-symlinks-out-of-the-SessionModel.patch ++++++ --- /var/tmp/diff_new_pack.dw3k3a/_old 2018-05-13 15:56:25.457248038 +0200 +++ /var/tmp/diff_new_pack.dw3k3a/_new 2018-05-13 15:56:25.461247892 +0200 @@ -11,10 +11,10 @@ src/greeter/SessionModel.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) -diff --git a/src/common/Session.h b/src/common/Session.h -index c8c527e..743b7a6 100644 ---- a/src/common/Session.h -+++ b/src/common/Session.h +Index: sddm-0.17.0/src/common/Session.h +=================================================================== +--- sddm-0.17.0.orig/src/common/Session.h ++++ sddm-0.17.0/src/common/Session.h @@ -35,7 +35,7 @@ namespace SDDM { WaylandSession }; @@ -24,10 +24,10 @@ Session(Type type, const QString &fileName); bool isValid() const; -diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp -index 27e8c40..bd5bbf0 100644 ---- a/src/greeter/SessionModel.cpp -+++ b/src/greeter/SessionModel.cpp +Index: sddm-0.17.0/src/greeter/SessionModel.cpp +=================================================================== +--- sddm-0.17.0.orig/src/greeter/SessionModel.cpp ++++ sddm-0.17.0/src/greeter/SessionModel.cpp @@ -122,6 +122,12 @@ namespace SDDM { if (!dir.exists(session)) continue; @@ -41,17 +41,17 @@ Session *si = new Session(type, session); bool execAllowed = true; QFileInfo fi(si->tryExec()); -@@ -149,8 +155,9 @@ namespace SDDM { +@@ -149,8 +155,12 @@ namespace SDDM { delete si; } // find out index of the last session + QString canonicalLastSession = QFileInfo(stateConfig.Last.Session.get()).canonicalFilePath(); for (int i = 0; i < d->sessions.size(); ++i) { - if (d->sessions.at(i)->fileName() == stateConfig.Last.Session.get()) { -+ if (d->sessions.at(i)->fileName() == canonicalLastSession) { ++ QString sessionPath = d->sessions.at(i)->directory().absoluteFilePath(d->sessions.at(i)->fileName()); ++ QString canonicalSession = QFileInfo(sessionPath).canonicalFilePath(); ++ ++ if (canonicalSession == canonicalLastSession) { d->lastIndex = i; break; } --- -2.12.2 -
