From c858c709cc984fe3611e7a659c7a2f3692dc34a8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Mon, 18 Jun 2018 07:06:31 -0500
Subject: [PATCH] pull in some upstream fixes

---
 .gitignore                           |  6 ++++++
 0001-Port-from-xauth-to-libXau.patch |  2 +-
 sddm.spec                            | 19 +++++++++++++++++--
 sources                              |  6 ++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f410ded..023c0a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
 /angle-down.png
 /v0.15.0.tar.gz
 /v0.17.0.tar.gz
+/0004-Fix-race-between-sddm-and-logind.patch
+/0008-Don-t-quit-on-SIGHUP.patch
+/0009-Add-SOCK_CLOEXEC-to-signal-handling-sockets.patch
+/0014-Bump-Qt-requirement-to-5.8.0.patch
+/0033-XorgDisplayServer.cpp-Check-pipe-output-if-there-is-.patch
+/0034-Fix-build-with-Qt-5.11-1024.patch
diff --git a/0001-Port-from-xauth-to-libXau.patch b/0001-Port-from-xauth-to-libXau.patch
index 3798b56..c23f04a 100644
--- a/0001-Port-from-xauth-to-libXau.patch
+++ b/0001-Port-from-xauth-to-libXau.patch
@@ -31,7 +31,7 @@ index 005c9ad..f480b1c 100644
 +find_package(XAU REQUIRED)
 +
  # Qt 5
- find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools)
+ find_package(Qt5 5.8.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test)
  
 diff --git a/cmake/FindXAU.cmake b/cmake/FindXAU.cmake
 new file mode 100644
diff --git a/sddm.spec b/sddm.spec
index 0a29224..d762b68 100644
--- a/sddm.spec
+++ b/sddm.spec
@@ -2,7 +2,7 @@
 
 Name:           sddm
 Version:        0.17.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 # code GPLv2+, fedora theme CC-BY-SA
 License:        GPLv2+ and CC-BY-SA
 Summary:        QML based X11 desktop manager
@@ -11,7 +11,12 @@ Url:            https://github.com/sddm/sddm
 Source0:        https://github.com/sddm/sddm/archive/v%{version}.tar.gz
 
 ## upstream patches (in lookaside cache)
-#BuildRequires: git-core
+Patch4: 0004-Fix-race-between-sddm-and-logind.patch
+Patch8: 0008-Don-t-quit-on-SIGHUP.patch
+Patch9: 0009-Add-SOCK_CLOEXEC-to-signal-handling-sockets.patch
+Patch14: 0014-Bump-Qt-requirement-to-5.8.0.patch
+Patch33: 0033-XorgDisplayServer.cpp-Check-pipe-output-if-there-is-.patch
+Patch34: 0034-Fix-build-with-Qt-5.11-1024.patch
 
 ## upstreamable patches
 # Fixes RHBZ #1392654
@@ -96,6 +101,13 @@ A collection of sddm themes, including: elarun, maldives, maya
 %prep
 %setup -q
 
+%patch4 -p1 -b .0004
+%patch8 -p1 -b .0008
+%patch9 -p1 -b .0009
+%patch14 -p1 -b .0014
+%patch33 -p1 -b .0033
+%patch34 -p1 -b .0034
+
 %patch54 -p1 -b .0054
 
 %patch101 -p1 -b .fedora_config
@@ -222,6 +234,9 @@ exit 0
 
 
 %changelog
+* Mon Jun 18 2018 Rex Dieter <rdieter@fedoraproject.org> - 0.17.0-4
+- pull in some upstream fixes
+
 * Wed May 09 2018 Rex Dieter <rdieter@fedoraproject.org> - 0.17.0-3
 - Suggests: qt5-qtvirtualkeyboard
 
diff --git a/sources b/sources
index 73e865e..09e4579 100644
--- a/sources
+++ b/sources
@@ -1 +1,7 @@
 SHA512 (v0.17.0.tar.gz) = aeedf25c2e5ef54a1cf469fa4bb14d7f6a9bd1df4501f55ca81ed4d9655c9ae0f5c9ddc94408f6fe5eb2502593c38345cb6afc0b80d42007876d73a942fc99a4
+SHA512 (0004-Fix-race-between-sddm-and-logind.patch) = 1bdf2e73acb8abe5fa303894a4a7d2f70f664d4f9ceb021a7df35d910b03a2c4fc4aebec6e72f6eb13d17830fd9803da583a3e1bbaac2a2710f91c54833efdfc
+SHA512 (0008-Don-t-quit-on-SIGHUP.patch) = 7ba7d757135cfafd1c17da76a4e1ee44d8debc3a97d46acb5ee98d3793947c57511d075841c4c4784afc9f847e9d7974beed7db715c0d405fc42eddec901e4fb
+SHA512 (0009-Add-SOCK_CLOEXEC-to-signal-handling-sockets.patch) = 571a2aec12ec1855f44bde2da9aff892f6e7e3cf7b782c0a3785f43366e8a8391248ab092efd2bc008cff4e5196a5d476456ee635b6a651d89b750a2bc60aa70
+SHA512 (0014-Bump-Qt-requirement-to-5.8.0.patch) = 3b5b1b9e9d11c87f7bdda815b688919a8ab6845368de2eebad2f3f976b1b08080d49db9721ac1cd68ad68d162e76ba234d5636ce63fcbbd1bd8c3aafc800e097
+SHA512 (0033-XorgDisplayServer.cpp-Check-pipe-output-if-there-is-.patch) = 1b51ebbb4f002b405dc5e6679d53a831b7fe69905caa9573d096fba3d1d450c1ca2784d3def091653b60b7575bd5e47ac4177065af04d105858378f355a3fadb
+SHA512 (0034-Fix-build-with-Qt-5.11-1024.patch) = a7950b107abd69b08d468ac22e27f2a064aec8d195db21223b0bf6feddad92e1d124397a967a8008fed15ac596297e3115f9fba15e4801d62a7bb8f131aad28a