cvs commit: ALFS/profiles/BLFS/chapter16 libsoup.xml

vdzuba at linuxfromscratch.org vdzuba at linuxfromscratch.org
Wed Nov 19 14:28:57 PST 2003


vdzuba      03/11/19 15:28:57

  Modified:    profiles/BLFS BLFS.xml packages.ent system.ent
               profiles/BLFS/chapter08 aspell.xml g-wrap.xml gdbm.xml
                        glib.xml glib2.xml libfam.xml openssl.xml
                        readline.xml slang.xml
  Added:       profiles/BLFS/chapter08 ispell.xml
               profiles/BLFS/chapter16 libsoup.xml
  Removed:     profiles/BLFS/chapter08 stlport.xml zlib.xml
  Log:
  updated chapter 08
  
  Revision  Changes    Path
  1.7       +3 -5      ALFS/profiles/BLFS/BLFS.xml
  
  Index: BLFS.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/BLFS.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BLFS.xml	18 Nov 2003 23:44:00 -0000	1.6
  +++ BLFS.xml	19 Nov 2003 22:28:57 -0000	1.7
  @@ -5,8 +5,7 @@
   
          by Vassili Dzuba - vdzuba at linuxfromscratch.org
   
  -       Last updated : 20020917
  -
  +       Last updated : 20031103
         *** ALPHA VERSION ***
     -->
   
  @@ -109,12 +108,10 @@
       &glib2;
       &expat;
       &libesmtp;
  -    &aspell;
  +    &ispell;
       &guile;
       &slib;
       &g-wrap;
  -    &libsoup;
  -    &stlport;
       &lzo;
   
   </stage>
  @@ -190,6 +187,7 @@
       &curl;
       &wvstreams;
       &gnet;
  +    &libsoup;
   
   </stage>
   
  
  
  
  1.9       +29 -24    ALFS/profiles/BLFS/packages.ent
  
  Index: packages.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/packages.ent,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- packages.ent	19 Nov 2003 21:24:25 -0000	1.8
  +++ packages.ent	19 Nov 2003 22:28:57 -0000	1.9
  @@ -67,9 +67,11 @@
   
   <!--************* packages for chapter 8 *************-->
   
  -<!ENTITY openssl-version   "0.9.7b">
  -<!ENTITY openssl-package   "openssl-0.9.7b.tar.gz">
  -<!ENTITY openssl-directory "openssl-0.9.7b">
  +<!ENTITY openssl-version   "0.9.7c">
  +<!ENTITY openssl-package   "openssl-0.9.7c.tar.gz">
  +<!ENTITY openssl-directory "openssl-0.9.7c">
  +
  +<!ENTITY openssl-patch     "openssl-0.9.7c-manpages.patch">
   
   <!ENTITY pcre-version   "4.3">
   <!ENTITY pcre-package   "pcre-4.3.tar.bz2">
  @@ -83,15 +85,11 @@
   <!ENTITY slang-package   "slang-1.4.9.tar.bz2">
   <!ENTITY slang-directory "slang-1.4.9">
   
  -<!ENTITY libfam-version   "2.6.9">
  -<!ENTITY libfam-package   "fam-2.6.9.tar.gz">
  -<!ENTITY libfam-directory "fam-2.6.9">
  -
  -<!ENTITY libfam-ppatch1   "dnotify.patch.gz">
  -<!ENTITY libfam-patch1    "dnotify.patch">
  +<!ENTITY libfam-version   "2.6.10">
  +<!ENTITY libfam-package   "fam-2.6.10.tar.gz">
  +<!ENTITY libfam-directory "fam-2.6.10">
   
  -<!ENTITY libfam-ppatch2   "libfam-gcc3.patch.gz">
  -<!ENTITY libfam-patch2    "libfam-gcc3.patch">
  +<!ENTITY libfam-patch     "fam-2.6.10-dnotify.patch">
   
   <!ENTITY libxml-version   "1.8.17">
   <!ENTITY libxml-package   "libxml-1.8.17.tar.gz">
  @@ -129,7 +127,7 @@
   <!ENTITY expat-package   "expat-1.95.6.tar.gz">
   <!ENTITY expat-directory "expat-1.95.6">
   
  -<!ENTITY expat-patch     "expat-1.95.6.patch">
  +<!ENTITY expat-patch     "expat-1.95.6-fix-declaration-order.patch">
   
   <!ENTITY libesmtp-version   "1.0">
   <!ENTITY libesmtp-package   "libesmtp-1.0.tar.bz2">
  @@ -139,6 +137,12 @@
   <!ENTITY aspell-package   "aspell-0.50.3.tar.gz">
   <!ENTITY aspell-directory "aspell-0.50.3">
   
  +<!ENTITY aspell-patch     "aspell-0.50.3-gcc33-1.patch">
  +
  +<!ENTITY ispell-version   "3.2.06.epa6">
  +<!ENTITY ispell-package   "ispell-3.2.06.epa6.tar.bz2">
  +<!ENTITY ispell-directory "ispell-3.2.06.epa6">
  +
   <!ENTITY guile-version   "1.6.4">
   <!ENTITY guile-package   "guile-1.6.4.tar.gz">
   <!ENTITY guile-directory "guile-1.6.4">
  @@ -147,23 +151,18 @@
   <!ENTITY slib-package   "slib2d6.tar.gz">
   <!ENTITY slib-directory "slib">
   
  -<!ENTITY g-wrap-version   "1.2.1">
  -<!ENTITY g-wrap-package   "g-wrap-1.2.1.tar.bz2">
  -<!ENTITY g-wrap-directory "g-wrap-1.2.1">
  +<!ENTITY g-wrap-version   "1.3.4">
  +<!ENTITY g-wrap-package   "g-wrap-1.3.4.tar.gz">
  +<!ENTITY g-wrap-directory "g-wrap-1.3.4">
  +
  +<!ENTITY lzo-version       "1.08">
  +<!ENTITY lzo-package       "lzo-1.08.tar.gz">
  +<!ENTITY lzo-directory     "lzo-1.08">
   
   <!ENTITY libsoup-version   "1.99.23">
   <!ENTITY libsoup-package   "libsoup-1.99.23.tar.bz2">
   <!ENTITY libsoup-directory "libsoup-1.99.23">
   
  -<!ENTITY stlport-version   "4.5.3">
  -<!ENTITY stlport-package   "STLport-4.5.3.tar.gz">
  -<!ENTITY stlport-directory "STLport-4.5.3">
  -
  -<!ENTITY stlport-patch     "STLport-4.5.3-gcc3.patch">
  -
  -<!ENTITY lzo-version       "1.08">
  -<!ENTITY lzo-package       "lzo-1.08.tar.gz">
  -<!ENTITY lzo-directory     "lzo-1.08">
   
   <!--************* packages for chapter 9 *************-->
   
  @@ -1338,3 +1337,9 @@
   <!ENTITY fribidi-package   "fribidi-0.10.4.tar.gz">
   <!ENTITY fribidi-directory "fribidi-0.10.4">
    
  +<!ENTITY stlport-version   "4.5.3">
  +<!ENTITY stlport-package   "STLport-4.5.3.tar.gz">
  +<!ENTITY stlport-directory "STLport-4.5.3">
  +
  +<!ENTITY stlport-patch     "STLport-4.5.3-gcc3.patch">
  +
  
  
  
  1.6       +2 -2      ALFS/profiles/BLFS/system.ent
  
  Index: system.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/system.ent,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- system.ent	18 Nov 2003 23:44:00 -0000	1.5
  +++ system.ent	19 Nov 2003 22:28:57 -0000	1.6
  @@ -46,11 +46,10 @@
   <!ENTITY expat      SYSTEM "./chapter08/expat.xml">
   <!ENTITY libesmtp   SYSTEM "./chapter08/libesmtp.xml">
   <!ENTITY aspell     SYSTEM "./chapter08/aspell.xml">
  +<!ENTITY ispell     SYSTEM "./chapter08/ispell.xml">
   <!ENTITY guile      SYSTEM "./chapter08/guile.xml">
   <!ENTITY slib       SYSTEM "./chapter08/slib.xml">
   <!ENTITY g-wrap     SYSTEM "./chapter08/g-wrap.xml">
  -<!ENTITY libsoup    SYSTEM "./chapter08/libsoup.xml">
  -<!ENTITY stlport    SYSTEM "./chapter08/stlport.xml">
   <!ENTITY lzo        SYSTEM "./chapter08/lzo.xml">
   
   <!-- chapter 9 -->
  @@ -99,6 +98,7 @@
   <!ENTITY curl       SYSTEM "./chapter16/curl.xml">
   <!ENTITY wvstreams  SYSTEM "./chapter16/wvstreams.xml">
   <!ENTITY gnet       SYSTEM "./chapter16/gnet.xml">
  +<!ENTITY libsoup    SYSTEM "./chapter16/libsoup.xml">
   
   <!-- chapter 17 -->
   <!ENTITY links      SYSTEM "./chapter17/links.xml">
  
  
  
  1.2       +13 -0     ALFS/profiles/BLFS/chapter08/aspell.xml
  
  Index: aspell.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/aspell.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- aspell.xml	29 Sep 2003 18:11:25 -0000	1.1
  +++ aspell.xml	19 Nov 2003 22:28:57 -0000	1.2
  @@ -5,6 +5,12 @@
   			<archive>&packages_dir;/&aspell-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  +
  +	<copy>
  +		<source>&packages_dir;/&aspell-patch;</source>
  +		<destination>&build_dir;</destination>
  +	</copy>
  +
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -12,6 +18,12 @@
   			<base>&build_dir;/&aspell-directory;</base>
   		</stageinfo>
   
  +		<patch>
  +			<param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&aspell-patch;</param>
  +		</patch>
  +
   		<configure>
   			<param>--prefix=/usr</param>
   		</configure>
  @@ -25,6 +37,7 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&aspell-directory;</remove>
  +		<remove>&build_dir;/&aspell-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.2       +0 -8      ALFS/profiles/BLFS/chapter08/g-wrap.xml
  
  Index: g-wrap.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/g-wrap.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- g-wrap.xml	29 Sep 2003 18:11:25 -0000	1.1
  +++ g-wrap.xml	19 Nov 2003 22:28:57 -0000	1.2
  @@ -21,14 +21,6 @@
   			<param>--prefix=/usr</param>
   		</configure>
   
  -		<!-- to avoid a problem with gcc 3.2 -->
  -		<search_replace
  -		    base = "&build_dir;/&g-wrap-directory;/test">
  -		        <file>Makefile</file>
  -			<find>-Werror</find>
  -			<replace></replace>
  -		</search_replace>
  -
   		<make />
   
   		<make>
  
  
  
  1.2       +6 -13     ALFS/profiles/BLFS/chapter08/gdbm.xml
  
  Index: gdbm.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/gdbm.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gdbm.xml	29 Sep 2003 18:11:25 -0000	1.1
  +++ gdbm.xml	19 Nov 2003 22:28:57 -0000	1.2
  @@ -12,32 +12,25 @@
   			<base>&build_dir;/&gdbm-directory;</base>
   		</stageinfo>
   
  -		<configure />
  -
  +		<configure>
  +		        <param>--prefix=/usr</param>
  +			<param>--infodir=/usr/share/info</param>
  +			<param>--mandir=/usr/share/man</param>
  +		</configure>
   
  +		<make />
   
   		<make>
  -                        <param>prefix=/usr</param>		       
  -		</make>
  -
  -		<make>
  -                        <param>prefix=/usr</param>
  -			<param>man3dir=/usr/share/man/man3</param>
  -                        <param>infodir=/usr/share/info</param>
                           <param>BINOWN=root</param>
   			<param>BINGRP=root</param>
   			<param>install</param>
   		</make>
   
   		<make>
  -                        <param>prefix=/usr</param>
  -                        <param>man3dir=/usr/share/man/man3</param>
  -                        <param>infodir=/usr/share/info</param>
                           <param>BINOWN=root</param>
                           <param>BINGRP=root</param>
                           <param>install-compat</param>
   		</make>
  -
   	</stage>
   
   	<stage name="Clean-up.">
  
  
  
  1.2       +0 -9      ALFS/profiles/BLFS/chapter08/glib.xml
  
  Index: glib.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/glib.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- glib.xml	29 Sep 2003 18:11:25 -0000	1.1
  +++ glib.xml	19 Nov 2003 22:28:57 -0000	1.2
  @@ -1,14 +1,5 @@
   <package name="glib" version="&glib-version;">
   
  -    <packageinfo>
  -        <requires>
  -	    <name>pkgconfig</name>
  -	</requires>
  -        <utilizes>
  -	    <name>gtkdoc</name>
  -	</utilizes>
  -    </packageinfo>
  -
   	<stage name="Unpacking a package.">
   		<unpack>
   			<archive>&packages_dir;/&glib-package;</archive>
  
  
  
  1.2       +3 -4      ALFS/profiles/BLFS/chapter08/glib2.xml
  
  Index: glib2.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/glib2.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- glib2.xml	29 Sep 2003 18:11:25 -0000	1.1
  +++ glib2.xml	19 Nov 2003 22:28:57 -0000	1.2
  @@ -2,9 +2,9 @@
   
           <packageinfo>
                   <requires><name>pkgconfig</name></requires>
  -		<utilizes>gtk-doc</utilizes>
  -		<utilizes>xml-dtd</utilizes>
  -		<utilizes>docbook-xsl</utilizes>
  +		<utilizes><name>gtk-doc</name></utilizes>
  +		<utilizes><name>xml-dtd</name></utilizes>
  +		<utilizes><name>docbook-xsl</name></utilizes>
           </packageinfo>
   
   	<stage name="Unpacking a package.">
  @@ -21,7 +21,6 @@
   
   		<configure>
   			<param>--prefix=/usr</param>
  -			<param>--enable-gtk-doc</param>
   		</configure>
   
   		<make />
  
  
  
  1.2       +9 -17     ALFS/profiles/BLFS/chapter08/libfam.xml
  
  Index: libfam.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/libfam.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- libfam.xml	29 Sep 2003 18:11:25 -0000	1.1
  +++ libfam.xml	19 Nov 2003 22:28:57 -0000	1.2
  @@ -13,19 +13,13 @@
   			<destination>&build_dir;</destination>
   		</unpack>
   
  -		<unpack>
  -		        <archive>&packages_dir;/&libfam-ppatch1;</archive>
  +		<copy>
  +		        <source>&packages_dir;/&libfam-patch;</source>
   			<destination>&build_dir;</destination>
  -		</unpack>
  -
  -		<unpack>
  -		        <archive>&packages_dir;/&libfam-ppatch2;</archive>
  -			<destination>&build_dir;</destination>
  -		</unpack>
  +		</copy>
   	</stage>
   
   
  -
   	<stage name="Installing a package.">
   		<stageinfo>
   			<base>&build_dir;/&libfam-directory;</base>
  @@ -34,14 +28,13 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&libfam-patch1;</param>
  +			<param>-i ../&libfam-patch;</param>
   		</patch>
   
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
  -			<param>-i ../&libfam-patch2;</param>
  -		</patch>
  +		<execute command="libtoolize --force" />
  +		<execute command="aclocal" />
  +		<execute command="automake --add-missing" />
  +		<execute command="autoconf" />
   
   		<configure>
   			<param>--prefix=/usr</param>
  @@ -57,8 +50,7 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&libfam-directory;</remove>
  -		<remove>&build_dir;/&libfam-patch1;</remove>
  -		<remove>&build_dir;/&libfam-patch2;</remove>
  +		<remove>&build_dir;/&libfam-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.2       +26 -2     ALFS/profiles/BLFS/chapter08/openssl.xml
  
  Index: openssl.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/openssl.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- openssl.xml	29 Sep 2003 18:11:26 -0000	1.1
  +++ openssl.xml	19 Nov 2003 22:28:57 -0000	1.2
  @@ -5,6 +5,12 @@
   			<archive>&packages_dir;/&openssl-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  +
  +	<copy>
  +		<source>&packages_dir;/&openssl-patch;</source>
  +		<destination>&build_dir;</destination>
  +	</copy>
  +
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -12,6 +18,12 @@
   			<base>&build_dir;/&openssl-directory;</base>
   		</stageinfo>
   
  +		<patch>
  +			<param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&openssl-patch;</param>
  +		</patch>
  +
   		<search_replace base="&build_dir;/&openssl-directory;/doc/apps">
   		       <file>passwd.pod</file>
   		       <find>passwd - compute password hashes</find>
  @@ -23,8 +35,7 @@
   			<destination>doc/apps/openssl-passwd.pod</destination>
   		</move>
   
  -		<configure command="./Configure">
  -			<param>linux-elf</param>
  +		<configure command="./config">
   			<param>--openssldir=/etc/ssl</param>
   			<param>--prefix=/usr</param>
   			<param>shared</param>
  @@ -39,12 +50,25 @@
   			<param>install</param>
   		</make>
   
  +		<copy>
  +		        <option>recursive</option>
  +		        <source>certs</source>
  +			<destination>/etc/ssl</destination>
  +		</copy>
  +
   		<remove>/etc/ssl/lib</remove>
  +
  +		<permissions mode="755">
  +		        <name>/usr/lib/pkgconfig</name>
  +		</permissions>
  +
  +
   	</stage>
   
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&openssl-directory;</remove>
  +		<remove>&build_dir;/&openssl-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.2       +5 -1      ALFS/profiles/BLFS/chapter08/readline.xml
  
  Index: readline.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/readline.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- readline.xml	29 Sep 2003 18:11:26 -0000	1.1
  +++ readline.xml	19 Nov 2003 22:28:57 -0000	1.2
  @@ -20,11 +20,15 @@
   			<param>--prefix=/usr</param>
   		</configure>
   
  -		<make />
  +		<make>
  +		        <param>SHLIB_LIBS=-lcurses</param>
  +		</make>
   
   		<make>
   			<param>install</param>
   		</make>
  +
  +		<execute command="/sbin/ldconfig" />
   	</stage>
   
   	<stage name="Clean-up.">
  
  
  
  1.2       +18 -0     ALFS/profiles/BLFS/chapter08/slang.xml
  
  Index: slang.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/slang.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- slang.xml	29 Sep 2003 18:11:26 -0000	1.1
  +++ slang.xml	19 Nov 2003 22:28:57 -0000	1.2
  @@ -21,6 +21,24 @@
   		<make>
   			<param>install</param>
   		</make>
  +
  +		<make>
  +			<param>elf</param>
  +		</make>
  +
  +		<make>
  +			<param>install-elf</param>
  +		</make>
  +
  +		<make>
  +			<param>install-links</param>
  +		</make>
  +
  +		<permissions mode="755">
  +		        <name>/usr/lib/libslang.so.1.4.9</name>
  +		</permissions>
  +
  +		<execute command="/sbin/ldconfig" />
   	</stage>
   
   	<stage name="Clean-up.">
  
  
  
  1.1                  ALFS/profiles/BLFS/chapter08/ispell.xml
  
  Index: ispell.xml
  ===================================================================
  <package name="ispell" version="&ispell-version;">
  
  	<stage name="Unpacking a package.">
  		<unpack>
  			<archive>&packages_dir;/&ispell-package;</archive>
  			<destination>&build_dir;</destination>
  		</unpack>
  
  	</stage>
  
  	<stage name="Installing a package.">
  		<stageinfo>
  			<base>&build_dir;/&ispell-directory;</base>
  		</stageinfo>
  
  		<execute command='sed -e "s:/usr/local:/usr:g" local.h.linux > local.h' />
  
  		<make />
  
  		<make>
  			<param>install</param>
  		</make>
  	</stage>
  
  	<stage name="Clean-up.">
  		<remove>&build_dir;/&ispell-directory;</remove>
  	</stage>
  
  </package>
  
  
  
  1.1                  ALFS/profiles/BLFS/chapter16/libsoup.xml
  
  Index: libsoup.xml
  ===================================================================
  <package name="libsoup" version="&libsoup-version;">
  
      <packageinfo>
          <utilizes>
  	    <name>openssl</name>
  	</utilizes>
      </packageinfo>
  
  	<stage name="Unpacking a package.">
  		<unpack>
  			<archive>&packages_dir;/&libsoup-package;</archive>
  			<destination>&build_dir;</destination>
  		</unpack>
  	</stage>
  
  	<stage name="Installing a package.">
  		<stageinfo>
  			<base>&build_dir;/&libsoup-directory;</base>
  		</stageinfo>
  
  		<configure>
  			<param>--prefix=/usr</param>
  		</configure>
  
  		<make />
  
  		<make>
  			<param>install</param>
  		</make>
  	</stage>
  
  	<stage name="Clean-up.">
  		<remove>&build_dir;/&libsoup-directory;</remove>
  	</stage>
  
  </package>
  
  
  



More information about the alfs-log mailing list