On 08/22/2014 02:04 PM, [email protected] wrote: > Author: cjg > Date: Fri Aug 22 05:04:47 2014 > New Revision: 13978 > > Log: > Bumped date and release date. Bumped libreoffice version and added additional > sed and removed using system boost as it only builds against previous > version. Updated stats. > > Modified: > branches/systemd/general.ent > branches/systemd/packages.ent > branches/systemd/xsoft/office/libreoffice.xml >
Please provide a changelog entry with a reference to trac ticket. > Modified: branches/systemd/general.ent > ============================================================================== > --- branches/systemd/general.ent Fri Aug 22 01:36:59 2014 (r13977) > +++ branches/systemd/general.ent Fri Aug 22 05:04:47 2014 (r13978) > @@ -1,12 +1,12 @@ > <!-- $LastChangedBy$ $Date$ --> > > -<!ENTITY day "21"> <!-- Always 2 digits --> > +<!ENTITY day "22"> <!-- Always 2 digits --> > <!ENTITY month "08"> <!-- Always 2 digits --> > <!ENTITY year "2014"> > <!ENTITY copyrightdate "2001-&year;"> > <!ENTITY copyholder "The BLFS systemd Development Team"> > <!ENTITY version "&year;-&month;-&day;"> > -<!ENTITY releasedate "August 21st, &year;"> > +<!ENTITY releasedate "August 22st, &year;"> > <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> > <!ENTITY blfs-version "systemd"> <!-- svn|[release #] --> > <!ENTITY lfs-version "systemd"> <!-- x.y|development] --> > > Modified: branches/systemd/packages.ent > ============================================================================== > --- branches/systemd/packages.ent Fri Aug 22 01:36:59 2014 (r13977) > +++ branches/systemd/packages.ent Fri Aug 22 05:04:47 2014 (r13978) > @@ -548,7 +548,7 @@ > <!ENTITY gnumeric-version "1.12.17"> > <!ENTITY gnucash-version "2.4.11"> > > -<!ENTITY libreoffice-version "4.2.5"> > +<!ENTITY libreoffice-version "4.3.0.4"> This should read 4.3.0 and libreoffice-patch below should be updated to add .4. > <!ENTITY libreoffice-patch ".2"> > <!ENTITY libreoffice-dlversion > "&libreoffice-version;&libreoffice-patch;"> > > > Modified: branches/systemd/xsoft/office/libreoffice.xml > ============================================================================== > --- branches/systemd/xsoft/office/libreoffice.xml Fri Aug 22 01:36:59 > 2014 (r13977) > +++ branches/systemd/xsoft/office/libreoffice.xml Fri Aug 22 05:04:47 > 2014 (r13978) > @@ -7,23 +7,23 @@ > <!ENTITY libreoffice-dl > "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;";> > > <!ENTITY libreoffice-core-download-http > "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz"> > - <!ENTITY libreoffice-core-md5sum "eb44cc33bb9331db4c1b6ae0b03fff9f"> > - <!ENTITY libreoffice-core-size "118 MB"> > + <!ENTITY libreoffice-core-md5sum "de0d9322f3aaeb20abd5e06c5c0972bb"> > + <!ENTITY libreoffice-core-size "145 MB"> > > <!ENTITY libreoffice-dict-download-http > "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz"> > - <!ENTITY libreoffice-dict-md5sum "8ac6a48b78c34f52e8bf43f29cf14bfe"> > + <!ENTITY libreoffice-dict-md5sum "cd27ec060c68079a13abf0984dbbf5fa"> > <!ENTITY libreoffice-dict-size "36 MB"> > > <!ENTITY libreoffice-help-download-http > "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz"> > - <!ENTITY libreoffice-help-md5sum "867c10167b05ba19162b78032405524b"> > + <!ENTITY libreoffice-help-md5sum "89d9da0ff2d5ea07f8c30c680fee2b0a"> > <!ENTITY libreoffice-help-size "1.8 MB"> > > <!ENTITY libreoffice-translations-download-http > "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz"> > - <!ENTITY libreoffice-translations-md5sum > "6bcd61a3f977f78c64b1eaa13a40524c"> > - <!ENTITY libreoffice-translations-size "122 MB"> > + <!ENTITY libreoffice-translations-md5sum > "8e2f7905a0f827f655a1e21d93c6ddf7"> > + <!ENTITY libreoffice-translations-size "121 MB"> > > - <!ENTITY libreoffice-buildsize "4.0 GB (423 MB installed) - 9.6 > GB (528 MB installed), with translations"> > - <!ENTITY libreoffice-time "139 SBU - 165 SBU, with > translations"> > + <!ENTITY libreoffice-buildsize "8.23 G,(497 MB installed) with > translations"> > + <!ENTITY libreoffice-time "144.3 SBU, with translations"> > ]> > > <sect1 id="libreoffice" xreflabel="LibreOffice-&libreoffice-version;"> > @@ -274,17 +274,17 @@ > source directory so they won't get downloaded again: > </para> > > -<screen><userinput>install -dm755 src && > +<screen><userinput>install -dm755 external/tarballs && > > tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz > --no-overwrite-dir --strip-components=1 && > -ln -sfv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz src/ > && > -ln -sfv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz > src/</userinput></screen> > +ln -sfv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz > external/tarballs/ && > +ln -sfv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz > external/tarballs/</userinput></screen> > > <para> > If you have downloaded the translations tarball, create a symlink: > </para> > > -<screen><userinput>ln -sfv > ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz > src/</userinput></screen> > +<screen><userinput>ln -sfv > ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz > external/tarballs/</userinput></screen> > > <note> > <para> > @@ -318,6 +318,11 @@ > -i bin/distro-install-desktop-integration && > sed -e "/distro-install-file-lists/d" -i Makefile.in && > > +sed -e "/distro-install-file-lists/d" \ > + -e "s:fetch_Download_item:&_unchecked:" \ > + -e "/fetch_Download_item/s:,no-check::" \ > + -i Makefile.in && > + > chmod -v +x bin/unpack-sources && > sed -e "s/target\.mk/langlist\.mk/" \ > -e "s/tar -xf/tar -x --strip-components=1 -f/" \ > @@ -336,7 +341,6 @@ > --disable-postgresql-sdbc \ > --enable-release-build \ > --enable-python=system \ > - --with-system-boost \ You could've just commented it out, so we can easily restore it when it builds again. > --with-system-clucene \ > --with-system-cairo \ > --with-system-curl \ > @@ -400,7 +404,8 @@ > <para> > <command>sed -e ...</command>: First sed prevents compression of the > manual pages, the second one prevents a script that causes install to > - fail from running and the third one fixes the unpack script. > + fail from running, the third one fixes the download location > + and the fourth one fixes the unpack script. > </para> > > <para> > -- Note: My last name is not Krejzi.
signature.asc
Description: OpenPGP digital signature
-- http://lists.linuxfromscratch.org/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
