Changeset 2a0de979

Timestamp:

08/18/2013 02:33:50 AM (11 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

31d2934

Parents:

b82840b

Message:

Libreoffice: Fix build with system neon.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11648 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (3 diffs)
• xsoft/office/libreoffice.xml (modified) (2 diffs)

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Libreoffice: Fix build with system neon.</para>
+        </listitem>
+        <listitem>
           <para>[rthomsen] - Amarok 2.8.0. Fixes
            <ulink url="&blfs-ticket-root;3981">#3981</ulink>.</para>
@@ -59 +62 @@
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] Update to gpgme-1.4.3. Fixes
+          <para>[bdubbs] - Update to gpgme-1.4.3. Fixes
            <ulink url="&blfs-ticket-root;3974">#3974</ulink>.</para>
         </listitem>
@@ -73 +76 @@
       <itemizedlist>
         <listitem>
-          <para>[fernando] LibreOffice: fixes to build dictionaries, 
+          <para>[fernando] - LibreOffice: fixes to build dictionaries, 
           help and languages support. Thanks to David B.</para>
         </listitem>

xsoft/office/libreoffice.xml

@@ -136 +136 @@
           Required patch:
           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-system_poppler-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-system_neon-1.patch"/>
         </para>
       </listitem>
@@ -300 +306 @@
     -i bin/unpack-sources &amp;&amp;
 
+patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-system_neon-1.patch    &amp;&amp;
 patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-system_poppler-1.patch &amp;&amp;
 ./autogen.sh --prefix=/usr              \