Changeset 9c9775f for BLFS/libs


Ignore:
Timestamp:
09/19/2007 04:50:48 PM (17 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
3778352
Parents:
0510381
Message:

Updated experimental branch to current trunk code.

Location:
BLFS/libs
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • BLFS/libs/func_dependencies

    r0510381 r9c9775f  
    187187      hal-requirements | hal-runtime-dependencies ) continue ;;
    188188      perl-* | tk-perl )         DEP=perl-modules ;;
     189      dbus-* )                   DEP=dbus-bindings ;;
     190      pyxml | pycairo | pygobject | pygtk | pyorbit | \
     191      gnome-python | gnome-python-desktop ) DEP=python-modules ;;
    189192
    190193        # Orphan links (proper link must be created when generating the book)
    … …  
    203206                  pkg_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f3)
    204207                  inst_ver=$(grep "^${X11}[[:space:]]" ../packages | cut -f4)
    205                   [ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
     208                  [ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" = "x${inst_ver}" ]] && continue
     209                  [ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" < "x${inst_ver}" ]] && continue
    206210                  ;;
    207211        esac
    … …  
    212216    pkg_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f3)
    213217    inst_ver=$(grep "^${DEP}[[:space:]]" ../packages | cut -f4)
    214     [ -n "${pkg_ver}" ] && [ "x${pkg_ver}" = "x${inst_ver}" ] && continue
     218    [ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" = "x${inst_ver}" ]] && continue
     219    [ -n "${pkg_ver}" ] && [[ "x${pkg_ver}" < "x${inst_ver}" ]] && continue
    215220
    216221    #------------------
    … …  
    220225    # due empty *.xinc files
    221226    case $DEP in
    222       jadetex | perl-* | lynx | Links | w3m )
    223         # Optional dependencies are runtime only
     227      akode )
     228        # Both are in the same page
     229        [[ "$PKG" = "kdemultimedia" ]] && continue
     230        ;;
     231      aRts )
     232        # esound-->aRts-->esound
     233        [[ "$PKG" = "esound" ]] && continue
     234        ;;
     235      dbus-bindings )
     236        # True circular dependecy
     237        [[ "$PKG" = "dbus-bindings" ]] && continue
     238        ;;
     239      DocBook )
     240        # Used to rebuild the documentation
     241        [[ "$PKG" = "linux-pam" ]] && continue
     242        ;;
     243      docbook-xsl )
     244        # Used to rebuild the documentation
     245        [[ "$PKG" = "linux-pam" ]] && continue
     246        ;;
     247      doxygen )
     248        # Used to rebuild the documentation
     249        [[ "$PKG" = "dbus" ]] && continue
     250        [[ "$PKG" = "libdvdcss" ]] && continue
     251        [[ "$PKG" = "libusb" ]] && continue
     252        [[ "$PKG" = "libxcb" ]] && continue
     253        ;;
     254      espgs )
     255        # Used to rebuild the documentation
     256        [[ "$PKG" = "$MAIL_SERVER" ]] && continue
     257        ;;
     258      ffmpeg )
     259        # alsa-plugins-->ffmpeg-->several-->alsa-plugins
     260        [[ "$PKG" = "alsa-plugins" ]] && continue
     261        ;;
     262      fop )
     263        # Used to rebuild the documentation
     264        [[ "$PKG" = "linux-pam" ]] && continue
     265        ;;
     266      graphviz )
     267        # Used to build the API documentation
     268        [[ "$PKG" = "libusb" ]] && continue
     269        ;;
     270      GTK )
     271        # deprecated GTK version
     272        [[ "$PKG" = "alsa-tools" ]] && continue
     273        ;;
     274      gtk2 )
     275        # Testsuite only
     276        [[ "$PKG" = "cairo" ]] && continue
     277        ;;
     278      jadetex )
     279        # Runtime only
    224280        [[ "$PKG" = "docbook-utils" ]] && continue
     281        ;;
     282      $KBR5 )
     283        # cyrus-sasl-->postgresql-->$KBR5-->openldap-->cyrus-sasl
     284        [[ "$PKG" = "cyrus-sasl" ]] && continue
     285        ;;
     286      librsvg )
     287        # Testsuite only
     288        [[ "$PKG" = "cairo" ]] && continue
    225289        ;;
    226290      libxslt )
    … …  
    228292        [[ "$PKG" = "libxml2" ]] && continue
    229293        ;;
    230       openldap | postgresql | $KBR5 )
    231         # cyrus-sasl-->several-->cyrus-sasl
     294      Links )
     295        # Runtime only
     296        [[ "$PKG" = "docbook-utils" ]] && continue
     297        ;;
     298      lynx )
     299        # Runtime only
     300        [[ "$PKG" = "docbook-utils" ]] && continue
     301        ;;
     302      openldap )
     303        # cyrus-sasl-->postgresql-->$KBR5-->openldap-->cyrus-sasl
    232304        [[ "$PKG" = "cyrus-sasl" ]] && continue
    233305        ;;
    234       espgs )
    235         # sendmail-->espgs-->cups-->php-->sendmail
    236         [[ "$PKG" = "$MAIL_SERVER" ]] && continue
    237         ;;
    238       aRts )
    239         # esound-->aRts-->esound
    240         [[ "$PKG" = "esound" ]] && continue
    241         ;;
    242       gimp | sane )
    243         # imagemagick-->{sane}-->gimp-->imagemagick
    244         [[ "$PKG" = "imagemagick" ]] && continue
    245         ;;
    246       ffmpeg )
    247         # alsa-plugins-->ffmpeg-->several-->alsa-plugins
    248         [[ "$PKG" = "alsa-plugins" ]] && continue
    249         ;;
    250       akode )
    251         # Both are in the same page
    252         [[ "$PKG" = "kdemultimedia" ]] && continue
     306      poppler )
     307        # Testsuite only
     308        [[ "$PKG" = "cairo" ]] && continue
     309        ;;
     310      postgresql )
     311        # cyrus-sasl-->postgresql-->$KBR5-->openldap-->cyrus-sasl
     312        [[ "$PKG" = "cyrus-sasl" ]] && continue
     313        ;;
     314      python-modules )
     315        # True circular dependecy
     316        [[ "$PKG" = "python-modules" ]] && continue
     317        # libgsf-->python-modules-->several combinations-->libgsf
     318        [[ "$PKG" = "libgsf" ]] && continue
     319        # gimp-->python-modules-->several combinations-->gimp
     320        [[ "$PKG" = "gimp" ]] && continue
     321        # Used to rebuild the documentation
     322        [[ "$PKG" = "gstreamer" ]] && continue
     323        [[ "$PKG" = "gst-plugins-base" ]] && continue
     324        [[ "$PKG" = "gst-plugins-good" ]] && continue
     325        ;;
     326      tk )
     327        # python-->tk-->xorg7-->several combinations-->libxslt-->python
     328        [[ "$PKG" = "python" ]] && continue
     329        ;;
     330      w3m )
     331        # Runtime only
     332        [[ "$PKG" = "docbook-utils" ]] && continue
     333        # Used to rebuild the documentation
     334        [[ "$PKG" = "linux-pam" ]] && continue
    253335        ;;
    254336    esac

  • BLFS/libs/func_packages

    r0510381 r9c9775f  
    2828        bind-utils ) pkg_id=bind ;;
    2929         html-tidy ) pkg_id=tidy ;;
    30                jdk ) pkg_id=jdk-src ;;
    3130          reiserfs ) pkg_id=reiser ;;
    3231               xfs ) pkg_id=xfsprogs ;;
    … …  
    3433
    3534  xmllint --noent ./${BLFS_XML}/book/bookinfo.xml 2>/dev/null | \
    36   grep -i " ${pkg_id}-version " | cut -d "\"" -f2
     35  grep -i " ${pkg_id}-version " | cut -d "\"" -f2 | sed "s/ /_/g"
    3736
    3837}
    … …  
    4342  local pkg_id=$1
    4443
    45   find $TRACKING_DIR -name "${pkg_id}-[[:digit:]]*" | sed "s/.*${pkg_id}-//"
     44
     45  case ${pkg_id} in
     46    html-tidy )
     47      find $TRACKING_DIR -name "${pkg_id}-cvs_[[:digit:]]*" | sed "s/.*${pkg_id}-//"
     48      ;;
     49    cdparanoia )
     50      find $TRACKING_DIR -name "${pkg_id}-III-[[:digit:]]*" | sed "s/.*${pkg_id}-//"
     51      ;;
     52    ffmpeg )
     53      find $TRACKING_DIR -name "${pkg_id}-svn_[[:digit:]]*" | sed "s/.*${pkg_id}-//"
     54      ;;
     55    psutils )
     56      find $TRACKING_DIR -name "${pkg_id}-p[[:digit:]]*" | sed "s/.*${pkg_id}-//"
     57      ;;
     58    * )
     59      find $TRACKING_DIR -name "${pkg_id}-[[:digit:]]*" | sed "s/.*${pkg_id}-//" | sed "s/ /_/g"
     60      ;;
     61  esac
    4662
    4763}
    … …  
    5874  for file in `find $BLFS_XML -name "*.xml"` ; do
    5975    pkg_id=$(grep "sect1 id" $file | sed -e 's/<sect1 id="//;s/".*//')
    60     pkg_ver=$(get_pkg_ver $pkg_id)
     76    case ${pkg_id} in
     77      dbus-bindings | \
     78      perl-modules | \
     79      python-modules ) pkg_ver=0.no_version ;;
     80                   * ) pkg_ver=$(get_pkg_ver $pkg_id) ;;
     81    esac
    6182    installed_ver=$(get_installed_ver $pkg_id)
    6283    [[ ! -z "$pkg_id" ]] && echo -e "$pkg_id\t$file\t$pkg_ver\t$installed_ver" >> packages.tmp
    … …  
    6485
    6586  # IDs clean-up (unuseful pages or commented-out packages, could be more)
    66   sed -i '/template/d;/ntroduction/d;/preface/d;/alsa.xml/d' packages.tmp
    67   sed -i '/obsolete/d;/postlfs-/d;/-client.xml/d;/xorg7.xml/d' packages.tmp
    68   sed -i '/courier.xml/d;/-other\t/d;/others-/d;/other-/d' packages.tmp
     87  sed -i '/template/d;/ntroduction/d;/preface/d;/alsa.xml/d;/xorg.xml/d' packages.tmp
     88  sed -i '/obsolete/d;/ispell\t/d;/postlfs-/d;/-client.xml/d;/xorg7.xml/d' packages.tmp
     89  sed -i '/courier.xml/d;/-other\t/d;/others-/d;/other-/d;/^ash\t/d' packages.tmp
    6990  sed -i '/fw-firewall\t/d;/gcc2\t/d;/cvsserver\t/d;/svnserver\t/d' packages.tmp
    70   sed -i '/fam\t/d;/libungif\t/d;/ncpfs\t/d;/slrn\t/d;/konq\t/d' packages.tmp
    71   sed -i '/gst-plugins\t/d;/openquicktime\t/d;/compressdoc\t/d' packages.tmp
     91  sed -i '/fam\t/d;/libungif\t/d;/ncpfs\t/d;/slrn\t/d;/konq\t/d;/arts\t/d' packages.tmp
     92  sed -i '/gst-plugins\t/d;/gimp-print\t/d;/openquicktime\t/d;/compressdoc\t/d' packages.tmp
     93  sed -i '/errata\t/d;/foreword\t/d;/organization\t/d;/whoread\t/d' packages.tmp
    7294
    7395  # Meta-packages version
    … …  
    205227#--------------------------#
    206228  echo -e "x-config\nx-setup\nrman\nxterm2\nxorg7-driver\nxorg7-server\nluit\n\
    207 xorg7-font\nxorg7-data\nxorg7-app\nxbitmaps\nmesalib\nlibdrm\n\
    208 xorg7-lib\nxorg7-util\nxorg7-proto" > libs/xorg7.dep
    209 }
     229xkeyboard-config\nxorg7-font\nxorg7-data\nxorg7-app\nmesalib\nlibdrm\nxbitmaps\n\
     230xorg7-lib\nlibxcb\nxcb-proto\nlibXdmcp\nlibXau\nxorg7-util\nxorg7-proto" > libs/xorg7.dep
     231}

  • BLFS/libs/func_parser

    r0510381 r9c9775f  
    3030cat << EOF
    3131<?xml version="1.0" encoding="ISO-8859-1"?>
    32 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
    33   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" >
     32<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
     33  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
    3434
    3535<book>
    … …  
    107107           $TARGET-index.xml > xsltproc.log 2>&1
    108108  mkdir HTML/{stylesheets,images}
    109   cp ../$BLFS_XML/stylesheets/*.css HTML/stylesheets
     109  cp ../$BLFS_XML/stylesheets/lfs-xsl/*.css HTML/stylesheets
    110110  cp ../$BLFS_XML/images/*.png HTML/images
    111111  cd HTML

  • BLFS/libs/scripts.xsl

    r0510381 r9c9775f  
    3030
    3131        <!-- Package name (use "Download FTP" by default. If empty, use "Download HTTP" -->
    32       <xsl:param name="package">
     32      <xsl:variable name="package">
    3333        <xsl:choose>
    3434          <xsl:when
    … …  
    4747          </xsl:otherwise>
    4848        </xsl:choose>
    49       </xsl:param>
     49      </xsl:variable>
    5050
    5151        <!-- FTP dir name -->
    52       <xsl:param name="ftpdir">
     52      <xsl:variable name="ftpdir">
    5353        <xsl:call-template name="ftp_dir">
    5454          <xsl:with-param name="package" select="$package"/>
    5555        </xsl:call-template>
    56       </xsl:param>
     56      </xsl:variable>
    5757
    5858        <!-- The build order -->
    … …  
    8787        <!-- Creating the scripts -->
    8888      <exsl:document href="{$order}-z-{$filename}" method="text">
    89         <xsl:text>#!/bin/sh&#xA;set -e&#xA;&#xA;</xsl:text>
     89        <xsl:text>#!/bin/bash&#xA;set -e&#xA;&#xA;</xsl:text>
    9090        <xsl:choose>
    9191          <!-- Package page -->
    … …  
    107107            </xsl:apply-templates>
    108108            <!-- Clean-up -->
    109             <xsl:text>cd $SRC_DIR/$PKG_DIR&#xA;</xsl:text>
    110             <xsl:text>rm -rf $UNPACKDIR unpacked&#xA;&#xA;</xsl:text>
     109            <xsl:if test="not(@id='mesalib')">
     110              <xsl:text>cd $SRC_DIR/$PKG_DIR&#xA;</xsl:text>
     111              <xsl:text>rm -rf $UNPACKDIR unpacked&#xA;&#xA;</xsl:text>
     112            </xsl:if>
     113            <xsl:if test="@id='xorg7-server'">
     114              <xsl:text>cd $SRC_DIR/MesaLib
     115UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
     116rm -rf $UNPACKDIR unpacked&#xA;&#xA;</xsl:text>
     117            </xsl:if>
    111118          </xsl:when>
    112119          <!-- Xorg7 pseudo-packages -->
    … …  
    149156if [[ -e unpacked ]] ; then
    150157  UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
    151   rm -rf $UNPACKDIR
     158  [[ -n $UNPACKDIR ]] &amp;&amp; [[ -d $UNPACKDIR ]] &amp;&amp; rm -rf $UNPACKDIR
    152159fi
    153160tar -xvf $PACKAGE > unpacked
    … …  
    156163        <xsl:apply-templates select=".//screen | .//para/command"/>
    157164        <xsl:if test="$sudo = 'y'">
    158           <xsl:text>sudo </xsl:text>
     165          <xsl:text>sudo /sbin/</xsl:text>
    159166        </xsl:if>
    160167        <xsl:text>ldconfig&#xA;&#xA;</xsl:text>
    … …  
    169176  <xsl:template match="sect2" mode="xorg7">
    170177    <xsl:choose>
    171       <xsl:when test="@role = 'package'"/>
     178      <xsl:when test="@role = 'package'">
     179        <xsl:apply-templates select="itemizedlist/listitem/para" mode="xorg7"/>
     180      </xsl:when>
    172181      <xsl:when test="not(@role)">
    173         <xsl:apply-templates select=".//screen"/>
    174         <xsl:apply-templates select="../sect2[@role='package']/itemizedlist/listitem/para"
    175                              mode="xorg7"/>
    176         <xsl:text>WGET_LST=</xsl:text>
    177         <xsl:apply-templates select=".//screen" mode="wget_lst"/>
    178         <xsl:text>&#xA;</xsl:text>
     182        <xsl:text>SRC_ARCHIVE=$SRC_ARCHIVE
     183FTP_SERVER=$FTP_SERVER&#xA;</xsl:text>
     184        <xsl:apply-templates select=".//screen" mode="sect-ver"/>
     185        <xsl:text>mkdir -p ${section}&#xA;cd ${section}&#xA;</xsl:text>
     186        <xsl:apply-templates select="../sect2[@role='package']/itemizedlist/listitem/para" mode="xorg7-patch"/>
     187        <xsl:text>for line in $(grep -v '^#' ../${sect_ver}.wget) ; do
     188  if [[ ! -f ${line} ]] ; then
     189    if [[ -f $SRC_ARCHIVE/Xorg/${section}/${line} ]] ; then
     190      cp $SRC_ARCHIVE/Xorg/${section}/${line} ${line}
     191    elif [[ -f $SRC_ARCHIVE/Xorg/${line} ]] ; then
     192      cp $SRC_ARCHIVE/Xorg/${line} ${line}
     193    elif [[ -f $SRC_ARCHIVE/${section}/${line} ]] ; then
     194      cp $SRC_ARCHIVE/${section}/${line} ${line}
     195    elif [[ -f $SRC_ARCHIVE/${line} ]] ; then
     196      cp $SRC_ARCHIVE/${line} ${line}
     197    else
     198      wget ${FTP_SERVER}conglomeration/Xorg/${line} || \
     199      wget http://xorg.freedesktop.org/releases/individual/${section}/${line}
     200    fi
     201  fi
     202done
     203md5sum -c ../${sect_ver}.md5
     204cp ../${sect_ver}.wget ../${sect_ver}.wget.orig
     205cp ../${sect_ver}.md5 ../${sect_ver}.md5.orig&#xA;</xsl:text>
    179206      </xsl:when>
    180207      <xsl:when test="@role = 'installation'">
    181         <xsl:text>for package in $(cat $WGET_LST) ; do
     208        <xsl:text>for package in $(grep -v '^#' ../${sect_ver}.wget) ; do
    182209  packagedir=$(echo $package | sed 's/.tar.bz2//')
    183   tar -xf $package
    184   cd $packagedir&#xA;</xsl:text>
     210  tar -xf ${package}
     211  cd ${packagedir}&#xA;</xsl:text>
    185212        <xsl:apply-templates select=".//screen | .//para/command"/>
    186213        <xsl:text>  cd ..
    187   rm -rf $packagedir
    188 done&#xA;</xsl:text>
     214  rm -rf ${packagedir}
     215  sed -i "/${package}/d" ../${sect_ver}.wget
     216  sed -i "/${package}/d" ../${sect_ver}.md5
     217done
     218mv ../${sect_ver}.wget.orig ../${sect_ver}.wget
     219mv ../${sect_ver}.md5.orig ../${sect_ver}.md5&#xA;</xsl:text>
    189220        <xsl:if test="$sudo = 'y'">
    190           <xsl:text>sudo </xsl:text>
     221          <xsl:text>sudo /sbin/</xsl:text>
    191222        </xsl:if>
    192223        <xsl:text>ldconfig&#xA;&#xA;</xsl:text>
     224      </xsl:when>
     225      <xsl:when test="@role = 'configuration'">
     226        <xsl:apply-templates select=".//screen"/>
     227        <xsl:text>&#xA;</xsl:text>
    193228      </xsl:when>
    194229    </xsl:choose>
    … …  
    357392        <xsl:text>    wget ${FTP_SERVER}conglomeration/$PKG_DIR/$PACKAGE</xsl:text>
    358393        <!-- Upstream HTTP URL -->
    359         <xsl:if test="string-length(ulink/@url) &gt; '10' and
    360                       not(contains(string(ulink/@url),'sourceforge'))">
     394        <xsl:if test="string-length(ulink/@url) &gt; '10'">
    361395          <xsl:text> || \&#xA;    wget </xsl:text>
    362           <xsl:value-of select="ulink/@url"/>
     396          <xsl:choose>
     397            <xsl:when test="contains(ulink/@url,'?')">
     398              <xsl:value-of select="substring-before(ulink/@url,'?')"/>
     399            </xsl:when>
     400            <xsl:otherwise>
     401              <xsl:value-of select="ulink/@url"/>
     402            </xsl:otherwise>
     403          </xsl:choose>
    363404        </xsl:if>
    364405      </xsl:when>
    … …  
    386427
    387428  <xsl:template match="itemizedlist/listitem/para" mode="xorg7">
     429    <xsl:if test="contains(string(ulink/@url),'.md5') or
     430                  contains(string(ulink/@url),'.wget')">
     431      <xsl:text>wget </xsl:text>
     432      <xsl:value-of select="ulink/@url"/>
     433      <xsl:text>&#xA;</xsl:text>
     434    </xsl:if>
     435  </xsl:template>
     436
     437  <xsl:template match="itemizedlist/listitem/para" mode="xorg7-patch">
    388438    <xsl:if test="contains(string(ulink/@url),'.patch')">
    389439      <xsl:text>wget </xsl:text>
    … …  
    398448    <xsl:if test="child::* = userinput and not(@role = 'nodump')">
    399449      <xsl:if test="@role = 'root' and $sudo = 'y'">
    400         <xsl:text>sudo sh -c "</xsl:text>
     450        <xsl:text>sudo sh -c '</xsl:text>
    401451      </xsl:if>
    402452      <xsl:apply-templates select="userinput"/>
    403453      <xsl:if test="@role = 'root' and $sudo = 'y'">
    404         <xsl:text>"</xsl:text>
     454        <xsl:text>'</xsl:text>
    405455      </xsl:if>
    406456      <xsl:text>&#xA;</xsl:text>
    … …  
    408458  </xsl:template>
    409459
    410   <xsl:template match="screen" mode="wget_lst">
    411     <xsl:value-of select="substring-after(string(),' -i ')"/>
     460  <xsl:template match="screen" mode="sect-ver">
     461    <xsl:text>section=</xsl:text>
     462    <xsl:value-of select="substring-before(substring-after(string(),'mkdir '),' &amp;')"/>
     463    <xsl:text>&#xA;sect_ver=</xsl:text>
     464    <xsl:value-of select="substring-before(substring-after(string(),'-c ../'),'.md5')"/>
     465    <xsl:text>&#xA;</xsl:text>
    412466  </xsl:template>
    413467
    … …  
    428482
    429483  <xsl:template match="replaceable">
    430     <xsl:text>**EDITME</xsl:text>
    431     <xsl:apply-templates/>
    432     <xsl:text>EDITME**</xsl:text>
     484    <xsl:choose>
     485      <xsl:when test="ancestor::sect1[@id='xorg7-server']">
     486        <xsl:text>$SRC_DIR/MesaLib</xsl:text>
     487      </xsl:when>
     488      <xsl:otherwise>
     489        <xsl:text>**EDITME</xsl:text>
     490        <xsl:apply-templates/>
     491        <xsl:text>EDITME**</xsl:text>
     492      </xsl:otherwise>
     493    </xsl:choose>
    433494  </xsl:template>
    434495
Note: See TracChangeset for help on using the changeset viewer.