[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: ca0238e2836bfc97cd7c4d3813189ff60519d2c8
Author: Alexander Golubev gmail com>
AuthorDate: Mon Dec 25 01:30:39 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 22 10:28:14 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ca0238e2
x11-misc/sddm: add logrotate config
Bug: https://bugs.gentoo.org/565862
Signed-off-by: Alexander Golubev gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34466
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/files/sddm.logrotate | 5 +
x11-misc/sddm/sddm-.ebuild | 8 +++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/x11-misc/sddm/files/sddm.logrotate
b/x11-misc/sddm/files/sddm.logrotate
new file mode 100644
index ..ba6199c4
--- /dev/null
+++ b/x11-misc/sddm/files/sddm.logrotate
@@ -0,0 +1,5 @@
+/var/log/sddm.log {
+ missingok
+ notifempty
+ copytruncate
+}
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index bc905539..f210629a 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -101,6 +101,12 @@ src_install() {
insinto /etc/sddm.conf.d/
doins "${S}"/01gentoo.conf
+
+ # with systemd logs are sent to journald, so no point to bother in that
case
+ if ! use systemd; then
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/sddm.logrotate" sddm
+ fi
}
pkg_postinst() {
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: 5eae66259c02474e086039397bb15d24fbd04cf7
Author: Mike Lothian fireburn co uk>
AuthorDate: Tue Jan 2 01:57:38 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 10 09:08:31 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5eae6625
x11-misc/sddm: Update patches
* asturm 2024-01-10:
- Kept patch names intact where nothing actually changed
- Fixed historic attribution and original commit dates
Signed-off-by: Mike Lothian fireburn.co.uk>
Closes: https://github.com/gentoo/qt/pull/273
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/files/sddm-0.19.0-Xsession.patch | 24 -
.../sddm-0.20.0-disable-etc-debian-check.patch | 26 --
.../files/sddm-0.20.0-respect-user-flags.patch | 16 -
x11-misc/sddm/files/sddm--Xsession.patch | 41 ++
.../files/sddm--disable-etc-debian-check.patch | 26 ++
... sddm--no-default-pam_systemd-module.patch} | 13 +++
x11-misc/sddm/sddm-.ebuild | 6 ++--
7 files changed, 92 insertions(+), 60 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
b/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
deleted file mode 100644
index e1e3c152..
--- a/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
+++ /dev/null
@@ -1,24 +0,0 @@
a/data/scripts/Xsession
-+++ b/data/scripts/Xsession
-@@ -50,6 +50,10 @@
- ;;
- esac
-
-+# Make D-Bus start properly, see:
-+# /etc/X11/xinit/xinitrc.d/80-dbus
-+command="$@"
-+
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f $HOME/.xprofile ] && . $HOME/.xprofile
-
-@@ -94,8 +98,8 @@
- . "$USERXSESSION"
- fi
-
--if [ -z "$*" ]; then
-+if [ -z "$command" ]; then
- exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION
is no valid session."
- else
--exec $@
-+exec $command
- fi
diff --git a/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
b/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
deleted file mode 100644
index b851c852..
--- a/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 20adb0eb3462e79ec76f93f2a622b99956145424 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Tue, 13 Oct 2020 01:04:44 +0200
-Subject: [PATCH] Disable /etc/debian_version check
-
-Signed-off-by: Andreas Sturmlechner
- services/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
-index 5032f33..afa5fd5 100644
a/services/CMakeLists.txt
-+++ b/services/CMakeLists.txt
-@@ -11,7 +11,7 @@ else()
- endif()
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in"
"${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam")
-
--if(EXISTS "/etc/debian_version")
-+if(0)
- install(FILES debian.sddm-autologin.pam DESTINATION
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-autologin)
- install(FILES debian.sddm-greeter.pam DESTINATION
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-greeter)
- install(FILES debian.sddm.pam DESTINATION
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm)
---
-2.39.1
-
diff --git a/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch
b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch
index daaf9f52..7f5bc400 100644
--- a/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch
+++ b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch
@@ -1,6 +1,17 @@
+From f03f4c977b8038559c4f26e0e10cec4a3167c00c Mon Sep 17 00:00:00 2001
+From: Lorenzo Porta
+Date: Wed, 23 Sep 2015 23:34:38 2015 +0100
+Subject: Respect user flags
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b883a5e..77cd263 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -51,7 +51,7 @@
+@@ -39,7 +39,7 @@ if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug)
message(STATUS "Debug build")
add_definitions(-DDEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
@@ -9,3 +20,6 @@
message(STATUS "Release build")
add_definitions(-DNDEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+--
+2.43.0
+
diff --git a/x11-misc/sddm/files/sddm--Xsession.patch
b/x11-misc/sddm/files/sddm--Xsession.patch
new file mode 100644
index ..0388ee89
--- /dev/null
+++ b/x11-misc/sddm/files/sddm--Xsession.patch
@@ -0,0 +1,41 @@
+From dac9752495d1467d11e30450989194177677f30a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sat, 21 Oct 2017 14:44:59 2017 +0200
+Subject: [PATCH 2/5] Xsession
+
+Thanks-to: Joakim Tjernlund
+Bug: https://bugs.gentoo.org/611210
+
+---
+ data/scripts/Xsession | 8 ++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/data/scripts/Xsession b/data/scripts/Xsession
+index a971d40..2d84a5a 100755
+--- a/data/scripts/Xsession
b/data/scripts/Xsession
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: a933ee7b5c1795f5eadc3cc68c500cf6320fefb4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Feb 10 19:15:28 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Feb 10 19:16:07 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a933ee7b
x11-misc/sddm: Use upstream sddm-tmpfiles.conf
Upstream commit 0a54d3abbb896d652bac7a495ed98b0617306a6c
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/files/sddm.tmpfiles | 1 -
x11-misc/sddm/sddm-.ebuild| 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/x11-misc/sddm/files/sddm.tmpfiles
b/x11-misc/sddm/files/sddm.tmpfiles
deleted file mode 100644
index 300d6461..
--- a/x11-misc/sddm/files/sddm.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/lib/sddm 0755 sddm sddm
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index e67ddc99..b8117a94 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -110,6 +110,8 @@ src_configure() {
local mycmakeargs=(
-DBUILD_MAN_PAGES=ON
-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+ -DRUNTIME_DIR=/run
+ -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
-DENABLE_PAM=$(usex pam)
-DNO_SYSTEMD=$(usex !systemd)
-DUSE_ELOGIND=$(usex elogind)
@@ -120,8 +122,6 @@ src_configure() {
src_install() {
cmake_src_install
- newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
insinto /etc/sddm.conf.d/
doins "${S}"/01gentoo.conf
}
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: 874d04dd36d01a9bb6f07d2bad6427c7b6883cbb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 4 11:22:59 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 4 12:56:46 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=874d04dd
x11-misc/sddm: Adapt to upstream changes for 0.20.0 release prep
- Set QTMIN to 5.15.2
- Switch SDDM configuration to /etc/sddm.conf.d/
- New Gentoo defaults file: 01gentoo.conf
- For IUSE="elogind", fix path to /bin/loginctl
- Don't look for pam_systemd.so by default
- Respin pam-1.4 substack patch, dropping upstreamed changes
- Respin *-respect-user-flags.patch for minimal context
See also: https://github.com/gentoo/gentoo/pull/18935
See also: https://github.com/gentoo/gentoo/pull/25853
Bug: https://bugs.gentoo.org/669980
Bug: https://bugs.gentoo.org/728550
Bug: https://bugs.gentoo.org/790713
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/files/pam-1.4-substack.patch | 31 -
.../files/sddm-0.18.1-respect-user-flags.patch | 25
.../sddm-0.20.0-disable-etc-debian-check.patch | 26
...sddm-0.20.0-no-default-pam_systemd-module.patch | 43 +
.../files/sddm-0.20.0-respect-user-flags.patch | 11
.../files/sddm-0.20.0-sddm.pam-use-substack.patch | 37 +++
x11-misc/sddm/sddm-.ebuild | 74 ++
7 files changed, 166 insertions(+), 81 deletions(-)
diff --git a/x11-misc/sddm/files/pam-1.4-substack.patch
b/x11-misc/sddm/files/pam-1.4-substack.patch
deleted file mode 100644
index b0467b26..
--- a/x11-misc/sddm/files/pam-1.4-substack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
sddm-0.18.1/services/sddm-autologin.pam.bak2020-06-19
22:27:57.305580696 +0200
-+++ sddm-0.18.1/services/sddm-autologin.pam2020-06-19 22:30:50.513583973
+0200
-@@ -1,6 +1,5 @@
- #%PAM-1.0
- authrequiredpam_env.so
--authrequiredpam_tally.so file=/var/log/faillog onerr=succeed
- authrequiredpam_shells.so
- authrequiredpam_nologin.so
- authrequiredpam_permit.so
sddm-0.18.1/services/sddm.pam.bak 2020-06-19 22:27:26.721580117 +0200
-+++ sddm-0.18.1/services/sddm.pam 2020-06-19 22:27:48.729580533 +0200
-@@ -1,15 +1,15 @@
- #%PAM-1.0
-
--auth include system-login
-+auth substacksystem-login
- -auth optionalpam_gnome_keyring.so
- -auth optional pam_kwallet5.so
-
--account include system-login
-+account substacksystem-login
-
--password include system-login
-+password substacksystem-login
- -password optionalpam_gnome_keyring.so use_authtok
-
- session optionalpam_keyinit.so force revoke
--session include system-login
-+session substacksystem-login
- -session optionalpam_gnome_keyring.so auto_start
- -session optional pam_kwallet5.so auto_start
\ No newline at end of file
diff --git a/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
deleted file mode 100644
index 6801fa79..
--- a/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
a/CMakeLists.txt 2020-10-12 13:03:39.0 +0200
-+++ b/CMakeLists.txt 2020-10-12 23:40:04.480687143 +0200
-@@ -41,22 +41,6 @@
- # Definitions
- add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_FOREACH)
-
--# 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-0.20.0-disable-etc-debian-check.patch
b/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
new file mode 100644
index ..b851c852
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
@@ -0,0 +1,26 @@
+From 20adb0eb3462e79ec76f93f2a622b99956145424 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Tue, 13 Oct 2020 01:04:44 +0200
+Subject: [PATCH] Disable /etc/debian_version check
+
+Signed-off-by: Andreas Sturmlechner
+---
+ services/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
+index 5032f33..afa5fd5 100644
+--- a/services/CMakeLists.txt
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/
commit: bf0725ff5d83277677e3216c6d7b84b8832f3b7e Author: Sam James gentoo org> AuthorDate: Sat Jul 16 15:08:44 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 16 15:08:44 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bf0725ff x11-misc/sddm: add missing sddm.tmpfiles Signed-off-by: Sam James gentoo.org> x11-misc/sddm/files/sddm.tmpfiles | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-misc/sddm/files/sddm.tmpfiles b/x11-misc/sddm/files/sddm.tmpfiles new file mode 100644 index ..300d6461 --- /dev/null +++ b/x11-misc/sddm/files/sddm.tmpfiles @@ -0,0 +1 @@ +d /var/lib/sddm 0755 sddm sddm
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: 5d29b281bbcdaabddd3ff40009ab6ed6428fda17
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jan 1 17:37:58 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jan 1 17:37:58 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5d29b281
x11-misc/sddm: Drop IUSE=consolekit
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch | 20
x11-misc/sddm/metadata.xml | 1 -
x11-misc/sddm/sddm-.ebuild | 7 ++-
3 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
deleted file mode 100644
index bbe2a272..
--- a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2
-has the same interface names as logind.
-
-This patch forces sddm to use legacy behaviour when consolekit2 is detected.
-
-Bug: https://bugs.gentoo.org/633920
-Bug: https://github.com/sddm/sddm/issues/903
-Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99
-
a/src/daemon/LogindDBusTypes.cpp
-+++ b/src/daemon/LogindDBusTypes.cpp
-@@ -60,7 +60,7 @@
-
- if
(QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit")))
{
- qDebug() << "Console kit interface found";
--available = true;
-+available = false;
- serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
- managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
- managerIfaceName =
QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't
match logind
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index 43cf40aa..9f20b6da 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -10,7 +10,6 @@
Gentoo KDE Project
- Use ck-launch-session from
sys-auth/consolekit (no native support)
Use sys-auth/elogind for
session tracking.
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index e2ddf0c9..e5d3a7ec 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sddm/sddm;
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
+IUSE="elogind +pam systemd test"
REQUIRED_USE="?? ( elogind systemd )"
@@ -39,7 +39,6 @@ RDEPEND="
>=dev-qt/qtnetwork-5.9.4:5
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb]
- consolekit? ( >=sys-auth/consolekit-0.9.4 )
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
systemd? ( sys-apps/systemd:= )
@@ -55,8 +54,6 @@ PATCHES=(
# fix for groups: https://github.com/sddm/sddm/issues/1159
"${FILESDIR}/${PN}-0.18.1-revert-honor-PAM-supplemental-groups.patch"
"${FILESDIR}/${PN}-0.18.1-honor-PAM-supplemental-groups-v2.patch"
- # TODO: fix properly
- "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
)
src_prepare() {
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: 2224a25412ba0fc7d3007b0384c912829971f181
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Oct 28 15:26:04 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Oct 28 15:31:32 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2224a254
x11-misc/sddm: sync with main tree
Package-Manager: portage-2.3.2
.../sddm/files/sddm--respect-user-flags.patch | 4 +-
x11-misc/sddm/sddm-.ebuild | 57 --
2 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/x11-misc/sddm/files/sddm--respect-user-flags.patch
b/x11-misc/sddm/files/sddm--respect-user-flags.patch
index 67a6621..fc45016 100644
--- a/x11-misc/sddm/files/sddm--respect-user-flags.patch
+++ b/x11-misc/sddm/files/sddm--respect-user-flags.patch
@@ -1,6 +1,6 @@
diff -u CMakeLists.txt CMakeLists.txt
CMakeLists.txt 2015-09-05 22:40:50.0 +0200
-+++ CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200
+--- a/CMakeLists.txt 2015-09-05 22:40:50.0 +0200
b/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)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 869ae35..44740c2 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-inherit cmake-utils git-r3 toolchain-funcs user
+EAPI=6
+inherit cmake-utils git-r3 user
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm;
@@ -14,12 +14,11 @@ LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
IUSE="consolekit +pam systemd"
-RDEPEND="dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtdeclarative:5
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
+RDEPEND=">=dev-qt/qtcore-5.6:5
+ >=dev-qt/qtdbus-5.6:5
+ >=dev-qt/qtgui-5.6:5
+ >=dev-qt/qtdeclarative-5.6:5
+ >=dev-qt/qtnetwork-5.6:5
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb(-)]
consolekit? ( >=sys-auth/consolekit-0.9.4 )
@@ -29,7 +28,9 @@ RDEPEND="dev-qt/qtcore:5
DEPEND="${RDEPEND}
dev-python/docutils
- dev-qt/linguist-tools:5
+ >=dev-qt/linguist-tools-5.6:5
+ >=dev-qt/qttest-5.6:5
+ kde-frameworks/extra-cmake-modules
virtual/pkgconfig"
pkg_pretend() {
@@ -41,27 +42,17 @@ pkg_pretend() {
}
src_prepare() {
- cmake-utils_src_prepare
-
- 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"
- )
+ # fix for flags handling and bug 563108
+ eapply "${FILESDIR}/${P}-respect-user-flags.patch"
+ use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch"
- cmake-utils_src_configure
+ cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_no pam PAM)
- $(cmake-utils_use_no systemd SYSTEMD)
+ -DENABLE_PAM=$(usex pam)
+ -DNO_SYSTEMD=$(usex '!systemd')
-DBUILD_MAN_PAGES=ON
-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
)
@@ -71,5 +62,19 @@ src_configure() {
pkg_postinst() {
enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+ if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login
]]; then
+ local line=$(grep "pam_ck_connector.*nox11"
"${ROOT}"/etc/pam.d/system-login)
+ if [[ -z ${line} ]]; then
+ ewarn
+ ewarn "Erroneous /etc/pam.d/system-login settings
detected!"
+ ewarn "Please restore 'nox11' option in the line
containing pam_ck_connector:"
+ ewarn
+ ewarn "session optional pam_ck_connector.so
nox11"
+ ewarn
+ ewarn "or 'emerge -1 sys-auth/pambase' and run
etc-update."
+ ewarn
+ fi
+ fi
}
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/
commit: f35a07ec72e72b4220a941d1442b6d81606a7a0d Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 28 13:05:46 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 28 13:05:54 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f35a07ec x11-misc/sddm: rebase consolekit patch Gentoo-bug: 595658 Package-Manager: portage-2.3.2 x11-misc/sddm/files/sddm--consolekit.patch | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/x11-misc/sddm/files/sddm--consolekit.patch b/x11-misc/sddm/files/sddm--consolekit.patch index acdfdc1..692ee17 100644 --- a/x11-misc/sddm/files/sddm--consolekit.patch +++ b/x11-misc/sddm/files/sddm--consolekit.patch @@ -1,13 +1,11 @@ diff --git a/data/scripts/Xsession b/data/scripts/Xsession -index a5d270d..4b48524 100755 +index 0c923a8..eae4f28 100755 --- a/data/scripts/Xsession +++ b/data/scripts/Xsession -@@ -74,7 +74,7 @@ case $session in - exec xterm -geometry 80x24-0-0 - ;; - *) --eval exec "$session" -+eval exec ck-launch-session "$session" - ;; - esac - exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." +@@ -91,5 +91,5 @@ fi + if [ -z "$@" ]; then + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." + else +-exec $@ ++exec ck-launch-session $@ + fi
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: 9f3b848a1fc10768f6f55f0c523c8e039acd8723
Author: Joao Carreira gmail com>
AuthorDate: Wed Sep 23 22:34:38 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 24 19:24:56 2015 +
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--respect-user-flags.patch | 26 +
x11-misc/sddm/files/sddm--upower.patch | 12
x11-misc/sddm/sddm-.ebuild | 64 --
3 files changed, 60 insertions(+), 42 deletions(-)
diff --git a/x11-misc/sddm/files/sddm--respect-user-flags.patch
b/x11-misc/sddm/files/sddm--respect-user-flags.patch
new file mode 100644
index 000..67a6621
--- /dev/null
+++ b/x11-misc/sddm/files/sddm--respect-user-flags.patch
@@ -0,0 +1,26 @@
+diff -u CMakeLists.txt CMakeLists.txt
+--- CMakeLists.txt 2015-09-05 22:40:50.0 +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--upower.patch
b/x11-misc/sddm/files/sddm--upower.patch
deleted file mode 100644
index 8c0f34c..000
--- a/x11-misc/sddm/files/sddm--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.cpp2014-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-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 150b6c7..ed31b37 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.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"
+ )
+
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/
commit: 1eb67b9be0d5a0de870ef0c60f4ef51736c89cc2 Author: Jauhien Piatlicki jauhien AT gentoo DOT org AuthorDate: Mon Aug 4 10:43:25 2014 + Commit: Jauhien Piatlicki jauhien AT gentoo DOT org CommitDate: Mon Aug 4 10:43:25 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1eb67b9b [x11-misc/sddm] fix bug #518192 --- x11-misc/sddm/files/sddm--consolekit.patch | 18 ++ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/x11-misc/sddm/files/sddm--consolekit.patch b/x11-misc/sddm/files/sddm--consolekit.patch index a5ac62a..acdfdc1 100644 --- a/x11-misc/sddm/files/sddm--consolekit.patch +++ b/x11-misc/sddm/files/sddm--consolekit.patch @@ -1,19 +1,13 @@ data/scripts/Xsession -+++ data/scripts/Xsession -@@ -74,13 +74,13 @@ +diff --git a/data/scripts/Xsession b/data/scripts/Xsession +index a5d270d..4b48524 100755 +--- a/data/scripts/Xsession b/data/scripts/Xsession +@@ -74,7 +74,7 @@ case $session in exec xterm -geometry 80x24-0-0 ;; - custom) --exec $HOME/.xsession -+exec ck-launch-session $HOME/.xsession - ;; - default) --exec /usr/bin/startkde -+exec ck-launch-session /usr/bin/startkde - ;; *) -eval exec $session -+eval ck-launch-session $session ++eval exec ck-launch-session $session ;; esac exec xmessage -center -buttons OK:0 -default OK Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/
commit: 3689679276e46b350788a78f17bf1c60bbd08d20
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sat May 24 19:25:41 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sat May 24 19:25:41 2014 +
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..000
--- 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..000
--- 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 QDebug
- #include QHostInfo
- #include QTimer
-+#include QFile
-
- #include iostream
-
-@@ -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
