Changeset 1ca65eb

Timestamp:

09/30/2018 10:40:42 PM (5 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 8.4, 9.0, 9.1, bdubbs/svn, elogind, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

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:

• general/prog/vala.xml (modified) (4 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/prog/vala.xml

@@ -74 +74 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Optional patch to allow building without graphviz.
+          <ulink url="&patch-root;/vala-&vala-version;-avoid_graphviz-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Vala Dependencies</bridgehead>
 
@@ -105 +115 @@
     commands:</para>
 
-<!--
     <note>
-      <para>The two sed commands and the autoreconf command below are required
-      if the optional dependency <xref linkend="graphviz"/> is not installed.
-      This will allow building the valadoc program and libraries that can be
-      used to generate API documentation in HTML format from Vala source code.
+      <para>If the recommended dependency <xref linkend="graphviz"/> is not
+      installed, apply a patch. This will prevent building the valadoc program
+      and libraries that can be used to generate API documentation in HTML format
+      from Vala source code.
       </para>
-<screen><userinput>sed -i '115d; 121,137d; 139,140d'  configure.ac &amp;&amp;
-sed -i '/valadoc/d' Makefile.am                 &amp;&amp;
+
+<screen><userinput>patch -p1 -i ../vala-&vala-version;-avoid_graphviz-1.patch &amp;&amp;
 ACLOCAL= autoreconf -fiv</userinput></screen>
     </note>
-Removed in 0.42.0 - recommended Graphite. -renodr -->
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
@@ -146 +154 @@
           vala-&vala-major-version;, 
           valac, 
-          valadoc (not built if the sed is applied), 
+          valadoc (not built if the patch is applied),
           vala-gen-introspect, and
           vapigen (symlinks);
 
           valac-&vala-major-version;,
-          valadoc-&vala-major-version; (not built if the sed is applied),
+          valadoc-&vala-major-version; (not built if the patch is applied),
           vala-gen-introspect-&vala-major-version;, and
           vapigen-&vala-major-version;
@@ -157 +165 @@
         <seg>
           libvala-&vala-major-version;.so and
-          libvaladoc-&vala-major-version;.so (not built if the sed is applied)
+          libvaladoc-&vala-major-version;.so (not built if the patch is applied)
         </seg>
         <seg>
           /usr/include/vala-&vala-major-version;,
-          /usr/include/valadoc-&vala-major-version; (not built if the sed is applied),
+          /usr/include/valadoc-&vala-major-version; (not built if the patch is applied),
           /usr/lib/vala-&vala-major-version;,
-          /usr/lib/valadoc (not built if the sed is applied),
-          /usr/share/vala, 
-          /usr/share/valadoc (not built if the sed is applied),
+          /usr/lib/valadoc (not built if the patch is applied),
+          /usr/share/vala,
+          /usr/share/valadoc (not built if the patch is applied),
           /usr/share/devhelp/books/vala-&vala-major-version;, and
           /usr/share/vala-&vala-major-version;

introduction/welcome/changelog.xml

@@ -47 +47 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Add a patch to vala-0.42.0 so that graphviz is
+          not required. Fixes
+          <ulink url="&blfs-ticket-root;11198">#11198</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Update to rustc-1.29.1, using Python3. Fixes
           <ulink url="&blfs-ticket-root;11188">#11188</ulink>.</para>