Changeset 57d78e0

Timestamp:

10/05/2014 01:40:19 PM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

kde5-14686, systemd-13485

Children:

8a19a62

Parents:

f87a1fd

Message:

Merge more updates from trunk.

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

Files:

• packages.ent (modified) (2 diffs)
• server/other/openldap-systemd.xml (modified) (1 diff)
• xsoft/other/thunderbird.xml (modified) (4 diffs)

packages.ent

@@ -416 +416 @@
 
 <!-- Chapter 23 -->
-<!ENTITY openldap-version             "2.4.39">
+<!ENTITY openldap-version             "2.4.40">
 <!ENTITY soprano-version              "2.9.4">
 <!ENTITY unbound-version              "1.4.22">
@@ -599 +599 @@
 <!ENTITY rox-filer-version            "2.11">
 <!ENTITY rxvt-unicode-version         "9.20">
-<!ENTITY thunderbird-version          "31.1.1">
+<!ENTITY thunderbird-version          "31.1.2">
 <!ENTITY tigervnc-version             "1.3.1">
 <!ENTITY transmission-version         "2.84">

server/other/openldap-systemd.xml

@@ -7 +7 @@
   <!ENTITY openldap-download-http " ">
   <!ENTITY openldap-download-ftp  "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
-  <!ENTITY openldap-md5sum        "b0d5ee4b252c841dec6b332d679cf943">
-  <!ENTITY openldap-size          "5.3 MB">
-  <!ENTITY openldap-buildsize     "48 MB (client) 103 MB (server)">
-  <!ENTITY openldap-time          "0.9 SBU (client) 1.8 SBU (server)">
+  <!ENTITY openldap-md5sum        "423c1f23d2a0cb96b3e9baf7e9d7dda7">
+  <!ENTITY openldap-size          "5.4 MB">
+  <!ENTITY openldap-buildsize     "47 MB (client) 101 MB (server - additional 5 MB for the tests)">
+  <!ENTITY openldap-time          "0.9 SBU (client) 1.8 SBU (server - additional 3.4 SBU for the tests)">
 ]>
 

xsoft/other/thunderbird.xml

@@ -9 +9 @@
   <!ENTITY thunderbird-download-ftp
            "&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">
-  <!ENTITY thunderbird-md5sum            "92a36f2e4916529c1226aa283dc160a6">
-  <!ENTITY thunderbird-size              "163 MB">
-  <!ENTITY thunderbird-buildsize         "4.6 GB (62 MB installed)">
-  <!ENTITY thunderbird-time              "50 SBU">
+  <!ENTITY thunderbird-md5sum            "1c8061066e42cef89fe5eed7a0d25dcd">
+  <!ENTITY thunderbird-size              "164 MB">
+  <!ENTITY thunderbird-buildsize         " 3.7 GB (68 MB installed)">
+  <!ENTITY thunderbird-time              "47 SBU">
 ]>
 
@@ -240 +240 @@
     </para>
 
+<!-- might be necessary
+test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&-->
 <screen><userinput>mkdir -vp mozilla/thunderbuild</userinput></screen>
 
@@ -274 +276 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+<!-- might be necessary
+    <para>
+      <command>test $(uname -m) = "i686" &amp;&amp; sed ...</command>: On this
+      version of thunderbird, an old bug has reappeared in 32-bit builds.  With
+      optimization, the install fails with a Python error.  This command will
+      fix i686 builds and preserve the optimization on x86_64.
+    </para>-->
 
     <para>
@@ -343 +352 @@
     </para>
 
-<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
+<screen role="root"><userinput>mkdir -pv /usr/share/{applications,pixmaps} &amp;&amp;
 
 cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;