Changeset aa035a3

Timestamp:

04/26/2022 06:26:28 PM (2 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

39b5f49f

Parents:

3f33827 (diff), 2310936 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:

• general/genutils/ibus.xml (modified) (1 diff)
• general/prog/java.xml (modified) (2 diffs)
• general/prog/openjdk.xml (modified) (6 diffs)
• gnome/platform/gnome-bluetooth.xml (modified) (1 diff)
• gnome/platform/gnome-control-center.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

general/genutils/ibus.xml

@@ -168 +168 @@
     <para>
       To test the results, issue: <command>make -k check</command>.
-      One test, test-override-ibus.py, is known to fail.
+      The test named ibus-compose fails because it uses some locales
+      not installed in LFS.
+      The test named ibus-keypress is known to fail in Wayland based desktop
+      environment.
+      The test named test-override-ibus.py is known to fail if Python
+      support library is enabled.
     </para>
 

general/prog/java.xml

@@ -9 +9 @@
   <!ENTITY anduin-download             "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
   <!ENTITY openjdk-download-binary-x86 "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;/OpenJDK-&openjdk-version;+&openjdk-build;-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86      "063ba63745bd69c1946a0d1c5d516469">
-  <!ENTITY openjdk-bin-size-x86        "153 MB">
-  <!ENTITY openjdk-bin-buildsize-x86   "293 MB">
+  <!ENTITY openjdk-bin-md5sum-x86      "f34dce52622488041247aecc2e966b89">
+  <!ENTITY openjdk-bin-size-x86        "154 MB">
+  <!ENTITY openjdk-bin-buildsize-x86   "295 MB">
 
 <!-- Not uploaded to anduin, since this file is now available under GNU GPLv2
@@ -18 +18 @@
      request. - Doug -->
   <!ENTITY openjdk-download-binary-x64 "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;/OpenJDK-&openjdk-version;+&openjdk-build;-x86_64-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x64      "579344d9a426f452539bbd21429549d8">
-  <!ENTITY openjdk-bin-size-x64        "159 MB">
-  <!ENTITY openjdk-bin-buildsize-x64   "317 MB">
+  <!ENTITY openjdk-bin-md5sum-x64      "b9629a85041fbbc1579c0f02711a83bb">
+  <!ENTITY openjdk-bin-size-x64        "160 MB">
+  <!ENTITY openjdk-bin-buildsize-x64   "319 MB">
 ]>
 

general/prog/openjdk.xml

@@ -6 +6 @@
 
   <!ENTITY ojdk-tarball              "jdk-&openjdk-version;-ga.tar.gz">
-  <!ENTITY ojdk-repo                 "https://github.com/openjdk/jdk17u">
+  <!ENTITY ojdk-repo                 "https://github.com/openjdk/jdk18u">
   <!ENTITY ojdk-download             "&ojdk-repo;/archive/&ojdk-tarball;">
 
   <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "94344312ee396394964f51933936f7aa">
-  <!ENTITY ojdk-size                 "100 MB">
+  <!ENTITY ojdk-md5sum               "b7ce8aaafaf0f244321b54132d9ff72e">
+  <!ENTITY ojdk-size                 "101 MB">
 
   <!ENTITY jtreg-version             "6.1+1">
@@ -19 +19 @@
   <!ENTITY jtreg-size                "8.0 MB">
 
-  <!ENTITY ojdk-bdsize               "4.6 GB (add 466 MB for tests)">
-  <!ENTITY ojdk-time                 "5.1 SBU with 4 jobs (add 55 SBU for tests with 4 jobs)">
+  <!ENTITY ojdk-bdsize               "4.6 GB (add 590 MB for tests)">
+  <!ENTITY ojdk-time                 "4.9 SBU with 4 jobs (add 47 SBU for tests with 4 jobs)">
 ]>
 
@@ -260 +260 @@
                --with-libpng=system                   \
                --with-zlib=system                     \
-               --with-version-build="&openjdk-build;"               \
+               --with-version-build="&openjdk-build;"              \
                --with-version-pre=""                  \
                --with-version-opt=""                  \
@@ -296 +296 @@
          17.0.2+8:
          for x86_64: passed: 6,238; failed: 48; error: 13
-         for i686:   passed: 6,208; failed: 29; error: 6-->
+         for i686:   passed: 6,208; failed: 29; error: 6
+         18.0.1+10:
+         for x86_64: passed: 6,323; failed: 53; error: 14
+         for i686:   passed: 6,290; failed: 29; error: 11-->
 
     <para>
@@ -522 +525 @@
         <seg>jar, jarsigner, java, javac, javadoc, javap, jcmd,
         jconsole, jdb, jdeprscan, jdeps, jfr, jhsdb, jimage, jinfo,
-        jlink, jmap, jmod, jpackage, jps, jrunscript, jshell, jstack,
-        jstat, jstatd, keytool, rmiregistry, and serialver</seg>
+        jlink, jmap, jmod, jpackage, jps, jrunscript, jshell, jstack,
+        jstat, jstatd, jwebserver, keytool, rmiregistry, and serialver</seg>
         <seg>/opt/jdk-&openjdk-version;/lib/*</seg>
         <seg>/opt/jdk-&openjdk-version;</seg>
@@ -881 +884 @@
       </varlistentry>
 
+      <varlistentry id="jwebserver">
+        <term><command>jwebserver</command></term>
+        <listitem>
+          <para>
+            provides a minimal HTTP server, designed to be used for
+            prototyping, testing, and debugging
+          </para>
+          <indexterm zone="openjdk jwebserver">
+            <primary sortas="b-jwebserver">jwebserver</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="keytool">
         <term><command>keytool</command></term>

gnome/platform/gnome-bluetooth.xml

@@ -78 +78 @@
     <para role="required">
       <xref linkend="gtk3"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libcanberra"/>, and
+      <xref linkend="gsound"/>,
+      <xref linkend="itstool"/>, and
       <xref linkend="libnotify"/>
     </para>

gnome/platform/gnome-control-center.xml

@@ -77 +77 @@
     <para role="required">
       <xref linkend="accountsservice"/>,
-      <xref linkend="clutter-gtk"/>,
       <xref linkend="colord-gtk"/>,
       <xref linkend="gnome-online-accounts"/>,
       <xref linkend="gnome-settings-daemon"/>,
-      <xref linkend="grilo"/>,
       <xref linkend="gsound"/>,
       <xref linkend="libgtop"/>,
@@ -92 +90 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="cheese"/>,
       <xref linkend="cups"/> and
       <xref linkend="samba"/> (for the Printers Panel),
@@ -179 +176 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dcheese=false</option>: Use this switch if you have not
-      installed the recommended <application>Cheese</application> dependency.
-    </para>
 
     <para>

introduction/welcome/changelog.xml

@@ -54 +54 @@
           <ulink url="&blfs-ticket-root;16467">#16467</ulink>.</para>
         </listitem>
+        <listitem>
+          <para>[pierre] - Update to java-18.0.1 binary. Fixes
+          <ulink url="&blfs-ticket-root;16453">#16453</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to OpenJDK-18.0.1. Part of
+          <ulink url="&blfs-ticket-root;16453">#16453</ulink>.</para>
+        </listitem>
       </itemizedlist>
     </listitem>

packages.ent

@@ -405 +405 @@
 <!ENTITY hamcrest-version             "1.3">
 -->
-<!ENTITY openjdk-version              "17.0.2">
-<!ENTITY openjdk-build                "8">
+<!ENTITY openjdk-version              "18.0.1">
+<!ENTITY openjdk-build                "10">
 
 <!-- Perl module versions used in the Perl Modules instructions