public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
@ 2024-02-22 11:32 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-02-22 11:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ca0238e2836bfc97cd7c4d3813189ff60519d2c8
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Mon Dec 25 01:30:39 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 10:28:14 2024 +0000
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 <fatzer2 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34466
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-misc/sddm/files/sddm.logrotate | 5 +++++
 x11-misc/sddm/sddm-9999.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 00000000..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-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index bc905539..f210629a 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.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() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
@ 2024-01-10  9:13 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-01-10  9:13 UTC (permalink / raw
  To: gentoo-commits

commit:     5eae66259c02474e086039397bb15d24fbd04cf7
Author:     Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk>
AuthorDate: Tue Jan  2 01:57:38 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 09:08:31 2024 +0000
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 <mike <AT> fireburn.co.uk>
Closes: https://github.com/gentoo/qt/pull/273
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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-9999-Xsession.patch       | 41 ++++++++++++++++++++++
 .../files/sddm-9999-disable-etc-debian-check.patch | 26 ++++++++++++++
 ... sddm-9999-no-default-pam_systemd-module.patch} | 13 +++----
 x11-misc/sddm/sddm-9999.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..00000000
--- 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..00000000
--- 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 <asturm@gentoo.org>
-Date: Tue, 13 Oct 2020 01:04:44 +0200
-Subject: [PATCH] Disable /etc/debian_version check
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- 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 <vindex17@outlook.it>
+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-9999-Xsession.patch b/x11-misc/sddm/files/sddm-9999-Xsession.patch
new file mode 100644
index 00000000..0388ee89
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-9999-Xsession.patch
@@ -0,0 +1,41 @@
+From dac9752495d1467d11e30450989194177677f30a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 21 Oct 2017 14:44:59 2017 +0200
+Subject: [PATCH 2/5] Xsession
+
+Thanks-to: Joakim Tjernlund <joakim.tjernlund@infinera.com>
+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
+@@ -39,6 +39,10 @@ case $SHELL in
+     ;;
+ esac
+ 
++# Make D-Bus start properly, see:
++# /etc/X11/xinit/xinitrc.d/80-dbus
++command="$@"
++
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f /usr/local/etc/xprofile ] && . /usr/local/etc/xprofile
+ [ -f $HOME/.xprofile ] && . $HOME/.xprofile
+@@ -87,8 +91,8 @@ if [ -f "$USERXSESSION" ]; then
+   . "$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
+-- 
+2.43.0
+

