sddm-0.17.0, rebase patches

Recommends: qt5-qtvirtualkeyboard

.gitignore

@@ -1,3 +1,3 @@
 /angle-down.png
 /v0.15.0.tar.gz
-/v0.16.0.tar.gz
+/v0.17.0.tar.gz

0001-Port-from-xauth-to-libXau.patch

@@ -1,23 +1,29 @@
-From 6532fa6c875481566f4e98daf944627b75355613 Mon Sep 17 00:00:00 2001
+From 4741f7d02a30cf3023dbd287d88a1ee9c9d71d10 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20B=C5=99=C3=ADza?= <mbriza@redhat.com>
+From: Rex Dieter <rdieter@gmail.com>
-Date: Tue, 15 Aug 2017 17:23:56 +0200
+Date: Wed, 6 Dec 2017 10:54:51 -0600
 Subject: [PATCH] Port from xauth to libXau
 
+Rebase
+https://github.com/sddm/sddm/pull/863
+
+As part of an effort to support
+https://github.com/sddm/sddm/issues/733
+and make sddm more resilient to hostname changes
 ---
- CMakeLists.txt                   |  3 +++
+ CMakeLists.txt                   |  3 ++
- cmake/FindXAU.cmake              | 54 ++++++++++++++++++++++++++++++++++++++
+ cmake/FindXAU.cmake              | 54 ++++++++++++++++++++++++++++++++++
  src/daemon/CMakeLists.txt        |  4 ++-
- src/daemon/XorgDisplayServer.cpp | 56 +++++++++++++++++++++++++++++-----------
+ src/daemon/XorgDisplayServer.cpp | 62 ++++++++++++++++++++++++++++++----------
- src/helper/CMakeLists.txt        |  5 +++-
+ src/helper/CMakeLists.txt        |  2 +-
- src/helper/UserSession.cpp       | 52 +++++++++++++++++++++++++++----------
+ src/helper/UserSession.cpp       | 55 ++++++++++++++++++++++++++---------
- 6 files changed, 143 insertions(+), 31 deletions(-)
+ 6 files changed, 150 insertions(+), 30 deletions(-)
  create mode 100644 cmake/FindXAU.cmake
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 23e0383..abb9b7e 100644
+index 005c9ad..f480b1c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -88,6 +88,9 @@ find_package(XCB REQUIRED)
+@@ -92,6 +92,9 @@ find_package(XCB REQUIRED)
  # XKB
  find_package(XKB REQUIRED)
  
@@ -88,10 +94,10 @@ index 0000000..03cafb7
 +  MARK_AS_ADVANCED(LIBXAU_INCLUDE_DIR LIBXAU_LIBRARIES)
 +ENDIF (NOT WIN32)
 diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
-index 77fe55e..054d526 100644
+index 9c3a582..4cc82a6 100644
 --- a/src/daemon/CMakeLists.txt
 +++ b/src/daemon/CMakeLists.txt
