[neon/3rdparty/sddm/Neon/stable] debian/patches: remove patches in git

[Jonathan Esk-Riddell]

Git commit 19f596176013fcbbd0f9cd2978de8d95be9aa31f by Jonathan Esk-Riddell.
Committed on 16/08/2022 at 10:59.
Pushed by jriddell into branch 'Neon/stable'.

remove patches in git

M  +0    -2    debian/patches/series
D  +0    -31   debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff
D  +0    -26   debian/patches/upstream_Fix-compilation-once-QTBUG-88431-gets-fixed.patch

https://invent.kde.org/neon/3rdparty/sddm/commit/19f596176013fcbbd0f9cd2978de8d95be9aa31f

diff --git a/debian/patches/series b/debian/patches/series
index 92259cb..e02a20a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 02_kubuntu_use_breeze.diff
 05_add_debian_themes.diff
 06_nvidia_prime_setup.diff
-upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff
-upstream_Fix-compilation-once-QTBUG-88431-gets-fixed.patch
diff --git a/debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff b/debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff
deleted file mode 100644
index 1ec83cb..0000000
--- a/debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Origin: https://github.com/sddm/sddm/commit/cf65e99eb8abfe2ee1ef7e2f7dc43862e83bf0ab
-From: soredake
-Date: Tue, 9 Mar 2021 07:28:11 +0000
-Subject: Add fish /etc/profile and $HOME/.profile sourcing
----
-diff --git a/data/scripts/Xsession b/data/scripts/Xsession
-index 54498101..d0c2605f 100755
---- a/data/scripts/Xsession
-+++ b/data/scripts/Xsession
-@@ -39,6 +39,8 @@ case $SHELL in
-     rm -f $xsess_tmp
-     ;;
-   */fish)
-+    [ -f /etc/profile ] && . /etc/profile
-+    [ -f $HOME/.profile ] && . $HOME/.profile
-     xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
-     $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
-     . $xsess_tmp
-diff --git a/data/scripts/wayland-session b/data/scripts/wayland-session
-index 1f905543..552a39f5 100755
---- a/data/scripts/wayland-session
-+++ b/data/scripts/wayland-session
-@@ -43,6 +43,8 @@ case $SHELL in
-     rm -f $wlsess_tmp
-     ;;
-   */fish)
-+    [ -f /etc/profile ] && . /etc/profile
-+    [ -f $HOME/.profile ] && . $HOME/.profile
-     xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
-     $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
-     . $xsess_tmp
diff --git a/debian/patches/upstream_Fix-compilation-once-QTBUG-88431-gets-fixed.patch b/debian/patches/upstream_Fix-compilation-once-QTBUG-88431-gets-fixed.patch
deleted file mode 100644
index 7790350..0000000
--- a/debian/patches/upstream_Fix-compilation-once-QTBUG-88431-gets-fixed.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001
-From: "aacid at kde.org" <aacid at kde.org>
-Date: Thu, 12 Nov 2020 23:42:48 +0100
-Subject: [PATCH] Fix compilation once QTBUG-88431 gets fixed
-
-And also comes closes to Qt6 compatibility
----
- src/daemon/XorgDisplayServer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
-index 5f93a1b..d5f29a9 100644
---- a/src/daemon/XorgDisplayServer.cpp
-+++ b/src/daemon/XorgDisplayServer.cpp
-@@ -65,7 +65,7 @@ namespace SDDM {
-         // create a random hexadecimal number
-         const char *digits = "0123456789abcdef";
-         for (int i = 0; i < 32; ++i)
--            m_cookie[i] = digits[dis(gen)];
-+            m_cookie[i] = QLatin1Char(digits[dis(gen)]);
-     }
- 
-     XorgDisplayServer::~XorgDisplayServer() {
--- 
-2.35.1
-