Changeset 0f43c3a

Timestamp:

08/09/2014 10:27:26 AM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485

Children:

9b8c8705

Parents:

c5e29f4

Message:

Merge trunk, minor text correction on nautilus update.

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

Files:

• general.ent (modified) (2 diffs)
• general/genlib/libsigc++.xml (modified) (2 diffs)
• gnome-systemd/desktop/nautilus.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• postlfs/security/openssl.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "08">                   <!-- Always 2 digits -->
+<!ENTITY day          "09">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 8th, &year;">
+<!ENTITY releasedate  "August 9th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">              <!-- svn|[release #] -->

general/genlib/libsigc++.xml

@@ -84 +84 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>sed -i '/type_traits.h/i\#include &lt;sigc++/visit_each.h&gt;' \
+ sigc++/macros/limit_reference.h.m4 &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -96 +98 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i '/type_traits.h/i\#include &lt;sigc++/visit_each.h&gt;' 
+      sigc++/macros/limit_reference.h.m4</command>: This sed fixes a bug
+      which prevents <application>inkscape</application> compiling.
+    </para>
 
   </sect2>

gnome-systemd/desktop/nautilus.xml

@@ -141 +141 @@
     <para>
       <parameter>--disable-tracker</parameter>: This switch disables
-      use of <application>Tracker</application> remove it if you have
-      installed the optional <application><xref linkend="tracker"/></application>
-      application.
+      use of <application>Tracker</application>. Remove it if you have
+      installed <xref linkend="tracker"/>.
     </para>
 

introduction/welcome/changelog.xml

@@ -44 +44 @@
 
 -->
+
+    <listitem>
+      <para>August 9th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[igor] - Update to openssl-1.0.1i. Fixes
+          <ulink url="&blfs-ticket-root;5340">#5340</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>August 8th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Apply upstream fix to libsigc++-2.3.2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

packages.ent

@@ -27 +27 @@
 <!ENTITY nss-version                  "3.&nss-minor-version;.&nss-micro-version;">
 <!ENTITY openssh-version              "6.6p1">
-<!ENTITY openssl-version              "1.0.1h">
+<!ENTITY openssl-version              "1.0.1i">
 <!ENTITY p11-kit-version              "0.20.3">    <!-- Even minors only -->
 <!ENTITY polkit-version               "0.112">

postlfs/security/openssl.xml

@@ -9 +9 @@
   <!ENTITY openssl-download-ftp
            "ftp://ftp.openssl.org/source/openssl-&openssl-version;.tar.gz">
-  <!ENTITY openssl-md5sum        "8d6d684a9430d5cc98a62a5d8fbda8cf">
-  <!ENTITY openssl-size          "4.3 MB">
-  <!ENTITY openssl-buildsize     "51 MB (additional 1 MB for the tests)">
-  <!ENTITY openssl-time          "1.0 SBU (additional 0.4 SBU for the tests)">
+  <!ENTITY openssl-md5sum        "c8dc151a671b9b92ff3e4c118b174972">
+  <!ENTITY openssl-size          "4.2 MB">
+  <!ENTITY openssl-buildsize     "55 MB (additional 1 MB for the tests)">
+  <!ENTITY openssl-time          "1.1 SBU (additional 0.4 SBU for the tests)">
 ]>