Changeset b69df19 for general

Timestamp:

11/01/2022 06:59:01 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.3, 12.0, 12.1, 12.2, gimp3, 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/for-12.3, xry111/llvm18, xry111/spidermonkey128, xry111/xf86-video-removal

Children:

8c5e6ec

Parents:

8b819c5 (diff), 35ea4f04 (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' into plabs/python-mods

Location:

general

Files:

• genlib/libunistring.xml (modified) (1 diff)
• graphlib/libtiff.xml (modified) (1 diff)
• prog/java.xml (modified) (2 diffs)
• prog/openjdk.xml (modified) (4 diffs)

general/genlib/libunistring.xml

@@ -10 +10 @@
   <!ENTITY libunistring-size          "2.3 MB">
   <!ENTITY libunistring-buildsize     "51 MB (add 56 MB for tests)">
-  <!ENTITY libunistring-time          "0.4 SBU (iUsing parallelism=4; add 1.0 SBU for tests)">
+  <!ENTITY libunistring-time          "0.4 SBU (Using parallelism=4; add 1.0 SBU for tests)">
 ]>
 

general/graphlib/libtiff.xml

@@ -71 +71 @@
         <para>
           Estimated build time: &libtiff-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/tiff-&libtiff-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>

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      "8c963c364e402e57f84e1636358d0649">
-  <!ENTITY openjdk-bin-size-x86        "154 MB">
-  <!ENTITY openjdk-bin-buildsize-x86   "295 MB">
+  <!ENTITY openjdk-bin-md5sum-x86      "a241e4697d80e76e2a34681ed97815dc">
+  <!ENTITY openjdk-bin-size-x86        "159 MB">
+  <!ENTITY openjdk-bin-buildsize-x86   "307 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      "89271dd2c7655c4c2b256f68abc4b732">
+  <!ENTITY openjdk-bin-md5sum-x64      "a7052c0ccf330a906ac7e0b64613d823">
   <!ENTITY openjdk-bin-size-x64        "160 MB">
-  <!ENTITY openjdk-bin-buildsize-x64   "320 MB">
+  <!ENTITY openjdk-bin-buildsize-x64   "324 MB">
 ]>
 

general/prog/openjdk.xml

@@ -6 +6 @@
 
   <!ENTITY ojdk-tarball              "jdk-&openjdk-version;-ga.tar.gz">
-  <!ENTITY ojdk-repo                 "https://github.com/openjdk/jdk18u">
+  <!ENTITY ojdk-repo                 "https://github.com/openjdk/jdk19u">
   <!ENTITY ojdk-download             "&ojdk-repo;/archive/&ojdk-tarball;">
 
   <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "23dbcb515ee1f329aa564d935f303ee4">
-  <!ENTITY ojdk-size                 "101 MB">
+  <!ENTITY ojdk-md5sum               "e1067bc90894e5377b61dca68a22f07c">
+  <!ENTITY ojdk-size                 "103 MB">
 
   <!ENTITY jtreg-version             "6.1+1">
@@ -19 +19 @@
   <!ENTITY jtreg-size                "8.0 MB">
 
-  <!ENTITY ojdk-bdsize               "4.5 GB (add 591 MB for tests)">
-  <!ENTITY ojdk-time                 "5.1 SBU with 4 jobs (add 41 SBU for tests with 4 jobs)">
+  <!ENTITY ojdk-bdsize               "5.1 GB (add 596 MB for tests)">
+  <!ENTITY ojdk-time                 "5.0 SBU with 4 jobs (add 48 SBU for tests with 4 jobs)">
 ]>
 
@@ -286 +286 @@
       You should expect to see around 40 failures and 10 errors.
     </para>
-    <!-- 11.0.2+9:
-         for x86_64: 2 Errors, 28 Failures
-         for i686:   13 Errors, 48 Failures
-         12.0.2+10:
-         for x86_64: 5828 Passed, 52 Errors, no failures
-         for i686: PENDING
+    <!--
          14.0.1+7:
          for x86_64: passed: 5,836; failed: 42; error: 50
@@ -306 +301 @@
          for x86_64: passed: 6,329; failed: 50; error: 14
          for i686:   passed: 6,289; failed: 31; error: 13
+         19.0.1+10:
+         for x86_64: passed: 6,423; failed: 58; error: 15
+         for i686:   passed: 6,376; failed: 31; error: 12
     -->