Changeset 92dd66f for xsoft/other/thunderbird.xml

Timestamp:

07/02/2016 07:15:54 PM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 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:

68f9243

Parents:

3d6df725

Message:

Update to Thunderbird-45.2.0.

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

File:

• xsoft/other/thunderbird.xml (modified) (6 diffs)

xsoft/other/thunderbird.xml

@@ -8 +8 @@
 <!--  <!ENTITY thunderbird-download-ftp "&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.xz">-->
   <!ENTITY thunderbird-download-ftp " ">
-  <!ENTITY thunderbird-md5sum            "19e1a8eb1aa99927c35ea2fcfbd7f255">
+  <!ENTITY thunderbird-md5sum            "e46b0d17809d52e6be479a1b77b6445c">
   <!ENTITY thunderbird-size              "192 MB">
-  <!ENTITY thunderbird-buildsize         "3.8 GB (73 MB installed)">
-  <!ENTITY thunderbird-time              "9.3 SBU (with -j4, estimated 30 SBU with -j1)">
+  <!ENTITY thunderbird-buildsize         "4.8 GB (80 MB installed)">
+  <!ENTITY thunderbird-time              "18 SBU (with -j4, estimated 63 SBU with -j1)">
 ]>
 
@@ -69 +69 @@
         <para>
           Estimated build time: &thunderbird-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch, if building with gcc-6:
-          <ulink url="&patch-root;/thunderbird-&thunderbird-version;-gcc6-2.patch"/>
         </para>
       </listitem>
@@ -250 +240 @@
 <!-- might be necessary
 test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&-->
-    <para>Fix some issues with GCC-6.1:</para>
-
-<screen><userinput>patch -Np1 -i ../thunderbird-&thunderbird-version;-gcc6-2.patch</userinput></screen>
 
     <para>
@@ -264 +251 @@
     </para></note>
 
-<screen><userinput>CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-export CFLAGS CXXFLAGS
+<screen><userinput>sed -e '/#include/i\
+    print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\\n"\;' \
+    -i mozilla/nsprpub/config/make-system-wrappers.pl
+
+sed -e '/#include/a\
+    print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\\n"\;' \
+    -i mozilla/nsprpub/config/make-system-wrappers.pl
+
+export CFLAGS_HOLD=$CFLAGS
+export CXXFLAGS_HOLD=$CXXFLAGS
+export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+export CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+
 make -f client.mk</userinput></screen>
 
@@ -279 +276 @@
 
 <screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
-chown -R 0:0 /usr/lib/thunderbird-&thunderbird-version;</userinput></screen>
+chown -R 0:0 /usr/lib/thunderbird-&thunderbird-version;
+export CFLAGS=$CFLAGS_HOLD
+export CXXFLAGS=$CFLAGS_HOLD
+unset CFLAGS_HOLD CXXFLAGS_HOLD</userinput></screen>
 
 <!-- thunderbuild directory does not exist anymore. Leaving as comment,
@@ -306 +306 @@
 
     <para>
-      <command>CFLAGS= ... CXXFLAGS= ...</command>: These settings work around
-      code which gcc6 would otherwise regard as out-of-specification and allow
-      it to produce a working program.
+      <command>sed ...</command>: These commands correct the source to be
+      compatible with gcc6 by preventing c++ scope errors.
+    </para>
+
+    <para>
+      <command>export CFLAGS= ... export CXXFLAGS= ...</command>: These
+      settings work around code which gcc6 would otherwise regard as
+      out-of-specification and allow it to produce a working program.
     </para>