Changeset 71952e0

Timestamp:

08/07/2014 03:26:59 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

f921a51

Parents:

58fb69a

Message:

Merged trunk.

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

Files:

• book/organization.xml (modified) (1 diff)
• general.ent (modified) (1 diff)
• general/prog/gcc.xml (modified) (1 diff)
• gnome-systemd/applications/gnome-screenshot.xml (modified) (2 diffs)
• gnome/applications/gnome-screenshot.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/audioutils/lame.xml (modified) (1 diff)
• multimedia/libdriv/gst-plugins-base-systemd.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• postlfs/filesystems/mdadm.xml (modified) (1 diff)
• postlfs/virtualization/qemu-systemd.xml (modified) (2 diffs)
• server/mail/exim-systemd.xml (modified) (4 diffs)
• x/installing/x7app.xml (modified) (1 diff)
• x/installing/x7driver-wacom.xml (modified) (1 diff)
• x/lib/fltk.xml (modified) (2 diffs)
• xsoft/office/libreoffice.xml (modified) (2 diffs)

book/organization.xml

@@ -67 +67 @@
   <bridgehead renderas="sect2">Part IX - Xfce</bridgehead>
 
-  <para><application>Xfce</application> is an lightweight alternative to
+  <para><application>Xfce</application> is a lightweight alternative to
   <application>GNOME</application> and <application>KDE</application>.
   </para>

general.ent

@@ -136 +136 @@
                                can be installed on the same system.</para></note>">
 
+
+<!-- Problem with some packages introduced by a given dependency version -->
+<!ENTITY gcc-490                        "gcc-4.9.0">
+
+
+
 <!ENTITY % package-entities SYSTEM      "packages.ent">
 %package-entities;

general/prog/gcc.xml

@@ -127 +127 @@
     bootstrap anyways, add <parameter>--disable-bootstrap</parameter> to the
     <command>./configure</command> options below.</para>
+
+    <para>As in LFS, fix a problem identified upstream:</para>
+
+<screen><userinput>sed -i 's/if \((code.*))\)/if (\1 \&amp;\&amp; \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen>
 
     <para>Install <application>GCC</application> by running the

gnome-systemd/applications/gnome-screenshot.xml

@@ -33 +33 @@
 
     <para>
-      The <application>GNOME Screenshot</application> is an utility used
-      for taking screenshots of the entire screen, a window or an user-
+      The <application>GNOME Screenshot</application> is a utility used
+      for taking screenshots of the entire screen, a window or a user-
       defined area of the screen, with optional beautifying border effects.
     </para>
@@ -139 +139 @@
         <listitem>
           <para>
-            is used to capture the screen, a window, or an user-defined
+            is used to capture the screen, a window, or a user-defined
             area and save the snapshot image to a file.
           </para>

gnome/applications/gnome-screenshot.xml

@@ -33 +33 @@
 
     <para>
-      The <application>GNOME Screenshot</application> is an utility used
-      for taking screenshots of the entire screen, a window or an user-
+      The <application>GNOME Screenshot</application> is a utility used
+      for taking screenshots of the entire screen, a window or a user-
       defined area of the screen, with optional beautifying border effects.
     </para>
@@ -139 +139 @@
         <listitem>
           <para>
-            is used to capture the screen, a window, or an user-defined
+            is used to capture the screen, a window, or a user-defined
             area and save the snapshot image to a file.
           </para>

introduction/welcome/changelog.xml

@@ -46 +46 @@
 
     <listitem>
+      <para>August 7th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[igor] - Update to qemu-2.1.0. Fixes
+          <ulink url="&blfs-ticket-root;5318">#5318</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 6th, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Create a standard for packages with problems
+          introduced by gcc-4.9.0. Modified: mdadm-3.3.1,
+          gst-plugins-base-0.10.36, LAME-3.99.5 and LibreOffice-4.2.5.
+          Thanks Christopher G., from systemd branch, for pointing that out,
+          and Akhiezer and Armin K. for discussions.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Exim-4.83: fix exim daemon version in
+          'Short Descriptions'. Thanks Denis M.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - GCC-4.9.1: as in LFS, use sed to fix a problem
+          identified upstream.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - FLTK-1.3.2: fix output of fltk-config --version.
+          Thanks Jeremy H.</para>
+        </listitem>
         <listitem>
           <para>[igor] - Update to libxcb-1.11. Fixes

multimedia/audioutils/lame.xml

@@ -91 +91 @@
 
     <para>
-      First, if you are using i686 and gcc-4.9.0, fix a compile problem:
+      First, if you are using i686, fix a compile problem inroduced by
+      <application>&gcc-490;</application>:
     </para>
 

multimedia/libdriv/gst-plugins-base-systemd.xml

@@ -146 +146 @@
 
     <para>
-      First, if you are using i686 and gcc-4.9.0, fix a compile problem:
+      First, if you are using i686, fix a compile problem inroduced by
+      <application>&gcc-490;</application>:
     </para>
 

packages.ent

@@ -62 +62 @@
 
 <!-- Chapter 8 Virtualization -->
-<!ENTITY qemu-version                 "2.0.0">
+<!ENTITY qemu-version                 "2.1.0">
 
 <!-- Part III -->

postlfs/filesystems/mdadm.xml

