Changeset 9a3e4ba for xsoft

Timestamp:

02/24/2016 07:31:59 AM (9 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

996dfc4a

Parents:

a91856d1

Message:

Merge changes from trunk to r17005.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17009 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

xsoft

Files:

• graphweb/firefox.xml (modified) (1 diff)
• office/libreoffice.xml (modified) (8 diffs)
• other/thunderbird.xml (modified) (1 diff)

xsoft/graphweb/firefox.xml

@@ -9 +9 @@
   <!ENTITY firefox-download-ftp "&mozilla-ftp;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2"> -->
   <!ENTITY firefox-download-ftp " ">
-  <!ENTITY firefox-md5sum        "66d4810df0b5a6095e2276256bf17675">
+  <!ENTITY firefox-md5sum        "9596accec2ce7031eaab5c33373a1af4">
   <!ENTITY firefox-size          "174 MB">
-  <!ENTITY firefox-buildsize     "4.4 GB (79 MB installed)">
+  <!ENTITY firefox-buildsize     "4.4 GB (80 MB installed)">
   <!ENTITY firefox-time          "10 SBU (with parallelism=4)">
 ]>

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>,
@@ -393 +393 @@
 
 sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
-<!--
-sed -e "/ustrbuf/a #include &lt;algorithm&gt;" \
-    -i svl/source/misc/gridprinter.cxx   &amp;&amp;-->
+
+sed -i "s#isnan#std::&amp;#g" xmloff/source/draw/ximp3dscene.cxx &amp;&amp;
 
 chmod -v +x bin/unpack-sources &amp;&amp;
@@ -402 +401 @@
              --sysconfdir=/etc           \
              --with-vendor=BLFS          \
-             --with-lang=fr en-GB        \
+             --with-lang='fr en-GB'      \
              --with-help                 \
              --with-myspell-dicts        \
@@ -520 +519 @@
     <para>
       <command>sed -e ...</command>: The first sed prevents compression of the
-      manual pages, the second one prevents install from failing<!-- and the third
-      one includes a missing header without which <command>make build</command>
-      fails-->.
+      manual pages, the second one prevents install from failing and the third
+      one fixes a build failure caused by a <application>glibc-2.23</application>
+      change.
     </para>
 
@@ -535 +534 @@
 
     <para>
-      <parameter>--with-lang=fr en-GB</parameter>: This switch sets
+      <parameter>--with-lang='fr en-GB'</parameter>: This switch sets
       what languages to support. To list several languages, separate them with
       a space. For all languages, use
@@ -638 +637 @@
 
     <para>
+      <option>--disable-firebird-sdbc</option>: By default, the ability to
+      connect to a <application>firebird</application> database is enabled.
+      This is regarded as 'experimental' and from time to time the unit test
+      CppunitTest_dbaccess_firebird_test fails near the end of the build. If
+      you need to connect to such a database, and the build fails for you,
+      you will need to build <xref linkend="gdb"/> to help upstream debug it.
+    </para>
+
+    <para>
       <option>--disable-gstreamer-1-0</option>: Use this switch if you have not
       installed <xref linkend="gst10-plugins-base"/>.
+    </para>
+
+    <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>
 
@@ -651 +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>
 

xsoft/other/thunderbird.xml

@@ -8 +8 @@
 <!--  <!ENTITY thunderbird-download-ftp "&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">-->
   <!ENTITY thunderbird-download-ftp " ">
-  <!ENTITY thunderbird-md5sum            "44919e93fdd3d8e9ba99e62d1d7e1fd7">
+  <!ENTITY thunderbird-md5sum            "110a1a31bb4fe7d50cfbfbfd65e5968b">
   <!ENTITY thunderbird-size              "195 MB">
-  <!ENTITY thunderbird-buildsize         "3.8 GB (72 MB installed)">
-  <!ENTITY thunderbird-time              "9 SBU (with -j4, estimated 30 SBU with -j1)">
+  <!ENTITY thunderbird-buildsize         "3.8 GB (73 MB installed)">
+  <!ENTITY thunderbird-time              "9.3 SBU (with -j4, estimated 30 SBU with -j1)">
 ]>