Changeset 9a8e5d2

Timestamp:

12/22/2018 06:40:19 PM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

cf4e047

Parents:

65b99b9

Message:

Complete integration of elogind fd passing in xtrans/xorg-server.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/installing/x7lib.xml (modified) (2 diffs)
• x/installing/xorg-server.xml (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <listitem>
+      <para>December 22nd, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Complete integration of elogind fd passing in
+          xtrans/xorg-server.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 21st, 2018</para>
       <itemizedlist>

x/installing/x7lib.xml

@@ -146 +146 @@
       <listitem>
         <para>Estimated build time: &x7libs-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact" revision="sysv">
+      <listitem>
+        <para>
+          Optional patch:
+          <ulink url="&patch-root;/xtrans-&xtrans-version;-elogind-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -249 +259 @@
     commands:</para>
 
-<screen><userinput>for package in $(grep -v '^#' ../lib-&xorg-version;.md5 | awk '{print $2}')
+<screen revision="sysv"><userinput>for package in $(grep -v '^#' ../lib-&xorg-version;.md5 | awk '{print $2}')
+do
+  packagedir=${package%.tar.bz2}
+  tar -xf $package
+  pushd $packagedir
+  case $packagedir in
+    libICE* )
+      ./configure $XORG_CONFIG ICE_LIBS=-lpthread
+    ;;
+
+    libXfont2-[0-9]* )
+      ./configure $XORG_CONFIG --disable-devel-docs
+    ;;
+
+    libXt-[0-9]* )
+      ./configure $XORG_CONFIG \
+                  --with-appdefaultdir=/etc/X11/app-defaults
+    ;;
+
+    xtrans*)
+      patch -Np1 -i ../xtrans-&xtrans-version;-elogind-1.patch
+      ./configure $XORG_CONFIG
+    ;;
+
+    * )
+      ./configure $XORG_CONFIG
+    ;;
+  esac
+  make
+  #make check 2>&amp;1 | tee ../$packagedir-make_check.log
+  as_root make install
+  popd
+  rm -rf $packagedir
+  as_root /sbin/ldconfig
+done</userinput></screen>
+
+<screen revision="systemd"><userinput>for package in $(grep -v '^#' ../lib-&xorg-version;.md5 | awk '{print $2}')
 do
   packagedir=${package%.tar.bz2}

x/installing/xorg-server.xml

@@ -146 +146 @@
     </para>
 
-<screen revision="sysv"><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-elogind-2.patch &amp;&amp;
+<screen revision="sysv"><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-elogind-3.patch &amp;&amp;
 autoreconf -fi</userinput></screen>