From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5334813881C for ; Thu, 24 Sep 2015 19:25:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FC2F21C071; Thu, 24 Sep 2015 19:25:08 +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 DA0DD21C071 for ; Thu, 24 Sep 2015 19:25:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B94BE340504 for ; Thu, 24 Sep 2015 19:25:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2434818C for ; Thu, 24 Sep 2015 19:25:05 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1443122696.9f3b848a1fc10768f6f55f0c523c8e039acd8723.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/ X-VCS-Repository: proj/qt X-VCS-Files: x11-misc/sddm/files/sddm-9999-respect-user-flags.patch x11-misc/sddm/files/sddm-9999-upower.patch x11-misc/sddm/sddm-9999.ebuild X-VCS-Directories: x11-misc/sddm/files/ x11-misc/sddm/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 9f3b848a1fc10768f6f55f0c523c8e039acd8723 X-VCS-Branch: master Date: Thu, 24 Sep 2015 19:25:05 +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: 5c6bdec5-ffc8-4e44-abb6-dee4e6a4ddfb X-Archives-Hash: 5f181e439405dac9a25dee1bd19d3bee commit: 9f3b848a1fc10768f6f55f0c523c8e039acd8723 Author: Joao Carreira gmail com> AuthorDate: Wed Sep 23 22:34:38 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Sep 24 19:24:56 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9f3b848a x11-misc/sddm: sync live ebuild with tree Update live ebuild to cope with changes in the version 0.12.0 .../sddm/files/sddm-9999-respect-user-flags.patch | 26 +++++++++ x11-misc/sddm/files/sddm-9999-upower.patch | 12 ---- x11-misc/sddm/sddm-9999.ebuild | 64 ++++++++++++---------- 3 files changed, 60 insertions(+), 42 deletions(-) diff --git a/x11-misc/sddm/files/sddm-9999-respect-user-flags.patch b/x11-misc/sddm/files/sddm-9999-respect-user-flags.patch new file mode 100644 index 0000000..67a6621 --- /dev/null +++ b/x11-misc/sddm/files/sddm-9999-respect-user-flags.patch @@ -0,0 +1,26 @@ +diff -u CMakeLists.txt CMakeLists.txt +--- CMakeLists.txt 2015-09-05 22:40:50.000000000 +0200 ++++ CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200 +@@ -35,22 +35,6 @@ + # Definitions + add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII) + +-# Default build type +-if(NOT CMAKE_BUILD_TYPE) +- set(CMAKE_BUILD_TYPE Release) +-endif() +- +-# Handle build type +-if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug) +- message(STATUS "Debug build") +- add_definitions(-DDEBUG) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") +-else() +- message(STATUS "Release build") +- add_definitions(-DNDEBUG) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") +-endif() +- + # Default absolute paths + if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR) + set(CMAKE_INSTALL_SYSCONFDIR "/etc") diff --git a/x11-misc/sddm/files/sddm-9999-upower.patch b/x11-misc/sddm/files/sddm-9999-upower.patch deleted file mode 100644 index 8c0f34c..0000000 --- a/x11-misc/sddm/files/sddm-9999-upower.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp sddm-0.9.0/src/daemon/PowerManager.cpp ---- sddm-0.9.0.orig/src/daemon/PowerManager.cpp 2014-10-01 18:40:37.402683578 +0200 -+++ sddm-0.9.0/src/daemon/PowerManager.cpp 2014-10-01 18:40:43.502618164 +0200 -@@ -197,7 +197,7 @@ - m_backends << new Login1Backend(); - - // check if upower interface exists -- if (interface->isServiceRegistered(UPOWER_SERVICE)) -+// if (interface->isServiceRegistered(UPOWER_SERVICE)) - m_backends << new UPowerBackend(); - } - diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild index 150b6c7..ed31b37 100644 --- a/x11-misc/sddm/sddm-9999.ebuild +++ b/x11-misc/sddm/sddm-9999.ebuild @@ -10,62 +10,66 @@ 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" +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" SLOT="0" -IUSE="consolekit systemd +upower" -REQUIRED_USE="?? ( upower systemd )" +IUSE="consolekit +pam systemd" -RDEPEND="sys-libs/pam - >=x11-base/xorg-server-1.15.1 - x11-libs/libxcb[xkb(-)] - dev-qt/qtcore:5 +RDEPEND="dev-qt/qtcore:5 dev-qt/qtdbus:5 + dev-qt/qtgui:5 dev-qt/qtdeclarative:5 + dev-qt/qtnetwork:5 dev-qt/linguist-tools:5 dev-qt/qttest:5 + >=x11-base/xorg-server-1.15.1 + x11-libs/libxcb[xkb(-)] + consolekit? ( >=sys-auth/consolekit-0.9.4 ) + pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) - upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" + !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" + DEPEND="${RDEPEND} - >=sys-devel/gcc-4.7.0 + dev-python/docutils virtual/pkgconfig" pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-version) < 4.7 ]] && \ + if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then + if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then die 'The active compiler needs to be gcc 4.7 (or newer)' + fi fi } src_prepare() { - use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch" - use upower && epatch "${FILESDIR}/${P}-upower.patch" + cmake-utils_src_prepare - # respect user's cflags - sed -e 's|-Wall -march=native||' \ - -e 's|-O2||' \ - -i CMakeLists.txt || die 'sed failed' + epatch "${FILESDIR}/${P}-respect-user-flags.patch" + use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch" } src_configure() { local mycmakeargs=( + $(cmake-utils_use_no pam PAM) $(cmake-utils_use_no systemd SYSTEMD) - ) + -DBUILD_MAN_PAGES=ON + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + ) + cmake-utils_src_configure } -pkg_postinst() { - if use consolekit; then - ewarn "This display manager doesn't have native built-in ConsoleKit support." - ewarn "In order to use ConsoleKit pam module with this display manager," - ewarn "you should remove the \"nox11\" parameter from pm_ck_connector.so" - ewarn "line in /etc/pam.d/system-login" - fi - ewarn "Add the sddm user manually to the video group" - ewarn "if you experience flickering or other rendering issues of sddm-greeter" - ewarn "see https://github.com/gentoo/qt/pull/52" +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_no pam PAM) + $(cmake-utils_use_no systemd SYSTEMD) + -DBUILD_MAN_PAGES=ON + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + ) + + cmake-utils_src_configure } -pkg_setup() { +pkg_postinst() { enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/sddm ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video }