Changeset 16218ef


Ignore:
Timestamp:
11/01/2022 09:31:52 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:
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.

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/js91.xml

    r6455875 r16218ef  
    170170    </para>
    171171
    172      <note>
    173         <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     172    <note>
     173      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    174174         href="../../xincludes/mozshm.xml"/>
    175175
    176         <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     176      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    177177         href="../../xincludes/mozconfigure.xml"/>
    178178
    179         <para>
    180           Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',
    181           the rust code will use all processors.
    182         </para>
    183      </note>
    184 
     179      <para>
     180        Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',
     181        the rust code will use all processors.
     182      </para>
     183    </note>
     184
     185    <para>
     186      First remove an obsolete flag in python code, that has been removed
     187      in python-3.11:
     188    </para>
     189
     190<screen><userinput>grep -rl \"rU\" | sed -i 's/"rU"/"r"/'</userinput></screen>
     191
     192    <para>
     193      Then run:
     194    </para>
    185195
    186196<screen><userinput>mkdir obj &amp;&amp;

  • xsoft/graphweb/firefox.xml

    r6455875 r16218ef  
    358358
    359359    <para>
     360      First remove an obsolete flag in python code, that has been removed
     361      in python-3.11:
     362    </para>
     363
     364<screen><userinput>grep -rl \"rU\" | sed -i 's/"rU"/"r"/'</userinput></screen>
     365
     366    <para>
    360367      Now invoke the Python <command>mach</command> script to compile the package.
    361368    </para>
    362369
    363 <screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system &amp;&amp;
     370<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
    364371export MOZBUILD_STATE_PATH=${PWD}/mozbuild            &amp;&amp;
    365372./mach configure                                      &amp;&amp;
    … …  
    381388    </para>
    382389
    383 <screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system ./mach install</userinput></screen>
     390<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none ./mach install</userinput></screen>
    384391
    385392    <para>
    … …  
    415422
    416423    <para>
    417       <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system</command>: Use the
     424      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none</command>: Use the
    418425      system python to create a virtual environment for <command>mach</command>
    419       without downloading any python wheels.
     426      without downloading any python wheels nor using the system python modules.
     427      This prevent version mismatches between system modules and bundled ones.
    420428    </para>
    421429

  • xsoft/graphweb/seamonkey.xml

    r6455875 r16218ef  
    269269<screen><userinput>patch -Np1 -i ../seamonkey-&seamonkey-version;-security_fix-1.patch</userinput></screen>
    270270-->
     271
     272    <para>
     273      First remove an obsolete flag in python code, that has been removed
     274      in python-3.11:
     275    </para>
     276
     277<screen><userinput>grep -rl \"rU\" | sed -i 's/"rU"/"r"/'</userinput></screen>
    271278
    272279    <para>

  • xsoft/other/thunderbird.xml

    r6455875 r16218ef  
    248248    </note>
    249249
    250 <screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system &amp;&amp;
     250    <para>
     251      First remove an obsolete flag in python code, that has been removed
     252      in python-3.11:
     253    </para>
     254
     255<screen><userinput>grep -rl \"rU\" | sed -i 's/"rU"/"r"/'</userinput></screen>
     256
     257<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
    251258export MOZBUILD_STATE_PATH=./mozbuild                 &amp;&amp;
    252259./mach configure                                      &amp;&amp;
    … …  
    262269    </para>
    263270
    264 <screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system ./mach install</userinput></screen>
     271<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none ./mach install</userinput></screen>
    265272<!-- devs: For DESTDIR install, prepend DESTDIR=<dest> to the above -->
    266273    <para>
    … …  
    276283
    277284    <para>
    278       <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system</command>: Use the
     285      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none</command>: Use the
    279286      system python to create a virtual environment for <command>mach</command>
    280       without downloading any python wheels.
     287      without downloading any python wheels nor using the system python modules.
     288      This prevent version mismatches between system modules and bundled ones.
    281289    </para>
    282290
Note: See TracChangeset for help on using the changeset viewer.