Changeset 1ca65eb


Ignore:
Timestamp:
09/30/2018 10:40:42 PM (4 years ago)
Author:
Ken Moffat <ken@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 8.4, 9.0, 9.1, bdubbs/svn, elogind, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
32b15287
Parents:
7d259126
Message:

Vala - use an optional patch if graphviz has not been installed.

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • general/prog/vala.xml

    r7d259126 r1ca65eb  
    7474    </itemizedlist>
    7575
     76    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     77    <itemizedlist spacing="compact">
     78      <listitem>
     79        <para>
     80          Optional patch to allow building without graphviz.
     81          <ulink url="&patch-root;/vala-&vala-version;-avoid_graphviz-1.patch"/>
     82        </para>
     83      </listitem>
     84    </itemizedlist>
     85
    7686    <bridgehead renderas="sect3">Vala Dependencies</bridgehead>
    7787
     
    105115    commands:</para>
    106116
    107 <!--
    108117    <note>
    109       <para>The two sed commands and the autoreconf command below are required
    110       if the optional dependency <xref linkend="graphviz"/> is not installed.
    111       This will allow building the valadoc program and libraries that can be
    112       used to generate API documentation in HTML format from Vala source code.
     118      <para>If the recommended dependency <xref linkend="graphviz"/> is not
     119      installed, apply a patch. This will prevent building the valadoc program
     120      and libraries that can be used to generate API documentation in HTML format
     121      from Vala source code.
    113122      </para>
    114 <screen><userinput>sed -i '115d; 121,137d; 139,140d'  configure.ac &amp;&amp;
    115 sed -i '/valadoc/d' Makefile.am                &amp;&amp;
     123
     124<screen><userinput>patch -p1 -i ../vala-&vala-version;-avoid_graphviz-1.patch &amp;&amp;
    116125ACLOCAL= autoreconf -fiv</userinput></screen>
    117126    </note>
    118 Removed in 0.42.0 - recommended Graphite. -renodr -->
    119127
    120128<screen><userinput>./configure --prefix=/usr &amp;&amp;
     
    146154          vala-&vala-major-version;,
    147155          valac,
    148           valadoc (not built if the sed is applied),
     156          valadoc (not built if the patch is applied),
    149157          vala-gen-introspect, and
    150158          vapigen (symlinks);
    151159
    152160          valac-&vala-major-version;,
    153           valadoc-&vala-major-version; (not built if the sed is applied),
     161          valadoc-&vala-major-version; (not built if the patch is applied),
    154162          vala-gen-introspect-&vala-major-version;, and
    155163          vapigen-&vala-major-version;
     
    157165        <seg>
    158166          libvala-&vala-major-version;.so and
    159           libvaladoc-&vala-major-version;.so (not built if the sed is applied)
     167          libvaladoc-&vala-major-version;.so (not built if the patch is applied)
    160168        </seg>
    161169        <seg>
    162170          /usr/include/vala-&vala-major-version;,
    163           /usr/include/valadoc-&vala-major-version; (not built if the sed is applied),
     171          /usr/include/valadoc-&vala-major-version; (not built if the patch is applied),
    164172          /usr/lib/vala-&vala-major-version;,
    165           /usr/lib/valadoc (not built if the sed is applied),
    166           /usr/share/vala, 
    167           /usr/share/valadoc (not built if the sed is applied),
     173          /usr/lib/valadoc (not built if the patch is applied),
     174          /usr/share/vala,
     175          /usr/share/valadoc (not built if the patch is applied),
    168176          /usr/share/devhelp/books/vala-&vala-major-version;, and
    169177          /usr/share/vala-&vala-major-version;
  • introduction/welcome/changelog.xml

    r7d259126 r1ca65eb  
    4747      <itemizedlist>
    4848        <listitem>
     49          <para>[ken] - Add a patch to vala-0.42.0 so that graphviz is
     50          not required. Fixes
     51          <ulink url="&blfs-ticket-root;11198">#11198</ulink>.</para>
     52        </listitem>
     53        <listitem>
    4954          <para>[ken] - Update to rustc-1.29.1, using Python3. Fixes
    5055          <ulink url="&blfs-ticket-root;11188">#11188</ulink>.</para>
Note: See TracChangeset for help on using the changeset viewer.