From 2b9f9dc9c1f052908b954f6f436a273e997555a6 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 16 Nov 2014 16:41:31 +0000
Subject: [PATCH] Modify a boost header to fix a problem with Qt's moc command

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14920 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 general/genlib/boost.xml           | 12 +++++++++++-
 introduction/welcome/changelog.xml | 10 ++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/general.ent b/general.ent
index 256045e763..df984d28db 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "16">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "November 15th, &year;">
+<!ENTITY releasedate  "November 16th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/general/genlib/boost.xml b/general/genlib/boost.xml
index 3ef1785583..ec96c59e36 100644
--- a/general/genlib/boost.xml
+++ b/general/genlib/boost.xml
@@ -93,7 +93,11 @@
       commands:
     </para>
 
-<screen><userinput>./bootstrap.sh --prefix=/usr &amp;&amp;
+<screen><userinput>sed -e '1 i#ifndef Q_MOC_RUN' \
+    -e '$ a#endif'            \
+    -i boost/type_traits/detail/has_binary_operator.hpp &amp;&amp;
+
+./bootstrap.sh --prefix=/usr &amp;&amp;
 ./b2 stage threading=multi link=shared</userinput></screen>
 
     <para>
@@ -113,6 +117,12 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <command>sed ... has_binary_operator.hpp</command>: This command
+      fixes a header to overcome a problem with Qt's moc command.  It
+      is necessary for building some KDE packages.
+    </para>
+
     <para>
       <parameter>threading=multi</parameter>: This parameter ensures that
       <application>Boost</application> is built with multithreading support.
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index c73267b5c8..9348d758cc 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
 
 -->
 
+    <listitem>
+      <para>November 16th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Modify a boost header to fix a problem
+          with Qt's moc command.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>November 15th, 2014</para>
       <itemizedlist>