r3332 - in trunk: BOOK BOOK/introduction/welcome BOOK/multimedia/cdwriteutils patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Mon Jan 24 20:39:16 PST 2005


Author: randy
Date: 2005-01-24 21:39:14 -0700 (Mon, 24 Jan 2005)
New Revision: 3332

Added:
   trunk/patches/cdrdao-1.1.9-gcc34-1.patch
   trunk/patches/libglademm-2.2.0-gcc34-1.patch
   trunk/patches/libgnomecanvasmm-2.0.2-gcc34-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml
Log:
Modified dependency list and added patches to Cdrdao so that the gcdmaster program will build

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-01-24 05:19:18 UTC (rev 3331)
+++ trunk/BOOK/general.ent	2005-01-25 04:39:14 UTC (rev 3332)
@@ -1,4 +1,4 @@
-<!ENTITY day          "24">
+<!ENTITY day          "25">
 <!ENTITY month        "01">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-01-24 05:19:18 UTC (rev 3331)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-01-25 04:39:14 UTC (rev 3332)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>January 25th, 2005 [randy]: Modified dependency list and added 
+patches to Cdrdao so that the gcdmaster program will build.</para></listitem>
+
 <listitem><para>January 24th, 2005 [randy]: Updated to 
 HTML Tidy-050120.</para></listitem>
 

Modified: trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml	2005-01-24 05:19:18 UTC (rev 3331)
+++ trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml	2005-01-25 04:39:14 UTC (rev 3332)
@@ -2,21 +2,23 @@
    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
- 
+
   <!ENTITY cdrdao-download-http "http://prdownloads.sourceforge.net/cdrdao/cdrdao-&cdrdao-version;.tar.gz">
   <!ENTITY cdrdao-download-ftp  " ">
   <!ENTITY cdrdao-size          "1.6 MB">
-  <!ENTITY cdrdao-buildsize     "46 MB">
-  <!ENTITY cdrdao-time          "0.68 SBU">
+  <!ENTITY cdrdao-buildsize     "54 MB">
+  <!ENTITY cdrdao-time          "1.47 SBU (includes building <command>gcdmaster</command>)">
 ]>
 
-<sect1 id="cdrdao" xreflabel="Cdrdao-&cdrdao-version;">
+<sect1 id="cdrdao-package" xreflabel="Cdrdao-&cdrdao-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="cdrdao.html"?>
 <title>Cdrdao-&cdrdao-version;</title>
+<indexterm zone="cdrdao-package">
+<primary sortas="a-Cdrdao">Cdrdao</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>Cdrdao</application></title>
@@ -38,15 +40,42 @@
 &cdrdao-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch (if building <command>gcdmaster</command>): 
+<ulink url="&patch-root;/cdrdao-&cdrdao-version;-gcc34-1.patch"/></para>
+</listitem>
+<listitem><para>Required patch (if building <command>gcdmaster</command>): 
+<ulink url="&patch-root;/libglademm-2.2.0-gcc34-1.patch"/></para>
+</listitem>
+<listitem><para>Required patch (if building <command>gcdmaster</command>): 
+<ulink url="&patch-root;/libgnomecanvasmm-2.0.2-gcc34-1.patch"/></para>
+</listitem>
+</itemizedlist>
+</sect3>
+
 <sect3><title><application>Cdrdao</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="lame-package"/>,
-<xref linkend="pkgconfig"/>,
-<ulink url="http://www.gtkmm.org/">gtkmm-1.2.8</ulink> 
-(requires <xref linkend="GTK"/> and libsig++-1.0.4) and
-<ulink url="http://www.gtkmm.org/">gnomemm-1.2.4</ulink> 
-(requires <xref linkend="gnome-libs"/>)</para>
+<para><xref linkend="lame-package"/> (required to build 
+<command>toc2mp3</command>) and 
+<ulink url="http://www.polhode.com/pccts.html">PCCTS</ulink></para>
 </sect4>