diff --git a/x11-misc/sddm/files/sddm-9999-disable-etc-debian-check.patch b/x11-misc/sddm/files/sddm-9999-disable-etc-debian-check.patch
new file mode 100644
index 00000000..b0a13259
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-9999-disable-etc-debian-check.patch
@@ -0,0 +1,26 @@
+From cef0ad9776d9349e85020b529d20dcc88113015a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 13 Oct 2020 01:04:44 +0200
+Subject: [PATCH 4/5] Disable /etc/debian_version check
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ services/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
+index 5158e87..441e46a 100644
+--- a/services/CMakeLists.txt
++++ b/services/CMakeLists.txt
+@@ -20,7 +20,7 @@ endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in" "${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam")
+ 
+ if(INSTALL_PAM_CONFIGURATION)
+-    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.43.0
+

diff --git a/x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch b/x11-misc/sddm/files/sddm-9999-no-default-pam_systemd-module.patch
similarity index 75%
rename from x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch
rename to x11-misc/sddm/files/sddm-9999-no-default-pam_systemd-module.patch
index 2ad739a8..4a213d85 100644
--- a/x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch
+++ b/x11-misc/sddm/files/sddm-9999-no-default-pam_systemd-module.patch
@@ -1,7 +1,8 @@
-From 02a13d11dac72699e7580c538c152a7b5e0eb056 Mon Sep 17 00:00:00 2001
+From 6f618b6862d625796c13677ff265bae21b44e029 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
 Date: Tue, 13 Oct 2020 01:10:00 +0200
-Subject: Don't add pam_systemd.so to pam.d/sddm-greeter in case of NO_SYSTEMD
+Subject: [PATCH 5/5] Don't add pam_systemd.so to pam.d/sddm-greeter in case of
+ NO_SYSTEMD
 
 ---
  services/CMakeLists.txt      | 7 +++++--
@@ -9,11 +10,11 @@ Subject: Don't add pam_systemd.so to pam.d/sddm-greeter in case of NO_SYSTEMD
  2 files changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
-index 3d12eec..2ff13a8 100644
+index 441e46a..8e70fb1 100644
 --- a/services/CMakeLists.txt
 +++ b/services/CMakeLists.txt
-@@ -4,10 +4,13 @@ if(SYSTEMD_FOUND)
-     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sddm.service" DESTINATION "${SYSTEMD_SYSTEM_UNIT_DIR}")
+@@ -12,10 +12,13 @@ if(DEFINED SYSTEMD_TMPFILES_DIR)
+     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sddm-tmpfiles.conf" DESTINATION "${SYSTEMD_TMPFILES_DIR}" RENAME sddm.conf)
  endif()
  
 +set(LOGIND_PAM_MODULE "session		optional")
@@ -39,5 +40,5 @@ index d41792d..35dcfd5 100644
 -session		optional @LOGIND_PAM_MODULE@
 +@LOGIND_PAM_MODULE@
 -- 
-2.35.1
+2.43.0
 

diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 75e5fdcc..bc905539 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -56,10 +56,10 @@ BDEPEND="
 PATCHES=(
 	# Downstream patches
 	"${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch"
-	"${FILESDIR}/${PN}-0.19.0-Xsession.patch" # bug 611210
+	"${FILESDIR}/${P}-Xsession.patch" # bug 611210
 	"${FILESDIR}/${PN}-0.20.0-sddm.pam-use-substack.patch" # bug 728550
-	"${FILESDIR}/${PN}-0.20.0-disable-etc-debian-check.patch"
-	"${FILESDIR}/${PN}-0.20.0-no-default-pam_systemd-module.patch" # bug 669980
+	"${FILESDIR}/${P}-disable-etc-debian-check.patch"
+	"${FILESDIR}/${P}-no-default-pam_systemd-module.patch" # bug 669980
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
@ 2023-02-10 19:18 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-02-10 19:18 UTC (permalink / raw
  To: gentoo-commits

commit:     a933ee7b5c1795f5eadc3cc68c500cf6320fefb4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 19:15:28 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 19:16:07 2023 +0000
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 <asturm <AT> gentoo.org>

 x11-misc/sddm/files/sddm.tmpfiles | 1 -
 x11-misc/sddm/sddm-9999.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..00000000
--- 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-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index e67ddc99..b8117a94 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.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
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
@ 2023-02-04 13:00 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-02-04 13:00 UTC (permalink / raw
  To: gentoo-commits

commit:     874d04dd36d01a9bb6f07d2bad6427c7b6883cbb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 11:22:59 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 12:56:46 2023 +0000
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 <asturm <AT> 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-9999.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..00000000
--- a/x11-misc/sddm/files/pam-1.4-substack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- sddm-0.18.1/services/sddm-autologin.pam.bak	2020-06-19 22:27:57.305580696 +0200
-+++ sddm-0.18.1/services/sddm-autologin.pam	2020-06-19 22:30:50.513583973 +0200
-@@ -1,6 +1,5 @@
- #%PAM-1.0
- auth        required    pam_env.so
--auth        required    pam_tally.so file=/var/log/faillog onerr=succeed
- auth        required    pam_shells.so
- auth        required    pam_nologin.so
- auth        required    pam_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		substack		system-login
- -auth		optional	pam_gnome_keyring.so
- -auth   optional  pam_kwallet5.so
- 
--account		include		system-login
-+account		substack		system-login
- 
--password	include		system-login
-+password	substack		system-login
- -password	optional	pam_gnome_keyring.so use_authtok
- 
- session		optional	pam_keyinit.so force revoke
--session		include		system-login
-+session		substack		system-login
- -session		optional	pam_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..00000000
--- 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.000000000 +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 00000000..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 <asturm@gentoo.org>
+Date: Tue, 13 Oct 2020 01:04:44 +0200
+Subject: [PATCH] Disable /etc/debian_version check
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ 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-no-default-pam_systemd-module.patch b/x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch
new file mode 100644
index 00000000..2ad739a8
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch
@@ -0,0 +1,43 @@
+From 02a13d11dac72699e7580c538c152a7b5e0eb056 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 13 Oct 2020 01:10:00 +0200
+Subject: Don't add pam_systemd.so to pam.d/sddm-greeter in case of NO_SYSTEMD
+
+---
+ services/CMakeLists.txt      | 7 +++++--
+ services/sddm-greeter.pam.in | 2 +-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
+index 3d12eec..2ff13a8 100644
+--- a/services/CMakeLists.txt
++++ b/services/CMakeLists.txt
+@@ -4,10 +4,13 @@ if(SYSTEMD_FOUND)
+     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sddm.service" DESTINATION "${SYSTEMD_SYSTEM_UNIT_DIR}")
+ endif()
+ 
++set(LOGIND_PAM_MODULE "session		optional")
+ if(USE_ELOGIND)
+-    set(LOGIND_PAM_MODULE "pam_elogind.so")
++    set(LOGIND_PAM_MODULE "${LOGIND_PAM_MODULE}	pam_elogind.so")
++elseif(NOT NO_SYSTEMD)
++    set(LOGIND_PAM_MODULE "${LOGIND_PAM_MODULE}	pam_systemd.so")
+ else()
+-    set(LOGIND_PAM_MODULE "pam_systemd.so")
++    set(LOGIND_PAM_MODULE "")
+ endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in" "${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam")
+ 
+diff --git a/services/sddm-greeter.pam.in b/services/sddm-greeter.pam.in
+index d41792d..35dcfd5 100644
+--- a/services/sddm-greeter.pam.in
++++ b/services/sddm-greeter.pam.in
+@@ -14,4 +14,4 @@ password	required pam_deny.so
+ 
+ # Setup session
+ session		required pam_unix.so
+-session		optional @LOGIND_PAM_MODULE@
++@LOGIND_PAM_MODULE@
+-- 
+2.35.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
new file mode 100644
index 00000000..daaf9f52
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,7 +51,7 @@
+     message(STATUS "Debug build")
+     add_definitions(-DDEBUG)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
+-else()
++elseif(CMAKE_BUILD_TYPE MATCHES Release)
+     message(STATUS "Release build")
+     add_definitions(-DNDEBUG)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")

diff --git a/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch b/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch
new file mode 100644
index 00000000..6267adc7
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch
@@ -0,0 +1,37 @@
+From 9cbeb07664f4bd4273c2b62a522a864f6d4f27ae Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 4 Feb 2023 13:31:36 +0100
+Subject: [PATCH] sddm.pam: Change to substack for system-login
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ services/sddm.pam | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/services/sddm.pam b/services/sddm.pam
+index df11003..0a073f4 100644
+--- a/services/sddm.pam
++++ b/services/sddm.pam
+@@ -1,15 +1,15 @@
+ #%PAM-1.0
+ 
+-auth        include     system-login
++auth        substack    system-login
+ -auth       optional    pam_gnome_keyring.so
+ -auth       optional    pam_kwallet5.so
+ 
+-account     include     system-login
++account     substack    system-login
+ 
+-password    include     system-login
++password    substack    system-login
+ -password   optional    pam_gnome_keyring.so    use_authtok
+ 
+ session     optional    pam_keyinit.so          force revoke
+-session     include     system-login
++session     substack    system-login
+ -session    optional    pam_gnome_keyring.so    auto_start
+ -session    optional    pam_kwallet5.so         auto_start
+-- 
+2.39.1
+

diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index bd2e2d38..1c137b41 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -11,6 +11,7 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
+QTMIN=5.15.2
 inherit cmake linux-info systemd tmpfiles
 
 DESCRIPTION="Simple Desktop Display Manager"
@@ -26,11 +27,11 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	acct-group/sddm
 	acct-user/sddm
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
 	x11-base/xorg-server
 	x11-libs/libxcb:=
 	elogind? ( sys-auth/elogind )
@@ -40,22 +41,27 @@ COMMON_DEPEND="
 	!systemd? ( sys-power/upower )
 "
 DEPEND="${COMMON_DEPEND}
-	test? ( dev-qt/qttest:5 )
+	test? ( >=dev-qt/qttest-${QTMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
 	!systemd? ( gui-libs/display-manager-init )
 "
 BDEPEND="
 	dev-python/docutils
-	dev-qt/linguist-tools:5
+	>=dev-qt/linguist-tools-${QTMIN}:5
 	kde-frameworks/extra-cmake-modules:5
 	virtual/pkgconfig
 "
 
 PATCHES=(
 	# Downstream patches
-	"${FILESDIR}/${PN}-0.18.1-respect-user-flags.patch" # bug 563108
+	"${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch"
 	"${FILESDIR}/${PN}-0.19.0-Xsession.patch" # bug 611210
+	"${FILESDIR}/${PN}-0.20.0-sddm.pam-use-substack.patch" # bug 728550
+	"${FILESDIR}/${PN}-0.20.0-disable-etc-debian-check.patch"
+	"${FILESDIR}/${PN}-0.20.0-no-default-pam_systemd-module.patch" # bug 669980
+	# TODO: add this: https://github.com/sddm/sddm/pull/1230 ...ACK'd
+	#  for merge but pending testing. by openSUSE, Fedora usage for >1y
 )
 
 pkg_setup() {
@@ -64,6 +70,32 @@ pkg_setup() {
 }
 
 src_prepare() {
+	touch 01gentoo.conf || die
+
+	if use elogind || use systemd; then
+cat <<-EOF >> 01gentoo.conf
+[General]
+# Halt/Reboot command
+HaltCommand=$(usex elogind "loginctl" "systemctl") poweroff
+RebootCommand=$(usex elogind "loginctl" "systemctl") reboot
+
+EOF
+	fi
+
+cat <<-EOF >> 01gentoo.conf
+# Remove qtvirtualkeyboard as InputMethod default
+InputMethod=
+
+[Users]
+ReuseSession=true
+
+[Wayland]
+EnableHiDPI=true
+
+[X11]
+EnableHiDPI=true
+EOF
+
 	cmake_src_prepare
 
 	if ! use test; then
@@ -74,11 +106,11 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_PAM=$(usex pam)
-		-DNO_SYSTEMD=$(usex '!systemd')
-		-DUSE_ELOGIND=$(usex 'elogind')
 		-DBUILD_MAN_PAGES=ON
 		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+		-DENABLE_PAM=$(usex pam)
+		-DNO_SYSTEMD=$(usex !systemd)
+		-DUSE_ELOGIND=$(usex elogind)
 	)
 	cmake_src_configure
 }
@@ -88,31 +120,23 @@ src_install() {
 
 	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
 
-	# Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
-	local confd="/usr/lib/sddm/sddm.conf.d"
-	dodir ${confd}
-	"${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
-		|| die "Failed to create 00default.conf"
-
-	sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
-		-e "/^ReuseSession/s/false/true/" \
-		-e "/^EnableHiDPI/s/false/true/" \
-		-i "${D}/${confd}"/00default.conf || die
+	insinto /etc/sddm.conf.d/
+	doins "${S}"/01gentoo.conf
 }
 
 pkg_postinst() {
 	tmpfiles_process "${PN}.conf"
 
-	elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
-	elog "Use it to override specific options. SDDM defaults are now"
-	elog "found in: /usr/lib/sddm/sddm.conf.d/00default.conf"
-	elog
 	elog "NOTE: If SDDM startup appears to hang then entropy pool is too low."
 	elog "This can be fixed by configuring one of the following:"
 	elog "  - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel"
 	elog "  - # emerge sys-apps/haveged && rc-update add haveged boot"
 	elog "  - # emerge sys-apps/rng-tools && rc-update add rngd boot"
 	elog
+	elog "SDDM example config can be shown with:"
+	elog "  ${EROOT}/usr/bin/sddm --example-config"
+	elog "Use ${EROOT}/etc/sddm.conf.d/ directory to override specific options."
+	elog
 	elog "For more information on how to configure SDDM, please visit the wiki:"
 	elog "  https://wiki.gentoo.org/wiki/SDDM"
 	if has_version x11-drivers/nvidia-drivers; then


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
@ 2021-01-01 18:58 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-01-01 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     5d29b281bbcdaabddd3ff40009ab6ed6428fda17
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 17:37:58 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 17:37:58 2021 +0000
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 <asturm <AT> gentoo.org>

 x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch | 20 --------------------
 x11-misc/sddm/metadata.xml                       |  1 -
 x11-misc/sddm/sddm-9999.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..00000000
--- 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 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="consolekit">Use ck-launch-session from sys-auth/consolekit (no native support)</flag>
 		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
 	</use>
 	<longdescription lang="en">

diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index e2ddf0c9..e5d3a7ec 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.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() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
@ 2016-10-28 15:31 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2016-10-28 15:31 UTC (permalink / raw
  To: gentoo-commits

commit:     2224a25412ba0fc7d3007b0384c912829971f181
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 15:26:04 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 15:31:32 2016 +0000
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-9999-respect-user-flags.patch  |  4 +-
 x11-misc/sddm/sddm-9999.ebuild                     | 57 ++++++++++++----------
 2 files changed, 33 insertions(+), 28 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
index 67a6621..fc45016 100644
--- a/x11-misc/sddm/files/sddm-9999-respect-user-flags.patch
+++ b/x11-misc/sddm/files/sddm-9999-respect-user-flags.patch
@@ -1,6 +1,6 @@
 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
+--- a/CMakeLists.txt      2015-09-05 22:40:50.000000000 +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-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 869ae35..44740c2 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.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
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
@ 2015-09-24 19:25 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2015-09-24 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9f3b848a1fc10768f6f55f0c523c8e039acd8723
Author:     Joao Carreira <jfmcarreira <AT> gmail <DOT> com>
AuthorDate: Wed Sep 23 22:34:38 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> 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
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-02-22 11:32 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-22 11:32 [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-01-10  9:13 Andreas Sturmlechner
2023-02-10 19:18 Andreas Sturmlechner
2023-02-04 13:00 Andreas Sturmlechner
2021-01-01 18:58 Andreas Sturmlechner
2016-10-28 15:31 Michael Palimaka
2015-09-24 19:25 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox