0.12.0-3

- pull in upstream fixes (#1265813)
- fedora theme QML error (#1264946)

0008-Inherit-path-environment-variables-from-parent.patch

@@ -0,0 +1,35 @@
+From 3349d1d84dd2ab317ba4fa15eac2e62fa906f9cd Mon Sep 17 00:00:00 2001
+From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+Date: Sun, 6 Sep 2015 02:25:39 +0200
+Subject: [PATCH 08/11] Inherit path environment variables from parent
+
+Make themes installed in non-standard locations work.
+
+Issue: #410
+
+[ChangeLog][Daemon][Greater] Inherit path environment variables from
+parent so that themes installed in non-standard paths will work.
+---
+ src/daemon/Greeter.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
+index 32f4a40..68c4dc3 100644
+--- a/src/daemon/Greeter.cpp
++++ b/src/daemon/Greeter.cpp
+@@ -128,7 +128,11 @@ namespace SDDM {
+             insertEnvironmentList({QStringLiteral("LANG"), QStringLiteral("LANGUAGE"),
+                                    QStringLiteral("LC_CTYPE"), QStringLiteral("LC_NUMERIC"), QStringLiteral("LC_TIME"), QStringLiteral("LC_COLLATE"),
+                                    QStringLiteral("LC_MONETARY"), QStringLiteral("LC_MESSAGES"), QStringLiteral("LC_PAPER"), QStringLiteral("LC_NAME"),
+-                                   QStringLiteral("LC_ADDRESS"), QStringLiteral("LC_TELEPHONE"), QStringLiteral("LC_MEASUREMENT"), QStringLiteral("LC_IDENTIFICATION")
++                                   QStringLiteral("LC_ADDRESS"), QStringLiteral("LC_TELEPHONE"), QStringLiteral("LC_MEASUREMENT"), QStringLiteral("LC_IDENTIFICATION"),
++                                   QStringLiteral("LD_LIBRARY_PATH"),
++                                   QStringLiteral("QML2_IMPORT_PATH"),
++                                   QStringLiteral("QT_PLUGIN_PATH"),
++                                   QStringLiteral("XDG_DATA_DIRS")
+             }, sysenv, env);
+ 
+             env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get());
+-- 
+1.9.3
+

0011-Don-t-cast-QByteArray-to-char.patch

@@ -0,0 +1,44 @@
+From c637727c958286659e9905993fca276a63f6f6d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?D=C4=81vis?= <davispuh@gmail.com>
+Date: Thu, 24 Sep 2015 02:52:46 +0300
+Subject: [PATCH 11/11] Don't cast QByteArray to (char *)
+
+They're obsolete members [1] and caused #489.
+
+[1] http://doc.qt.io/qt-5/qbytearray-obsolete.html
+---
+ CMakeLists.txt             | 2 +-
+ src/helper/UserSession.cpp | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0f10f92..c2192a0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,7 +33,7 @@ option(BUILD_MAN_PAGES "Build man pages" OFF)
+ option(ENABLE_JOURNALD "Enable logging to journald" ON)
+ 
+ # Definitions
+-add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII)
++add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY)
+ 
+ # Default build type
+ if(NOT CMAKE_BUILD_TYPE)
+diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
+index 68c87d1..0f3d7ff 100644
+--- a/src/helper/UserSession.cpp
++++ b/src/helper/UserSession.cpp
+@@ -110,8 +110,8 @@ namespace SDDM {
+             }
+         }
+ 
+-        const char  *username = qobject_cast<HelperApp*>(parent())->user().toLocal8Bit();
+-        struct passwd *pw = getpwnam(username);
++        const QByteArray username = qobject_cast<HelperApp*>(parent())->user().toLocal8Bit();
++        struct passwd *pw = getpwnam(username.constData());
+         if (setgid(pw->pw_gid) != 0) {
+             qCritical() << "setgid(" << pw->pw_gid << ") failed for user: " << username;
+             exit(Auth::HELPER_OTHER_ERROR);
+-- 
+1.9.3
+

fedora-Main.qml

@@ -108,7 +108,6 @@ Rectangle {
             }
 
             Row {
-                anchors.right: parent.right
                 spacing: 4
 
                 Button {

sddm.spec

@@ -2,7 +2,7 @@
 
 Name:           sddm
 Version:        0.12.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 # code GPLv2+, fedora theme CC-BY-SA
 License:        GPLv2+ and CC-BY-SA
 Summary:        QML based X11 desktop manager
@@ -11,6 +11,8 @@ Url:            https://github.com/sddm/sddm
 Source0:        https://github.com/sddm/sddm/archive/v%{version}.tar.gz
 
 ## upstream patches
+Patch8: 0008-Inherit-path-environment-variables-from-parent.patch
+Patch11: 0011-Don-t-cast-QByteArray-to-char.patch
 
 ## downstream patches
 # downstream fedora-specific configuration
@@ -170,6 +172,10 @@ exit 0
 
 
 %changelog
+* Thu Sep 24 2015 Rex Dieter <rdieter@fedoraproject.org> - 0.12.0-3
+- pull in upstream fixes (#1265813)
+- fedora theme QML error (#1264946)
+
 * Thu Sep 10 2015 Rex Dieter <rdieter@fedoraproject.org> 0.12.0-2
 - sddm.pam: add pam_kwallet5 support