+
+<sect4><title>Optional (required to build the <command>gcdmaster</command> 
+program)</title>
+<para><emphasis>Note: all the following packages must be built in 
+the order listed.</emphasis></para>
+
+<para><xref linkend="libgnomeui"/>, 
+<ulink url="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/">
+libsigc++-1.2.5</ulink>, 
+<ulink url="http://www.gtkmm.org/">gtkmm-2.2.12</ulink>, 
+<ulink url="http://www.gtkmm.org/">libglademm-2.2.0</ulink>, 
+<ulink url="http://www.gtkmm.org/">libgnomecanvasmm-2.0.2</ulink>, 
+<ulink url="http://www.gtkmm.org/">gconfmm-2.0.2</ulink>, 
+<ulink url="http://www.gtkmm.org/">libgnomemm-2.0.1</ulink> and 
+<ulink url="http://www.gtkmm.org/">libgnomeuimm-2.0.0</ulink></para>
+</sect4>
 </sect3>
 
 </sect2>
@@ -57,46 +86,90 @@
 <para>Install <application>Cdrdao</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr &&
-make &&
-make install</command></userinput></screen>
+<screen><userinput><command>patch -Np1 -i ../cdrdao-&cdrdao-version;-gcc34-1.patch &&
+./configure --prefix=/usr &&
+make</command></userinput></screen>
 
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
+
 </sect2>
 
 <sect2>
 <title>Contents</title>
 
-<para>The <application>Cdrdao</application> package contains
-<command>cdrdao</command>,
-<command>cue2toc</command>, 
-<command>toc2cue</command>, 
-<command>toc2cddb</command> and optionally, 
-<command>toc2mp3</command>.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Directory</segtitle>
+<seglistitem>
+<seg>cdrdao, cue2toc, toc2cddb, toc2cue and optionally, gcdmaster and 
+toc2mp3</seg>
+<seg>/usr/share/cdrdao</seg>
+</seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
+<varlistentry id="cdrdao">
+<term><command>cdrdao</command></term>
+<listitem><para>records audio or data <acronym>CD</acronym>-Rs in disk-at-once 
+(<acronym>DAO</acronym>) mode based on a textual description of the 
+<acronym>CD</acronym> contents.</para>
+<indexterm zone="cdrdao-package cdrdao">
+<primary sortas="b-cdrdao">cdrdao</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>cdrdao</title>
-<para><command>cdrdao</command> records audio or data
-<acronym>CD</acronym>-Rs in disk-at-once 
-(<acronym>DAO</acronym>) mode based on a textual description of the
-<acronym>CD</acronym> contents.
-</para></sect3>
+<varlistentry id="cue2toc">
+<term><command>cue2toc</command></term>
+<listitem><para>converts <acronym>CUE</acronym> to <acronym>TOC</acronym> 
+format for audio <acronym>CD</acronym>s.</para>
+<indexterm zone="cdrdao-package cue2toc">
+<primary sortas="b-cue2toc">cue2toc</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>cue2toc, toc2cue</title>
-<para><command>cue2toc</command> and <command>toc2cue</command>
-convert CUE to TOC format (and vice versa) for audio
-<acronym>CD</acronym>s.</para></sect3>
+<varlistentry id="gcdmaster">
+<term><command>gcdmaster</command></term>
+<listitem><para>is a graphical front end to <command>cdrdao</command> for 
+composing audio <acronym>CD</acronym>s.</para>
+<indexterm zone="cdrdao-package gcdmaster">
+<primary sortas="b-gcdmaster">gcdmaster</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>toc2cddb</title>
-<para><command>toc2cddb</command> converts a <application>Cdrdao</application> 
-TOC file into a cddb file and prints it to stdout.</para></sect3>
+<varlistentry id="toc2cddb">
+<term><command>toc2cddb</command></term>
+<listitem><para>converts a <application>Cdrdao</application> 
+<acronym>TOC</acronym> file into a cddb file and prints it to stdout.</para>
+<indexterm zone="cdrdao-package toc2cddb">
+<primary sortas="b-toc2cddb">toc2cddb</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>toc2mp3</title>
-<para><command>toc2mp3</command> converts an audio <acronym>CD</acronym> 
-disk image (.toc file) to mp3 files.</para></sect3>
+<varlistentry id="toc2cue">
+<term><command>toc2cue</command></term>
+<listitem><para>converts <acronym>TOC</acronym> to <acronym>CUE</acronym> 
+format for audio <acronym>CD</acronym>s.</para>
+<indexterm zone="cdrdao-package toc2cue">
+<primary sortas="b-toc2cue">toc2cue</primary></indexterm>
+</listitem>
+</varlistentry>
 
