Changeset 0129b143

Timestamp:

08/07/2019 08:52:11 PM (5 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 9.0, 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:

6323b10d

Parents:

7e5a3ec

Message:

Fix subversion to work with SWIG-4 again

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

Files:

• general.ent (modified) (2 diffs)
• general/prog/subversion.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 6th, &year;">
+<!ENTITY releasedate  "August 7th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

general/prog/subversion.xml

@@ -167 +167 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../subversion-&subversion-version;-apr_1.7.0_fix-1.patch</userinput></screen>
-
-    <para>
-      Next, apply some fixes to adapt subversion to <xref linkend="swig"/>:
+<screen><userinput>patch -Np1 -i ../subversion-&subversion-version;-apr_1.7.0_fix-1.patch</userinput></screen> -->
+
+    <para>
+      First, apply a fix to adapt subversion to <xref linkend="swig"/>:
     </para>
  
-<screen><userinput>sed -i '/define.*MEMORY/a#define SWIG_POINTER_NO_NULL 0x4' \
-   subversion/bindings/swig/proxy/swigrun.swg &amp;&amp;
-sed -i 's/classic/nofastunpack/' build.conf</userinput></screen>
--->
+<screen><userinput remap="pre">sed -i 's/classic/nofastunpack/' build.conf</userinput></screen>
+
     <para>
       Install <application>Subversion</application> by running the following
@@ -243 +241 @@
     </para>
 
-    <para>
+    <note><para>
       The Python Bindings test suite (<command>make check-swig-py</command>)
       is broken with SWIG-4.0.0, however the bindings themselves work as
       expected.
-    </para>
+    </para></note>
 
     <para>

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </listitem>
        -->
+    <listitem>
+      <para>August 7th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Adapt Subversion to changes in SWIG-4.0.0
+          again.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>