Changeset 54d09e7 for general/genlib/js91.xml

Timestamp:

11/06/2022 07:36:09 PM (19 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

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/xf86-video-removal

Children:

acd69075

Parents:

33f878a9 (diff), d7ba6b4d (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

File:

• general/genlib/js91.xml (modified) (1 diff)

general/genlib/js91.xml

@@ -170 +170 @@
     </para>
 
-     <note>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <note>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
          href="../../xincludes/mozshm.xml"/>
 
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
          href="../../xincludes/mozconfigure.xml"/>
 
-        <para>
-          Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',
-          the rust code will use all processors.
-        </para>
-     </note>
-
+      <para>
+        Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',
+        the rust code will use all processors.
+      </para>
+    </note>
+
+    <para>
+      First remove an obsolete flag in python code, that has been removed
+      in python-3.11:
+    </para>
+
+<screen><userinput>grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/'</userinput></screen>
+
+    <para>
+      Then run:
+    </para>
 
 <screen><userinput>mkdir obj &amp;&amp;