Changeset e77c478 for general/graphlib

Timestamp:

07/18/2023 04:51:51 PM (10 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.0, 12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

6dfe4ab

Parents:

4048bc73 (diff), 5af5876 (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 lxqt

Location:

general/graphlib

Files:

• freetype2.xml (modified) (1 diff)
• graphite2.xml (modified) (1 diff)
• harfbuzz.xml (modified) (2 diffs)
• libjpeg-turbo.xml (modified) (1 diff)
• librsvg.xml (modified) (2 diffs)
• opencv.xml (modified) (1 diff)
• poppler.xml (modified) (2 diffs)
• qpdf.xml (modified) (1 diff)

general/graphlib/freetype2.xml

@@ -156 +156 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/freetype-&freetype2-version; &amp;&amp;
-cp -v -R docs/*     /usr/share/doc/freetype-&freetype2-version; &amp;&amp;
+<screen role="root"><userinput>cp -v -R docs -T /usr/share/doc/freetype-&freetype2-version; &amp;&amp;
 rm -v /usr/share/doc/freetype-&freetype2-version;/freetype-config.1</userinput></screen>
 

general/graphlib/graphite2.xml

@@ -149 +149 @@
     <para>
       To test the results, issue: <command>make test</command>.
+      One test named <filename>nametabletest</filename> is known to fail.
     </para>
 

general/graphlib/harfbuzz.xml

@@ -8 +8 @@
            "https://github.com/harfbuzz/harfbuzz/releases/download/&harfbuzz-version;/harfbuzz-&harfbuzz-version;.tar.xz">
   <!ENTITY harfbuzz-download-ftp  " ">
-  <!ENTITY harfbuzz-md5sum        "b6cbea4577691c2b65aa21a8515a0136">
+  <!ENTITY harfbuzz-md5sum        "6d4c01cb9611b7c68b805655096670ca">
   <!ENTITY harfbuzz-size          "18 MB">
-  <!ENTITY harfbuzz-buildsize     "149 MB (with tests)">
+  <!ENTITY harfbuzz-buildsize     "151 MB (with tests)">
   <!ENTITY harfbuzz-time          "0.7 SBU (Using parallelism=4; with tests)">
 ]>
@@ -91 +91 @@
       <xref linkend="gtk-doc"/>,
       <ulink url="https://pypi.org/project/FontTools/">FontTools</ulink>
-      (Python 3 module, for the test suite), and
-      <ulink url="https://www.colm.net/open-source/ragel/">ragel</ulink>
+      (Python 3 module, for the test suite),
+      <ulink url="https://www.colm.net/open-source/ragel/">ragel</ulink>,
+      and <ulink url="https://github.com/bytecodealliance/wasm-micro-runtime">wasm-micro-runtime</ulink>
     </para>
 

general/graphlib/libjpeg-turbo.xml

@@ -7 +7 @@
   <!ENTITY libjpeg-download-http "&sourceforge-dl;/libjpeg-turbo/libjpeg-turbo-&libjpeg-turbo-version;.tar.gz">
   <!ENTITY libjpeg-download-ftp  " ">
-  <!ENTITY libjpeg-md5sum        "aed60d4d776dd5cf00b5a01c609d50f7">
-  <!ENTITY libjpeg-size          "2.2 MB">
-  <!ENTITY libjpeg-buildsize     "17 MB (add 17 MB for tests)">
-  <!ENTITY libjpeg-time          "0.1 SBU (using parallelism=4; add 0.2 SBU for tests)">
+  <!ENTITY libjpeg-md5sum        "aa1f0a1c72cb6772e34d9d5136267f56">
+  <!ENTITY libjpeg-size          "2.7 MB">
+  <!ENTITY libjpeg-buildsize     "55 MB (with tests)">
+  <!ENTITY libjpeg-time          "0.5 SBU (with tests; both using parallelism=4)">
 ]>
 

general/graphlib/librsvg.xml

@@ -7 +7 @@
   <!ENTITY librsvg-download-http "&gnome-download-http;/librsvg/&librsvg-minor;/librsvg-&librsvg-version;.tar.xz">
   <!ENTITY librsvg-download-ftp  "&gnome-download-ftp;/librsvg/&librsvg-minor;/librsvg-&librsvg-version;.tar.xz">
-  <!ENTITY librsvg-md5sum        "023e34798503c964ad982d130ee369c9">
+  <!ENTITY librsvg-md5sum        "3a73cf8b41be9c231885801f2ad49cd6">
   <!ENTITY librsvg-size          "5.4 MB">
   <!ENTITY librsvg-buildsize     "747 MB (25 MB installed), add 378 MB for tests">
@@ -110 +110 @@
 
     <para>
-      To test the results, issue: <command>make -k check</command>. During
-      testing some binaries are rebuilt with a different debug level, so you
-      should run <command>make</command> again after the tests are complete
-      to ensure everything is ready to be installed.
-    </para>
+      To test the results, issue:
+    </para>
+
+<screen remap='test'><userinput>sed 's/-Z unstable-options//' -i Makefile &amp;&amp;
+make check</userinput></screen>
 
     <para>

general/graphlib/opencv.xml

@@ -7 +7 @@
   <!ENTITY opencv-download-http     "https://github.com/opencv/opencv/archive/&opencv-version;/opencv-&opencv-version;.tar.gz">
   <!ENTITY opencv-download-ftp      " ">
-  <!ENTITY opencv-md5sum            "13e13244cb0cc6ec4f01eacd38d05d17">
-  <!ENTITY opencv-size              "87 MB">
-  <!ENTITY opencv-buildsize         "675 MB">
-  <!ENTITY opencv-time              "3.3 SBU (using parallelism=4)">
-
+  <!ENTITY opencv-md5sum            "c2225e737ce7f671b839a687f2dc7ab9">
+  <!ENTITY opencv-size              "88 MB">
+  <!ENTITY opencv-buildsize         "783 MB">
+  <!ENTITY opencv-time              "4.1 SBU (using parallelism=4)">
 
   <!ENTITY opencv-contrib-download "https://github.com/opencv/opencv_contrib/archive/&opencv-version;/opencv_contrib-&opencv-contrib-version;.tar.gz">

general/graphlib/poppler.xml

@@ -7 +7 @@
   <!ENTITY poppler-download-http "https://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
   <!ENTITY poppler-download-ftp  " ">
-  <!ENTITY poppler-md5sum        "088f9f2c6730f93a62aa6b46a6f0a6bf">
+  <!ENTITY poppler-md5sum        "c85c6640ac0b0e974887c41df9639e2e">
   <!ENTITY poppler-size          "1.8 MB">
   <!ENTITY poppler-buildsize     "91 MB (with Qt5 library and tests)">
@@ -155 +155 @@
   <sect2 role="installation">
     <title>Installation of Poppler</title>
-
-    <!-- remove when version is gtr 23.06.0 -->
-    <!-- missing incl is fixed upstream already -->
-    <para>
-      First add a missing include statement which will break compilation
-      on 32-bit systems:
-    </para>
-
-<screen><userinput>sed -e '/#include "GPGMECryptoSignBackend.h"/i#include &lt;config.h&gt;' \
-    -i poppler/GPGMECryptoSignBackend.cc</userinput></screen>
-    <!-- /remove -->
 
     <para>

general/graphlib/qpdf.xml

@@ -7 +7 @@
   <!ENTITY qpdf-download-http "https://github.com/qpdf/qpdf/releases/download/v&qpdf-version;/qpdf-&qpdf-version;.tar.gz">
   <!ENTITY qpdf-download-ftp  " ">
-  <!ENTITY qpdf-md5sum        "6806fb6d150d7abf426e191a4718f659">
+  <!ENTITY qpdf-md5sum        "d916ac26b7f30a5cf3827c708c455ec9">
   <!ENTITY qpdf-size          "18 MB">
-  <!ENTITY qpdf-buildsize     "258 MB (add 1 MB for tests)">
-  <!ENTITY qpdf-time          "0.6 SBU (using parallelism=4; add 0.5 SBU for tests)">
+  <!ENTITY qpdf-buildsize     "253 MB (add 1 MB for tests)">
+  <!ENTITY qpdf-time          "0.4 SBU (using parallelism=4; add 0.5 SBU for tests)">
 ]>