Changeset e7d00a2

Timestamp:

02/26/2023 11:54:45 PM (14 months ago)

Author:

Ken Moffat <ken@…>

Branches:

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

Children:

528a24f

Parents:

4c3c9faf (diff), 6a22b91 (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 'ken/inkscape-core-mods' into trunk

Files:

• general/prog/python-dependencies.xml (modified) (2 diffs)
• general/prog/python-dependencies/msgpack.xml (added)
• general/prog/python-modules.xml (modified) (6 diffs)
• general/prog/python-modules/cachecontrol.xml (added)
• general/prog/python-modules/cssselect.xml (added)
• general/prog/python-modules/numpy.xml (added)
• general/prog/python-modules/pyserial.xml (added)
• packages.ent (modified) (3 diffs)
• xsoft/other/inkscape.xml (modified) (3 diffs)

general/prog/python-dependencies.xml

@@ -129 +129 @@
       <listitem>
         <para>
+          <xref linkend="msgpack"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="pathspec"/>
         </para>
@@ -266 +271 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-dependencies/msgpack.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-dependencies/pathspec.xml"/>
 

general/prog/python-modules.xml

@@ -62 +62 @@
       <listitem>
         <para>
+          <xref linkend="cachecontrol"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="cssselect"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="cython"/>
         </para>
@@ -122 +132 @@
       <listitem>
         <para>
+          <xref linkend="numpy"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="packaging"/>
         </para>
@@ -173 +188 @@
         <para>
           <xref linkend="pyparsing"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pyserial"/>
         </para>
       </listitem>
@@ -231 +251 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/cssselect.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/cachecontrol.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/cython.xml"/>
 
@@ -267 +293 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/numpy.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/packaging.xml"/>
 
@@ -300 +329 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pyserial.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/pytest.xml"/>
 

packages.ent

@@ -514 +514 @@
 <!ENTITY asciidoc-version             "10.2.0">
 <!ENTITY asciidoc-md5sum              "ecac3af818f7a65596efc6e243b520a0">
+<!ENTITY cachecontrol-version         "0.12.11">
+<!ENTITY cachecontrol-md5sum          "d4393117a879bf1b4e2c01e9c5a285a5">
+<!ENTITY cssselect-version            "1.2.0">
+<!ENTITY cssselect-md5sum             "27fbafacce5447cb867acb240d35002a">
 <!ENTITY cython-version               "0.29.33">
 <!ENTITY cython-md5sum                "bd42c555cb2298b8a94fa8de7ee679ba">
@@ -549 +553 @@
 <!ENTITY mako-version                 "1.2.4">
 <!ENTITY mako-md5sum                  "651f365616611fcd4f2702a9002e2195">
+<!ENTITY numpy-version                "1.24.2">
+<!ENTITY numpy-md5sum                 "c4212a8da1ecf17ece37e2afd0319806">
 <!ENTITY pyparsing-version            "3.0.9">
 <!ENTITY pyparsing-md5sum             "fadc2f3bf5872bf6310576a86c3566e0">
+<!ENTITY pyserial-version             "3.5">
+<!ENTITY pyserial-md5sum             "1cf25a76da59b530dbfc2cf99392dc83">
 <!ENTITY pytest-version               "7.2.1">
 <!ENTITY pytest-md5sum                "366a4047534ef0485f700c20bb574f67">
@@ -596 +604 @@
 <!ENTITY meson_python-version           "0.12.0">
 <!ENTITY meson_python-md5sum            "1c9a037d78a8f35d8704b98d37b638c4">
+<!ENTITY msgpack-version                "1.0.4">
+<!ENTITY msgpack-md5sum                 "1822cdb939e7531f7ad0f7f09b434f22">
 <!ENTITY pathspec-version               "0.10.3">
 <!ENTITY pathspec-md5sum                "d89408b52aff020ac768a14c0ef1c7de">

xsoft/other/inkscape.xml

@@ -114 +114 @@
       <xref role="nodep" linkend="lcms"/>,
       <xref linkend="libcanberra"/> (to eliminate plugin warnings),
-      <xref linkend="potrace"/> (for the bucket-fill tool),
-      <xref role="runtime" linkend="lxml"/> and
-      <xref role="runtime" linkend="scour"/> (both at runtime, for Save As
-        Optimized SVG).
+      <xref linkend="potrace"/> (for the bucket-fill tool), also
+      various Python modules at runtime for the core extensions:
+      <!-- there might be others, or other needed dependencies:
+       needs someone who knows how to use *all" the core extensions -->
+      <xref role="runtime" linkend="cachecontrol"/>,
+      <xref role="runtime" linkend="cssselect"/>,
+      <xref role="runtime" linkend="lxml"/>,
+      <xref role="runtime" linkend="numpy"/>,
+      <xref role="runtime" linkend="pyserial"/>, and
+      <xref role="runtime" linkend="scour"/>
     </para>
 
@@ -137 +143 @@
       <ulink url="https://github.com/LibreOffice/libvisio">libvisio</ulink>,
       <ulink url="https://libwpg.sourceforge.net/">libwpg</ulink> (or
-      <ulink url="https://libwpd.sourceforge.net/">libwpd</ulink>) and
-      <ulink role="runtime"
-             url="https://sourceforge.net/projects/NumPy/files/">NumPy</ulink>
-      (at runtime for some extensions)
-    </para>
-
+      <ulink url="https://libwpd.sourceforge.net/">libwpd</ulink>)
+    </para>
+
+<!-- no trace of this perl module in the core extensions for 1.2.2
     <bridgehead renderas="sect4">Optional Runtime Dependencies
     (for some of the Inkscape extensions)</bridgehead>
@@ -148 +152 @@
       <ulink role="runtime"
              url="https://metacpan.org/pod/release/TJMATHER/XML-XQL-0.68/lib/XML/XQL.pm">XML::XQL</ulink>
-    </para>
+    </para>-->
 
     <para condition="html" role="usernotes">