[neon/3rdparty/sddm/Neon/release-lts] debian: Sync patches with Kubuntu.

[Aurélien COUDERC]

Git commit fc5ad52be1e036740ebe6c286cfeef99f3e037db by Aurélien COUDERC.
Committed on 06/11/2020 at 21:48.
Pushed by sitter into branch 'Neon/release-lts'.

Sync patches with Kubuntu.

M  +1    -0    debian/changelog
M  +4    -8    debian/patches/06_nvidia_prime_setup.diff
A  +30   -0    debian/patches/07_fix-desktop-session-env-var.diff
M  +2    -0    debian/patches/series

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

diff --git a/debian/changelog b/debian/changelog
index d84f5b7..86b626c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ sddm (0.19.0-1) UNRELEASED; urgency=medium
   * New upstream release (0.19.0):
     - Fix X not having access control on startup (fixes CVE-2020-28049)
   * Fix lintian warning command-with-path-in-maintainer-script in postrm.
+  * Sync patches with Kubuntu.
 
  -- Aurélien COUDERC <coucouf at debian.org>  Wed, 04 Nov 2020 17:34:00 +0100
 
diff --git a/debian/patches/06_nvidia_prime_setup.diff b/debian/patches/06_nvidia_prime_setup.diff
index edbe48d..209b94e 100644
--- a/debian/patches/06_nvidia_prime_setup.diff
+++ b/debian/patches/06_nvidia_prime_setup.diff
@@ -7,10 +7,8 @@ Forwarded: yes, although it's not very elegant so may not be accepted
 Last-Update: 2015-04-02
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: sddm-0.11.0/data/scripts/Xsetup
-===================================================================
---- sddm-0.11.0.orig/data/scripts/Xsetup
-+++ sddm-0.11.0/data/scripts/Xsetup
+--- a/data/scripts/Xsetup
++++ b/data/scripts/Xsetup
 @@ -1,3 +1,7 @@
  #!/bin/sh
  # Xsetup - run as root before the login dialog appears
@@ -19,10 +17,8 @@ Index: sddm-0.11.0/data/scripts/Xsetup
 +    echo running NVIDIA Prime setup /sbin/prime-offload
 +    /sbin/prime-offload
 +fi
-Index: sddm-0.11.0/data/scripts/Xstop
-===================================================================
---- sddm-0.11.0.orig/data/scripts/Xstop
-+++ sddm-0.11.0/data/scripts/Xstop
+--- a/data/scripts/Xstop
++++ b/data/scripts/Xstop
 @@ -1,2 +1,7 @@
  #!/bin/sh
  # Xstop - run as root after stopping X
diff --git a/debian/patches/07_fix-desktop-session-env-var.diff b/debian/patches/07_fix-desktop-session-env-var.diff
new file mode 100644
index 0000000..0c2f6a5
--- /dev/null
+++ b/debian/patches/07_fix-desktop-session-env-var.diff
@@ -0,0 +1,30 @@
+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 356b831..ebcb271 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@
 03_vt7-minimum-vt.diff
 04_set_default_path.diff
 05_add_debian_themes.diff
+06_nvidia_prime_setup.diff
+07_fix-desktop-session-env-var.diff