Changeset a1cfa44

Timestamp:

02/21/2018 10:36:24 AM (7 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

51d1fdbe

Parents:

a29d9e0

Message:

Fix W3m and lightdm

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19830 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/textweb/w3m.xml (modified) (4 diffs)
• x/dm/lightdm.xml (modified) (4 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "20">                   <!-- Always 2 digits -->
+<!ENTITY day          "21">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "February 20th, &year;">
+<!ENTITY releasedate  "February 21st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </listitem>
 -->
+    <listitem>
+      <para>February 21st, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Various fixes for lightdm: allow building
+          without itstool and exo, and allow a DE in /opt.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Fix building W3M with openssl-1.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>February 20th, 2018</para>

networking/textweb/w3m.xml

@@ -33 +33 @@
     also be used as a text-mode WWW browser.</para>
 
-    &lfs81_checked;
+    &lfs82_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75 +75 @@
     <para role="optional">
       <xref linkend="gpm"/>,
-      <xref linkend="openssl10"/>,
+<!--      <xref linkend="openssl10"/>,-->
       <xref linkend="imlib2"/>,
       <xref linkend="gtk2"/>,
@@ -99 +99 @@
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../w3m-&w3m-version;-bdwgc72-1.patch &amp;&amp;
-sed -i 's/file_handle/file_foo/' istream.{c,h} &amp;&amp;
+<screen><userinput>
+patch -Np1 -i ../w3m-&w3m-version;-bdwgc72-1.patch      &amp;&amp;
+sed -i 's/file_handle/file_foo/' istream.{c,h}  &amp;&amp;
 sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#' configure &amp;&amp;
-
-PKG_CONFIG_PATH="/usr/lib/openssl-1.0/pkgconfig:$PKG_CONFIG_PATH" \
-    ./configure --prefix=/usr --sysconfdir=/etc  &amp;&amp;
+sed -i '/USE_EGD/s/define/undef/' config.h.in   &amp;&amp;
+
+
+./configure --prefix=/usr --sysconfdir=/etc  &amp;&amp;
 make</userinput></screen>
 
@@ -136 +138 @@
     using <xref linkend="gtk2"/> as its image library. It has no impact if
     <xref linkend="gtk2"/> is not installed.</para>
+
+    <para>
+      <command>sed -i '/USE_EGD/s/define/undef/' config.h.in</command>: Allows
+      building against <application>openssl-1.1</application>.
+    </para>
 
     <para><parameter>--sysconfdir=/etc</parameter>: This option puts the

x/dm/lightdm.xml

@@ -44 +44 @@
     </para>
 
-    &lfs81_checked;
+    &lfs82_checked;
 
     <bridgehead renderas="sect3">Lightdm Package Information</bridgehead>
@@ -144 +144 @@
       <xref linkend="at-spi2-core"/>, 
       <xref linkend="exo"/>,
-      <xref linkend="gtk-doc"/>, 
+      <xref linkend="gtk-doc"/>,
       <xref linkend="itstool"/>,
       <xref linkend="qt5"/>,
@@ -201 +201 @@
 
 <screen role="root"><userinput>make install                                                  &amp;&amp;
-cp tests/src/lightdm-session /usr/bin                         &amp;&amp;
+sed '\@/bin/sh@a\
+\
+. /etc/profile' tests/src/lightdm-session > /usr/bin/lightdm-session &amp;&amp;
+chmod a+x /usr/bin/lightdm-session                            &amp;&amp;
 rm -rf /etc/init                                              &amp;&amp;
 install -v -dm755 -o lightdm -g lightdm /var/lib/lightdm      &amp;&amp;
@@ -236 +239 @@
     </para>
 
-<screen><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>