jauhien 14/05/24 19:38:54 Added: sddm-0.1.0-clang.patch sddm-0.1.0-cmake.patch Log: Initial import from the qt overlay, thanks to Harvey Mittens and Davide Pesavento, closing bug #462824 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB2EFA1D4)
Revision Changes Path 1.1 x11-misc/sddm/files/sddm-0.1.0-clang.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/sddm/files/sddm-0.1.0-clang.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/sddm/files/sddm-0.1.0-clang.patch?rev=1.1&content-type=text/plain Index: sddm-0.1.0-clang.patch =================================================================== clang-3.4 and earlier has a bug with intitialization of QStringList with initialization lists --- src/daemon/Authenticator.cpp +++ src/daemon/Authenticator.cpp @@ -314,7 +314,7 @@ process->setProcessEnvironment(env); // start session - process->start(Configuration::instance()->sessionCommand(), { command }); + process->start(Configuration::instance()->sessionCommand(), QStringList(command)); // connect signal connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished())); --- src/daemon/DisplayServer.cpp +++ src/daemon/DisplayServer.cpp @@ -60,6 +60,7 @@ // log message qDebug() << " DAEMON: Display server starting..."; + QStringList start_parameters; #if !TEST // set process environment QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); @@ -72,9 +73,11 @@ Display *display = qobject_cast<Display *>(parent()); // start display server - process->start(Configuration::instance()->serverPath(), { m_display, "-auth", m_authPath, "-nolisten", "tcp", QString("vt%1").arg(QString::number(display->vtNumber()), 2, '0')}); + start_parameters << m_display << "-auth" << m_authPath << "-nolisten" << "tcp" << QString("vt%1").arg(QString::number(display->vtNumber()), 2, '0'); + process->start(Configuration::instance()->serverPath(), start_parameters); #else - process->start("/usr/bin/Xephyr", { m_display, "-ac", "-br", "-noreset", "-screen", "800x600"}); + start_parameters << m_display << "-ac" << "-br" << "-noreset" << "-screen" << "800x600"; + process->start("/usr/bin/Xephyr", start_parameters); #endif // wait for display server to start if (!process->waitForStarted()) { --- src/daemon/Greeter.cpp +++ src/daemon/Greeter.cpp @@ -70,12 +70,15 @@ env.insert("XCURSOR_THEME", Configuration::instance()->cursorTheme()); process->setProcessEnvironment(env); + QStringList start_parameters; #if !TEST // start greeter - process->start(QString("%1/sddm-greeter").arg(BIN_INSTALL_DIR), { "--socket", m_socket, "--theme", m_theme }); + start_parameters << "--socket" << m_socket << "--theme" << m_theme; + process->start(QString("%1/sddm-greeter").arg(BIN_INSTALL_DIR), start_parameters); #else // start greeter - process->start(QString("%1/sddm-greeter").arg("."), { "--socket", m_socket, "--theme", m_theme }); + start_parameters << "--socket" << m_socket << "--theme" << m_theme; + process->start(QString("%1/sddm-greeter").arg("."), start_parameters); #endif // wait for greeter to start if (!process->waitForStarted()) { 1.1 x11-misc/sddm/files/sddm-0.1.0-cmake.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/sddm/files/sddm-0.1.0-cmake.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/sddm/files/sddm-0.1.0-cmake.patch?rev=1.1&content-type=text/plain Index: sddm-0.1.0-cmake.patch =================================================================== --- CMakeLists.txt +++ CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -add_definitions(-Wall -march=native -std=c++11) +add_definitions(-Wall -std=c++11) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) @@ -19,7 +19,6 @@ else() message(STATUS "Release build") add_definitions(-DNDEBUG) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") endif() # PKG-CONFIG @@ -52,26 +51,26 @@ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) +if(USE_systemd) # login1 -pkg_check_modules(LOGIN1 "libsystemd-login") +pkg_check_modules(LOGIN1 REQUIRED "libsystemd-login") -if(LOGIN1_FOUND) - # do nothing else() set(LOGIN1_FOUND 0) endif() +if(USE_upower) # upower -pkg_check_modules(UPOWER "upower-glib") +pkg_check_modules(UPOWER REQUIRED "upower-glib") -if(UPOWER_FOUND) - # do nothing else() set(UPOWER_FOUND 0) endif() +if(USE_systemd) # systemd -pkg_check_modules(SYSTEMD "systemd") +pkg_check_modules(SYSTEMD REQUIRED "systemd") +endif() if(SYSTEMD_FOUND) execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR)
