Changeset 99d85abd

Timestamp:

05/05/2024 07:42:17 PM (13 days ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

lazarus, trunk

Children:

c8c80645

Parents:

32a3136

Message:

firefox, thunderbird: Get rid of python-3.11

Location:

xsoft

Files:

• graphweb/firefox.xml (modified) (4 diffs)
• other/thunderbird.xml (modified) (4 diffs)

xsoft/graphweb/firefox.xml

@@ -146 +146 @@
         now deprecated by mozilla), in either case please read the
         Configuration Information,
-      <xref linkend="python311"/> (built after installing <xref linkend="sqlite"/>),
-      <!--<xref linkend="six"/>,-->
       <xref linkend="startup-notification"/>, and
       <xref linkend="unzip"/>
@@ -418 +416 @@
 <screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
 export MOZBUILD_STATE_PATH=${PWD}/mozbuild          &amp;&amp;
-export PYTHON311=/opt/python3.11/bin/python3.11     &amp;&amp;
-$PYTHON311 ./mach build</userinput></screen>
+./mach build</userinput></screen>
 
     <para>
@@ -437 +434 @@
 
 <screen role="root"><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
-export PYTHON311=/opt/python3.11/bin/python3.11     &amp;&amp;
-$PYTHON311 ./mach install</userinput></screen>
+./mach install</userinput></screen>
 
     <para>
@@ -445 +441 @@
 
 <screen><userinput>unset MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE
-unset MOZBUILD_STATE_PATH
-unset PYTHON311</userinput></screen>
+unset MOZBUILD_STATE_PATH</userinput></screen>
 
   </sect2>

xsoft/other/thunderbird.xml

@@ -85 +85 @@
       <xref linkend="pulseaudio"/> (or <xref linkend="alsa-lib"/> if you edit
       the mozconfig; although it is now deprecated by mozilla),
-      <xref linkend="python311"/> (rebuilt with the sqlite module),
       <xref linkend="startup-notification"/>, and
       <xref linkend="unzip"/>
@@ -302 +301 @@
 <screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
 export MOZBUILD_STATE_PATH=./mozbuild               &amp;&amp;
-export PYTHON311=/opt/python3.11/bin/python3.11     &amp;&amp;
-$PYTHON311 ./mach build</userinput></screen>
+./mach build</userinput></screen>
 
     <para>
@@ -314 +312 @@
     </para>
 
-<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none $PYTHON311 ./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 -->
 
@@ -322 +320 @@
 
 <screen><userinput>unset MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE &amp;&amp;
-unset MOZBUILD_STATE_PATH                     &amp;&amp;
-unset PYTHON311</userinput></screen>
+unset MOZBUILD_STATE_PATH</userinput></screen>
 
   </sect2>