File 0001-Don-t-cast-QByteArray-to-char.patch of Package sddm

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Don-t-cast-QByteArray-to-char.patch of Package sddm (Revision 31118292d97ca0c7b928a2793a6809d4)

Currently displaying revision 31118292d97ca0c7b928a2793a6809d4 , Show latest

From ef31b386d16cdf2042b62c45702a01d4e5de7ee9 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 1/2] Don't cast QByteArray to (char *)

They're obsolete members [1] and caused #489.

[1] http://doc.qt.io/qt-5/qbytearray-obsolete.html

(cherry picked from commit c637727c958286659e9905993fca276a63f6f6d5)
---
 CMakeLists.txt             | 2 +-
 src/helper/UserSession.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f10f9201925cf1fb94485497dc1f0b73e882a12..c2192a01ec265c453e5bd849f90a479dba8ed482 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 68c87d156ba9a8a2c91f52fb2e159eff88fc9238..0f3d7fff80bb7b1e2fc32a83c4d9fdc1b0ae7dd3 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);
-- 
2.6.0

Places

File 0001-Don-t-cast-QByteArray-to-char.patch of Package sddm (Revision 31118292d97ca0c7b928a2793a6809d4)

Places