Changeset 8d52465b

Timestamp:

04/01/2021 09:35:29 PM (2 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

f863a1b0

Parents:

442c799

Message:

Python2: Remove extra newline before the patch is applied
Hexchat: Fix python plugin and temporarily disable lua plugin

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@24425 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/python2.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/other/hexchat.xml (modified) (4 diffs)

general/prog/python2.xml

@@ -159 +159 @@
     </para>
 
-<screen><userinput>
-patch -Np1 -i ../Python-&python2-version;-security_fixes-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../Python-&python2-version;-security_fixes-1.patch &amp;&amp;
 ./configure --prefix=/usr                              \
             --enable-shared                            \

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Fix Hexchat to work with Python-3.8+ and fix a crash
+          that occurs when Lua-5.4.3 is installed.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to Seamonkey-2.53.7 (Security Update). Fixes
           <ulink url="&blfs-ticket-root;14840">#14840</ulink>.</para>

xsoft/other/hexchat.xml

@@ -85 +85 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gtk2"/>,
-      <xref linkend="libcanberra"/>, and
-      <xref linkend="lua"/>
+      <xref linkend="gtk2"/> and
+      <xref linkend="libcanberra"/>
+      <!--<xref linkend="lua"/> -->
+      <!-- Lua plugin support is currently broken and causes Hexchat to crash
+           upon startup.
+           FIXME: Check upstream in a few days.-->
     </para>
 
@@ -110 +113 @@
 
     <para>
+      First, fix the python plugin:
+    </para>
+
+<screen><userinput remap="pre">sed -i "s/(python_opt/&amp; + '-embed'/" plugins/python/meson.build</userinput></screen>
+
+    <para>
       Install <application>HexChat</application> by running the following
       commands:
@@ -117 +126 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr -Dwith-libproxy=false -Dwith-lua=lua .. &amp;&amp;
+meson --prefix=/usr -Dwith-libproxy=false -Dwith-lua=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -135 +144 @@
     <title>Command Explanations</title>
 
+    <!--
     <para>
       <parameter>-Dwith-lua=lua</parameter>: By default, this package 
       will look for luajit. Use the normal lua instead.
+    </para>
+    -->
+
+    <para>
+      <parameter>-Dwith-lua=false</parameter>: By default, this package will
+      look for luajit. However, the Lua plugin support is currently broken
+      and will cause the application to crash on startup.
     </para>