Changeset 105d06c

Timestamp:

12/26/2023 07:33:08 AM (6 months ago)

Author:

Rahul Chandra <rahul@…>

Branches:

12.1, ken/TL2024, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, trunk, xry111/llvm18

Children:

5bd4e666

Parents:

b1463480

Message:

Add python3.11 in order to build Mozilla packages

I haven't modified all the reverse-depends to remove the
python-3.12 fixes (only firefox right now)

Files:

• general/prog/prog.xml (modified) (1 diff)
• general/prog/python311.xml (added)
• packages.ent (modified) (1 diff)
• xsoft/graphweb/firefox.xml (modified) (5 diffs)

general/prog/prog.xml

@@ -47 +47 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python3.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python311.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python-modules.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python-dependencies.xml"/>

packages.ent

@@ -345 +345 @@
 <!ENTITY python3-lib-suffix           "cpython-&python3-major;&python3-minor;-&lt;arch&gt;-linux-gnu">
 <!ENTITY python3-site                 "/usr/lib/python&python3-majorver;/site-packages">
+
+<!-- Remove once mozilla programs can use python 3.12 -->
+<!ENTITY python311-version                  "3.11.1">
 
 <!ENTITY ruby-minor-version           "3.2">

xsoft/graphweb/firefox.xml

@@ -146 +146 @@
         now deprecated by mozilla), in either case please read the
         Configuration Information,
-      <xref linkend="python3"/> (rebuilt after installing <xref linkend="sqlite"/>),
+      <xref linkend="python311"/> (built after installing <xref linkend="sqlite"/>),
       <xref linkend="six"/>,
       <xref linkend="startup-notification"/>, and
@@ -192 +192 @@
     <title>Installation of Firefox</title>
 
+<!--
     <para>
       The building system ships several internal copies of the Python 3
@@ -232 +233 @@
 sed '/import imp/d' -i netwerk/dns/prepare_tlds.py
 </userinput></screen>
+-->
 
     <!-- https://bugzilla.mozilla.org/show_bug.cgi?id=1859752
@@ -421 +423 @@
 <screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
 export MOZBUILD_STATE_PATH=${PWD}/mozbuild          &amp;&amp;
-./mach configure                                    &amp;&amp;
-./mach build</userinput></screen>
+python3.11 ./mach configure                                    &amp;&amp;
+python3.11 ./mach build</userinput></screen>
 
     <para>
@@ -439 +441 @@
     </para>
 
-<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none ./mach install</userinput></screen>
+<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none python3.11 ./mach install</userinput></screen>
 
     <para>