Changeset 16218efb for xsoft

Timestamp:

11/01/2022 09:31:52 PM (23 months 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:

877b80ac

Parents:

6455875

Message:

Some fixes to mozilla apps due to python-3.11

This may not be the only thing needed for ff and tb.

Location:

xsoft

Files:

• graphweb/firefox.xml (modified) (3 diffs)
• graphweb/seamonkey.xml (modified) (1 diff)
• other/thunderbird.xml (modified) (3 diffs)

xsoft/graphweb/firefox.xml

@@ -358 +358 @@
 
     <para>
+      First remove an obsolete flag in python code, that has been removed
+      in python-3.11:
+    </para>
+
+<screen><userinput>grep -rl \"rU\" | sed -i 's/"rU"/"r"/'</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=system &amp;&amp;
+<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
 export MOZBUILD_STATE_PATH=${PWD}/mozbuild            &amp;&amp;
 ./mach configure                                      &amp;&amp;
@@ -381 +388 @@
     </para>
 
-<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system ./mach install</userinput></screen>
+<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none ./mach install</userinput></screen>
 
     <para>
@@ -415 +422 @@
 
     <para>
-      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system</command>: Use the
+      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none</command>: Use the
       system python to create a virtual environment for <command>mach</command>
-      without downloading any python wheels.
+      without downloading any python wheels nor using the system python modules.
+      This prevent version mismatches between system modules and bundled ones.
     </para>
 

xsoft/graphweb/seamonkey.xml

@@ -269 +269 @@
 <screen><userinput>patch -Np1 -i ../seamonkey-&seamonkey-version;-security_fix-1.patch</userinput></screen>
 -->
+
+    <para>
+      First remove an obsolete flag in python code, that has been removed
+      in python-3.11:
+    </para>
+
+<screen><userinput>grep -rl \"rU\" | sed -i 's/"rU"/"r"/'</userinput></screen>
 
     <para>

xsoft/other/thunderbird.xml

@@ -248 +248 @@
     </note>
 
-<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system &amp;&amp;
+    <para>
+      First remove an obsolete flag in python code, that has been removed
+      in python-3.11:
+    </para>
+
+<screen><userinput>grep -rl \"rU\" | sed -i 's/"rU"/"r"/'</userinput></screen>
+
+<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
 export MOZBUILD_STATE_PATH=./mozbuild                 &amp;&amp;
 ./mach configure                                      &amp;&amp;
@@ -262 +269 @@
     </para>
 
-<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system ./mach install</userinput></screen>
+<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none ./mach install</userinput></screen>
 <!-- devs: For DESTDIR install, prepend DESTDIR=<dest> to the above -->
     <para>
@@ -276 +283 @@
 
     <para>
-      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system</command>: Use the
+      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none</command>: Use the
       system python to create a virtual environment for <command>mach</command>
-      without downloading any python wheels.
+      without downloading any python wheels nor using the system python modules.
+      This prevent version mismatches between system modules and bundled ones.
     </para>