diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-01-01 19:51:25 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-01-01 19:51:25 +0100 |
| commit | 255c77d9f60c74e05cdda384da3b3c06bf62b9a6 (patch) | |
| tree | 8819fc5b234b4242da8ffad73fcea51f932db264 | |
| parent | x11-misc/sddm: Drop IUSE=consolekit (diff) | |
| download | qt-255c77d9f60c74e05cdda384da3b3c06bf62b9a6.tar.gz qt-255c77d9f60c74e05cdda384da3b3c06bf62b9a6.tar.bz2 qt-255c77d9f60c74e05cdda384da3b3c06bf62b9a6.zip | |
x11-misc/sddm: Update patches
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch (renamed from x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch) | 9 | ||||
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.19.0-Xsession.patch (renamed from x11-misc/sddm/files/sddm-0.18.0-Xsession.patch) | 8 | ||||
| -rw-r--r-- | x11-misc/sddm/sddm-9999.ebuild | 10 |
3 files changed, 14 insertions, 13 deletions
diff --git a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch index fc450169..6801fa79 100644 --- a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch +++ b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch @@ -1,9 +1,8 @@ -diff -u CMakeLists.txt CMakeLists.txt ---- 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 @@ +--- 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) + 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) diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch index 41c813a0..e1e3c152 100644 --- a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch +++ b/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch @@ -1,11 +1,11 @@ ---- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200 -+++ b/data/scripts/Xsession 2017-10-21 15:25:47.668886596 +0200 +--- a/data/scripts/Xsession ++++ b/data/scripts/Xsession @@ -50,6 +50,10 @@ ;; esac -+# Make D-Bus and ConsoleKit start properly, see: -+# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit} ++# Make D-Bus start properly, see: ++# /etc/X11/xinit/xinitrc.d/80-dbus +command="$@" + [ -f /etc/xprofile ] && . /etc/xprofile diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild index e5d3a7ec..30319842 100644 --- a/x11-misc/sddm/sddm-9999.ebuild +++ b/x11-misc/sddm/sddm-9999.ebuild @@ -49,11 +49,13 @@ DEPEND="${RDEPEND} " PATCHES=( - "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108 - "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 + # Pending upstream # 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" + "${FILESDIR}"/${PN}-0.18.1-revert-honor-PAM-supplemental-groups.patch + "${FILESDIR}"/${PN}-0.18.1-honor-PAM-supplemental-groups-v2.patch + # Downstream patches + "${FILESDIR}"/${PN}-0.18.1-respect-user-flags.patch # bug 563108 + "${FILESDIR}"/${PN}-0.19.0-Xsession.patch # bug 611210 ) src_prepare() { |