Changeset 5377506

Timestamp:

11/10/2022 12:15:47 PM (18 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:

0a91797

Parents:

4227f0da

Message:

Fix qtwebengine and thunderbird for python-3.11

Files:

• x/lib/qtwebengine.xml (modified) (1 diff)
• xsoft/other/thunderbird.xml (modified) (1 diff)

x/lib/qtwebengine.xml

@@ -387 +387 @@
 <screen><userinput>sed -e '/link_pulseaudio/s/false/true/' \
     -i src/3rdparty/chromium/media/media_options.gni</userinput></screen>
+
+    <para>
+      Next, fix the build tools so they can be run with Python-3.11+:
+    </para>
+
+<screen><userinput>sed -e 's/\^(?i)/(?i)^/' \
+    -i src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py &amp;&amp;
+sed -e "s/'rU'/'r'/" \
+    -i src/3rdparty/chromium/tools/grit/grit/util.py</userinput></screen>
 
     <para>

xsoft/other/thunderbird.xml

@@ -255 +255 @@
 <screen><userinput>grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/'</userinput></screen>
 
+    <para>
+      Then fix an issue with regular expressions in python-3.11:
+    </para>
+
+<screen><userinput>sed -e 's/?s)\./?s:.)/'               \
+    -e '/?m)/{s/?m)/?m:/;s/\$"/$)"/}' \
+    -e '/?s)%/{s/?s)/?s:/;s/?"/?)"/}' \
+    -i xpcom/idl-parser/xpidl/xpidl.py</userinput></screen>
+
+     <para>
+       Now invoke the Python <command>mach</command> script to compile the
+       package.
+     </para>
+
 <screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
-export MOZBUILD_STATE_PATH=./mozbuild                 &amp;&amp;
-./mach configure                                      &amp;&amp;
+export MOZBUILD_STATE_PATH=./mozbuild               &amp;&amp;
+./mach configure                                    &amp;&amp;
 ./mach build</userinput></screen>