Changeset ae93d7e

Timestamp:

02/21/2016 12:31:13 AM (8 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

4b92d8d

Parents:

5b117af

Message:

libreoffice: gtk+-3 is now the default (if present), but gtk+-2 is still needed for the gtk-plugin, so recommend both of them.

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

Files:

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

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <para>February 20th, 2016</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Libreoffice prefers gtk3, but also wants
+          gtk2. Fixes
+          <ulink url="&blfs-ticket-root;7482">#7482</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Update to ImageMagick-6.9.3-5. Fixes

xsoft/office/libreoffice.xml

@@ -194 +194 @@
       <xref linkend="graphite2"/>,
       <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk2"/>,
+      <xref linkend="gtk3"/> and
+      <xref linkend="gtk2"/> (see <quote>Command Explanations</quote>),
       <xref linkend="harfbuzz"/>,
       <xref linkend="icu"/>,
@@ -226 +227 @@
       <xref linkend="doxygen"/> (not relevant if using --disable-odk),
       <xref linkend="gdb"/>,
-      <xref linkend="gtk3"/> (see <quote>Command Explanations</quote>),
       <xref linkend="kdelibs"/>,
       <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
@@ -651 +651 @@
 
     <para>
+      <option>--disable-gtk3</option>: Use this switch if you want to use only
+      <application>GTK+-2</application> here, but have already installed
+      <application>GTK+-3</application> which is used as the default if it is
+      present. Note that a <application>GTK+-3</application> build still
+      requires <application>GTK+-2</application> to build the gtk-plugin.
+    </para>
+
+    <para>
       <option>--disable-postgresql-sdbc</option>: This switch disables compiling
       <application>LibreOffice</application> with the ability to connect to a
@@ -659 +667 @@
       <application>LibreOffice</application> to use that rather than compile its
       own copy, use the <option>--with-system-postgresql</option> switch.
-    </para>
-
-    <para>
-      <option>--enable-gtk3</option>: Use this switch if you want to build the
-      <application>GTK+ 3</application> integration module. This is
-      experimental and may not work.
     </para>