+<varlistentry id="toc2mp3">
+<term><command>toc2mp3</command></term>
+<listitem><para>converts an audio <acronym>CD</acronym>
+disk image (<filename>.toc</filename> file) to MP3 files (requires 
+<xref linkend="lame-package"/> to build).</para>
+<indexterm zone="cdrdao-package toc2mp3">
+<primary sortas="b-toc2mp3">toc2mp3</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
+
 </sect2>
 
 </sect1>

Added: trunk/patches/cdrdao-1.1.9-gcc34-1.patch
===================================================================
--- trunk/patches/cdrdao-1.1.9-gcc34-1.patch	2005-01-24 05:19:18 UTC (rev 3331)
+++ trunk/patches/cdrdao-1.1.9-gcc34-1.patch	2005-01-25 04:39:14 UTC (rev 3332)
@@ -0,0 +1,39 @@
+Submitted By:            BLFS Book <blfs-book at linuxfromscratch.org>
+Date:                    2005-01-24
+Initial Package Version: 1.1.9
+Upstream Status:         Already in CVS
+Origin:                  Cdrdao CVS
+Description:             Fixes gcdmaster compilation issue with GCC-3.4.x
+
+$LastChangedBy$
+$Date$
+
+diff -Naur cdrdao-1.1.9-orig/xdao/Project.h cdrdao-1.1.9/xdao/Project.h
+--- cdrdao-1.1.9-orig/xdao/Project.h	2004-02-12 01:13:32.000000000 +0000
++++ cdrdao-1.1.9/xdao/Project.h	2005-01-25 01:22:03.961953520 +0000
+@@ -51,14 +51,12 @@
+   virtual void createToolbar() = 0;
+   virtual void createStatusbar();
+   void updateWindowTitle();
+-  void saveProject();
+   void saveAsProject();
+   Gtk::FileSelection *saveFileSelector_;
+   void saveFileSelectorOKCB();
+   void saveFileSelectorCancelCB();
+ 
+   virtual bool on_delete_event(GdkEventAny *event);
+-  virtual void recordToc2CD() = 0;
+   virtual void projectInfo() = 0;
+ 
+ public:
+@@ -67,7 +65,9 @@
+   void readToc(char *name);
+   void statusMessage(const char *fmt, ...);
+   void tocBlockedMsg(const char *);
+-  virtual bool closeProject() = 0;
++  virtual bool closeProject() = 0; 
++  virtual void saveProject();
++  virtual void recordToc2CD() = 0;
+   int projectNumber();
+   TocEdit *tocEdit();
+   gint getViewNumber();


Property changes on: trunk/patches/cdrdao-1.1.9-gcc34-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date

