Changeset e7d893b for x/wm

Timestamp:

05/19/2019 04:54:33 AM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

215c728b

Parents:

853ae3e5

Message:

Merge to HEAD 21602.

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

Location:

x/wm

Files:

• fluxbox.xml (modified) (2 diffs)
• icewm.xml (modified) (4 diffs)
• openbox.xml (modified) (1 diff)

x/wm/fluxbox.xml

@@ -6 +6 @@
 
   <!ENTITY fluxbox-download-http "&sourceforge-dl;/fluxbox/fluxbox-&fluxbox-version;.tar.xz">
-  <!ENTITY fluxbox-download-ftp
-           "&jaist-ftp-repo;/f/fl/fluxbox/fluxbox/&fluxbox-version;/fluxbox-&fluxbox-version;.tar.xz">
+  <!--  <!ENTITY fluxbox-download-ftp
+  "&jaist-ftp-repo;/f/fl/fluxbox/fluxbox/&fluxbox-version;/fluxbox-&fluxbox-version;.tar.xz"> -->
+  <!-- This was reported to no longer work. After testing, I can confirm.
+  Trying to use it results in a "No such directory" error. -->
+  <!ENTITY fluxbox-download-ftp  " ">
   <!ENTITY fluxbox-md5sum        "b44afd10ee1e64624c23115aa51dcd55">
   <!ENTITY fluxbox-size          "772 KB">
@@ -147 +150 @@
 EOF</userinput></screen>
 
-      <para>If you didn't install <application>GDM</application> or
-      <application>KDM</application> in <filename class='directory'>/usr</filename>,
+      <para>If you didn't install <application>GDM</application>,
+      <application>SDDM</application>, or <application>LightDM</application>
+      in <filename class='directory'>/usr</filename>,
       then change that command to fit the prefix you chose.</para>
 

x/wm/icewm.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY icewm-download-http "https://github.com/bbidulock/icewm/releases/download/&icewm-version;/icewm-&icewm-version;.tar.bz2">
+  <!ENTITY icewm-download-http "https://github.com/ice-wm/icewm/releases/download/&icewm-version;/icewm-&icewm-version;.tar.xz">
   <!ENTITY icewm-download-ftp  " ">
-  <!ENTITY icewm-md5sum        "3e7c3a95e7f8518346267f48a11966cd">
-  <!ENTITY icewm-size          "1.7 MB">
-  <!ENTITY icewm-buildsize     "57 MB">
-  <!ENTITY icewm-time          "0.4 SBU">
+  <!ENTITY icewm-md5sum        "be2bad9780f0ce9addf9220635dfad9b">
+  <!ENTITY icewm-size          "1.6 MB">
+  <!ENTITY icewm-buildsize     "32 MB">
+  <!ENTITY icewm-time          "0.8 SBU">
 ]>
 
@@ -68 +68 @@
     <para role="optional">
       <xref linkend="fribidi"/> (for languages written right to left),
+      <xref linkend="librsvg"/>,
       <xref linkend="libsndfile"/> and
       <xref linkend="alsa-lib"/> (for the experimental icesound program)
@@ -83 +84 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr                     \
-            --sysconfdir=/etc                 \
-            --docdir=/usr/share/doc/icewm-&icewm-version; &amp;&amp;
+<screen><userinput>sed -i "s/nullptr/NULL/" src/{wmconfig.cc,icewmhint.cc} &amp;&amp;
+
+mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr         \
+      -DCMAKE_BUILD_TYPE=Release          \
+      -DCFGDIR=/etc                       \
+      -DDOCDIR=/usr/share/doc/icewm-&icewm-version; \
+      ..
 make</userinput></screen>
 
@@ -107 +115 @@
       <xref linkend="lightdm"/></phrase>.
     </para>
-
+<!--
     <para>
-      <option>--enable-guievents --with-icesound=ALSA</option>: these two switches
+      <option>- -enable-guievents - -with-icesound=ALSA</option>: these two switches
       permit <command>icesound</command> to be compiled.
     </para>
 
     <para>
-      <option>--enable-corefonts</option>: use this if you wish to able to use
+      <option>- -enable-corefonts</option>: use this if you wish to able to use
       the old X11 core fonts (instead of the fonts selected by
       <application>fontconfig</application>) in your
       <filename>preferences</filename> file.
     </para>
-
+-->
   </sect2>
 

x/wm/openbox.xml

@@ -103 +103 @@
     scripts to Python 3:</para>
 
-<screen><userinput>2to3 -w data/autostart/openbox-xdg-autostart &amp;&amp;
+<screen><userinput>2to3-&python3-majorver; -w data/autostart/openbox-xdg-autostart &amp;&amp;
 sed 's/python/python3/' -i data/autostart/openbox-xdg-autostart</userinput></screen>