-@@ -39,7 +39,9 @@ target_link_libraries(sddm
+@@ -57,7 +57,9 @@ target_link_libraries(sddm
                        Qt5::DBus
                        Qt5::Network
                        Qt5::Qml
@@ -103,10 +109,10 @@ index 77fe55e..054d526 100644
      target_link_libraries(sddm ${PAM_LIBRARIES})
  else()
 diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
-index 7656856..46e7452 100644
+index b1a6788..5557005 100644
 --- a/src/daemon/XorgDisplayServer.cpp
 +++ b/src/daemon/XorgDisplayServer.cpp
-@@ -33,6 +33,7 @@
+@@ -34,6 +34,7 @@
  #include <random>
  
  #include <xcb/xcb.h>
@@ -114,7 +120,7 @@ index 7656856..46e7452 100644
  
  #include <pwd.h>
  #include <unistd.h>
-@@ -87,28 +88,59 @@ namespace SDDM {
+@@ -88,28 +89,59 @@ namespace SDDM {
      }
  
      void XorgDisplayServer::addCookie(const QString &file) {
@@ -190,27 +196,23 @@ index 7656856..46e7452 100644
  
      bool XorgDisplayServer::start() {
 diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
-index 8163d94..3e76577 100644
+index ebf4a6e..51d47ef 100644
 --- a/src/helper/CMakeLists.txt
 +++ b/src/helper/CMakeLists.txt
-@@ -27,7 +27,11 @@ else()
+@@ -31,7 +31,7 @@ else()
  endif()
  
  add_executable(sddm-helper ${HELPER_SOURCES})
--target_link_libraries(sddm-helper Qt5::Network Qt5::DBus)
+-target_link_libraries(sddm-helper Qt5::Network Qt5::DBus Qt5::Qml)
-+target_link_libraries(sddm-helper
++target_link_libraries(sddm-helper Qt5::Network Qt5::DBus Qt5::Qml ${LIBXAU_LIBRARIES})
-+    Qt5::Network
-+    Qt5::DBus
-+    ${LIBXAU_LIBRARIES}
-+)
  if(PAM_FOUND)
      target_link_libraries(sddm-helper ${PAM_LIBRARIES})
  else()
 diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
-index 587888d..8690cb0 100644
+index 8166c93..066f754 100644
 --- a/src/helper/UserSession.cpp
 +++ b/src/helper/UserSession.cpp
-@@ -31,6 +31,9 @@
+@@ -33,6 +33,9 @@
  #include <unistd.h>
  #include <fcntl.h>
  
@@ -220,7 +222,7 @@ index 587888d..8690cb0 100644
  namespace SDDM {
      UserSession::UserSession(HelperApp *parent)
              : QProcess(parent) {
-@@ -169,31 +172,57 @@
+@@ -171,31 +174,57 @@ namespace SDDM {
          if (!cookie.isEmpty()) {
              QString file = processEnvironment().value(QStringLiteral("XAUTHORITY"));
              QString display = processEnvironment().value(QStringLiteral("DISPLAY"));
@@ -290,7 +292,7 @@ index 587888d..8690cb0 100644
 +            fclose(fp);
          }
      }
- }
+ 
 -- 
-2.13.4
+2.14.3
 

sddm.spec

@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name:           sddm
-Version:        0.16.0
+Version:        0.17.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 # code GPLv2+, fedora theme CC-BY-SA
 License:        GPLv2+ and CC-BY-SA
 Summary:        QML based X11 desktop manager
@@ -18,7 +18,7 @@ Source0:        https://github.com/sddm/sddm/archive/v%{version}.tar.gz
 Patch54: https://github.com/sddm/sddm/pull/735.patch
 
 ## downstream patches
-Patch101:       sddm-0.15.0-fedora_config.patch
+Patch101:       sddm-0.17.0-fedora_config.patch
 
 Patch102:       0001-Port-from-xauth-to-libXau.patch
 
@@ -69,6 +69,8 @@ Requires: systemd
 Requires: xorg-x11-xinit
 %ifnarch s390 s390x
 Requires: xorg-x11-server-Xorg
+
+Recommends: qt5-qtvirtualkeyboard%{?_isa}
 %endif
 %{?systemd_requires}
 
@@ -218,6 +220,10 @@ exit 0
 
 
 %changelog
+* Wed Dec 06 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.17.0-1
+- sddm-0.17.0, rebase patches
+- Recommends: qt5-qtvirtualkeyboard
+
 * Fri Dec 01 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.16.0-2
 - omit 'fedora' theme (rely on fallback maui instead)
 - %%post themes: drop config hack, no longer needed

sources

@@ -1,2 +1 @@
-SHA512 (angle-down.png) = 054f6c257afeba5b7d91225117c1642dfb1382f0caf00ee5268d2d021042f73c99e03746e91052ec52d7f4e5bae3e0b8d4c9aef9d13fa70e85e0474a47c50dee
+SHA512 (v0.17.0.tar.gz) = aeedf25c2e5ef54a1cf469fa4bb14d7f6a9bd1df4501f55ca81ed4d9655c9ae0f5c9ddc94408f6fe5eb2502593c38345cb6afc0b80d42007876d73a942fc99a4
-SHA512 (v0.16.0.tar.gz) = c4a8fc4cb23e61defb8ca5a48bb9354cfa694057cb6fc3697f9dcd52a24b21e9a24568ae1f54810137468f3e0b198483cbb500c11f19f654267c40053f301abc