Changeset 6848f3f5

Timestamp:

12/27/2023 03:41:42 AM (4 months ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

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

Children:

604708d

Parents:

da314782

Message:

Seamonkey: adapt to the new Python 3.11 installation method.

File:

• xsoft/graphweb/seamonkey.xml (modified) (7 diffs)

xsoft/graphweb/seamonkey.xml

@@ -75 +75 @@
     </itemizedlist>
 
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -94 +95 @@
       </listitem>
     </itemizedlist>
+    -->
 
     <note>
@@ -111 +113 @@
       <xref linkend="gtk3"/>,
       <xref linkend="nodejs"/>,
-      <xref linkend="six"/>,
+      <xref linkend="python311"/>,
       <xref linkend="unzip"/>,
       <xref linkend="yasm"/>, and
@@ -263 +265 @@
     </note>
 
+<!-- Restore when no longer using Python 3.11. We may want to restore the patch
+     at that point as well, which includes the 'distro' and 'ICU' changes. -renodr
     <para>
       First, fix several problems that occur with Python-3.12 and ICU-74.
@@ -279 +283 @@
 
 tar xf ../setuptools-&setuptools-version;.tar.gz                             &amp;&amp;
-pip3 wheel --no-build-isolation --no-deps --no-cache-dir       \
+pip3 wheel - -no-build-isolation - -no-deps - -no-cache-dir       \
            $PWD/setuptools-&setuptools-version;                              \
            -w third_party/python/virtualenv/virtualenv_support</userinput></screen>
-
-    <para>
-      Next, if you are on Python-3.11 still, fix a problem with the bundled
-      'distro' python module. This has been included in the patch for
-      Python-3.12 users:
-    </para>
-
-<screen role="nodump"><userinput>sed -e '1012 s/stderr=devnull/stderr=subprocess.DEVNULL/' \
+-->
+
+    <para>
+      First, if you are building with system ICU, adapt the line break mapping
+      for ICU-74 and later:
+    </para>
+
+<screen><userinput remap="pre">(for i in {43..47}; do
+   sed '/ZWJ/s/$/,CLASS_CHARACTER/' -i intl/lwbrk/LineBreaker.cpp || exit $?
+done)</userinput></screen>
+
+    <para>
+      Next, fix a problem with the bundled 'distro' python module:
+    </para>
+
+<screen><userinput remap="pre">sed -e '1012 s/stderr=devnull/stderr=subprocess.DEVNULL/' \
     -e '1013 s/OSError/(OSError, subprocess.CalledProcessError)/' \
     -i third_party/python/distro/distro.py</userinput></screen>
@@ -298 +310 @@
     </para>
 
-<screen><userinput>AUTOCONF=true ./mach configure &amp;&amp;
-./mach build</userinput></screen>
+<screen><userinput>export PYTHON311=/opt/python3.11/bin/python3.11 &amp;&amp;
+$PYTHON311 AUTOCONF=true ./mach configure       &amp;&amp;
+$PYTHON311 AUTOCONF=true ./mach build</userinput></screen>
 
     <para>
@@ -310 +323 @@
     </para>
 
-
-<screen role="root"><userinput>./mach install                  &amp;&amp;
+<screen role="root"><userinput>$PYTHON311 ./mach install       &amp;&amp;
 chown -R 0:0 /usr/lib/seamonkey &amp;&amp;
+unset $PYTHON311                &amp;&amp;
 
 cp -v $(find -name seamonkey.1 | head -n1) /usr/share/man/man1</userinput></screen>