cvs commit: ALFS/profiles/BLFS/chapter10 bc.xml compface.xml rep-gtk.xml

jbeckers at linuxfromscratch.org jbeckers at linuxfromscratch.org
Sun May 16 06:40:56 PDT 2004


jbeckers    04/05/16 07:40:56

  Modified:    profiles/BLFS BLFS.xml packages.ent system.ent
               profiles/BLFS/chapter10 bc.xml compface.xml rep-gtk.xml
  Log:
  chapter 10 update
  
  Revision  Changes    Path
  1.27      +1 -0      ALFS/profiles/BLFS/BLFS.xml
  
  Index: BLFS.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/BLFS.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- BLFS.xml	16 May 2004 10:54:04 -0000	1.26
  +++ BLFS.xml	16 May 2004 13:40:56 -0000	1.27
  @@ -146,6 +146,7 @@
       &rep-gtk;
       &compface;
       &imagemagick;
  +    &hd2u;
   
   </stage>
   
  
  
  
  1.35      +17 -11    ALFS/profiles/BLFS/packages.ent
  
  Index: packages.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/packages.ent,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- packages.ent	16 May 2004 11:03:58 -0000	1.34
  +++ packages.ent	16 May 2004 13:40:56 -0000	1.35
  @@ -251,25 +251,31 @@
   <!--************* packages for chapter 10 *************-->
   
   <!ENTITY bc-version   "1.06">
  -<!ENTITY bc-package   "bc-1.06.tar.gz">
  -<!ENTITY bc-directory "bc-1.06">
  +<!ENTITY bc-package   "bc-&bc-version;.tar.gz">
  +<!ENTITY bc-directory "bc-&bc-version;">
   
  -<!ENTITY bc-patch1    "bc-1.06-flex-invocation.patch">
  -<!ENTITY bc-patch2    "bc-1.06-readline.patch">
  +<!ENTITY bc-flex-invocation-patch    "bc-1.06-flex-invocation.patch">
  +<!ENTITY bc-readline-patch    "bc-1.06-readline.patch">
   
   <!ENTITY rep-gtk-version   "0.18">
  -<!ENTITY rep-gtk-package   "rep-gtk-0.18.tar.gz">
  -<!ENTITY rep-gtk-directory "rep-gtk-0.18">
  +<!ENTITY rep-gtk-package   "rep-gtk-&rep-gtk-version;.tar.gz">
  +<!ENTITY rep-gtk-directory "rep-gtk-&rep-gtk-version;">
  +
  +<!ENTITY rep-gtk-gtk2.4-patch    "rep-gtk-0.18-gtk2.4.patch">
   
   <!ENTITY compface-version   "1.4">
  -<!ENTITY compface-package   "compface-1.4.tar.gz">
  -<!ENTITY compface-directory "compface-1.4">
  +<!ENTITY compface-package   "compface-&compface-version;.tar.gz">
  +<!ENTITY compface-directory "compface-&compface-version;">
   
  -<!ENTITY compface-patch     "compface-1.4-errno-2.patch">
  +<!ENTITY compface-errno-2-patch     "compface-1.4-errno-2.patch">
   
   <!ENTITY imagemagick-version   "5.5.7-16">
  -<!ENTITY imagemagick-package   "ImageMagick-5.5.7-16.tar.bz2">
  -<!ENTITY imagemagick-directory "ImageMagick-5.5.7">
  +<!ENTITY imagemagick-package   "ImageMagick-&imagemagick-version;.tar.bz2">
  +<!ENTITY imagemagick-directory "ImageMagick-&imagemagick-version;">
  +
  +<!ENTITY hd2u-version   "0.9.0">
  +<!ENTITY hd2u-package   "hd2u-&hd2u-version;.tar.gz">
  +<!ENTITY hd2u-directory "hd2u-&hd2u-version;">
   
   <!--************* packages for chapter 11 *************-->
   
  
  
  
  1.22      +1 -0      ALFS/profiles/BLFS/system.ent
  
  Index: system.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/system.ent,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- system.ent	15 May 2004 07:20:24 -0000	1.21
  +++ system.ent	16 May 2004 13:40:56 -0000	1.22
  @@ -76,6 +76,7 @@
   <!ENTITY rep-gtk    SYSTEM "./chapter10/rep-gtk.xml">
   <!ENTITY compface   SYSTEM "./chapter10/compface.xml">
   <!ENTITY imagemagick SYSTEM "./chapter10/imagemagick.xml">
  +<!ENTITY hd2u       SYSTEM "./chapter10/hd2u.xml">
   
   <!-- chapter 11 -->
   <!ENTITY gpm        SYSTEM "./chapter11/gpm.xml">
  
  
  
  1.3       +6 -6      ALFS/profiles/BLFS/chapter10/bc.xml
  
  Index: bc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter10/bc.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- bc.xml	20 Nov 2003 19:13:02 -0000	1.2
  +++ bc.xml	16 May 2004 13:40:56 -0000	1.3
  @@ -11,12 +11,12 @@
   		</unpack>
   
   		<copy>
  -			<source>&packages_dir;/&bc-patch1;</source>
  +			<source>&packages_dir;/&bc-flex-invocation-patch;</source>
   			<destination>&build_dir;</destination>
   		</copy>
   
   		<copy>
  -		        <source>&packages_dir;/&bc-patch2;</source>
  +		        <source>&packages_dir;/&bc-readline-patch;</source>
   			<destination>&build_dir;</destination>
   		</copy>
   	</stage>
  @@ -29,13 +29,13 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&bc-patch1;</param>
  +			<param>-i ../&bc-flex-invocation-patch;</param>
   		</patch>
   
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&bc-patch2;</param>
  +			<param>-i ../&bc-readline-patch;</param>
   		</patch>
   
   		<configure>
  @@ -52,8 +52,8 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&bc-directory;</remove>
  -		<remove>&build_dir;/&bc-patch1;</remove>
  -		<remove>&build_dir;/&bc-patch2;</remove>
  +		<remove>&build_dir;/&bc-flex-invocation-patch;</remove>
  +		<remove>&build_dir;/&bc-readline-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.2       +8 -3      ALFS/profiles/BLFS/chapter10/compface.xml
  
  Index: compface.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter10/compface.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- compface.xml	20 Nov 2003 19:13:02 -0000	1.1
  +++ compface.xml	16 May 2004 13:40:56 -0000	1.2
  @@ -6,9 +6,8 @@
   			<destination>&build_dir;</destination>
   		</unpack>
   
  -
   		<copy>
  -			<source>&packages_dir;/&compface-patch;</source>
  +			<source>&packages_dir;/&compface-errno-2-patch;</source>
   			<destination>&build_dir;</destination>
   		</copy>
   	</stage>
  @@ -18,6 +17,12 @@
   			<base>&build_dir;/&compface-directory;</base>
   		</stageinfo>
   
  +		<patch>
  +			<param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&compface-errno-2-patch;</param>
  +		</patch>
  +
   		<configure>
   			<param>--prefix=/usr</param>
   		</configure>
  @@ -31,7 +36,7 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&compface-directory;</remove>
  -		<remove>&build_dir;/&compface-patch;</remove>
  +		<remove>&build_dir;/&compface-errno-2-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.2       +12 -0     ALFS/profiles/BLFS/chapter10/rep-gtk.xml
  
  Index: rep-gtk.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter10/rep-gtk.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- rep-gtk.xml	29 Sep 2003 18:11:26 -0000	1.1
  +++ rep-gtk.xml	16 May 2004 13:40:56 -0000	1.2
  @@ -11,6 +11,11 @@
   			<archive>&packages_dir;/&rep-gtk-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  +
  +		<copy>
  +			<source>&packages_dir;/&rep-gtk-gtk2.4-patch;</source>
  +			<destination>&build_dir;</destination>
  +		</copy>
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -18,6 +23,12 @@
   			<base>&build_dir;/&rep-gtk-directory;</base>
   		</stageinfo>
   
  +		<patch>
  +			<param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&rep-gtk-gtk2.4-patch;</param>
  +		</patch>
  +
   		<configure>
   			<param>--prefix=/usr</param>
   		</configure>
  @@ -31,6 +42,7 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&rep-gtk-directory;</remove>
  +		<remove>&build_dir;/&rep-gtk-gtk2.4-patch;</remove>
   	</stage>
   
   </package>
  
  
  



More information about the alfs-log mailing list