commit: 6835b13c0e3475b5a73250303fc39098a21c1055 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Sat May 24 19:52:59 2014 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Sat May 24 19:52:59 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6835b13c
[x11-misc/sddm] Remove 0.1.0, moved to gx86 by jauhien. Package-Manager: portage-2.2.10 --- x11-misc/sddm/Manifest | 1 - 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 | 4 --- x11-misc/sddm/sddm-0.1.0.ebuild | 50 -------------------------- x11-misc/sddm/sddm-9999.ebuild | 1 + 6 files changed, 1 insertion(+), 166 deletions(-) diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest deleted file mode 100644 index 4882162..0000000 --- a/x11-misc/sddm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sddm-0.1.0.tar.gz 4710358 SHA256 586b87331663d2c389e27fc6cda7cfb83adcd7015aebd1dc683e4adcbe1bfc45 SHA512 b6ea89d9874e5b07f7a00b455cf1362590f0596cf521ebf13d5927b9181c316bbe8fce9d11715f6d1454f905b75681cb681bac4b7f642ffbac29b1b8ca4b6705 WHIRLPOOL d551b0c68a89c70a5255d79905db0676f01585da159819ecace6a394cf32a1c4dc395dc9a145dcfe89d046615cffdc1ef834c8064df3945fe4e647ceb748548a diff --git a/x11-misc/sddm/files/sddm-0.1.0-clang.patch b/x11-misc/sddm/files/sddm-0.1.0-clang.patch deleted file mode 100644 index 7f0a0e7..0000000 --- a/x11-misc/sddm/files/sddm-0.1.0-clang.patch +++ /dev/null @@ -1,58 +0,0 @@ -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()) { diff --git a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch b/x11-misc/sddm/files/sddm-0.1.0-cmake.patch deleted file mode 100644 index f0e68ac..0000000 --- a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- 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 index 81d4ce5..d2d2be4 100644 --- a/x11-misc/sddm/metadata.xml +++ b/x11-misc/sddm/metadata.xml @@ -5,10 +5,6 @@ <email>jauh...@gentoo.org</email> <name>Jauhien Piatlicki</name> </maintainer> - <maintainer> - <email>teknocratdefu...@riseup.net</email> - <name>Harvey Mittens</name> - </maintainer> <use> <flag name="upower">Use <pkg>sys-power/upower</pkg> for power management</flag> </use> diff --git a/x11-misc/sddm/sddm-0.1.0.ebuild b/x11-misc/sddm/sddm-0.1.0.ebuild deleted file mode 100644 index 46d7bcf..0000000 --- a/x11-misc/sddm/sddm-0.1.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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 -} diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild index 3a20b0f..21df8f3 100644 --- a/x11-misc/sddm/sddm-9999.ebuild +++ b/x11-misc/sddm/sddm-9999.ebuild @@ -8,6 +8,7 @@ inherit cmake-utils git-r3 toolchain-funcs DESCRIPTION="Simple Desktop Display Manager" HOMEPAGE="https://github.com/sddm/sddm" EGIT_REPO_URI="git://github.com/${PN}/${PN}.git" +KEYWORDS="" LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain" SLOT="0"