@@ -90 +90 @@
 
     <para>
-      First, fix a problem with gcc-4.9.0:
+      First, fix a problem inroduced by <application>&gcc-490;</application>:
     </para>
 

postlfs/virtualization/qemu-systemd.xml

@@ -7 +7 @@
   <!ENTITY qemu-download-http "http://wiki.qemu.org/download/qemu-&qemu-version;.tar.bz2">
   <!ENTITY qemu-download-ftp  " ">
-  <!ENTITY qemu-md5sum        "2790f44fd76da5de5024b4aafeb594c2">
-  <!ENTITY qemu-size          "12.3 MB">
-  <!ENTITY qemu-buildsize     "205 MB">
-  <!ENTITY qemu-time          "1.8 SBU">
+  <!ENTITY qemu-md5sum        "6726977292b448cbc7f89998fac6983b">
+  <!ENTITY qemu-size          "23 MB">
+  <!ENTITY qemu-buildsize     "287 MB">
+  <!ENTITY qemu-time          "1.4 SBU">
 ]>
 
@@ -63 +63 @@
     <para role="required">
       <xref linkend="glib2"/>,
-      <xref linkend="python2"/>,
-      <xref linkend="sdl"/>, and
+      <xref linkend="python2"/>, and
       <xref linkend="x-window-system"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="sdl"/>
     </para>
 

server/mail/exim-systemd.xml

@@ -11 +11 @@
   <!ENTITY exim-buildsize       "17 MB">
   <!ENTITY exim-time            "0.2 SBU">
+
+
+
+  <!ENTITY exim-daemon-version  "&exim-version;-3">
 ]>
 
@@ -309 +313 @@
 
       <seglistitem>
-        <seg>exicyclog, exigrep, exim, exim-4.83-3, exim_checkaccess,
+        <seg>exicyclog, exigrep, exim, exim-&exim-daemon-version;, exim_checkaccess,
         exim_dbmbuild, exim_dumpdb, exim_fixdb, exim_lock, exim_tidydb,
         eximstats, exinext, exipick, exiqgrep, exiqsumm, exiwhat, and
@@ -346 +350 @@
         <term><command>exim</command></term>
         <listitem>
-          <para>is a symlink to the <command>exim-4.82_1-5b7a7c0-XX-3</command>
+          <para>is a symlink to the <command>exim-&exim-daemon-version;</command>
           MTA daemon.</para>
           <indexterm zone="exim exim-prog">
@@ -354 +358 @@
       </varlistentry>
 
-      <varlistentry id="exim-4.82_1-5b7a7c0-XX-3">
-        <term><command>exim-4.82_1-5b7a7c0-XX-3</command></term>
+      <varlistentry id="exim-current_version">
+        <term><command>exim-&exim-daemon-version;</command></term>
         <listitem>
           <para>is the <application>Exim</application> mail transport
           agent daemon.</para>
-          <indexterm zone="exim exim-4.82_1-5b7a7c0-XX-3">
-            <primary sortas="b-exim-4.82_1-5b7a7c0-XX-3">exim-4.82_1-5b7a7c0-XX-3</primary>
+          <indexterm zone="exim exim-current_version">
+            <primary sortas="b-exim-&exim-daemon-version;">exim-&exim-daemon-version;</primary>
           </indexterm>
         </listitem>

x/installing/x7app.xml

@@ -520 +520 @@
         <term><command>xinput</command></term>
         <listitem>
-          <para>is an utility to configure and test X input devices.</para>
+          <para>is a utility to configure and test X input devices.</para>
           <indexterm zone="xorg7-app xinput-x7">
             <primary sortas="b-xinput">xinput</primary>

x/installing/x7driver-wacom.xml

@@ -155 +155 @@
           <listitem>
             <para>
-              is an commandline utility used to query
+              is a commandline utility used to query
               and modify wacom driver settings.
             </para>

x/lib/fltk.xml

@@ -132 +132 @@
 <screen><userinput>patch -Np1 -i ../fltk-&fltk-version;-tigervnc-1.patch     &amp;&amp;
 patch -Np1 -i ../fltk-&fltk-version;-dynamic_libs-1.patch &amp;&amp;
+sed -i -e '/FL_PATCH_VERSION=/ s/1/2/' configure &amp;&amp;
 sed -i -e '/cat./d' documentation/Makefile       &amp;&amp;
 
@@ -175 +176 @@
       <command>patch ...dynamic_libs-1.patch</command>: Allow building
       dynamic libraries.
+    </para>
+
+    <para>
+      <command>sed ... configure</command>: configure: Fix output of
+      <command>fltk-config --version</command>.
     </para>
 

xsoft/office/libreoffice.xml

@@ -130 +130 @@
       <listitem>
         <para>
-          Required patch for i686 systems with
-          <application>gcc-4.9.0</application>:
+          Required patch for i686 systems, in order to fix a problem inroduced
+          by <application>&gcc-490;</application>:
           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-gcc_4_9_0-1.patch"/>
         </para>
@@ -324 +324 @@
 
     <para>
-     For i686 systems with <application>gcc-4.9.0</application>,
-     apply the patch:
+     For i686 systems, fix a problem inroduced by
+     <application>&gcc-490;</application>:
     </para>