Changeset 4115817

Timestamp:

09/16/2022 07:55:29 PM (20 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/soup3

Children:

be9944b

Parents:

796b52a9

git-author:

Xi Ruoyao <xry111@…> (09/16/2022 12:06:55 PM)

git-committer:

Xi Ruoyao <xry111@…> (09/16/2022 07:55:29 PM)

Message:

webkitgtk: port to libsoup3

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/webkitgtk.xml (modified) (9 diffs)

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[xry111] - Link WebKitGTK against libsoup-3 instead of
+          libsoup-2.</para>
+        </listitem>
+        <listitem>
           <para>[xry111] - Update to libsoup-3.2.0.  Fixes
           <ulink url="&blfs-ticket-root;17031">#17031</ulink>.</para>

x/lib/webkitgtk.xml

@@ -97 +97 @@
       <xref linkend="libgudev"/>,
       <xref linkend="libsecret"/>,
-      <xref linkend="libsoup"/>,
+      <xref linkend="libsoup3"/>,
       <xref linkend="libtasn1"/>,
       <xref linkend="libwebp"/>,
@@ -168 +168 @@
       -DENABLE_MINIBROWSER=ON     \
       -DUSE_WOFF2=OFF             \
-      -DUSE_SOUP2=ON              \
       -DUSE_WPE_RENDERER=ON       \
       -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
@@ -186 +185 @@
       -DENABLE_MINIBROWSER=ON     \
       -DUSE_WOFF2=OFF             \
-      -DUSE_SOUP2=ON              \
       -DUSE_WPE_RENDERER=ON       \
       -DENABLE_JOURNALD_LOG=OFF   \
@@ -214 +212 @@
     </para>
 
-<screen role="root"><userinput>ninja install &amp;&amp;
-
+<screen role="root"><userinput>ninja install</userinput></screen>
+
+<!-- Documentation is for API 4.0 in 2.36.7 release.
+     Maybe we'll have 4.1 doc in 2.38.  -->
+<!--
 install -vdm755 /usr/share/gtk-doc/html/webkit{2,dom}gtk-4.0 &amp;&amp;
 install -vm644  ../Documentation/webkit2gtk-4.0/html/*   \
@@ -221 +222 @@
 install -vm644  ../Documentation/webkitdomgtk-4.0/html/* \
                 /usr/share/gtk-doc/html/webkitdomgtk-4.0</userinput></screen>
+-->
   </sect2>
 
@@ -317 +319 @@
       <seglistitem>
         <seg>
-<!-- Moved to /usr/libexec/webkit2gtk-4.0, so shouldn't appear here
+<!-- Moved to /usr/libexec/webkit2gtk-4.1, so shouldn't appear here
           jsc,
           MiniBrowser, and -->
@@ -323 +325 @@
         </seg>
         <seg>
-          libjavascriptcoregtk-4.0.so and
-          libwebkit2gtk-4.0.so
+          libjavascriptcoregtk-4.1.so and
+          libwebkit2gtk-4.1.so
         </seg>
         <seg>
-          /usr/include/webkitgtk-4.0,
-          /usr/lib{,exec}/webkit2gtk-4.0, and
-          /usr/share/gtk-doc/html/webkit{2,dom}gtk-4.0
+          /usr/include/webkitgtk-4.1 and
+          /usr/lib{,exec}/webkit2gtk-4.1
+<!--          /usr/share/gtk-doc/html/webkit{2,dom}gtk-4.0 -->
         </seg>
       </seglistitem>
@@ -377 +379 @@
       </varlistentry>
 
-      <varlistentry id="libjavascriptcoregtk-4.0">
+      <varlistentry id="libjavascriptcoregtk-4.1">
         <term>
-          <filename class="libraryfile">libjavascriptcoregtk-4.0.so</filename>
+          <filename class="libraryfile">libjavascriptcoregtk-4.1.so</filename>
         </term>
         <listitem>
@@ -385 +387 @@
             contains core JavaScript API functions used by
             <command>jsc</command> and
-            <filename class="libraryfile">libwebkit2gtk-4.0</filename>
+            <filename class="libraryfile">libwebkit2gtk-4.1</filename>
           </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-4.0">
-            <primary sortas="c-libjavascriptcoregtk-4.0">libjavascriptcoregtk-4.0.0.so</primary>
+          <indexterm zone="webkitgtk libjavascriptcoregtk-4.1">
+            <primary sortas="c-libjavascriptcoregtk-4.1">libjavascriptcoregtk-4.1.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libwebkit2gtk-4">
-        <term><filename class="libraryfile">libwebkit2gtk-4.0.so</filename></term>
+      <varlistentry id="libwebkit2gtk-4.1">
+        <term><filename class="libraryfile">libwebkit2gtk-4.1.so</filename></term>
         <listitem>
           <para>
             contains the <application>WebKit2</application> API functions
           </para>
-          <indexterm zone="webkitgtk libwebkit2gtk-4">
-            <primary sortas="c-libwebkit2gtk-4">libwebkit2gtk-4.0.so</primary>
+          <indexterm zone="webkitgtk libwebkit2gtk-4.1">
+            <primary sortas="c-libwebkit2gtk-4.1">libwebkit2gtk-4.1.so</primary>
           </indexterm>
         </listitem>