r1956 - in profiles/BLFS/trunk: chapter09 chapter37 chapter43 chapter45 config_standard/packages wget

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Fri Jul 22 11:15:54 PDT 2005


Author: thomasp
Date: 2005-07-22 12:15:51 -0600 (Fri, 22 Jul 2005)
New Revision: 1956

Modified:
   profiles/BLFS/trunk/chapter09/lcms.xml
   profiles/BLFS/trunk/chapter37/libmikmod.xml
   profiles/BLFS/trunk/chapter43/openjade.xml
   profiles/BLFS/trunk/chapter45/fop.xml
   profiles/BLFS/trunk/config_standard/packages/ch09.ent
   profiles/BLFS/trunk/config_standard/packages/ch37.ent
   profiles/BLFS/trunk/config_standard/packages/ch45.ent
   profiles/BLFS/trunk/wget/chapter09.urls
   profiles/BLFS/trunk/wget/chapter37.urls
   profiles/BLFS/trunk/wget/chapter45.urls
Log:
Added patches to libmikmod, lcms and fop to fix issues with the newer gcc and jdk versions.



Modified: profiles/BLFS/trunk/chapter09/lcms.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/lcms.xml	2005-07-22 17:54:18 UTC (rev 1955)
+++ profiles/BLFS/trunk/chapter09/lcms.xml	2005-07-22 18:15:51 UTC (rev 1956)
@@ -33,6 +33,19 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
+    <!-- Uncomment if planning on building the python module -->
+    <!--
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&lcms-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&lcms-gcc34-patch;</param>
+      </patch>
+    </stage>
+    -->
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&lcms-directory;</base>

Modified: profiles/BLFS/trunk/chapter37/libmikmod.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/libmikmod.xml	2005-07-22 17:54:18 UTC (rev 1955)
+++ profiles/BLFS/trunk/chapter37/libmikmod.xml	2005-07-22 18:15:51 UTC (rev 1956)
@@ -36,15 +36,26 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&libmikmod-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&libmikmod-diff;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
-        <base>&build_dir;/&libmikmod-directory;/</base>
+        <base>&build_dir;/&libmikmod-directory;</base>
       </stageinfo>
       <execute command="sed">
 	<param>-i -e "s/VERSION=10/VERSION=11/"</param>
 	<param>-e "s/sys_asoundlib/alsa_soundlib/"</param>
 	<param>-e "s/snd_cards/snd_card_load/g"</param>
 	<param>-e "s|sys/asoundlib.h|alsa/asoundlib.h|g"</param>
+	<param>-e "s/^LIBOBJS/#LIBOBJS/"</param>
 	<param>configure.in</param>
       </execute>
       <execute command="autoconf" />

Modified: profiles/BLFS/trunk/chapter43/openjade.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/openjade.xml	2005-07-22 17:54:18 UTC (rev 1955)
+++ profiles/BLFS/trunk/chapter43/openjade.xml	2005-07-22 18:15:51 UTC (rev 1956)
@@ -42,6 +42,9 @@
       <make>
         <param>install</param>
       </make>
+      <make>
+      	<param>install-man</param>
+      </make>
       <link base="/usr/bin">
         <option>force</option>
         <target>openjade</target>

Modified: profiles/BLFS/trunk/chapter45/fop.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/fop.xml	2005-07-22 17:54:18 UTC (rev 1955)
+++ profiles/BLFS/trunk/chapter45/fop.xml	2005-07-22 18:15:51 UTC (rev 1956)
@@ -36,6 +36,16 @@
       <destination>&build_dir;</destination>
     </unpack>
   </stage>
+  <stage name="Patching">
+    <stageinfo>
+      <base>&build_dir;/&fop-directory;</base>
+    </stageinfo>
+    <patch>
+      <param>-N</param>
+      <param>-p1</param>
+      <param>-i &packages_dir;/&fop-jdk15-patch;</param>
+    </patch>
+  </stage>
   <stage name="Installing JAI.">
     <stageinfo>
       <environment>

Modified: profiles/BLFS/trunk/config_standard/packages/ch09.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch09.ent	2005-07-22 17:54:18 UTC (rev 1955)
+++ profiles/BLFS/trunk/config_standard/packages/ch09.ent	2005-07-22 18:15:51 UTC (rev 1956)
@@ -38,6 +38,8 @@
 <!ENTITY lcms-md5       "399957403c76d20ea571a1b1232bda09">
 <!ENTITY lcms-directory "lcms-&lcms-version;">
 
