Author: bdubbs Date: Thu Dec 24 17:25:01 2020 New Revision: 24018 Log: Update to libreoffice-7.0.4.2. Update to gtkmm-3.24.3. Update to gtk+-2.24.33.
Modified: trunk/BOOK/general.ent trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/packages.ent trunk/BOOK/x/lib/gtk+2.xml trunk/BOOK/x/lib/gtkmm3.xml trunk/BOOK/xsoft/office/libreoffice.xml Modified: trunk/BOOK/general.ent ============================================================================== --- trunk/BOOK/general.ent Thu Dec 24 09:13:16 2020 (r24017) +++ trunk/BOOK/general.ent Thu Dec 24 17:25:01 2020 (r24018) @@ -1,12 +1,12 @@ <!-- $LastChangedBy$ $Date$ --> -<!ENTITY day "21"> <!-- Always 2 digits --> +<!ENTITY day "24"> <!-- Always 2 digits --> <!ENTITY month "12"> <!-- Always 2 digits --> <!ENTITY year "2020"> <!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyholder "The BLFS Development Team"> <!ENTITY version "&year;-&month;-&day;"> -<!ENTITY releasedate "December 21st, &year;"> +<!ENTITY releasedate "December 24th, &year;"> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY blfs-version "svn"> <!-- svn|[release #] --> <!ENTITY lfs-version "development"> <!-- x.y|development --> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Thu Dec 24 09:13:16 2020 (r24017) +++ trunk/BOOK/introduction/welcome/changelog.xml Thu Dec 24 17:25:01 2020 (r24018) @@ -42,6 +42,24 @@ </listitem> --> <listitem> + <para>December 24th, 2020</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Update to libreoffice-7.0.4.2. Fixes + <ulink url="&blfs-ticket-root;14402">#14402</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to gtkmm-3.24.3. Fixes + <ulink url="&blfs-ticket-root;14381">#14381</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to gtk+-2.24.33. Fixes + <ulink url="&blfs-ticket-root;14416">#14416</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>December 21st, 2020</para> <itemizedlist> <listitem> Modified: trunk/BOOK/packages.ent ============================================================================== --- trunk/BOOK/packages.ent Thu Dec 24 09:13:16 2020 (r24017) +++ trunk/BOOK/packages.ent Thu Dec 24 17:25:01 2020 (r24018) @@ -734,11 +734,11 @@ <!ENTITY glu-version "9.0.1"> <!ENTITY goffice010-version "0.10.48"> <!ENTITY graphene-version "1.10.2"> -<!ENTITY gtk2-version "2.24.32"> +<!ENTITY gtk2-version "2.24.33"> <!ENTITY gtk3-version "3.24.24"> <!ENTITY gtk-engines-version "2.20.2"> <!ENTITY gtkmm2-version "2.24.5"> -<!ENTITY gtkmm3-version "3.24.2"> +<!ENTITY gtkmm3-version "3.24.3"> <!ENTITY gtksourceview-version "3.24.11"> <!ENTITY gtksourceview4-version "4.8.0"> <!ENTITY gtk-vnc-version "1.0.0"> @@ -904,8 +904,8 @@ <!ENTITY gnumeric-version "1.12.48"> <!ENTITY gnucash-version "2.4.11"> -<!ENTITY libreoffice-version "7.0.3"> -<!ENTITY libreoffice-patch ".1"> +<!ENTITY libreoffice-version "7.0.4"> +<!ENTITY libreoffice-patch ".2"> <!ENTITY libreoffice-dlversion "&libreoffice-version;&libreoffice-patch;"> <!-- Chapter 40 --> Modified: trunk/BOOK/x/lib/gtk+2.xml ============================================================================== --- trunk/BOOK/x/lib/gtk+2.xml Thu Dec 24 09:13:16 2020 (r24017) +++ trunk/BOOK/x/lib/gtk+2.xml Thu Dec 24 17:25:01 2020 (r24018) @@ -6,10 +6,10 @@ <!ENTITY gtk2-download-http "&gnome-download-http;/gtk+/2.24/gtk+->k2-version;.tar.xz"> <!ENTITY gtk2-download-ftp "&gnome-download-ftp;/gtk+/2.24/gtk+->k2-version;.tar.xz"> - <!ENTITY gtk2-md5sum "d5742aa42275203a499b59b4c382a784"> + <!ENTITY gtk2-md5sum "0118e98dbe0e4dab90ce475f9f0e6c0c"> <!ENTITY gtk2-size "12 MB"> - <!ENTITY gtk2-buildsize "275 MB"> - <!ENTITY gtk2-time "1.0 SBU (using parallelism=4; add 0.1 SBU for tests)"> + <!ENTITY gtk2-buildsize "285 MB"> + <!ENTITY gtk2-time "0.9 SBU (using parallelism=4; add 0.1 SBU for tests)"> ]> <sect1 id="gtk2" xreflabel="GTK+->k2-version;"> @@ -125,12 +125,12 @@ make</userinput></screen> <para> - To test the results, issue: <command>make check</command>. Note that you + To test the results, issue: <command>make -k check</command>. Note that you must run the tests from a session with X Window Display capability (i.e., not a text-based terminal/console) as the tests attempt to open an X window, and the tests can take an excessively long time. Using an X - Window, the tests should take less than 0.3 SBU. One test, - DefaultValues/GdkPixbuf, is known to fail. + Window, the tests should take less than 0.1 SBU. One test, + aliasfilescheck.sh, is known to fail. </para> <para> Modified: trunk/BOOK/x/lib/gtkmm3.xml ============================================================================== --- trunk/BOOK/x/lib/gtkmm3.xml Thu Dec 24 09:13:16 2020 (r24017) +++ trunk/BOOK/x/lib/gtkmm3.xml Thu Dec 24 17:25:01 2020 (r24018) @@ -6,10 +6,10 @@ <!ENTITY gtkmm3-download-http "&gnome-download-http;/gtkmm/&gnome-minor-24;/gtkmm->kmm3-version;.tar.xz"> <!ENTITY gtkmm3-download-ftp "&gnome-download-ftp;/gtkmm/&gnome-minor-24;/gtkmm->kmm3-version;.tar.xz"> - <!ENTITY gtkmm3-md5sum "e311db484ca9c53f1689d35f5f58a06b"> + <!ENTITY gtkmm3-md5sum "9a9a00bcd634e3eca0b101809f2eae02"> <!ENTITY gtkmm3-size "13 MB"> - <!ENTITY gtkmm3-buildsize "411 MB (with tests)"> - <!ENTITY gtkmm3-time "2.1 SBU (Using parallelism=4; with tests)"> + <!ENTITY gtkmm3-buildsize "373 MB (with tests)"> + <!ENTITY gtkmm3-time "0.9 SBU (Using parallelism=4; with tests)"> ]> <sect1 id="gtkmm3" xreflabel="Gtkmm->kmm3-version;"> @@ -79,6 +79,11 @@ <xref linkend="pangomm"/> </para> + <bridgehead renderas="sect4">Optional</bridgehead> + <para role="optional"> + <xref linkend="doxygen"/> + </para> + <para condition="html" role="usernotes"> User Notes: <ulink url="&blfs-wiki;/gtkmm3"/> </para> @@ -88,22 +93,20 @@ <title>Installation of Gtkmm</title> <para> - First, fix the documentation directory name: - </para> - -<screen><userinput>sed -e '/^libdocdir =/ s/$(book_name)/gtkmm->kmm3-version;/' \ - -i docs/Makefile.in</userinput></screen> - - <para> Install <application>Gtkmm</application> by running the following commands: </para> -<screen><userinput>./configure --prefix=/usr && -make</userinput></screen> +<screen><userinput>mkdir gtkmm3-build && +cd gtkmm3-build && + +meson --prefix=/usr \ + -Dbuild-documentation=true && + +ninja</userinput></screen> <para> - To test the results, issue: <command>make check</command>. Note that you + To test the results, issue: <command>ninja test</command>. Note that you must be in a graphical environment, as the tests try to open some windows. </para> @@ -112,7 +115,8 @@ Now, as the <systemitem class="username">root</systemitem> user: </para> -<screen role="root"><userinput>make install</userinput></screen> +<screen role="root"><userinput>ninja install && +mv -v /usr/share/doc/gtkmm-3.0 /usr/share/doc/gtkmm->kmm3-version;</userinput></screen> </sect2> <sect2 role="content"> Modified: trunk/BOOK/xsoft/office/libreoffice.xml ============================================================================== --- trunk/BOOK/xsoft/office/libreoffice.xml Thu Dec 24 09:13:16 2020 (r24017) +++ trunk/BOOK/xsoft/office/libreoffice.xml Thu Dec 24 17:25:01 2020 (r24018) @@ -7,24 +7,24 @@ <!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 "7c07d445c7588c7ada6f6074a1bbc4c6"> - <!ENTITY libreoffice-core-size "230 MB"> + <!ENTITY libreoffice-core-md5sum "cad93ef2c87928b5a2971ae7e6474fe1"> + <!ENTITY libreoffice-core-size "226 MB"> <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz"> - <!ENTITY libreoffice-dict-md5sum "55ab3088c7c97715440cb69ebda28fe8"> - <!ENTITY libreoffice-dict-size "46 MB"> + <!ENTITY libreoffice-dict-md5sum "f55125ef3ec0541df31c87ee2fa00700"> + <!ENTITY libreoffice-dict-size "44 MB"> <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz"> - <!ENTITY libreoffice-help-md5sum "d486db827394ff5bcafebf9b1d563910"> + <!ENTITY libreoffice-help-md5sum "3862b85f1dd0e7daf2e02484e3839e72"> <!ENTITY libreoffice-help-size "106 MB"> <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz"> - <!ENTITY libreoffice-translations-md5sum "0512dc56db2697c5c0e843947958ba96"> + <!ENTITY libreoffice-translations-md5sum "05aa6fbbec0cc08005ff6dca32cb4c40"> <!ENTITY libreoffice-translations-size "168 MB"> <!-- full size remeasured for 7.0.0.3 --> - <!ENTITY libreoffice-buildsize "9.0 GB including the additional files if downloaded during the build (823 MB installed). Installing the whole set of languages requires more than 25 GB (around 3 GB installed)"> + <!ENTITY libreoffice-buildsize "6.5 GB including the additional files if downloaded during the build (775 MB installed). Installing the whole set of languages requires more than 25 GB (around 3 GB installed)"> <!-- Editors: many updates to poppler will break LO using system poppler until somebody is able to provide a patch or sed. In these cases, please mark @@ -48,7 +48,7 @@ 56 SBU for 7.0.3.1 not including download of translations, help, and dictionaries. -renodr --> - <!ENTITY libreoffice-time "56 SBU with parallelism=4 including typical download time"> + <!ENTITY libreoffice-time "45 SBU with parallelism=4 including typical download time"> ]> @@ -374,6 +374,13 @@ "Command Explanations", further below, before proceeding. </para> + <note> + <para> + If you set the ACLOCAL environment variable to support insalling + Xorg in /opt, you will need to unset it for this procedure. + </para> + </note> + <para> Prepare <application>LibreOffice</application> for compilation by running the following commands: @@ -388,9 +395,6 @@ sed -e "/distro-install-file-lists/d" -i Makefile.in && -sed -e 's@getURI()->c_str()@getURI().c_str()@' \ - -i sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx && - sed -i 29a\ '\\t\t&&sed -i "s/TRUE/true/g" src/lib/libcdr_utils.cpp \\' \ external/libcdr/ExternalProject_libcdr.mk && @@ -399,8 +403,6 @@ '\\t\t&&sed -i "s/TRUE/true/g" src/lib/EBOOKCharsetConverter.cpp \\' \ external/libebook/ExternalProject_libebook.mk && -sed -i 's/TRUE/true/' i18npool/source/calendar/calendar_gregorian.cxx && - ./autogen.sh --prefix=$LO_PREFIX \ --sysconfdir=/etc \ --with-vendor=BLFS \ -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page