r5046 - in trunk: BOOK/general/graphlib BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Fri Sep 9 21:54:35 PDT 2005


Author: randy
Date: 2005-09-09 22:54:35 -0600 (Fri, 09 Sep 2005)
New Revision: 5046

Added:
   trunk/patches/libexif-0.6.12-gcc4-1.patch
Modified:
   trunk/BOOK/general/graphlib/libexif.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Added a GCC-4 patch to the libexif instructions

Modified: trunk/BOOK/general/graphlib/libexif.xml
===================================================================
--- trunk/BOOK/general/graphlib/libexif.xml	2005-09-10 04:43:13 UTC (rev 5045)
+++ trunk/BOOK/general/graphlib/libexif.xml	2005-09-10 04:54:35 UTC (rev 5046)
@@ -57,6 +57,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/libexif-&libexif-version;-gcc4-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
   </sect2>
 
   <sect2 role="installation">
@@ -65,7 +73,8 @@
     <para>Install <application>libexif</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>patch -Np1 -i ../libexif-&libexif-version;-gcc4-1.patch &&
+./configure --prefix=/usr &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-09-10 04:43:13 UTC (rev 5045)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-09-10 04:54:35 UTC (rev 5046)
@@ -45,6 +45,10 @@
       <para>September 9th, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Added a GCC-4 patch to the libexif
+          instructions.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Added a GCC-4 patch to the Avifile
           instructions.</para>
         </listitem>

Added: trunk/patches/libexif-0.6.12-gcc4-1.patch
===================================================================
--- trunk/patches/libexif-0.6.12-gcc4-1.patch	2005-09-10 04:43:13 UTC (rev 5045)
+++ trunk/patches/libexif-0.6.12-gcc4-1.patch	2005-09-10 04:54:35 UTC (rev 5046)
@@ -0,0 +1,24 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-09-08
+Initial Package Version: 0.6.12
+Upstream Status:         This patch is from upstream CVS
+Origin:                  Upstream CVS
+                         http://cvs.sourceforge.net/viewcvs.py/libexif/libexif/libexif/exif-utils.c?r1=1.10&r2=1.11&sortby=date
+Description:             Fixes GCC-4.0.x build problems
+
+$LastChangedBy$
+$Date$
+
+
+diff -Naur libexif-0.6.12-orig/libexif/exif-utils.c libexif-0.6.12/libexif/exif-utils.c
+--- libexif-0.6.12-orig/libexif/exif-utils.c	2005-03-13 02:27:13.000000000 +0000
++++ libexif-0.6.12/libexif/exif-utils.c	2005-09-08 15:09:59.000000000 +0000
+@@ -83,7 +83,7 @@
+ 	}
+ }
+ 
+-static ExifSShort
++ExifSShort
+ exif_get_sshort (const unsigned char *buf, ExifByteOrder order)
+ {
+ 	if (!buf) return 0;


Property changes on: trunk/patches/libexif-0.6.12-gcc4-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list