Changeset 0a8734a

Timestamp:

06/19/2016 07:52:06 PM (8 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 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:

b3a1c8da

Parents:

b29c7705

Message:

Fix cdrdao for gcc-6.1 and remove remaining references to gcdmaster.

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/cdwriteutils/cdrdao.xml (modified) (7 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "17">                   <!-- Always 2 digits -->
+<!ENTITY day          "19">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 17th &year;">
+<!ENTITY releasedate  "June 19th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -44 +44 @@
 
 -->
+    <listitem>
+      <para>June 19th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix cdrdao for gcc-6.1. Fixes
+          <ulink url="&blfs-ticket-root;7967">#7967</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>June 17th, 2016</para>

multimedia/cdwriteutils/cdrdao.xml

@@ -9 +9 @@
   <!ENTITY cdrdao-md5sum        "8d15ba6280bb7ba2f4d6be31d28b3c0c">
   <!ENTITY cdrdao-size          "1.4 MB">
-  <!ENTITY cdrdao-buildsize     "64 MB">
-  <!ENTITY cdrdao-time          "1.3 SBU (includes building <command>gcdmaster</command>)">
+  <!ENTITY cdrdao-buildsize     "51 MB">
+  <!ENTITY cdrdao-time          "0.3 SBU">
 ]>
 
@@ -34 +34 @@
     CD in disk-at-once mode.</para>
 
-  &lfs79_checked;
+  &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -67 +67 @@
       <xref linkend="lame"/> (required to build <command>toc2mp3</command>)
     </para>
-<!--
-    <bridgehead renderas="sect4">Optional (Required to Build the
-    <command>gcdmaster</command> Program)</bridgehead>
-
-    <para>Note that the following packages must be built in
-    the order listed. Use the current <quote>stable</quote> version of
-    each package.</para>
-
-    <para role="optional">
-      <xref linkend="libsigc"/>,
-      <xref linkend="glibmm"/>,
-      <xref linkend="gtkmm2"/>,
-      <ulink url="http://www.gtkmm.org/">libglademm</ulink>,
-      <ulink url="http://www.gtkmm.org/">libgnomecanvasmm</ulink>,
-      <ulink url="http://www.gtkmm.org/">gconfmm</ulink>,
-      <ulink url="http://www.gtkmm.org/">gnome-vfsmm</ulink>,
-      <ulink url="http://www.gtkmm.org/">libgnomemm</ulink>, and
-      <ulink url="http://www.gtkmm.org/">libgnomeuimm</ulink>
-    </para>
-
-    <para>There are two additional optional dependencies that can be used by
-    the <application>Cdrdao</application> build:
-    <ulink url="http://cdrecord.berlios.de/private/cdrecord.html">Cdrtools</ulink>
-    and <ulink url="http://www.polhode.com/pccts133mr.html">PCCTS</ulink>.
-    The pieces of these two packages required to build
-    <application>Cdrdao</application> are also included in the source tree
-    and are used by default.</para>-->
 
     <para condition="html" role="usernotes">User Notes:
@@ -106 +79 @@
     commands:</para>
 
-<screen><userinput>sed -i '/ioctl/a #include &lt;sys/stat.h&gt;' dao/ScsiIf-linux.cc &amp;&amp;
+<screen><userinput>sed -i '/ioctl/a #include &lt;sys/stat.h&gt;' dao/ScsiIf-linux.cc    &amp;&amp;
+sed -i 's/\(char .*REMOTE\)/unsigned \1/' dao/CdrDriver.{cc,h} &amp;&amp;
 
 ./configure --prefix=/usr --mandir=/usr/share/man &amp;&amp;
@@ -130 +104 @@
 
     <para>
+      <command>sed -i 's/\(char .*REMOTE\)/unsigned \1/' ...</command>: This
+      sed stops <application>gcc-6.1</application> failing to build because
+      c++ now treats narrowing from 'int' to 'char' as an error.
+    </para>
+
+    <para>
       <command>--mandir=/usr/share/man</command>: Install manual pages in
       /usr/share/man instead of /usr/man.
@@ -145 +125 @@
 
       <seglistitem>
-        <seg>cdrdao, cue2toc, toc2cddb, toc2cue and optionally, gcdmaster and
+        <seg>cdrdao, cue2toc, toc2cddb, toc2cue and optionally
         toc2mp3</seg>
         <seg>None</seg>
-        <seg>/usr/share/cdrdao, /usr/share/doc/cdrdao-&cdrdao-version;
-        and /usr/share/gcdmaster</seg>
+        <seg>/usr/share/cdrdao, /usr/share/doc/cdrdao-&cdrdao-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -175 +154 @@
           <indexterm zone="cdrdao cue2toc">
             <primary sortas="b-cue2toc">cue2toc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcdmaster">
-        <term><command>gcdmaster</command></term>
-        <listitem>
-          <para>is a graphical front end to <command>cdrdao</command> for
-          composing audio CDs.</para>
-          <indexterm zone="cdrdao gcdmaster">
-            <primary sortas="b-gcdmaster">gcdmaster</primary>
           </indexterm>
         </listitem>