Changeset 1e50cf5

Timestamp:

07/28/2014 04:38:30 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

b506f26

Parents:

8faf5cc

Message:

Merge trunk.

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

Files:

• gnome/applications/gucharmap.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netlibs/libpcap.xml (modified) (2 diffs)
• networking/netprogs/nfs-utils-systemd.xml (modified) (2 diffs)
• packages.ent (modified) (2 diffs)
• pst/printing/cups-filters-systemd.xml (modified) (3 diffs)
• server/databases/postgresql-systemd.xml (modified) (1 diff)
• x/installing/xterm.xml (modified) (1 diff)

gnome/applications/gucharmap.xml

@@ -110 +110 @@
     </para>
 
-<screen><userinput>./configure -prefix=/usr --enable-vala &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --enable-vala &amp;&amp;
 make</userinput></screen>
 

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <para>July 28th, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch nfs-utils-1.3.0 to avoid segfault with
+          gcc-4.9.1 reported by The Lightning Stalker.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to cups-filters-1.0.55. Fixes
+          <ulink url="&blfs-ticket-root;5305">#5305</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to xterm-310. Fixes
+          <ulink url="&blfs-ticket-root;5303">#5303</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - libpcap-1.6.1 doesn't build with bluez-5.21.
+          Thanks Wayne B. Fixes
+          <ulink url="&blfs-ticket-root;5302">#5302</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[igor] - Update to libdrm-2.4.55. Fixes

networking/netlibs/libpcap.xml

@@ -97 +97 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --enable-bluetooth=no &amp;&amp;
 make</userinput></screen>
 
@@ -115 +115 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--enable-bluetooth=no</parameter>: Currently, <application>libpcap-1.6.1</application> doesn't build with  <application>bluez-5.21</application>.</para>
 
   </sect2>

networking/netprogs/nfs-utils-systemd.xml

@@ -56 +56 @@
       <listitem>
         <para>Estimated build time: &nfs-utils-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Download</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/nfs-utils-&nfs-utils-version;-gcc_4_9-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -138 +148 @@
     the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr          \
+<screen><userinput>patch -Np1 -i ../nfs-utils-&nfs-utils-version;-gcc_4_9-1.patch &amp;&amp;
+./configure --prefix=/usr          \
             --sysconfdir=/etc      \
             --without-tcp-wrappers \

packages.ent

@@ -412 +412 @@
 <!ENTITY xorg-server-version          "1.16.0">
 <!ENTITY twm-version                  "1.0.8">
-<!ENTITY xterm-version                "309">
+<!ENTITY xterm-version                "310">
 <!ENTITY xclock-version               "1.0.7">
 <!ENTITY xinit-version                "1.3.3">
@@ -674 +674 @@
 <!-- Chapter 42 -->
 <!ENTITY cups-version                 "1.7.4">
-<!ENTITY cups-filters-version         "1.0.54">
+<!ENTITY cups-filters-version         "1.0.55">
 <!ENTITY gs-version                   "9.14">
 <!ENTITY gutenprint-version           "5.2.10">

pst/printing/cups-filters-systemd.xml

@@ -8 +8 @@
   "http://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz">
   <!ENTITY cups-filters-download-ftp  " ">
-  <!ENTITY cups-filters-md5sum        "181ee0e6c27cfbb05e241f0267363678">
+  <!ENTITY cups-filters-md5sum        "088615a412f23a6237259179a6ab9f10">
   <!ENTITY cups-filters-size          "1.3 MB">
-  <!ENTITY cups-filters-buildsize     "32 MB (additional 2 MB for the tests)">
+  <!ENTITY cups-filters-buildsize     "32 MB (additional 3 MB for the tests)">
   <!ENTITY cups-filters-time          "0.4 SBU">
 ]>
@@ -70 +70 @@
         <para>
           Estimated build time: &cups-filters-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Download</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cups-filters-&cups-filters-version;-pdftoraster-1.patch"/>
         </para>
       </listitem>
@@ -130 +120 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../cups-filters-&cups-filters-version;-pdftoraster-1.patch &amp;&amp;
-./configure --prefix=/usr                               \
+<screen><userinput>./configure --prefix=/usr                               \
             --sysconfdir=/etc                           \
             --localstatedir=/var                        \

server/databases/postgresql-systemd.xml

@@ -176 +176 @@
 
     <para>
-      <command>sed -i ...</command>: These seds change server socket location
+      <command>sed -i ...</command>: This sed changes server socket location
       from <filename class="directory">/tmp</filename> to
       <filename class="directory">/run/postgresql</filename><!-- and fix up the

x/installing/xterm.xml

@@ -7 +7 @@
   <!ENTITY xterm-download-http " ">
   <!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">
-  <!ENTITY xterm-md5sum        "6d494f7a31ce579aac0e7b71e8b7d68f">
+  <!ENTITY xterm-md5sum        "6bada32548b66a805e9c4475a6736b43">
   <!ENTITY xterm-size          "1.2 MB">
   <!ENTITY xterm-buildsize     "12 MB">