Changeset 0913f48


Ignore:
Timestamp:
03/30/2012 07:22:43 PM (12 years ago)
Author:
Krejzi <krejzi@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
fcf1326d
Parents:
8500ee0
Message:

gdk-pixbuf 2.26.0, cogl, gobject-introspection, glib and vala instruction fixes

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9816 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r8500ee0 r0913f48  
    610610<!ENTITY atk-version                  "2.2.0">
    611611<!ENTITY atkmm-version                "2.22.6">
    612 <!ENTITY gdk-pixbuf-version           "2.24.0">
     612<!ENTITY gdk-pixbuf-version           "2.26.0">
    613613<!ENTITY gtk2-version                 "2.24.10">
    614614<!ENTITY gtk2-libdir                  "2.0/2.10.0">

  • general/genlib/glib2.xml

    r8500ee0 r0913f48  
    6666    <bridgehead renderas="sect4">Required</bridgehead>
    6767    <para role="required"><xref linkend="libffi"/> and <xref linkend="python2"/>
    68     <!--<para role="required"><xref linkend="pkgconfig"/> -->
    6968    </para>
    7069
    … …  
    148147    architecture dependent header file where programs can find it.</para>
    149148
    150     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    151     href="../../xincludes/gtk-doc-rebuild.xml"/>
    152 
    153149    <para><parameter>--with-pcre=system</parameter>: This parameter causes the
    154150    build to use a system-provided version of the
    155151    <application>PCRE</application> library instead of an internal
    156152    version.</para>
     153
     154    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     155    href="../../xincludes/gtk-doc-rebuild.xml"/>
    157156
    158157  </sect2>
    … …  
    196195
    197196      <seglistitem>
    198         <seg>gdbus, gdbus-codegen, gio-querymodules,
    199         glib-compile-resources, glib-compile-schemas,
    200         glib-genmarshal, glib-gettextize, glib-mkenums,
    201         gobject-query, gresource, gsettings, gtester
    202         and gtester-report</seg>
    203         <seg>libgio-2.0.so, libglib-2.0.so, libgmodule-2.0.so,
    204         libgobject-2.0.so, libgthread-2.0.so and libgiofam.so</seg>
    205         <seg>/usr/{include/{gio-unix-2.0/gio,glib-2.0/{gio,glib,gobject}},
    206         lib/{gdbus-2.0/codegen,gio/modules,glib-2.0/include},share/
    207         {gdb/auto-load,glib-2.0/{gdb,gettext/po},gtk-doc/html/
    208         {gio,glib,gobject}}}</seg>
     197        <seg>
     198          gdbus, gdbus-codegen, gio-querymodules,
     199          glib-compile-resources, glib-compile-schemas,
     200          glib-genmarshal, glib-gettextize, glib-mkenums,
     201          gobject-query, gresource, gsettings, gtester
     202          and gtester-report
     203        </seg>
     204
     205        <seg>
     206          libgio-2.0.so, libglib-2.0.so, libgmodule-2.0.so,
     207          libgobject-2.0.so, libgthread-2.0.so and libgiofam.so
     208        </seg>
     209
     210        <seg>
     211          /usr/include/{gio-unix-2.0/gio,glib-2.0/{gio,glib,gobject}},
     212          /usr/lib/{gdbus-2.0/codegen,gio/modules,glib-2.0/include},
     213          /usr/share/glib-2.0/{gdb,gettext/po} and
     214          /usr/share/gtk-doc/html/{gio,glib,gobject}
     215        </seg>
    209216      </seglistitem>
    210217    </segmentedlist>

  • general/genlib/gobject-introspection.xml

    r8500ee0 r0913f48  
    6161
    6262    <bridgehead renderas="sect4">Required</bridgehead>
    63     <para role="required">
    64       <xref linkend="libffi"/>,
    65       <xref linkend="pkgconfig"/> and
    66       <xref linkend="python2"/>
    67     </para>
     63    <para role="required"><xref linkend="pkgconfig"/></para>
    6864
    6965    <bridgehead renderas="sect4">Optional</bridgehead>
    … …  
    120116
    121117      <seglistitem>
    122 
    123118        <seg>
    124119          g-ir-annotation-tool, g-ir-compiler, g-ir-generate and g-ir-scanner
    … …  
    129124        </seg>
    130125       
    131         <seg>/usr/include/gobject-introspection-1.0,
    132              /usr/lib/{girepository-1.0,gobject-introspection/giscanner},
    133              /usr/lib/share/{gir-1.0,gobject-introspection-1.0/tests,
    134             gtk-doc/html/gi}
     126        <seg>
     127          /usr/include/gobject-introspection-1.0,
     128          /usr/lib/{girepository-1.0,gobject-introspection/giscanner},
     129          /usr/share/{gir-1.0,gobject-introspection-1.0/tests} and
     130          /usr/share/gtk-doc/html/gi
    135131        </seg>
    136132      </seglistitem>

  • general/prog/vala.xml

    r8500ee0 r0913f48  
    112112        </seg>
    113113
    114         <seg>/usr/{{include,lib}/vala-0.16,
    115         share/{devhelp/books/vala-0.16,vala,vala-0.16/vapi}}</seg>
     114        <seg>
     115          /usr/include/vala-0.16,
     116          /usr/lib/vala-0.16,
     117          /usr/share/devhelp/books/vala-0.16
     118          and /usr/share/{vala,vala-0.16/vapi}
     119        </seg>
    116120      </seglistitem>
    117121    </segmentedlist>

  • introduction/welcome/changelog.xml

    r8500ee0 r0913f48  
    6060          <para>[krejzi] - cogl 1.10.0.</para>
    6161        </listitem>
     62        <listitem>
     63          <para>[krejzi] - gdk-pixbuf 2.26.0.</para>
     64        </listitem>
    6265      </itemizedlist>
    6366    </listitem>

  • x/lib/cogl.xml

    r8500ee0 r0913f48  
    112112      <seglistitem>
    113113        <seg>None</seg>
    114         <seg>libcogl-pango.so and libcogl.so</seg>
    115         <seg>/usr/{include/cogl/{cogl,cogl-pango},
    116         share/{cogl/examples-data,gtk-doc/html/
    117         {cogl,cogl-2.0-experimental}}}</seg>
     114
     115        <seg>
     116          libcogl-pango.so and libcogl.so
     117       </seg>
     118
     119        <seg>
     120         /usr/include/cogl/{cogl,cogl-pango},
     121         /usr/share/cogl/examples-data and
     122         /usr/share/gtk-doc/html/{cogl,cogl-2.0-experimental}
     123       </seg>
    118124      </seglistitem>
    119125    </segmentedlist>

  • x/lib/gdk-pixbuf.xml

    r8500ee0 r0913f48  
    55  %general-entities;
    66
    7   <!ENTITY gdk-pixbuf-download-http "&gnome-download-http;/gdk-pixbuf/2.24/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
    8   <!ENTITY gdk-pixbuf-download-ftp  "&gnome-download-ftp;/gdk-pixbuf/2.24/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
    9   <!ENTITY gdk-pixbuf-md5sum        "bd7c2a9d23b573db467e39833f12103d">
     7  <!ENTITY gdk-pixbuf-download-http "&gnome-download-http;/gdk-pixbuf/2.26/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
     8  <!ENTITY gdk-pixbuf-download-ftp  "&gnome-download-ftp;/gdk-pixbuf/2.26/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
     9  <!ENTITY gdk-pixbuf-md5sum        "1c186f9903a20e96587b9afb27944b40">
    1010  <!ENTITY gdk-pixbuf-size          "1.1 MB">
    11   <!ENTITY gdk-pixbuf-buildsize     "22 MB">
     11  <!ENTITY gdk-pixbuf-buildsize     "25 MB">
    1212  <!ENTITY gdk-pixbuf-time          "0.2 SBU">
    1313]>
    … …  
    6262    <bridgehead renderas="sect3">gdk-pixbuf Dependencies</bridgehead>
    6363
     64    <!-- Whole package is useless without jpeg, png and tiff loaders. -->
    6465    <bridgehead renderas="sect4">Required</bridgehead>
    65     <para role="required"><xref linkend="pkgconfig"/></para>
     66    <para role="required"><xref linkend="libjpeg"/>,
     67    <xref linkend="libpng"/>, <xref linkend="libtiff"/>,
     68    <xref linkend="pkgconfig"/> and <xref linkend="xorg7-lib"/></para>
    6669
    6770    <bridgehead renderas="sect4">Recommended</bridgehead>
    68     <para role="recommended"><xref linkend="libtiff"/>,
    69     <xref linkend="libjpeg"/> and <xref linkend="libpng"/></para>
     71    <para role="recommended"><xref linkend="gobject-introspection"/>
     72    (Required if building GNOME)</para>
    7073
    7174    <bridgehead renderas="sect4">Optional</bridgehead>
    72     <para role="optional"><xref linkend="gobject-introspection"/>
    73     (required if you want to build <xref linkend="gnome"/>),
    74     <xref linkend="jasper"/> and <xref linkend="gtk-doc"/> (to rebuild the
    75     documentation)</para>
     75    <para role="optional"><xref linkend="jasper"/> and
     76    <xref linkend="gtk-doc"/></para>
    7677
    7778    <para condition="html" role="usernotes">User Notes:
    … …  
    8687    following commands:</para>
    8788
    88 <screen><userinput>./configure --prefix=/usr &amp;&amp;
     89<screen><userinput>./configure --prefix=/usr --with-x11 &amp;&amp;
    8990make</userinput></screen>
    9091
    … …  
    101102    <title>Command Explanations</title>
    102103
     104    <para><option>--with-x11</option>: This switch enables building of
     105    gdk-pixbuf x11 library which is needed for some packages.</para>
     106
    103107    <para><option>--with-libjasper</option>: If you've installed
    104108    <xref linkend="jasper"/> and you want gdk-pixbuf to use it to compile a
    105109    JPEG2000 image loader, pass this option to configure.</para>
    106110
    107     <para><option>--without-libjpeg</option>: If you've not installed
    108     <xref linkend="libjpeg"/> and you want to install gdk-pixbuf without jpeg
    109     support, pass this option to configure.</para>
    110 
    111     <para><option>--without-libpng</option>: If you've not installed
    112     <xref linkend="libpng"/> and you want to install gdk-pixbuf without png
    113     support, pass this option to configure.</para>
    114 
    115     <para><option>--without-libtiff</option>: If you've not installed
    116     <xref linkend="libtiff"/> and you want to install gdk-pixbuf without tiff
    117     support, pass this option to configure.</para>
    118 
    119     <para><option>--enable-gtk-doc</option>: Use this option if you want to
    120     force it to rebuild the documentation.</para>
     111    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     112    href="../../xincludes/gtk-doc-rebuild.xml"/>
    121113
    122114  </sect2>
    … …  
    131123
    132124      <seglistitem>
    133         <seg>gdk-pixbuf-csource and gdk-pixbuf-query-loaders</seg>
     125        <seg>gdk-pixbuf-csource, gdk-pixbuf-pixdata and gdk-pixbuf-query-loaders</seg>
    134126        <seg>libgdk_pixbuf-2.0.so and libgdk_pixbuf_xlib-2.0.so</seg>
    135127        <seg>/usr/include/gdk-pixbuf-2.0, /usr/lib/gdk-pixbuf-2.0 and
Note: See TracChangeset for help on using the changeset viewer.