Changeset 24761d24

Timestamp:

08/02/2022 08:30:12 AM (21 months 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:

62beded

Parents:

0e206b8

git-author:

Pierre Labastie <pierre.labastie@…> (08/02/2022 08:28:24 AM)

git-committer:

Pierre Labastie <pierre.labastie@…> (08/02/2022 08:30:12 AM)

Message:

Don't apply the poppler patch for libreoffice

It's not needed in 7.3.5

File:

• xsoft/office/libreoffice.xml (modified) (1 diff)

xsoft/office/libreoffice.xml

@@ -347 +347 @@
 
 <!-- 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
-  sed -i 's/yyn/yyrule/' connectivity/source/parse/sqlbison.y
-fi</userinput></screen>
+<!-- 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>
-     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>
       If you have downloaded the dictionaries, help and translations tarballs,