Changeset 941e3b09

Timestamp:

05/22/2022 08:18:33 PM (16 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.2, 11.3, 12.0, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, xry111/soup3, xry111/xf86-video-removal

Children:

3adca725, b63e4fc9

Parents:

43ad17a

Message:

Add libsoup-3.0.6.

libsoup3 should be OK now. There have not been any issues discovered
as of the date of this commit.

gvfs is also changed to add back http. Also avahi is now recommended.
avahi can be removed by adding -Ddnssd=false but that requires a patch.

​https://gitlab.gnome.org/GNOME/gvfs/-/issues/621

This has been fixed upstream.

Files:

• gnome/platform/gvfs.xml (modified) (9 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netlibs/libsoup.xml (modified) (2 diffs)
• networking/netlibs/libsoup3.xml (added)
• networking/netlibs/netlibs.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

gnome/platform/gvfs.xml

@@ -88 +88 @@
       <xref linkend="glib2"/>,
       <xref linkend="libusb"/>, and
-<!--  Needs libsoup 3, not yet in the book
-      <xref linkend="libsoup"/>, and -->
       <xref linkend="libsecret"/>
     </para>
@@ -95 +93 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="avahi"/>,
       <xref linkend="gcr"/>,
       <xref linkend="gtk3"/>,
@@ -100 +99 @@
       <xref linkend="libgdata"/>,
       <xref linkend="libgudev"/>,
+      <xref linkend="libsoup3"/>, 
       <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
       <phrase revision="systemd"><xref linkend="systemd"/>,</phrase> and
@@ -124 +124 @@
       <ulink url="http://www.libimobiledevice.org/">libimobiledevice</ulink>,
       <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink>,
-      <!-- temporary until we put libsoup-3 into the book -->
-      <ulink url="https://download.gnome.org/sources/libsoup/3.0/">libsoup-3</ulink>,
+      <!--<ulink url="https://download.gnome.org/sources/libsoup/3.0/">libsoup-3</ulink>,-->
       <ulink url="https://github.com/sahlberg/libnfs/">libnfs</ulink>, and
       <ulink url="http://twistedmatrix.com/trac/">Twisted</ulink>
@@ -145 +144 @@
 <screen revision='sysv'><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
-<!-- The -Dhttp=false is a workaround because we do not put libsoup-3
-     in the book yet. Remove when libsoup-3 is in the book. -->
+
 meson --prefix=/usr       \
       --buildtype=release \
-      -Dhttp=false        \
       -Dfuse=false        \
       -Dgphoto2=false     \
@@ -158 +155 @@
       -Dsmb=false         \
       -Dtmpfilesdir=no    \
-      -Ddnssd=false       \
       -Dgoa=false         \
       -Dgoogle=false      \
@@ -166 +162 @@
 <screen revision='systemd'><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
-<!-- The -Dhttp=false is a workaround because we do not put libsoup-3
-     in the book yet. Remove when libsoup-3 is in the book. -->
+
 meson --prefix=/usr       \
       --buildtype=release \
-      -Dhttp=false        \
       -Dfuse=false        \
       -Dgphoto2=false     \
@@ -178 +172 @@
       -Dmtp=false         \
       -Dsmb=false         \
-      -Ddnssd=false       \
       -Dgoa=false         \
       -Dgoogle=false      .. &amp;&amp;
@@ -205 +198 @@
     <para>
       <parameter>-D&lt;option&gt;=false</parameter>: These switches are
-      required if the corresponding optional dependency is not installed.
+      required if the corresponding dependency is not installed.
       Remove those where you have installed the corresponding application and
       wish to use it with <application>Gvfs</application>. The dnssd option

introduction/welcome/changelog.xml

@@ -47 +47 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Add libsoup-3.0.6. Fixes
+          <ulink url="&blfs-ticket-root;15568">#15568</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to libxkbcommon-1.4.1. Fixes
           <ulink url="&blfs-ticket-root;16569">#16569</ulink>.</para>

networking/netlibs/libsoup.xml

@@ -84 +84 @@
     </itemizedlist>
 -->
-
+<!--
     <warning>
       <para>
@@ -96 +96 @@
       </para>
     </warning>
-
+-->
     <bridgehead renderas="sect3">libsoup Dependencies</bridgehead>
 

networking/netlibs/netlibs.xml

@@ -34 +34 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libndp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsoup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsoup3.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtirpc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="neon.xml"/>

packages.ent

@@ -658 +658 @@
 <!ENTITY libsoup-minor                "2.74">
 <!ENTITY libsoup-version              "&libsoup-minor;.2">
+<!ENTITY libsoup3-minor               "3.0">
+<!ENTITY libsoup3-version             "&libsoup3-minor;.6">
 <!ENTITY libtirpc-version             "1.3.2">
 <!ENTITY neon-version                 "0.32.2">