[neon/3rdparty/sddm/Neon/release-lts] debian: Use upstream patch using only basename of session file as session name

[Norbert Preining]

Git commit 30344bf68b54af70f53e171cca16a2e819181746 by Norbert Preining.
Committed on 09/11/2020 at 19:37.
Pushed by sitter into branch 'Neon/release-lts'.

Use upstream patch using only basename of session file as session name

M  +2    -0    debian/changelog
D  +0    -30   debian/patches/07_fix-desktop-session-env-var.diff
M  +1    -1    debian/patches/series
A  +25   -0    debian/patches/upstream-2f034906d-use-only-basename-of-session.patch

https://invent.kde.org/neon/3rdparty/sddm/commit/30344bf68b54af70f53e171cca16a2e819181746

diff --git a/debian/changelog b/debian/changelog
index acf49b9..4a9ae22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ sddm (0.19.0-2) UNRELEASED; urgency=medium
   [ Norbert Preining ]
   * Disable 07_fix-desktop-session-env-var.diff imported from Ubuntu
     (Closes: #973907)
+  * Add upstream's d/p/upstream-2f034906d-use-only-basename-of-session to
+    use only the basename of the session file as session name.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 Nov 2020 17:10:58 +0900
 
diff --git a/debian/patches/07_fix-desktop-session-env-var.diff b/debian/patches/07_fix-desktop-session-env-var.diff
deleted file mode 100644
index 0c2f6a5..0000000
--- a/debian/patches/07_fix-desktop-session-env-var.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: DESKTOP_SESSION should only be the base name
- When xorg takes DESKTOP_SESSION from SDDM and uses it to set XDG_DATA_DIRS,
- the absolute path causes XDG_DATA_DIRS to contain paths which don't exist.
- This makes packages (like Lubuntu's default settings) break when they need to
- pull from /etc/xdg/xdg-$DESKTOP_SESSION.
-Author: Simon Quigley <tsimonq2 at ubuntu.com>
-Bug: https://github.com/sddm/sddm/issues/852
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1668722
-Forwarded: yes
-Last-Update: 2018-02-09
---- a/src/common/Session.cpp
-+++ b/src/common/Session.cpp
-@@ -119,7 +119,7 @@
- 
-     void Session::setTo(Type type, const QString &_fileName)
-     {
--        QString fileName(_fileName);
-+        QString fileName = _fileName;
-         if (!fileName.endsWith(s_entryExtention))
-             fileName += s_entryExtention;
- 
-@@ -189,6 +189,8 @@
- 
-         file.close();
- 
-+        m_fileName = fileName;
-+
-         m_type = type;
-         m_valid = true;
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 17ce182..6166035 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@
 04_set_default_path.diff
 05_add_debian_themes.diff
 06_nvidia_prime_setup.diff
-#07_fix-desktop-session-env-var.diff
+upstream-2f034906d-use-only-basename-of-session.patch
diff --git a/debian/patches/upstream-2f034906d-use-only-basename-of-session.patch b/debian/patches/upstream-2f034906d-use-only-basename-of-session.patch
new file mode 100644
index 0000000..cc6553f
--- /dev/null
+++ b/debian/patches/upstream-2f034906d-use-only-basename-of-session.patch
@@ -0,0 +1,25 @@
+From 2f034906ded7df6542a350bcc914f4ec808acbb0 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian at ritter-vogt.de>
+Date: Mon, 9 Nov 2020 11:22:15 +0100
+Subject: [PATCH] Only use the base name for $DESKTOP_SESSION
+
+Other DMs don't use the path.
+
+Fixes #852
+---
+ src/common/Session.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/Session.cpp b/src/common/Session.cpp
+index 2d7b04f1..3de28ef1 100644
+--- a/src/common/Session.cpp
++++ b/src/common/Session.cpp
+@@ -89,7 +89,7 @@ namespace SDDM {
+ 
+     QString Session::desktopSession() const
+     {
+-        return fileName().replace(s_entryExtention, QString());
++        return QFileInfo(m_fileName).completeBaseName();
+     }
+ 
+     QString Session::desktopNames() const