From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6EF851381FA for ; Sat, 24 May 2014 19:25:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3A1CE0919; Sat, 24 May 2014 19:25:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F187E0919 for ; Sat, 24 May 2014 19:25:50 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31E5933FD85 for ; Sat, 24 May 2014 19:25:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id C86101818D for ; Sat, 24 May 2014 19:25:47 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1400959541.3689679276e46b350788a78f17bf1c60bbd08d20.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/ X-VCS-Repository: proj/qt X-VCS-Files: x11-misc/sddm/files/Xsession x11-misc/sddm/files/pid-support.patch x11-misc/sddm/files/sddm-pm-utils-support.patch X-VCS-Directories: x11-misc/sddm/files/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 3689679276e46b350788a78f17bf1c60bbd08d20 X-VCS-Branch: master Date: Sat, 24 May 2014 19:25:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 09533928-62b4-4c2b-8df6-3daae9662cea X-Archives-Hash: 2d5735edfead68ace13002f8df6e4b4d commit: 3689679276e46b350788a78f17bf1c60bbd08d20 Author: Davide Pesavento gentoo org> AuthorDate: Sat May 24 19:25:41 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat May 24 19:25:41 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=36896792 [x11-misc/sddm] Delete unused files. Package-Manager: portage-2.2.10 --- x11-misc/sddm/files/Xsession | 69 ------------------- x11-misc/sddm/files/pid-support.patch | 52 -------------- x11-misc/sddm/files/sddm-pm-utils-support.patch | 92 ------------------------- 3 files changed, 213 deletions(-) diff --git a/x11-misc/sddm/files/Xsession b/x11-misc/sddm/files/Xsession deleted file mode 100755 index 70cdc66..0000000 --- a/x11-misc/sddm/files/Xsession +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# Modified LightDM wrapper to run around X sessions. - -echo "Running X session wrapper" - -# Load profile -for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do - if [ -f "$file" ]; then - echo "Loading profile from $file"; - . "$file" - fi -done - -# Load resources -for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do - if [ -f "$file" ]; then - echo "Loading resource: $file" - xrdb -nocpp -merge "$file" - fi -done - -# Load keymaps -for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do - if [ -f "$file" ]; then - echo "Loading keymap: $file" - setxkbmap `cat "$file"` - XKB_IN_USE=yes - fi -done - -# Load xmodmap if not using XKB -if [ -z "$XKB_IN_USE" ]; then - for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do - if [ -f "$file" ]; then - echo "Loading modmap: $file" - xmodmap "$file" - fi - done -fi - -unset XKB_IN_USE - -## Run all system xinitrc shell scripts. -#xinitdir="/etc/X11/xinit/xinitrc.d" -#if [ -d "$xinitdir" ]; then -# for script in $xinitdir/*; do -# echo "Loading xinit script $script" -# if [ -x "$script" -a ! -d "$script" ]; then -# . "$script" -# fi -# done -#fi - -# Load Xsession scripts -#xsessionddir="/etc/X11/Sessions" -#if [ -d "$xsessionddir" ]; then -# for i in `ls $xsessionddir`; do -# script="$xsessionddir/$i" -# echo "Loading X session script $script" -# if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then -# . "$script" -# fi -# done -#fi - -echo "X session wrapper complete, running session $@" - -eval exec "$@" diff --git a/x11-misc/sddm/files/pid-support.patch b/x11-misc/sddm/files/pid-support.patch deleted file mode 100644 index f0299b1..0000000 --- a/x11-misc/sddm/files/pid-support.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 770b53b..2d4b2ef 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,6 +92,7 @@ set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/apps/sddm" CACH - set(SYS_CONFIG_DIR "/etc" CACHE PATH "System config directory") - set(DBUS_CONFIG_DIR "${SYS_CONFIG_DIR}/dbus-1/system.d" CACHE PATH "DBus config files directory") - -+set(PID_FILE "/run/sddm.pid" CACHE PATH "Path to pid file") - set(CONFIG_FILE "${SYS_CONFIG_DIR}/sddm.conf" CACHE PATH "Path of the sddm config file") - set(LOG_FILE "/var/log/sddm.log" CACHE PATH "Path of the sddm log file") - set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory") -diff --git a/src/common/Constants.h.in b/src/common/Constants.h.in -index 75adfc6..1c9b9a5 100644 ---- a/src/common/Constants.h.in -+++ b/src/common/Constants.h.in -@@ -28,5 +28,6 @@ - - #define CONFIG_FILE "@CONFIG_FILE@" - #define LOG_FILE "@LOG_FILE@" -+#define PID_FILE "@PID_FILE@" - - #endif // SDDM_CONSTANTS_H -diff --git a/src/daemon/DaemonApp.cpp b/src/daemon/DaemonApp.cpp -index 9ad226b..b7d6cb5 100644 ---- a/src/daemon/DaemonApp.cpp -+++ b/src/daemon/DaemonApp.cpp -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include - -@@ -50,6 +51,16 @@ namespace SDDM { - // log message - qDebug() << " DAEMON: Initializing..."; - -+ // Write PID File -+ if ( ! QString(PID_FILE).isEmpty() ) { -+ QFile pidFile(PID_FILE); -+ QString pid = QString::number(QCoreApplication::applicationPid()); -+ if ( pidFile.open(QIODevice::WriteOnly | QIODevice::Text) ) { -+ pidFile.write(pid.toLatin1().data(), qstrlen(pid.toLatin1().data())); -+ pidFile.close(); -+ } -+ } -+ - // create configuration - m_configuration = new Configuration(CONFIG_FILE, this); - diff --git a/x11-misc/sddm/files/sddm-pm-utils-support.patch b/x11-misc/sddm/files/sddm-pm-utils-support.patch deleted file mode 100644 index ca943cb..0000000 --- a/x11-misc/sddm/files/sddm-pm-utils-support.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- src/daemon/PowerManager.cpp 2014-02-14 14:52:22.248986025 -0500 -+++ PowerManager.cpp 2014-02-14 14:55:25.163990924 -0500 -@@ -23,6 +23,7 @@ - #include "DaemonApp.h" - #include "Messages.h" - -+#include - #include - #include - #include -@@ -49,6 +50,59 @@ - virtual void hybridSleep() const = 0; - }; - -+/** -+ * PM-UTILS Backend (as failsafe only) -+ */ -+ -+ class PMUtilsBackend : public PowerManagerBackend { -+ public: -+ PMUtilsBackend() { -+ -+ } -+ -+ ~PMUtilsBackend() { -+ -+ } -+ -+ Capabilities capabilities() const { -+ Capabilities caps = Capability::PowerOff | Capability::Reboot; -+ -+ if(QProcess::execute("pm-is-supported --suspend")) -+ caps |= Capability::Suspend; -+ -+ if(QProcess::execute("pm-is-supported --hibernate")) -+ caps |= Capability::Hibernate; -+ -+ if(QProcess::execute("pm-is-supported --suspend-hybrid")) -+ caps |= Capability::HybridSleep; -+ -+ -+ return caps; -+ } -+ -+ void powerOff() const { -+ QProcess::execute(daemonApp->configuration()->haltCommand()); -+ } -+ -+ void reboot() const { -+ QProcess::execute(daemonApp->configuration()->rebootCommand()); -+ } -+ -+ void suspend() const { -+ QProcess::execute("pm-suspend"); -+ } -+ -+ void hibernate() const { -+ QProcess::execute("pm-hibernate"); -+ } -+ -+ void hybridSleep() const { -+ QProcess::execute("pm-suspend-hybrid"); -+ } -+ -+ }; -+ -+ - /**********************************************/ - /* UPOWER BACKEND */ - /**********************************************/ -@@ -199,11 +253,20 @@ - // check if upower interface exists - if (interface->isServiceRegistered(UPOWER_SERVICE)) - m_backends << new UPowerBackend(); -+ -+ // check if pm-utils is installed -+ QFile PMInstalled("/usr/bin/pm-is-supported"); -+ -+ //Only add pm-utils if no other option exists -+ if(PMInstalled.exists() && m_backends.empty()) -+ { -+ m_backends << new PMUtilsBackend(); -+ } - } - - PowerManager::~PowerManager() { - while (!m_backends.empty()) -- delete m_backends.takeFirst(); -+ delete m_backends.takeFirst(); - } - - Capabilities PowerManager::capabilities() const {