From 358258c2a874be84c89b30545acae65a7dc76e21 Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Sat, 7 Nov 2015 18:30:07 +0000
Subject: [PATCH] =?UTF-8?q?=E2=80=A2=20Update=20to=20sddm-0.13.0.=20?=
 =?UTF-8?q?=E2=80=A2=20Add=20fix=20for=20lxqt.desktop=20in=20"LXQt=20Deskt?=
 =?UTF-8?q?op=20Final=20Instructions",=20to=20be=20=20=20listed=20in=20SDD?=
 =?UTF-8?q?M=20and=20LXDM.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16618 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml | 8 ++++++--
 lxqt/desktop/post-install.xml      | 9 ++++++++-
 packages.ent                       | 2 +-
 x/dm/sddm.xml                      | 8 ++++----
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 0d817aca5f..ec51ec01d7 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -48,8 +48,12 @@
       <para>November 6th, 2015</para>
       <itemizedlist>
         <listitem>
-          <para>[fernando] - Update to QScintilla-gpl-2.9.1. Fixes
-          <ulink url="&blfs-ticket-root;7091">#7091</ulink>.</para>
+          <para>[fernando] - Add fix for lxqt.desktop in "LXQt Desktop Final
+          Instructions", to be listed in SDDM and LXDM.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to sddm-0.13.0. Fixes
+          <ulink url="&blfs-ticket-root;7090">#7090</ulink>.</para>
         </listitem>
         <listitem>
           <para>[fernando] - Update to firefox-42.0. Fixes
diff --git a/lxqt/desktop/post-install.xml b/lxqt/desktop/post-install.xml
index 9efddf45a0..ecd1aefb5c 100644
--- a/lxqt/desktop/post-install.xml
+++ b/lxqt/desktop/post-install.xml
@@ -67,6 +67,8 @@
 
 <screen role="root"><userinput>ln -svfn $LXQT_PREFIX/share/lxqt /usr/share/lxqt &amp;&amp;
 
+cp -v {$LXQT_PREFIX,/usr}/share/share/xsessions/lxqt.desktop &amp;&amp;
+
 for i in $LXQT_PREFIX/share/applications/*
 do
   ln -svf $i /usr/share/applications/
@@ -87,9 +89,14 @@ unset i</userinput></screen>
     <para>
       You can start <application>LXQt</application> from runlevel 3, using
       <xref linkend="xinit"/>, or from runlevel 5, using a Display Manager,
-      such as <xref linkend="sddm"/>.
+      such as <xref linkend="sddm"/>. The <filename>lxqt.desktop</filename>
+      file needs to be fixed, or will not be listed in <xref linkend="sddm"/>
+      and <xref linkend="lxdm"/>:
     </para>
 
+<screen role="root"><userinput>sed -e '/TryExec/d' \
+    -i /usr/share/xsessions/lxqt.desktop</userinput></screen>
+
     <para>
       To start <application>LXQt</application> using <xref linkend="xinit"/>,
       run the following commands:
diff --git a/packages.ent b/packages.ent
index 89fee6ded4..7dd0561867 100644
--- a/packages.ent
+++ b/packages.ent
@@ -500,7 +500,7 @@
 
 <!-- Chapter 26 -->
 <!ENTITY lxdm-version                 "0.5.2">
-<!ENTITY sddm-version                 "0.12.0">
+<!ENTITY sddm-version                 "0.13.0">
 
 <!-- Chapter 27 -->
 <!ENTITY fluxbox-version              "1.3.7">
diff --git a/x/dm/sddm.xml b/x/dm/sddm.xml
index 6f7c7a2b50..a73014531c 100644
--- a/x/dm/sddm.xml
+++ b/x/dm/sddm.xml
@@ -8,12 +8,12 @@
   <!ENTITY TEMPLATE-version "">
   -->
 
-  <!ENTITY sddm-download-http "https://github.com/sddm/sddm/releases/download/v0.12.0/sddm-&sddm-version;.tar.xz">
+  <!ENTITY sddm-download-http "https://github.com/sddm/sddm/releases/download/v&sddm-version;/sddm-&sddm-version;.tar.xz">
   <!ENTITY sddm-download-ftp  " ">
-  <!ENTITY sddm-md5sum        "520aab2b0ec3f9c253a7391133e2b1a9">
+  <!ENTITY sddm-md5sum        "8ef6ab36efcde075666f3758af8444ac">
   <!ENTITY sddm-size          "3.7 KB">
-  <!ENTITY sddm-buildsize     "11.4 MB">
-  <!ENTITY sddm-time          "0.7 SBU ">
+  <!ENTITY sddm-buildsize     "18 MB">
+  <!ENTITY sddm-time          "0.6 SBU ">
 ]>
 
 <sect1 id="sddm" xreflabel="sddm-&sddm-version;">