Changeset 8a71122 for xsoft/graphweb

Timestamp:

02/14/2023 01:16:04 AM (16 months ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

ba7d117

Parents:

b1c55f00

Message:

Update to seamonkey-2.53.15

File:

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

xsoft/graphweb/seamonkey.xml

@@ -7 +7 @@
   <!ENTITY seamonkey-download-http "&mozilla-http;/seamonkey/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.xz">
   <!ENTITY seamonkey-download-ftp  " ">
-  <!ENTITY seamonkey-md5sum        "a179b07515ba05d33d111ee89fe2dbe5">
-  <!ENTITY seamonkey-size          "244 MB">
-  <!ENTITY seamonkey-buildsize     "3.0 GB (159 MB installed)">
+  <!ENTITY seamonkey-md5sum        "d04916f10d082a503af9a309184365dd">
+  <!ENTITY seamonkey-size          "249 MB">
+  <!ENTITY seamonkey-buildsize     "3.2 GB (159 MB installed)">
   <!ENTITY seamonkey-time          "11 SBU (with parallelism=4)">
 ]>
@@ -139 +139 @@
     <para role="optional">
       <xref linkend="alsa-lib"/>,
-      <xref linkend="curl"/>,
+      <!--<xref linkend="curl"/>,-->
       <xref linkend="dbus-glib"/>,
-      <xref linkend="doxygen"/>,
+      <!--<xref linkend="doxygen"/>,-->
       <xref linkend="GConf"/>,
-      <xref linkend="gst10-plugins-base"/> (and other plugins, only for tests),
+      <!--<xref linkend="gst10-plugins-base"/> (and other plugins, only for tests),-->
       <!--<xref linkend="openjdk"/>, Not seen in logs -->
       <xref linkend="startup-notification"/>,
@@ -274 +274 @@
 <screen><userinput>grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/'</userinput></screen>
 
+<!-- Causes issues since xpidl is python2 in Seamonkey
     <para>
       Then fix an issue with regular expressions in python-3.11:
@@ -282 +283 @@
     -e '/?s)%/{s/?s)/?s:/;s/?"/?)"/}' \
     -i xpcom/idl-parser/xpidl/xpidl.py</userinput></screen>
+-->
+
+    <para>
+      Next, work around a problem in the Python virtual environment:
+    </para>
+
+<screen><userinput>sed -i "/if sys.executable !=/i\ open(join(bin_dir, 'pyvenv.cfg'), 'w').close()" \
+    third_party/python/virtualenv/virtualenv.py</userinput></screen>
 
     <para>
@@ -288 +297 @@
     </para>
 
-<screen><userinput>export CC=clang CXX=clang++ &amp;&amp;
-./mach configure            &amp;&amp;
+<screen><userinput>export CC=clang CXX=clang++          &amp;&amp;
+./mach configure || ./mach configure &amp;&amp;
 ./mach build</userinput></screen>
 
@@ -333 +342 @@
 
     <para>
-      <command>./mach configure</command>: This validates the supplied
-      dependencies and the <filename>mozconfig</filename>.
+      <command>./mach configure || ./mach configure</command>: This validates
+      the supplied dependencies and the <filename>mozconfig</filename>.
+      This is run twice because problems with mach will cause it to fail the
+      first time.
     </para>