From 5d9e03ae45762ca03a239d3fd1d71147ce607889 Mon Sep 17 00:00:00 2001
From: Michael Herstine <sp1ff@pobox.com>
Date: Wed, 3 Jan 2024 20:11:16 -0800
Subject: [PATCH] Cherry-picking a commit to fix CI.

---
 .github/workflows/ci.yml | 8 +++++---
 doc/scribbu-text.1       | 2 +-
 scribbu/scheme.cc        | 7 +++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 10d7552..a477d9a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -137,7 +137,7 @@ jobs:
     - name: Get boost (Ubuntu, oldest)
       if: matrix.os == 'ubuntu-22.04' && matrix.boost == 'oldest' && steps.cache-boost-ubuntu.outputs.cache-hit != 'true'
       run: |
-        set -x
+        set -ex
         pwd
         curl -L -o boost_${{ matrix.boost-ver }}.tar.bz2 ${{ matrix.boost-dl }}
         md5sum boost_${{ matrix.boost-ver }}.tar.bz2
@@ -151,11 +151,12 @@ jobs:
     - name: Get boost (MacOS)
       if: matrix.os == 'macos-12' && steps.cache-boost-macos.outputs.cache-hit != 'true'
       run: |
-        set -x
+        set -ex
         pwd
         curl -L -o boost_${{ matrix.boost-ver }}.tar.bz2 ${{ matrix.boost-dl }}
         ls -l boost_${{ matrix.boost-ver }}.tar.bz2
         md5 boost_${{ matrix.boost-ver }}.tar.bz2
+        # Apple clang version 14.0.0 (clang-1400.0.29.202)
         cc --version
         tar xf boost_${{ matrix.boost-ver }}.tar.bz2
         mkdir boost_${{ matrix.boost-ver }}/installdir
@@ -206,7 +207,8 @@ jobs:
         pwd
         ls
         export CFLAGS="-Wno-error=implicit-function-declaration"
-        ./bootstrap.sh --prefix=./installdir || { cat bootstrap.log; exit 1; }
+        # python failed for boost 1.63; I don't use it, so didn't bother debugging
+        ./bootstrap.sh --prefix=./installdir --without-libraries=python || { cat bootstrap.log; exit 1; }
         ./b2
         ./b2 install
 
diff --git a/doc/scribbu-text.1 b/doc/scribbu-text.1
index a1e1171..87a7cc3 100644
--- a/doc/scribbu-text.1
+++ b/doc/scribbu-text.1
@@ -65,7 +65,7 @@ Display more detailed help.
 Display this sub-command's node in the user's Info viewer.
 .RE
 .PP
-\-A,\-\-always\-create\-v1
+\-C,\-\-always\-create\-v1
 .RS 4
 Always create an ID3v1 tag with the genre field set appropriately for
 any file that does not possess one.
diff --git a/scribbu/scheme.cc b/scribbu/scheme.cc
index d7c3148..4007f5c 100644
--- a/scribbu/scheme.cc
+++ b/scribbu/scheme.cc
@@ -188,7 +188,7 @@ namespace {
       scm_error(sym_for_utf8("unexpected-type"), "scm_to_id3v2_tag",
                 "expected exact integer for ID3v2 version, got ~A", scm,
                 SCM_BOOL_F);
-      
+
     }
 
     int version = scm_to_int(scm_ver);
@@ -542,7 +542,7 @@ extern "C" {
    * \param scm_tag [in] the ID3v1 tag to be written
    *
    * \param scm_pth [in] the text (as a Scheme string) giving a path (relative
-   * or absolute) to the file of interest)
+   * or absolute) to the file of interest
    *
    *
    */
@@ -767,7 +767,7 @@ extern "C" {
 
   /// Define our types & functions at the top level of the current module
   void
-  init_scribbu() 
+  init_scribbu()
   {
 
     scribbu::init_symbols();
@@ -893,4 +893,3 @@ extern "C" {
   }
 
 } // End extern "C".
-