Changeset f9c1214

Timestamp:

01/10/2015 02:50:59 PM (9 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

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

Children:

07357c23

Parents:

95d46499

Message:

Update to fluxbox-1.3.6.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• x/wm/fluxbox.xml (modified) (3 diffs)

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Update to fluxbox-1.3.6. Fixes
+          <ulink url="&blfs-ticket-root;6009">#6009</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Update to xf86-input-wacom-0.28.0. Fixes
           <ulink url="&blfs-ticket-root;6008">#6008</ulink>.</para>

packages.ent

@@ -485 +485 @@
 
 <!-- Chapter 26 -->
-<!ENTITY fluxbox-version              "1.3.5">
+<!ENTITY fluxbox-version              "1.3.6">
 <!ENTITY icewm-version                "1.3.8">
 <!ENTITY openbox-version              "3.5.2">

x/wm/fluxbox.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY fluxbox-download-http "&sourceforge-repo;/fluxbox/fluxbox-&fluxbox-version;.tar.bz2">
+  <!ENTITY fluxbox-download-http "&sourceforge-repo;/fluxbox/fluxbox-&fluxbox-version;.tar.xz">
   <!ENTITY fluxbox-download-ftp
-           "&jaist-ftp-repo;/f/fl/fluxbox/fluxbox/&fluxbox-version;/fluxbox-&fluxbox-version;.tar.bz2">
-  <!ENTITY fluxbox-md5sum        "9d9e183424a0934e20417ff20775a570">
-  <!ENTITY fluxbox-size          "787 KB">
-  <!ENTITY fluxbox-buildsize     "150 MB">
+           "&jaist-ftp-repo;/f/fl/fluxbox/fluxbox/&fluxbox-version;/fluxbox-&fluxbox-version;.tar.xz">
+  <!ENTITY fluxbox-md5sum        "23e7b89217437600d580f4b8ccf78476">
+  <!ENTITY fluxbox-size          "776 KB">
+  <!ENTITY fluxbox-buildsize     "101 MB">
   <!ENTITY fluxbox-time          "0.9 SBU">
 ]>
@@ -157 +157 @@
 cp -v /usr/share/fluxbox/keys ~/.fluxbox/keys</userinput></screen>
 
-      <para>To generate the application menu:</para>
+      <para>To generate the application menu, first you may wish to run
+      <command>fluxbox-generate_menu -h</command>, in order to choose any
+      <replaceable>&lt;user_options&gt;</replaceable>, then issue:</para>
 
 <screen><userinput>cd ~/.fluxbox &amp;&amp;
-fluxbox-generate_menu</userinput></screen>
+fluxbox-generate_menu <replaceable>&lt;user_options&gt;</replaceable></userinput></screen>
 
       <para>Alternately, copy a pregenerated menu:</para>
@@ -171 +173 @@
       <para>If you want to use an image as your desktop background, copy the
       theme you like into <filename class='directory'>~/.fluxbox</filename>.
-      Then add a line to make it use the correct image. In the following command,
-      change <replaceable>&lt;theme&gt;</replaceable> for the name of the theme you
-      want and change <replaceable>&lt;/path/to/nice/image.xpm&gt;</replaceable> to
-      point to the actual image you want to use.</para>
+      Then add a line to make it use the correct image. In the following
+      command, change <replaceable>&lt;theme&gt;</replaceable> for the name of
+      the theme you want and change
+      <replaceable>&lt;/path/to/nice/image.ext&gt;</replaceable> to point to
+      the actual image you want to use, where <replaceable>ext</replaceable>
+      must be <quote>xpm</quote>, if <xref linkend="imlib2"/> is not installed
+      to allow other image formats.</para>
 
 <screen><userinput>cp /usr/share/fluxbox/styles/&lt;theme&gt; ~/.fluxbox/theme &amp;&amp;
+
 sed -i 's,\(session.styleFile:\).*,\1 ~/.fluxbox/theme,' ~/.fluxbox/init &amp;&amp;
-echo "background.pixmap: &lt;/path/to/nice/image.xpm&gt;" &gt;&gt; ~/.fluxbox/theme</userinput></screen>
+
+[ -f ~/.fluxbox/theme ] &amp;&amp;
+echo "background.pixmap: &lt;/path/to/nice/image.ext&gt;" >> ~/.fluxbox/theme ||
+[ -d ~/.fluxbox/theme ] &amp;&amp;
+echo "background.pixmap: &lt;/path/to/nice/image.ext&gt;" >> ~/.fluxbox/theme/theme.cfg</userinput></screen>
 
       <para>In some locales the font specified in the theme may not contain the