Changeset 2da3d572

Timestamp:

02/21/2019 07:45:05 AM (5 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.4, 9.0, 9.1, 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/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

7e28f17d

Parents:

c9bc0628

Message:

Reinstate the Python 2 build of PyGobject3 for the 8.4 release

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

File:

• general/prog/pygobject3.xml (modified) (5 diffs)

general/prog/pygobject3.xml

@@ -78 +78 @@
       </para>
 
+      <bridgehead renderas="sect5">Recommended</bridgehead>
+      <para role="recommended">
+        <xref linkend="python2"/> and
+        <xref linkend="pycairo"/>
+          (<application>Python 2</application> module)
+      </para>
+
       <bridgehead renderas="sect5">Optional (for the tests)</bridgehead>
       <para role="optional">
-        <xref linkend="python2"/>,
         <ulink url="https://pypi.python.org/pypi/pep8">pep8</ulink>,
         <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>, and
@@ -95 +101 @@
       <title>Installation of PyGObject3</title>
 
+      <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 <application>PyGObject3</application> as a
+        <application>Python 2</application> module, run the
+        following commands:
+      </para>
+
+<screen><userinput>mkdir python2                        &amp;&amp;
+pushd python2                        &amp;&amp;
+meson --prefix=/usr -Dpython=python2 &amp;&amp;
+ninja                                &amp;&amp;
+popd</userinput></screen>
+
+      <para>
+        To test the results, issue: <command>ninja -C python2 test</command>.
+        An already active graphical session with bus address is necessary to
+        run the tests.
+      </para>
+
       <para>
         To build <application>PyGObject3</application> as a
@@ -101 +133 @@
       </para>
 
-<screen><userinput>mkdir build                          &amp;&amp;
-cd build                             &amp;&amp;
+<screen><userinput>mkdir python3                        &amp;&amp;
+pushd python3                        &amp;&amp;
 meson --prefix=/usr -Dpython=python3 &amp;&amp;
-ninja</userinput></screen>
+ninja                                &amp;&amp;
+popd</userinput></screen>
 
       <para>
-        To test the results, issue: <command>ninja test</command>.
+        To test the results, issue: <command>ninja -C python3 test</command>.
         An already active graphical session with bus address is necessary to
         run the tests.
@@ -113 +146 @@
 
       <para>
-        To install the module, run the following command as the
+        To install the <application>Python 2</application> module,
+        run the following command as the
         <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>ninja install</userinput></screen>
+<screen role="root"><userinput>ninja -C python2 install</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>ninja -C python3 install</userinput></screen>
 
     </sect3>
@@ -134 +176 @@
            </seg>
           <seg>
+            /usr/lib/python&python2-majorver;/site-packages/gi/_gi{,_cairo}.so and/or
             /usr/lib/python&python3-majorver;/site-packages/gi/_gi{,_cairo}.cpython-37m-&lt;arch&gt;-linux-gnu.so
            </seg>
           <seg>
             /usr/include/pygobject-3.0, and
+            /usr/lib/python&python2-majorver;/site-packages/{gi,pygtkcompat} and/or
             /usr/lib/python&python3-majorver;/site-packages/{gi,pygtkcompat}
           </seg>