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 <ast...@gentoo.org> -Date: Tue, 13 Oct 2020 01:04:44 +0200 -Subject: [PATCH] Disable /etc/debian_version check - -Signed-off-by: Andreas Sturmlechner <ast...@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 <vinde...@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 <ast...@gentoo.org> +Date: Sat, 21 Oct 2017 14:44:59 2017 +0200 +Subject: [PATCH 2/5] Xsession + +Thanks-to: Joakim Tjernlund <joakim.tjernl...@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 <ast...@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 <ast...@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 <ast...@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() {
