Changeset 89cdb63d for xsoft

Timestamp:

10/21/2015 05:05:21 PM (9 years ago)

Author:

Bruce Dubbs <bdubbs@…>

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:

b78e9bc

Parents:

4ee2fcb

Message:

Fix issues in mozilla apps with freetype-2.6.1 and gconf dependencies.

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

Location:

xsoft

Files:

• graphweb/firefox.xml (modified) (4 diffs)
• graphweb/seamonkey.xml (modified) (4 diffs)
• other/thunderbird.xml (modified) (4 diffs)

xsoft/graphweb/firefox.xml

@@ -172 +172 @@
 ac_add_options --disable-necko-wifi
 
-# If you have installed GConf, comment out this line
-ac_add_options --disable-gconf
-
 # GStreamer is necessary for H.264 video playback in HTML5 Video Player;
 # to be enabled, also remember to set "media.gstreamer.enabled" to "true"
@@ -188 +185 @@
 # Comment out following option if you have PulseAudio installed
 ac_add_options --disable-pulseaudio
-<!-- Does not work uncommented
-# If you have not installed Yasm then uncomment this line:
-#ac_add_options - -disable-webm
--->
+
+# If you have installed GConf, comment out this line
+ac_add_options --disable-gconf
+
 # Comment out following options if you have not installed
 # recommended dependencies:
@@ -235 +232 @@
 
     <para>
+      First, fix building with system freetype-2.6.1 or later:
+    </para>
+
+<screen><userinput>sed -i '/^freetype\/ftcache.h/a freetype\/ftfntfmt.h' config/system-headers</userinput></screen>
+
+    <para>
       Compile <application>Firefox</application> by issuing the following
       commands:
@@ -256 +259 @@
 
 <screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
-
-chown -R 0:0 /usr/lib/firefox-&firefox-version;     &amp;&amp;
+chown -R 0:0 /usr/lib/firefox-&firefox-version;   &amp;&amp;
 
 mkdir -pv    /usr/lib/mozilla/plugins  &amp;&amp;
-ln    -sfv   ../../mozilla/plugins \
-             /usr/lib/firefox-&firefox-version;/browser</userinput></screen>
+ln    -sfv   ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browser</userinput></screen>
 
   </sect2>

xsoft/graphweb/seamonkey.xml

@@ -131 +131 @@
       <xref linkend="dbus-glib"/>,
       <xref linkend="doxygen"/>,
+      <xref linkend="GConf"/>,
       <xref linkend="gst10-plugins-base"/> (with
       <xref linkend="gst10-plugins-good"/> and
@@ -192 +193 @@
 # Comment out following option if you have PulseAudio installed
 ac_add_options --disable-pulseaudio
-<!-- Does not work
-# If you have not installed Yasm then uncomment this line:
-#ac_add_options - -disable-webm
--->
+
+# Comment out following option if you have gconf installed
+ac_add_options --disable-gconf
+
 # Comment out following options if you have not installed
 # recommended dependencies:
@@ -242 +243 @@
     </para>
 
-<screen><userinput>sed -i '/^ftglyph.h/ i ftfntfmt.h' mozilla/config/system-headers</userinput></screen>
+<screen><userinput>sed -e '/^ftglyph.h/i ftfntfmt.h'                     \
+    -e '/^freetype\/ftcache.h/a freetype\/ftfntfmt.h' \
+    -i mozilla/config/system-headers</userinput></screen>
 
     <note><para>
@@ -281 +284 @@
 
 <screen role="root"><userinput>make  -f client.mk install INSTALL_SDK= &amp;&amp;
-
-chown -R 0:0 /usr/lib/seamonkey-&seamonkey-version;  &amp;&amp;
+chown -R 0:0 /usr/lib/seamonkey-&seamonkey-version;    &amp;&amp;
 cp    -v moz-build-dir/dist/man/man1/seamonkey.1 /usr/share/man/man1</userinput></screen>
 

xsoft/other/thunderbird.xml

@@ -136 +136 @@
       <xref linkend="dbus-glib"/>,
       <xref linkend="doxygen"/>,
+      <xref linkend="GConf"/>,
       <xref linkend="gst10-plugins-base"/> (with
       <xref linkend="gst10-plugins-good"/> and
@@ -195 +196 @@
 # Comment out following option if you have PulseAudio installed
 ac_add_options --disable-pulseaudio
+
+# Comment out following option if you have gconf installed
+ac_add_options --disable-gconf
 <!-- Uncommenting does not work
 # If you have not installed Yasm then uncomment this line:
@@ -250 +254 @@
 <!-- might be necessary
 test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&-->
-<screen><userinput>sed -i '/^ftglyph.h/ i ftfntfmt.h' mozilla/config/system-headers</userinput></screen>
+<screen><userinput>sed -e '/^ftglyph.h/i ftfntfmt.h'                     \
+    -e '/^freetype\/ftcache.h/a freetype\/ftfntfmt.h' \
+    -i mozilla/config/system-headers</userinput></screen>
 
     <para>
@@ -274 +280 @@
 
 <screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
-
 chown -R 0:0 /usr/lib/thunderbird-&thunderbird-version;</userinput></screen>