Changeset cecac4d for networking/netlibs

Timestamp:

02/13/2016 07:48:09 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

ab88249

Parents:

5f0df0c

Message:

Merge several recent changes from trunk - sync relevant changes to r16949.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16960 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

networking/netlibs

Files:

• curl.xml (modified) (3 diffs)
• libsoup.xml (modified) (2 diffs)

networking/netlibs/curl.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY curl-download-http "http://curl.haxx.se/download/curl-&curl-version;.tar.lzma">
+  <!ENTITY curl-download-http "https://curl.haxx.se/download/curl-&curl-version;.tar.lzma">
   <!ENTITY curl-download-ftp  " ">
-  <!ENTITY curl-md5sum        "a6a400c4d6de843d13ffbbb39f4d8173">
+  <!ENTITY curl-md5sum        "8242c073d8e5fc1c2a1aa946f1e903a4">
   <!ENTITY curl-size          "2.8 MB">
-  <!ENTITY curl-buildsize     "54 MB (with tests)">
+  <!ENTITY curl-buildsize     "56 MB (with tests)">
   <!ENTITY curl-time          "0.4 SBU (additional 8.8 SBU for tests, with parallelism = 4)">
 ]>
@@ -172 +172 @@
 <screen role="root"><userinput>make install &amp;&amp;
 
+cp -a docs docs-save       &amp;&amp;
+rm -rf docs/examples/.deps &amp;&amp;
+
 find docs \( -name Makefile\* \
           -o -name \*.1       \
@@ -177 +180 @@
           -exec rm {} \;      &amp;&amp;
 install -v -d -m755 /usr/share/doc/curl-&curl-version; &amp;&amp;
-cp -v -R docs/*     /usr/share/doc/curl-&curl-version;</userinput></screen>
+cp -v -R docs/*     /usr/share/doc/curl-&curl-version; &amp;&amp;
+
+rm -rf docs &amp;&amp;
+mv -i docs-save doc</userinput></screen>
 
     <para>

networking/netlibs/libsoup.xml

@@ -86 +86 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gobject-introspection"/>
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="vala"/>
     </para>
 
@@ -132 +133 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <option>--disable-vala</option>: use this if you have not installed
+      Vala, e.g. because you are not building gnome.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"