Changeset fb109fd for networking

Timestamp:

11/20/2023 06:58:41 AM (5 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

fded572

Parents:

bc99c9d

Message:

wireshark: qt5 and qt6 shouldn't be both required

The problem is that qt6 is not strictly required, qince qt5 can
be used. But an option has to be added for using qt5. Furthermore,
we have an established layout of describing options in a "Command
explanations" paragraph. So:

• Move qt5 to optional
• Add a note telling that qt6 is not strictly required referring to command explanations.
• Add the said command explanation

File:

• networking/netutils/wireshark.xml (modified) (6 diffs)

networking/netutils/wireshark.xml

@@ -112 +112 @@
       <xref linkend="glib2"/>,
       <xref linkend="libgcrypt"/>, and
-      (<xref linkend="qt5"/> or
-       <xref role="nodep" linkend="qt5-components"/> with qtmultimedia) or
-       <xref linkend="qt6"/>
-    </para>
+      <xref linkend="qt6"/>
+    </para>
+
+    <note>
+      <para>
+        <xref linkend="qt6"/> is not strictly required, since it can be
+        replaced with <application>Qt5</application>. See <quote>Command
+        explanations</quote> below.
+      </para>
+    </note>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -135 +141 @@
       <xref linkend="mitkrb"/>,
       <xref linkend="nghttp2"/>,
+      (<xref linkend="qt5"/> or
+      <xref role="nodep" linkend="qt5-components"/> with qtmultimedia)
+      (required if <xref role="nodep" linkend="qt6"/> is not installed),
       <xref linkend="sbc"/>,
       <xref linkend="speex"/>,
@@ -186 +195 @@
 
 <screen role="root"><userinput>groupadd -g 62 wireshark</userinput></screen>
-<!--
-    <para>
-      Fix building with Python-3.12 and higher:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../wireshark-&wireshark-version;-py_3.12_fix-1.patch</userinput></screen>
--->
+
     <para>
       Continue to install <application>Wireshark</application> by running
@@ -208 +211 @@
 ninja</userinput></screen>
 
-    <note>
-      <para>
-        Wireshark now prefers <xref linkend="qt6"/>.  If it is not available
-        Add <code>-DUSE_qt6=OFF</code> to the build instructions above.
-      </para>
-    </note>
-
     <para>
       This package does not come with a test suite.
@@ -270 +266 @@
 
   </sect2>
-<!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+      <para>
+        <option>-DUSE_qt6=OFF</option>: Use this switch if
+        <xref linkend="qt6"/> is not available. You'll need
+        <xref linkend="qt5"/> or at least <xref linkend="qt5-components"/>
+        with qtmultimedia in this case.
+      </para>
+<!--
     <para>
       <option>- -disable-wireshark</option>: Use this switch if you
@@ -279 +282 @@
       any of the GUIs.
     </para>
+-->
   </sect2>
--->
 
   <sect2 role="configuration">