| 1 |
commit: d4fe5a71ce71d8c80cbd90e0cd9676dd2dc087d8 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 12 21:44:29 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 1 14:47:07 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4fe5a71 |
| 7 |
|
| 8 |
x11-misc/sddm: Rebase *respect-user-flags.patch onto 0.18.1 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
...ect-user-flags.patch => sddm-0.18.1-respect-user-flags.patch} | 9 ++++----- |
| 14 |
x11-misc/sddm/sddm-0.18.1-r5.ebuild | 2 +- |
| 15 |
x11-misc/sddm/sddm-0.18.1-r6.ebuild | 2 +- |
| 16 |
3 files changed, 6 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
similarity index 69% |
| 20 |
rename from x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch |
| 21 |
rename to x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch |
| 22 |
index fc450169792d..6801fa799ead 100644 |
| 23 |
--- a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch |
| 24 |
+++ b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch |
| 25 |
@@ -1,9 +1,8 @@ |
| 26 |
-diff -u CMakeLists.txt CMakeLists.txt |
| 27 |
---- a/CMakeLists.txt 2015-09-05 22:40:50.000000000 +0200 |
| 28 |
-+++ b/CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200 |
| 29 |
-@@ -35,22 +35,6 @@ |
| 30 |
+--- a/CMakeLists.txt 2020-10-12 13:03:39.000000000 +0200 |
| 31 |
++++ b/CMakeLists.txt 2020-10-12 23:40:04.480687143 +0200 |
| 32 |
+@@ -41,22 +41,6 @@ |
| 33 |
# Definitions |
| 34 |
- add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII) |
| 35 |
+ add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_FOREACH) |
| 36 |
|
| 37 |
-# Default build type |
| 38 |
-if(NOT CMAKE_BUILD_TYPE) |
| 39 |
|
| 40 |
diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild b/x11-misc/sddm/sddm-0.18.1-r5.ebuild |
| 41 |
index 20b127562993..52bc18534548 100644 |
| 42 |
--- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild |
| 43 |
+++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild |
| 44 |
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND} |
| 45 |
" |
| 46 |
|
| 47 |
PATCHES=( |
| 48 |
- "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" |
| 49 |
+ "${FILESDIR}/${P}-respect-user-flags.patch" |
| 50 |
"${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 |
| 51 |
"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" |
| 52 |
# fix for groups: https://github.com/sddm/sddm/issues/1159 |
| 53 |
|
| 54 |
diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild b/x11-misc/sddm/sddm-0.18.1-r6.ebuild |
| 55 |
index ee7fbfa1a60b..3d1b2b680504 100644 |
| 56 |
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild |
| 57 |
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild |
| 58 |
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND} |
| 59 |
" |
| 60 |
|
| 61 |
PATCHES=( |
| 62 |
- "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" |
| 63 |
+ "${FILESDIR}/${P}-respect-user-flags.patch" |
| 64 |
"${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 |
| 65 |
"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" |
| 66 |
# fix for groups: https://github.com/sddm/sddm/issues/1159 |
Archives