Changes in / [216deae:07c5c2ec]

Files:

• general/sysutils/cups-pk-helper.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netutils/wireshark.xml (modified) (2 diffs)
• packages.ent (modified) (1 diff)
• postlfs/security/polkit-gnome.xml (modified) (2 diffs)
• xsoft/office/abiword.xml (modified) (6 diffs)

general/sysutils/cups-pk-helper.xml

@@ -72 +72 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cups-pk-helper-&cups-pk-helper-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">cups-pk-helper Dependencies</bridgehead>
 
@@ -97 +87 @@
   <sect2 role="installation">
     <title>Installation of cups-pk-helper</title>
-
-    <para>
-      First, fix some deprecated syntax that will prevent cups-pk-helper from
-      building on future versions of CUPS:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../cups-pk-helper-&cups-pk-helper-version;-consolidated_fixes-1.patch</userinput></screen>
 
     <para>

introduction/welcome/changelog.xml

@@ -57 +57 @@
       <itemizedlist>
         <listitem>
-          <para>[renodr] - Adjust cups-pk-helper to no longer use deprecated
-          syntax that will cause issues with future versions of CUPS.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Adjust polkit-gnome to be able to pull user icons
-          again.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to abiword-3.0.5. Fixes
-          <ulink url="&blfs-ticket-root;15237">#15237</ulink>.</para>
-        </listitem>
-        <listitem>
           <para>[renodr] - Update to WebKitGTK+-2.32.2. Fixes
           <ulink url="&blfs-ticket-root;15258">#15258</ulink>.</para>

networking/netutils/wireshark.xml

@@ -116 +116 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="asciidoctor"/>,
       <xref linkend="brotli"/>,
       <xref linkend="c-ares"/>,
@@ -130 +129 @@
       <xref linkend="sbc"/>,
       <xref linkend="speex"/>,
-      <!--<ulink url="https://asciidoctor.org/">Asciidoctor</ulink>,-->
+      <ulink url="https://asciidoctor.org/">Asciidoctor</ulink>,
       <ulink url="https://www.linphone.org/technical-corner/bcg729">BCG729</ulink>,
       <ulink url="https://github.com/TimothyGu/libilbc">libilbc</ulink>,

packages.ent

@@ -909 +909 @@
 <!-- Part X -->
 <!-- Chapter 39 -->
-<!ENTITY AbiWord-version              "3.0.5">
+<!ENTITY AbiWord-version              "3.0.4">
 <!ENTITY gnumeric-version             "1.12.50">
 <!ENTITY gnucash-version              "2.4.11">

postlfs/security/polkit-gnome.xml

@@ -73 +73 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/polkit-gnome-&polkit-gnome-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Polkit GNOME Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <!-- due to the patch -->
-      <xref linkend="accountsservice"/>,
-      <xref linkend="gtk3"/>, and
+      <xref linkend="gtk3"/> and
       <xref linkend="polkit"/>
     </para>
@@ -100 +88 @@
   <sect2 role="installation">
     <title>Installation of Polkit GNOME</title>
-
-    <para>
-      First, apply some fixes that allow for the proper user icon to be used,
-      as well as some security fixes:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../polkit-gnome-&polkit-gnome-version;-consolidated_fixes-1.patch</userinput></screen>
 
     <para>

xsoft/office/abiword.xml

@@ -11 +11 @@
            "https://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-&AbiWord-version;.tar.gz">
   <!ENTITY AbiWord-download-ftp  " ">
-  <!ENTITY AbiWord-md5sum        "a8f218b711450e4ccae43a0522e0e806">
+  <!ENTITY AbiWord-md5sum        "04e31887049a8c72297881bc153b77c4">
   <!ENTITY AbiWord-size          "11 MB">
 
@@ -19 +19 @@
   <!ENTITY AbiWordDocs-size          "1.5 MB">
 
-  <!ENTITY AbiWord-buildsize     "690 MB, with docs (76 MB installed)">
+  <!ENTITY AbiWord-buildsize     "605 MB, with docs (76 MB installed)">
   <!ENTITY AbiWord-time          "2.4 SBU (Using parallelism=4, with docs)">
 ]>
@@ -97 +97 @@
         </para>
       </listitem>
-<!--
       <listitem>
         <para>
@@ -104 +103 @@
         </para>
       </listitem>
--->
     </itemizedlist>
-
 
     <bridgehead renderas="sect3">AbiWord Dependencies</bridgehead>
@@ -166 +163 @@
     <title>Installation of AbiWord</title>
 
-<!--
     <para>
       First, fix a build failure when using GCC-11:
@@ -172 +168 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../abiword-&AbiWord-version;-gcc11_fixes-1.patch</userinput></screen>
--->
 
     <para>