Ticket #5274: pkgconf.patch

File pkgconf.patch, 14.8 KB (added by rahul, 17 months ago)

Updated patch with dereferenced.org tar, move pkgconf back to original location

  • appendices/dependencies.xml 

    diff --color -Naur --exclude .git lfs-stock/appendices/dependencies.xml lfs-git/appendices/dependencies.xml
    old new  
    16071607        <segtitle>&dependencies;</segtitle>
    16081608        <seglistitem>
    16091609          <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
    1610           Gzip, Make, OpenSSL, Pkg-config, Sed, Xz, and Zlib</seg>
     1610          Gzip, Make, OpenSSL, Pkgconf, Sed, Xz, and Zlib</seg>
    16111611        </seglistitem>
    16121612      </segmentedlist>
    16131613
    … …  
    24842484      </segmentedlist>
    24852485
    24862486<!-- Begin Pkg-config dependency info -->
    2487   <bridgehead renderas="sect2" id="pkgconfig-dep">Pkg-config</bridgehead>
     2487  <bridgehead renderas="sect2" id="pkgconf-dep">Pkgconf</bridgehead>
    24882488
    2489       <segmentedlist id="pkgconfig-depends">
     2489      <segmentedlist id="pkgconf-depends">
    24902490        <segtitle>&dependencies;</segtitle>
    24912491        <seglistitem>
    24922492          <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
    2493           and Sed</seg>
     2493           and Sed</seg>
    24942494        </seglistitem>
    24952495      </segmentedlist>
    24962496
    2497       <segmentedlist id="pkgconfig-rundeps">
     2497      <segmentedlist id="pkgconf-rundeps">
    24982498        <segtitle>&runtime;</segtitle>
    24992499        <seglistitem>
    25002500          <seg>Glibc</seg>
    25012501        </seglistitem>
    25022502      </segmentedlist>
    25032503
    2504       <segmentedlist id="pkgconfig-testdeps">
     2504      <segmentedlist id="pkgconf-testdeps">
    25052505        <segtitle>&testsuites;</segtitle>
    25062506        <seglistitem>
    25072507          <seg>None</seg>
    25082508        </seglistitem>
    25092509      </segmentedlist>
    25102510
    2511       <segmentedlist id="pkgoonfig-before">
     2511      <segmentedlist id="pkgconf-before">
    25122512        <segtitle>&before;</segtitle>
    25132513        <seglistitem>
    25142514          <seg>Kmod</seg>
    25152515        </seglistitem>
    25162516      </segmentedlist>
    25172517
    2518       <segmentedlist id="pkgconfig-optdeps">
     2518      <segmentedlist id="pkgconf-optdeps">
    25192519        <segtitle>&external;</segtitle>
    25202520        <seglistitem>
    2521           <seg>
    2522             <ulink url="&blfs-book;general/glib2.html">Glib2</ulink>
    2523           </seg>
     2521          <seg>None</seg>
    25242522        </seglistitem>
    25252523      </segmentedlist>
    25262524

  • chapter01/changelog.xml 

    diff --color -Naur --exclude .git lfs-stock/chapter01/changelog.xml lfs-git/chapter01/changelog.xml
    old new  
    3939    <listitem revision="sysv"> or <listitem revision="systemd"> as
    4040    appropriate for the entry or if needed the entire day's listitem.
    4141    -->
     42
     43    <listitem>
     44      <para>2023-06-17</para>
     45      <itemizedlist>
     46        <listitem>
     47          <para>[rahul] - Changed from pkg-config to pkgconf 1.9.5.</para>
     48        </listitem>
     49      </itemizedlist>
     50    </listitem>
     51
    4252    <listitem>
    4353      <para>2023-06-09</para>
    4454      <itemizedlist>

  • chapter03/packages.xml 

    diff --color -Naur --exclude .git lfs-stock/chapter03/packages.xml lfs-git/chapter03/packages.xml
    old new  
    609609    </varlistentry>
    610610
    611611    <varlistentry>
    612       <term>Pkg-config (&pkgconfig-version;) - <token>&pkgconfig-size;</token>:</term>
     612      <term>Pkgconf (&pkgconf-version;) - <token>&pkgconf-size;</token>:</term>
    613613      <listitem>
    614         <para>Home page: <ulink url="&pkgconfig-home;"/></para>
    615         <para>Download: <ulink url="&pkgconfig-url;"/></para>
    616         <para>MD5 sum: <literal>&pkgconfig-md5;</literal></para>
     614        <para>Home page: <ulink url="&pkgconf-home;"/></para>
     615        <para>Download: <ulink url="&pkgconf-url;"/></para>
     616        <para>MD5 sum: <literal>&pkgconf-md5;</literal></para>
    617617      </listitem>
    618618    </varlistentry>
    619619

  • chapter08/chapter08.xml 

    diff --color -Naur --exclude .git lfs-stock/chapter08/chapter08.xml lfs-git/chapter08/chapter08.xml
    old new  
    2929  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
    32 
    3332  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
    3433  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
    3534  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.xml"/>
    … …  
    3938  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
    4039  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
    4140  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
    42   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconf.xml"/>
    4342  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
    4443  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
    4544  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>

  • chapter08/pkgconfig.xml 

    diff --color -Naur --exclude .git lfs-stock/chapter08/pkgconfig.xml lfs-git/chapter08/pkgconfig.xml
    old new  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
    2 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    3   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    4   <!ENTITY % general-entities SYSTEM "../general.ent">
    5   %general-entities;
    6 ]>
    7 
    8 <sect1 id="ch-system-pkgconfig" role="wrap">
    9   <?dbhtml filename="pkg-config.html"?>
    10 
    11   <sect1info condition="script">
    12     <productname>pkg-config</productname>
    13     <productnumber>&pkgconfig-version;</productnumber>
    14     <address>&pkgconfig-url;</address>
    15   </sect1info>
    16 
    17   <title>Pkg-config-&pkgconfig-version;</title>
    18 
    19   <indexterm zone="ch-system-pkgconfig">
    20     <primary sortas="a-pkgconfig">Pkgconfig</primary>
    21   </indexterm>
    22 
    23   <sect2 role="package">
    24     <title/>
    25 
    26     <para>The pkg-config package contains a tool for passing the include path
    27     and/or library paths to build tools during the configure and make phases
    28     of package installations.</para>
    29 
    30     <segmentedlist>
    31       <segtitle>&buildtime;</segtitle>
    32       <segtitle>&diskspace;</segtitle>
    33 
    34       <seglistitem>
    35         <seg>&pkgconfig-fin-sbu;</seg>
    36         <seg>&pkgconfig-fin-du;</seg>
    37       </seglistitem>
    38     </segmentedlist>
    39 
    40   </sect2>
    41 
    42   <sect2 role="installation">
    43     <title>Installation of Pkg-config</title>
    44 
    45     <para>Prepare Pkg-config for compilation:</para>
    46 
    47 <screen><userinput remap="configure">./configure --prefix=/usr              \
    48             --with-internal-glib       \
    49             --disable-host-tool        \
    50             --docdir=/usr/share/doc/pkg-config-&pkgconfig-version;</userinput></screen>
    51 
    52     <variablelist>
    53       <title>The meaning of the new configure options:</title>
    54 
    55       <varlistentry>
    56         <term><parameter>--with-internal-glib</parameter></term>
    57         <listitem>
    58           <para>This will allow pkg-config to use its internal version of
    59           Glib because an external version is not available in LFS.</para>
    60         </listitem>
    61       </varlistentry>
    62 
    63       <varlistentry>
    64         <term><parameter>--disable-host-tool</parameter></term>
    65         <listitem>
    66           <para>This option disables the creation of an undesired hard link
    67           to the pkg-config program.</para>
    68         </listitem>
    69       </varlistentry>
    70 
    71     </variablelist>
    72 
    73     <para>Compile the package:</para>
    74 
    75 <screen><userinput remap="make">make</userinput></screen>
    76 
    77     <para>To test the results, issue:</para>
    78 
    79 <screen><userinput remap="test">make check</userinput></screen>
    80 
    81     <para>Install the package:</para>
    82 
    83 <screen><userinput remap="install">make install</userinput></screen>
    84 
    85   </sect2>
    86 
    87   <sect2 id="contents-pkgconfig" role="content">
    88     <title>Contents of Pkg-config</title>
    89 
    90     <segmentedlist>
    91       <segtitle>Installed program</segtitle>
    92       <segtitle>Installed directory</segtitle>
    93 
    94       <seglistitem>
    95         <seg>pkg-config</seg>
    96         <seg>/usr/share/doc/pkg-config-&pkgconfig-version;</seg>
    97       </seglistitem>
    98     </segmentedlist>
    99 
    100     <variablelist>
    101       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
    102       <?dbfo list-presentation="list"?>
    103       <?dbhtml list-presentation="table"?>
    104 
    105       <varlistentry id="pkgconfig">
    106          <!-- Don't remove the extra space, it prevents a FOP warning. -->
    107         <term><command>pkg-config </command></term>
    108         <listitem>
    109           <para>Returns meta information for the specified library or package
    110           </para>
    111           <indexterm zone="ch-system-pkgconfig pkgconfig">
    112             <primary sortas="b-pkgconfig">pkg-config</primary>
    113           </indexterm>
    114         </listitem>
    115       </varlistentry>
    116 
    117     </variablelist>
    118 
    119   </sect2>
    120 
    121 </sect1>

  • chapter08/pkgconf.xml 

    diff --color -Naur --exclude .git lfs-stock/chapter08/pkgconf.xml lfs-git/chapter08/pkgconf.xml
    old new  
     1<?xml version="1.0" encoding="ISO-8859-1"?>
     2<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
     3  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
     4  <!ENTITY % general-entities SYSTEM "../general.ent">
     5  %general-entities;
     6]>
     7
     8<sect1 id="ch-system-pkgconf" role="wrap">
     9  <?dbhtml filename="pkgconf"?>
     10
     11  <sect1info condition="script">
     12    <productname>pkgconf</productname>
     13    <productnumber>&pkgconf-version;</productnumber>
     14    <address>&pkgconf-url;</address>
     15  </sect1info>
     16
     17  <title>Pkgconf-&pkgconf-version;</title>
     18
     19  <indexterm zone="ch-system-pkgconf">
     20    <primary sortas="a-pkgconf">Pkgconf</primary>
     21  </indexterm>
     22
     23  <sect2 role="package">
     24    <title/>
     25
     26    <para>The pkgconf package is a
     27    successor to pkg-config and contains a tool for passing the include path
     28    and/or library paths to build tools during the configure and make phases
     29    of package installations.</para>
     30
     31    <segmentedlist>
     32      <segtitle>&buildtime;</segtitle>
     33      <segtitle>&diskspace;</segtitle>
     34
     35      <seglistitem>
     36        <seg>&pkgconf-fin-sbu;</seg>
     37        <seg>&pkgconf-fin-du;</seg>
     38      </seglistitem>
     39    </segmentedlist>
     40
     41  </sect2>
     42
     43  <sect2 role="installation">
     44    <title>Installation of Pkgconf</title>
     45    <para>Prepare Pkgconf for compilation:</para>
     46
     47<screen><userinput remap="configure">./configure --prefix=/usr              \
     48            --disable-static           \
     49            --docdir=/usr/share/doc/pkgconf-&pkgconf-version;</userinput></screen>
     50
     51    <para>Compile the package:</para>
     52
     53<screen><userinput remap="make">make</userinput></screen>
     54
     55
     56    <para>Install the package:</para>
     57
     58<screen><userinput remap="install">make install</userinput></screen>
     59
     60    <para>To mantain compatibility with the original Pkg-config create a symlink</para>
     61
     62<screen><userinput remap="install">ln -sfv pkgconf /usr/bin/pkg-config</userinput></screen>
     63
     64  </sect2>
     65
     66  <sect2 id="contents-pkgconf" role="content">
     67    <title>Contents of Pkgconf</title>
     68
     69    <segmentedlist>
     70      <segtitle>Installed programs</segtitle>
     71      <segtitle>Installed library</segtitle>
     72      <segtitle>Installed directory</segtitle>
     73
     74      <seglistitem>
     75        <seg>pkgconf, pkg-config(link to pkgconf) and bomtool</seg>
     76        <seg>libpkgconf.so</seg>
     77        <seg>/usr/share/doc/pkgconf-&pkgconf-version;</seg>
     78      </seglistitem>
     79    </segmentedlist>
     80
     81    <variablelist>
     82      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
     83      <?dbfo list-presentation="list"?>
     84      <?dbhtml list-presentation="table"?>
     85
     86      <varlistentry id="pkgconf">
     87         <!-- Don't remove the extra space, it prevents a FOP warning. -->
     88        <term><command>pkgconf </command></term>
     89        <listitem>
     90          <para>Returns meta information for the specified library or package
     91          </para>
     92          <indexterm zone="ch-system-pkgconf pkgconf">
     93            <primary sortas="b-pkgconf">pkgconf</primary>
     94          </indexterm>
     95        </listitem>
     96      </varlistentry>
     97
     98
     99      <varlistentry id="pkg-config">
     100         <!-- Don't remove the extra space, it prevents a FOP warning. -->
     101        <term><command>pkg-config </command></term>
     102        <listitem>
     103          <para>A drop-in 1 to 1 compatibility layer for the Freedesktop version of pkg-config
     104          </para>
     105          <indexterm zone="ch-system-pkgconf pkg-config">
     106            <primary sortas="b-pkg-config">pkg-config</primary>
     107          </indexterm>
     108        </listitem>
     109      </varlistentry>
     110
     111      <varlistentry id="bomtool">
     112         <!-- Don't remove the extra space, it prevents a FOP warning. -->
     113        <term><command>bomtool </command></term>
     114        <listitem>
     115          <para>Generates a Software Bill Of Materials from pkg-config .pc files
     116          </para>
     117          <indexterm zone="ch-system-pkgconf bomtool">
     118            <primary sortas="b-bomtool">bomtool</primary>
     119          </indexterm>
     120        </listitem>
     121      </varlistentry>
     122
     123      <varlistentry id="libpkgconf">
     124        <term><filename class="libraryfile">libpkgconf</filename></term>
     125        <listitem>
     126          <para>Contains most of pkgconf's functionality, while allowing other tools
     127          like IDEs and compilers to use its frameworks</para>
     128          <indexterm zone="ch-system-pkgconf libpkgconf">
     129            <primary sortas="c-libpkgconf">libpkgconf</primary>
     130          </indexterm>
     131        </listitem>
     132      </varlistentry>
     133    </variablelist>
     134  </sect2>
     135
     136</sect1>

  • packages.ent 

    diff --color -Naur --exclude .git lfs-stock/packages.ent lfs-git/packages.ent
    old new  
    566566<!ENTITY perl-fin-du "234 MB">
    567567<!ENTITY perl-fin-sbu "7.9 SBU">
    568568
    569 <!ENTITY pkgconfig-version "0.29.2">
    570 <!ENTITY pkgconfig-size "1,970 KB">
    571 <!ENTITY pkgconfig-url "https://pkg-config.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
    572 <!ENTITY pkgconfig-md5 "f6e931e319531b736fadc017f470e68a">
    573 <!ENTITY pkgconfig-home "https://www.freedesktop.org/wiki/Software/pkg-config">
    574 <!ENTITY pkgconfig-fin-du "29 MB">
    575 <!ENTITY pkgconfig-fin-sbu "0.1 SBU">
     569<!ENTITY pkgconf-version "1.9.5">
     570<!ENTITY pkgconf-size "304 KB">
     571<!ENTITY pkgconf-url "https://distfiles.dereferenced.org/pkgconf/pkgconf-&pkgconf-version;.tar.xz">
     572<!ENTITY pkgconf-md5 "0a8b69723bef4ebad83e9c8b43a75cc7">
     573<!ENTITY pkgconf-home "http://pkgconf.org/">
     574<!ENTITY pkgconf-fin-du "8.1 MB">
     575<!ENTITY pkgconf-fin-sbu "less than 0.1 SBU">
    576576
    577577<!ENTITY procps-ng-version "4.0.3">
    578578<!ENTITY procps-ng-size "1,268 KB">