Changeset d608866 for xsoft/office/libreoffice.xml

Timestamp:

09/03/2022 08:29:09 PM (20 months ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

5e0e3d79

Parents:

6aa4fda0

Message:

Three security updates and relevant buildfixes:

Update to thunderbird-102.2.1
Update to poppler-22.09.0
Update to curl-7.85.0
Fix building inkscape with poppler-22.09.0
Fix building libreoffice with poppler-22.09.0

File:

• xsoft/office/libreoffice.xml (modified) (5 diffs)

xsoft/office/libreoffice.xml

@@ -183 +183 @@
 <!-- keep one commented patch, it's sure to again need one or more in a few months:-->
 
-<!--
+
       <listitem>
         <para>
           Required patch to fix building with <xref linkend="poppler"/>:
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler_2204_fix-1.patch"/>
-        </para>
-      </listitem>
--->
+          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler_2209_fixes-1.patch"/>
+        </para>
+      </listitem>
 
     </itemizedlist>
@@ -216 +215 @@
     <para role="recommended">
       <xref linkend="apache-ant"/>,
-      <xref linkend="apr"/>,
+<!--  <xref linkend="apr"/>, -->
       <xref linkend="boost"/>,
       <xref linkend="clucene"/>,
@@ -237 +236 @@
       <xref linkend="lcms2"/>,
       <xref linkend="librsvg"/>,
+      <xref linkend="libtiff"/>,
+      <xref linkend="libwebp"/>,
       <xref linkend="libxml2"/> and
       <xref linkend="libxslt"/>,
       <xref linkend="lxml"/>,
       <xref linkend="mesa"/>,
-      <xref linkend="neon"/>,
+<!--  <xref linkend="neon"/>, -->
       <xref linkend="nss"/>,
       <xref linkend="openldap"/> (if connecting to an LDAP server),
@@ -247 +248 @@
       <xref linkend="postgresql"/>,
       <xref linkend="redland"/>,
-      <xref linkend="serf"/>, and
+<!--  <xref linkend="serf"/>, --> and
       <xref linkend="unixodbc"/>
     </para>
@@ -347 +348 @@
 
 <!-- keep a commented instruction if no patches are currently required -->
-<!-- fixed in 7.3.5
-    <para>
-     Fix build failures introduced by the latest poppler version:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler_2204_fix-1.patch</userinput></screen>
--->
+
+    <para>
+     First, fix build failures introduced by the latest poppler version:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler_2209_fixes-1.patch</userinput></screen>
+
     <para>
       If you have downloaded the dictionaries, help and translations tarballs,