mirror of
https://github.com/Zeckmathederg/glfs.git
synced 2025-02-02 22:07:15 +08:00
gdk-pixbuf, pango:
Add --wrap-mode=no-fallback to prevent gi-docgen getting downloaded if you have the (python3) deps present. Comment gtk-doc in these packages, explain that gi-docgen is used for the documentation.
This commit is contained in:
parent
1eccbd91fe
commit
a8e1b4abcf
@ -44,6 +44,10 @@
|
||||
<listitem>
|
||||
<para>August 26th, 2021</para>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>[ken] - Add --wrap-mode=nofallback to gdk-pixbuf and pango. Fixes
|
||||
<ulink url="&blfs-ticket-root;15466">#15466</ulink>.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>[ken] - Update to Unicode-Collate-1.31 (perl module). Fixes
|
||||
<ulink url="&blfs-ticket-root;15446">#15446</ulink>.</para>
|
||||
|
@ -100,8 +100,9 @@
|
||||
<bridgehead renderas="sect4">Optional</bridgehead>
|
||||
<para role="optional">
|
||||
<!--<xref linkend="jasper"/> and-->
|
||||
<xref linkend="gtk-doc"/> and
|
||||
<!--<xref linkend="gtk-doc"/> and-->
|
||||
<ulink url="https://gitlab.gnome.org/ebassi/gi-docgen">gi-docgen</ulink>
|
||||
(to generate documentation)
|
||||
</para>
|
||||
|
||||
<para condition="html" role="usernotes">
|
||||
@ -120,7 +121,7 @@
|
||||
<screen><userinput>mkdir build &&
|
||||
cd build &&
|
||||
|
||||
meson --prefix=/usr --buildtype=release -Dgtk_doc=false .. &&
|
||||
meson --prefix=/usr --buildtype=release --wrap-mode=nofallback .. &&
|
||||
ninja</userinput></screen>
|
||||
|
||||
<para>
|
||||
@ -152,12 +153,17 @@ ninja</userinput></screen>
|
||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||
href="../../xincludes/meson-buildtype-release.xml"/>
|
||||
|
||||
<!-- gi-docgen can get installed without this, if deps exist -->
|
||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||
href="../../xincludes/meson-wrap-nofallback.xml"/>
|
||||
|
||||
<!-- gtk_doc replaced by gi-docgen
|
||||
<para>
|
||||
<option>-Dgtk_doc=true</option>: Use this parameter if
|
||||
<application>GTK-Doc</application> is installed and you wish to rebuild
|
||||
and install the API documentation.
|
||||
<!-- -Dgtk_doc is set to "yield=true" in meson_options.txt -->
|
||||
</para>
|
||||
<!\-\- -Dgtk_doc is set to "yield=true" in meson_options.txt \-\->
|
||||
</para>-->
|
||||
<!-- Removed in 2.42.0
|
||||
<para>
|
||||
<option>-Djasper=true</option>: If you've installed
|
||||
|
@ -93,9 +93,10 @@
|
||||
<bridgehead renderas="sect4">Optional</bridgehead>
|
||||
<para role="optional">
|
||||
<xref linkend="cantarell-fonts"/> (for tests),
|
||||
<xref linkend="gtk-doc"/>,
|
||||
<!--<xref linkend="gtk-doc"/>,-->
|
||||
<xref linkend="sysprof"/>,
|
||||
<ulink url="https://gitlab.gnome.org/GNOME/gi-docgen">gi-docgen</ulink>,
|
||||
<ulink url="https://gitlab.gnome.org/GNOME/gi-docgen">gi-docgen</ulink>
|
||||
(to generate documentation),
|
||||
<ulink url="https://ftpmirror.gnu.org/gnu/help2man">help2man</ulink>, and
|
||||
<ulink url="https://linux.thai.net/projects/libthai">libthai</ulink>
|
||||
</para>
|
||||
@ -116,7 +117,7 @@
|
||||
<screen><userinput>mkdir build &&
|
||||
cd build &&
|
||||
|
||||
meson --prefix=/usr --buildtype=release .. &&
|
||||
meson --prefix=/usr --buildtype=release --wrap-mode=nofallback .. &&
|
||||
ninja</userinput></screen>
|
||||
|
||||
<para>
|
||||
@ -151,20 +152,21 @@ install -vm 644 ../utils/pango-view.1.in /usr/share/man/man1/pango-view.1</useri
|
||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||
href="../../xincludes/meson-buildtype-release.xml"/>
|
||||
|
||||
<!-- gtk-doc replaced by gi-docgen
|
||||
<para>
|
||||
<option>-Dgtk_doc</option>: Use this switch if gtk-doc is
|
||||
installed and you wish to rebuild and install the API documentation.
|
||||
</para>
|
||||
</para>-->
|
||||
|
||||
<para>
|
||||
<option>-Dintrospection=false</option>: Use this switch if you do not
|
||||
want to use <xref linkend="gobject-introspection"/>.
|
||||
</para>
|
||||
|
||||
<!-- gi-docgen is now included in the tarball with 1.48.4
|
||||
<!-- gi-docgen can get installed without this, if deps exist -->
|
||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||
href="../../xincludes/meson-wrap-nodownload.xml"/>
|
||||
-->
|
||||
href="../../xincludes/meson-wrap-nofallback.xml"/>
|
||||
|
||||
</sect2>
|
||||
|
||||
<sect2 role="configuration">
|
||||
|
11
xincludes/meson-wrap-nofallback.xml
Normal file
11
xincludes/meson-wrap-nofallback.xml
Normal file
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
||||
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
|
||||
|
||||
|
||||
<para>
|
||||
<parameter>--wrap-mode=nofallback</parameter>: This switch prevents
|
||||
<command>meson</command> from iusing subproject fallbacks for any
|
||||
dependency declarations in the build files, stopping it downloading
|
||||
any optional dependency which is not installed on the system.
|
||||
</para>
|
Loading…
Reference in New Issue
Block a user