Changeset 0cf3733

Timestamp:

09/15/2019 06:57:21 PM (5 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 9.1, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

ae39488

Parents:

0ec2262

Message:

Add the python2 module for MarkupSafe so that Jinja2 can use it,
and recommend Jinja2 for QtWebEngine, since it is used in the build,
otherwise a shipped version is used

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

Files:

• general/prog/markupsafe.xml (modified) (1 diff)
• x/lib/qtwebengine.xml (modified) (1 diff)

general/prog/markupsafe.xml

@@ -73 +73 @@
     <sect3 role="installation">
       <title>Installation of MarkupSafe</title>
-<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
 
       <para>
-        To build the module, run the following command:
+        To build both Python 2 and Python 3 modules, run the following commands:
       </para>
 
-<screen><userinput>python3 setup.py build</userinput></screen>
+<screen><userinput>python2 setup.py build &amp;&amp;
+python3 setup.py build</userinput></screen>
 
       <para>
-        To install the module, run the following command as the
+        To install both modules, run the following commands as the
         <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
+<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
+python3 setup.py install --optimize=1</userinput></screen>
 
     </sect3>

x/lib/qtwebengine.xml

@@ -129 +129 @@
       <xref linkend="pulseaudio"/> (or both),
       <xref linkend="ffmpeg"/>,
+      <xref linkend="Jinja2"/> (Python 2 module),
       <xref linkend="icu"/>,
       <xref linkend="libwebp"/>,