Changeset b02db12d

Timestamp:

05/06/2022 06:33:43 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.2, 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:

29b434b, e088631

Parents:

5354fe2

git-author:

Pierre Labastie <pierre.labastie@…> (05/06/2022 06:32:43 AM)

git-committer:

Pierre Labastie <pierre.labastie@…> (05/06/2022 06:33:43 AM)

Message:

Update to libreoffice-7.3.3

Also add fixes for jdk-18 and poppler-22.04

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• xsoft/office/libreoffice.xml (modified) (6 diffs)

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
+      <para>May 6th, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to libreoffice-7.3.3. Fixes
+          <ulink url="&blfs-ticket-root;16515">#16515</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 5th, 2022</para>
       <itemizedlist>
         <listitem>
           <para>[pierre] - Update to poppler-22.05.0. Fixes
-          <ulink url="&blfs-ticket-root;16517">#16516</ulink>.</para>
+          <ulink url="&blfs-ticket-root;16516">#16516</ulink>.</para>
         </listitem>
         <listitem>

packages.ent

@@ -946 +946 @@
 <!ENTITY gnucash-version              "2.4.11">
 
-<!ENTITY libreoffice-version          "7.3.2">
+<!ENTITY libreoffice-version          "7.3.3">
 <!ENTITY libreoffice-patch            ".2">
 <!ENTITY libreoffice-dlversion        "&libreoffice-version;&libreoffice-patch;">

xsoft/office/libreoffice.xml

@@ -8 +8 @@
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "4a6c3d37e9ce238143606238df9a280d">
+  <!ENTITY libreoffice-core-md5sum        "d085844a143eec6424e39218848ef8fe">
   <!ENTITY libreoffice-core-size          "244 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "eb991bcb2fcb9d741dbfd8ab7eaeb753">
+  <!ENTITY libreoffice-dict-md5sum        "fe9fcfe1c3637b404592d9e7d1952b43">
   <!ENTITY libreoffice-dict-size          "49 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "a8e19a6b48e9fd0a03a463bcffc425e9">
-  <!ENTITY libreoffice-help-size          "108 MB">
+  <!ENTITY libreoffice-help-md5sum        "b2af1c64ddba75863c1028bd2cdbac88">
+  <!ENTITY libreoffice-help-size          "107 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "ab2fe92e8cc33fdb96b2e583a55bca02">
-  <!ENTITY libreoffice-translations-size          "188 MB">
+  <!ENTITY libreoffice-translations-md5sum        "6db5879c0cbf9ba5d59fcd23242222f6">
+  <!ENTITY libreoffice-translations-size          "187 MB">
 
   <!-- full size remeasured for 7.0.0.3 -->
 
-  <!ENTITY libreoffice-buildsize  "7.0 GB including the additional files if downloaded during the build (793 MB installed). Installing the whole set of languages requires more than 25 GB (around 3 GB installed)">
+  <!ENTITY libreoffice-buildsize  "9.8 GB including the additional files if downloaded during the build (860 MB installed). Installing the whole set of languages requires more than 25 GB (around 3 GB installed)">
 
  <!-- Editors: many updates to poppler will break LO using system poppler until
@@ -57 +57 @@
 
   -->
-  <!ENTITY libreoffice-time "50 SBU with parallelism=4 (will vary due to download time)">
+  <!ENTITY libreoffice-time "44 SBU with parallelism=4 (will vary due to download time)">
 
 ]>
@@ -186 +186 @@
         <para>
           Required patch to fix building with <xref linkend="poppler"/>:
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler_2203_fix-1.patch"/>
-        </para>
-      </listitem>
-
+          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler_2204_fix-1.patch"/>
+        </para>
+      </listitem>
 
     </itemizedlist>
@@ -346 +345 @@
 
 <!-- keep a commented instruction if no patches are currently required -->
-
+<!-- fixed in 7.3.3
     <para>
      First, fix a problem if bison-3.8 or later is installed:
     </para>
 
-<screen><userinput>if bison --version|grep -q 3.8; then
+<screen><userinput>if bison - -version|grep -q 3.8; then
   sed -i 's/yyn/yyrule/' connectivity/source/parse/sqlbison.y
 fi</userinput></screen>
-
+-->
 
     <para>
@@ -360 +359 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler_2203_fix-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler_2204_fix-1.patch</userinput></screen>
 
     <para>
@@ -424 +423 @@
    i?86) sed /-Os/d -i solenv/gbuild/platform/LINUX_INTEL_GCC.mk ;;
 esac</userinput></screen>
+
+    <para>
+      <xref linkend="openjdk"/> breaks the build if the following variable is
+      not set:
+    </para>
+
+<screen><userinput>export ANT_OPTS="-Djava.security.manager=allow"</userinput></screen>
 
     <para>