Added: trunk/patches/libglademm-2.2.0-gcc34-1.patch
===================================================================
--- trunk/patches/libglademm-2.2.0-gcc34-1.patch	2005-01-24 05:19:18 UTC (rev 3331)
+++ trunk/patches/libglademm-2.2.0-gcc34-1.patch	2005-01-25 04:39:14 UTC (rev 3332)
@@ -0,0 +1,23 @@
+Submitted By:            BLFS Book <blfs-book at linuxfromscratch.org>
+Date:                    2005-01-24
+Initial Package Version: 2.2.0
+Upstream Status:         Not Required - already in recent package versions
+Origin:                  http://bugzilla.gnome.org/attachment.cgi?id=31277&action=view
+Description:             Fixes GCC-3.4.x compiling issues
+
+$LastChangedBy$
+$Date$
+
+diff -Nur libglademm-2.2.0-orig/libglade/libglademm/xml.h libglademm-2.2.0/libglade/libglademm/xml.h
+--- libglademm-2.2.0-orig/libglade/libglademm/xml.h	2004-03-29 19:23:17.000000000 +0200
++++ libglademm-2.2.0/libglade/libglademm/xml.h	2004-09-04 13:38:29.000000000 +0200
+@@ -244,7 +244,7 @@
+      //If there is already a C++ instance, then return it again:
+      if(pObjectBase)
+      {
+-       widget = dynamic_cast<T_Widget*>( Glib::wrap(pCWidget) );
++       widget = dynamic_cast<T_Widget*>( Glib::wrap((GtkWidget*)(pCWidget)) );
+ 
+        //The dynamic cast checks that it is of the correct type.
+        //Somebody might be trying to call get_widget_derived() after already calling get_widget(),
+


Property changes on: trunk/patches/libglademm-2.2.0-gcc34-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date

Added: trunk/patches/libgnomecanvasmm-2.0.2-gcc34-1.patch
===================================================================
--- trunk/patches/libgnomecanvasmm-2.0.2-gcc34-1.patch	2005-01-24 05:19:18 UTC (rev 3331)
+++ trunk/patches/libgnomecanvasmm-2.0.2-gcc34-1.patch	2005-01-25 04:39:14 UTC (rev 3332)
@@ -0,0 +1,36 @@
+Submitted By:            BLFS Book <blfs-book at linuxfromscratch.org>
+Date:                    2005-01-24
+Initial Package Version: 2.0.1
+Upstream Status:         Not Required - already in recent package versions
+Origin:                  http://bugzilla.gnome.org/attachment.cgi?id=31276&action=view
+Description:             Fixes compilation issues when using GCC-3.4.x
+
+$LastChangedBy$
+$Date$
+
+--- libgnomecanvasmm-2.0.1-orig/examples/canvas_events/canvas_events.cc	2004-09-04 15:10:54.502629928 -0700
++++ libgnomecanvasmm-2.0.1/examples/canvas_events/canvas_events.cc	2004-09-04 15:21:57.682811216 -0700
+@@ -73,15 +73,15 @@
+   
+   //Connect canvas signals:
+ 
+-  signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),CE));
+-  signal_button_press_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_button_event_stub_notify),CBE));
+-  signal_button_press_event().connect(SigC::bind(SigC::slot(*this, &CanvasExample::on_button_event_stub),CBEA));
++  signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),(guint)CE));
++  signal_button_press_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_button_event_stub_notify),(guint)CBE));
++  signal_button_press_event().connect(SigC::bind(SigC::slot(*this, &CanvasExample::on_button_event_stub),(guint)CBEA));
+ 	
+-  item->signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),IE));
+-  item->signal_event().connect(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer),IEA));
++  item->signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),(guint)IE));
++  item->signal_event().connect(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer),(guint)IEA));
+ 
+-  item2->signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),IE));
+-  item2->signal_event().connect(bind(slot(*this, &CanvasExample::on_event_explorer),IEA));
++  item2->signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),(guint)IE));
++  item2->signal_event().connect(bind(slot(*this, &CanvasExample::on_event_explorer),(guint)IEA));
+ }
+ 
+ CanvasExample::~CanvasExample()
+


Property changes on: trunk/patches/libgnomecanvasmm-2.0.2-gcc34-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list