From 77634ce3fcb458c6ed4926db30cd62e07f296e51 Mon Sep 17 00:00:00 2001 From: Jauhien Piatlicki Date: Sat, 24 May 2014 19:38:53 +0000 Subject: 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) --- x11-misc/sddm/ChangeLog | 11 ++++++ x11-misc/sddm/Manifest | 5 +++ x11-misc/sddm/files/sddm-0.1.0-clang.patch | 58 ++++++++++++++++++++++++++++++ x11-misc/sddm/files/sddm-0.1.0-cmake.patch | 53 +++++++++++++++++++++++++++ x11-misc/sddm/metadata.xml | 17 +++++++++ x11-misc/sddm/sddm-0.1.0.ebuild | 50 ++++++++++++++++++++++++++ 6 files changed, 194 insertions(+) create mode 100644 x11-misc/sddm/ChangeLog create mode 100644 x11-misc/sddm/Manifest create mode 100644 x11-misc/sddm/files/sddm-0.1.0-clang.patch create mode 100644 x11-misc/sddm/files/sddm-0.1.0-cmake.patch create mode 100644 x11-misc/sddm/metadata.xml create mode 100644 x11-misc/sddm/sddm-0.1.0.ebuild (limited to 'x11-misc') diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog new file mode 100644 index 000000000000..3963fb13c5b5 --- /dev/null +++ b/x11-misc/sddm/ChangeLog @@ -0,0 +1,11 @@ +# ChangeLog for x11-misc/sddm +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.1 2014/05/24 19:38:53 jauhien Exp $ + +*sddm-0.1.0 (24 May 2014) + + 24 May 2014; Jauhien Piatlicki + +files/sddm-0.1.0-clang.patch, +files/sddm-0.1.0-cmake.patch, +metadata.xml, + +sddm-0.1.0.ebuild: + Initial import from the qt overlay, thanks to Harvey Mittens and Davide + Pesavento, closing bug #462824 diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest new file mode 100644 index 000000000000..3aa5dbe03480 --- /dev/null +++ b/x11-misc/sddm/Manifest @@ -0,0 +1,5 @@ +AUX sddm-0.1.0-clang.patch 2759 SHA256 78c0711149f7f8734476379b75aafcacd0d8bd99494cd61206e1098971cb8a0f SHA512 d7c99e9a46f832b756c5d748853b5726c0d4d075a0c14c86d45fd14c5b0a520f9a3e0352a222079258c2c7701b5227a72d34c73425bdd80c0654e582585d335d WHIRLPOOL ba63c47cd84bcaf1d6f3fbbd24828945c1750e49f485924b9bbb84e4f3f12540646fa47160264718f467555826d51e69934be110d45d1df3f9403a95b1bb8160 +AUX sddm-0.1.0-cmake.patch 1266 SHA256 e34eedffe8d48cd5b3c6c8ae1778e57a4275a3756ae7436f12349403a77303db SHA512 7b9f57d77184a3a81a81f31e3da5d98766edb551376b943a337edd942e9891eb427c3f932ff568ad56096cdec6336f2f5611e0fa86bafd6122c508100486681b WHIRLPOOL c10fd3f106aa262425ba16a784c52fb065605322342c98cb010613605a2cf269b1eccbeca3e291df4ef142d24975d63565ccbb0405576c1be521e7a18d4f2671 +DIST sddm-0.1.0.tar.gz 4710358 SHA256 586b87331663d2c389e27fc6cda7cfb83adcd7015aebd1dc683e4adcbe1bfc45 SHA512 b6ea89d9874e5b07f7a00b455cf1362590f0596cf521ebf13d5927b9181c316bbe8fce9d11715f6d1454f905b75681cb681bac4b7f642ffbac29b1b8ca4b6705 WHIRLPOOL d551b0c68a89c70a5255d79905db0676f01585da159819ecace6a394cf32a1c4dc395dc9a145dcfe89d046615cffdc1ef834c8064df3945fe4e647ceb748548a +EBUILD sddm-0.1.0.ebuild 1177 SHA256 441bb0e8668ac423612b6f6c5d1a7d7b3c4e7012b8a45905b0394fb2cd5082ec SHA512 4e9e106109be08b1b48a5d6ea72ec92bfdf2c7718b9f285118382f20150a303c1bb2fa6bcafd4088649fd68876f5e50bca6addd9136b99150cb608f08e58f793 WHIRLPOOL 3afe1ae5789325895ddb13366b79cc0452a47972e6de385013cb5cb8dc1003a65ff0bd43bdcab9a52ef6d767d8f770280de5165e9afa1fe3f215d92d7483042e +MISC metadata.xml 623 SHA256 91fe8917faf266e2d397bb1ce01b857b39dc1c81a0662410b1e6fdca154c4916 SHA512 2e19ce6bda7ba403e4885440a5dc66027f307eb27d79325e6d8cc4eb48ac9ad00310100a89eda2387b3d7df582e938cf3bb6be52ef1cd3f94186a2528428a5fa WHIRLPOOL 32aa7c8f4e292b7805fada54c9bb2c86954618efe1f01597e4cd0991533a725625935a7050f246d809deb13c5b48efbea43159fd13ad403c6b98abf2146e8ee4 diff --git a/x11-misc/sddm/files/sddm-0.1.0-clang.patch b/x11-misc/sddm/files/sddm-0.1.0-clang.patch new file mode 100644 index 000000000000..7f0a0e722a14 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.1.0-clang.patch @@ -0,0 +1,58 @@ +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(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()) { diff --git a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch b/x11-misc/sddm/files/sddm-0.1.0-cmake.patch new file mode 100644 index 000000000000..f0e68ac97247 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.1.0-cmake.patch @@ -0,0 +1,53 @@ +--- 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) diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml new file mode 100644 index 000000000000..d2d2be44ff9e --- /dev/null +++ b/x11-misc/sddm/metadata.xml @@ -0,0 +1,17 @@ + + + + + jauhien@gentoo.org + Jauhien Piatlicki + + + Use sys-power/upower for power management + + + SDDM is a modern display manager for X11 aiming to be fast, simple + and beatiful. It uses modern technologies like QtQuick, which in + turn gives the designer the ability to create smooth, animated + user interfaces. + + diff --git a/x11-misc/sddm/sddm-0.1.0.ebuild b/x11-misc/sddm/sddm-0.1.0.ebuild new file mode 100644 index 000000000000..44e106128327 --- /dev/null +++ b/x11-misc/sddm/sddm-0.1.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.1.0.ebuild,v 1.1 2014/05/24 19:38:53 jauhien Exp $ + +EAPI=5 +inherit cmake-utils toolchain-funcs + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm" +SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain" +SLOT="0" +IUSE="+qt4 qt5 systemd +upower" +REQUIRED_USE="^^ ( qt4 qt5 ) + ?? ( upower systemd )" + +RDEPEND="sys-libs/pam + x11-libs/libxcb[xkb(-)] + qt4? ( dev-qt/qtdeclarative:4 + dev-qt/qtdbus:4 ) + qt5? ( dev-qt/qtdeclarative:5 + dev-qt/qtdbus:5 ) + systemd? ( sys-apps/systemd:= ) + upower? ( sys-power/upower:= )" +DEPEND="${RDEPEND} + >=sys-devel/gcc-4.7.0 + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-clang.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + [[ $(gcc-version) < 4.7 ]] && \ + die 'The active compiler needs to be gcc 4.7 (or newer)' + fi +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_use qt5 QT5) + $(cmake-utils_use_use systemd) + $(cmake-utils_use_use upower) + ) + cmake-utils_src_configure +} -- cgit v1.2.3-65-gdbad