commit: d4fe5a71ce71d8c80cbd90e0cd9676dd2dc087d8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 21:44:29 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 14:47:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4fe5a71
x11-misc/sddm: Rebase *respect-user-flags.patch onto 0.18.1
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ect-user-flags.patch => sddm-0.18.1-respect-user-flags.patch} | 9 ++++-----
x11-misc/sddm/sddm-0.18.1-r5.ebuild | 2 +-
x11-misc/sddm/sddm-0.18.1-r6.ebuild | 2 +-
3 files changed, 6 insertions(+), 7 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
similarity index 69%
rename from x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
rename to x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
index fc450169792d..6801fa799ead 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/sddm-0.18.1-r5.ebuild
b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
index 20b127562993..52bc18534548 100644
--- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
+ "${FILESDIR}/${P}-respect-user-flags.patch"
"${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
# fix for groups: https://github.com/sddm/sddm/issues/1159
diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index ee7fbfa1a60b..3d1b2b680504 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
+ "${FILESDIR}/${P}-respect-user-flags.patch"
"${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
# fix for groups: https://github.com/sddm/sddm/issues/1159