+<!ENTITY lcms-gcc34-patch "lcms-&lcms-version;-gcc343-1.patch">
+
 <!ENTITY freetype-version   "2.1.10">
 <!ENTITY freetype-package   "freetype-&freetype-version;.tar.bz2">
 <!ENTITY freetype-md5       "a4012e7d1f6400df44a16743b11b8423">

Modified: profiles/BLFS/trunk/config_standard/packages/ch37.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch37.ent	2005-07-22 17:54:18 UTC (rev 1955)
+++ profiles/BLFS/trunk/config_standard/packages/ch37.ent	2005-07-22 18:15:51 UTC (rev 1956)
@@ -140,6 +140,8 @@
 <!ENTITY libmikmod-md5       "bc28df1cd2051eccc26272aae5c36a24">
 <!ENTITY libmikmod-directory "libmikmod-&libmikmod-version;">
 
+<!ENTITY libmikmod-diff "libmikmod-&libmikmod-version;-a.diff">
+
 <!ENTITY gstreamer-version   "0.8.7">
 <!ENTITY gstreamer-package   "gstreamer-&gstreamer-version;.tar.bz2">
 <!ENTITY gstreamer-md5       "6cbfa914cd577d2623bf7e16cf1f6510">

Modified: profiles/BLFS/trunk/config_standard/packages/ch45.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch45.ent	2005-07-22 17:54:18 UTC (rev 1955)
+++ profiles/BLFS/trunk/config_standard/packages/ch45.ent	2005-07-22 18:15:51 UTC (rev 1956)
@@ -51,5 +51,7 @@
 <!ENTITY fop-md5        "c9a738ed9f9f8313384d70fd027ae801">
 <!ENTITY fop-directory  "fop-&fop-version;">
 
+<!ENTITY fop-jdk15-patch "fop_&fop-version;-jdk_1.5.0-1.patch">
+
 <!ENTITY fop-jai-binary "jai-1_1_2_01-lib-linux-i586-jdk.bin">
 <!ENTITY fop-jai-md5    "f2be3619a8d002eff3874355e96327eb">

Modified: profiles/BLFS/trunk/wget/chapter09.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter09.urls	2005-07-22 17:54:18 UTC (rev 1955)
+++ profiles/BLFS/trunk/wget/chapter09.urls	2005-07-22 18:15:51 UTC (rev 1956)
@@ -11,7 +11,8 @@
 
 ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/L/libmng-1.0.9.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/L/lcms-1.14.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/L/lcms-1.14.tar.bz2
+http://www.linuxfromscratch.org/blfs/downloads/svn/lcms-1.14-gcc343-1.patch
 
 ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/freetype-2.1.10.tar.bz2
 

Modified: profiles/BLFS/trunk/wget/chapter37.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter37.urls	2005-07-22 17:54:18 UTC (rev 1955)
+++ profiles/BLFS/trunk/wget/chapter37.urls	2005-07-22 18:15:51 UTC (rev 1956)
@@ -47,7 +47,8 @@
 
 ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/W-Z/xine-lib-1.0.tar.bz2
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/L/libmikmod-3.1.11.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/L/libmikmod-3.1.11.tar.bz2
+http://mikmod.raphnet.net/files/libmikmod-3.1.11-a.diff
 
 ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/F-H/gstreamer-0.8.7.tar.bz2
 

Modified: profiles/BLFS/trunk/wget/chapter45.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter45.urls	2005-07-22 17:54:18 UTC (rev 1955)
+++ profiles/BLFS/trunk/wget/chapter45.urls	2005-07-22 18:15:51 UTC (rev 1956)
@@ -16,4 +16,5 @@
 ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/W-Z/xpdf-3.00pl3-freetype_2.1.7_hack-2.patch
 http://www.linuxfromscratch.org/blfs/downloads/6.0/xpdf-3.00pl3-freetype_2.1.7_hack-2.patch
 
-ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/F-H/fop-0.20.5.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/fop-0.20.5.tar.bz2
+ftp://ftp.lfs-matrix.net/pub/BLFS/SVN/F-H/fop_0.20.5-jdk_1.5.0-1.patch




More information about the alfs-log mailing list