Author: cjg Date: Sun Oct 5 06:40:19 2014 New Revision: 14500 Log: Merge more updates from trunk.
Modified: branches/systemd/packages.ent branches/systemd/server/other/openldap-systemd.xml branches/systemd/xsoft/other/thunderbird.xml Modified: branches/systemd/packages.ent ============================================================================== --- branches/systemd/packages.ent Sun Oct 5 06:21:00 2014 (r14499) +++ branches/systemd/packages.ent Sun Oct 5 06:40:19 2014 (r14500) @@ -415,7 +415,7 @@ <!ENTITY sqlite-version "3.8.6"> <!-- 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"> <!ENTITY virtuoso-version "6.1.8"> @@ -598,7 +598,7 @@ <!ENTITY pidgin-version "2.10.9"> <!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"> <!ENTITY xchat-version "2.8.8"> Modified: branches/systemd/server/other/openldap-systemd.xml ============================================================================== --- branches/systemd/server/other/openldap-systemd.xml Sun Oct 5 06:21:00 2014 (r14499) +++ branches/systemd/server/other/openldap-systemd.xml Sun Oct 5 06:40:19 2014 (r14500) @@ -6,10 +6,10 @@ <!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)"> ]> <sect1 id="openldap" xreflabel="OpenLDAP-&openldap-version;"> Modified: branches/systemd/xsoft/other/thunderbird.xml ============================================================================== --- branches/systemd/xsoft/other/thunderbird.xml Sun Oct 5 06:21:00 2014 (r14499) +++ branches/systemd/xsoft/other/thunderbird.xml Sun Oct 5 06:40:19 2014 (r14500) @@ -8,10 +8,10 @@ "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2";> <!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"> ]> <sect1 id="thunderbird" xreflabel="Thunderbird-&thunderbird-version;"> @@ -239,6 +239,8 @@ (MOZ_OBJDIR): </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> <para> @@ -273,6 +275,13 @@ <sect2 role="commands"> <title>Command Explanations</title> +<!-- might be necessary + <para> + <command>test $(uname -m) = "i686" && 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> <command>make -f client.mk</command>: Mozilla products are packaged to @@ -342,7 +351,7 @@ commands as the <systemitem class="username">root</systemitem> user: </para> -<screen role="root"><userinput>mkdir -pv /usr/share/applications && +<screen role="root"><userinput>mkdir -pv /usr/share/{applications,pixmaps} && cat > /usr/share/applications/thunderbird.desktop << "EOF" && <literal>[Desktop Entry] -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
