Changeset 1c1e722d

Timestamp:

10/31/2014 01:10:43 AM (9 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

systemd-13485

Children:

190f72f

Parents:

3d07659

Message:

Manually merge lxde-common update from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14814 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• lxde/desktop/lxde-common-systemd.xml (modified) (3 diffs)
• packages.ent (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -90 +90 @@
           <para>[fernando] - Update to newt-0.52.18.  Fixes
           <ulink url="&blfs-ticket-root;5730">#5730</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to lxde-common-0.99.0.  Fixes
+          <ulink url="&blfs-ticket-root;5738">#5738</ulink>.</para>
         </listitem>
       </itemizedlist>

lxde/desktop/lxde-common-systemd.xml

@@ -7 +7 @@
   <!ENTITY lxde-common-download-http "&sourceforge-repo;/lxde/lxde-common-&lxde-common-version;.tar.gz">
   <!ENTITY lxde-common-download-ftp  " ">
-  <!ENTITY lxde-common-md5sum        "259b4a2db50117e632e34912251cfcb9">
-  <!ENTITY lxde-common-size          "824 KB">
-  <!ENTITY lxde-common-buildsize     "1.3 MB">
+  <!ENTITY lxde-common-md5sum        "5a417f5a0e5b510a0c018b66b0dc4081">
+  <!ENTITY lxde-common-size          "868 KB">
+  <!ENTITY lxde-common-buildsize     "2.8 MB">
   <!ENTITY lxde-common-time          "less than 0.1 SBU">
 ]>
@@ -114 +114 @@
     </para>
 
-<screen><userinput>sed -e "s:@prefix@/share/lxde/pcmanfm:@sysconfdir@/xdg/pcmanfm/LXDE:" \
-    -i startlxde.in &amp;&amp;
-./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make</userinput></screen>
 
@@ -127 +125 @@
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-ln -svfn profile/LXDE /etc/xdg/lxpanel/LXDE &amp;&amp;
-install -Dm644 lxde-logout.desktop /usr/share/applications/lxde-logout.desktop</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
     <para>

packages.ent

@@ -562 +562 @@
 <!ENTITY lxpolkit-version             "0.1.0">
 <!ENTITY lxsession-version            "0.5.0">
-<!ENTITY lxde-common-version          "0.5.6">
+<!ENTITY lxde-common-version          "0.99.0">
 
 <!-- Chapter 35 -->