Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 ChangeLog                                                       |    4 
 FUNCTIONS                                                       |    4 
 MESON_FUNCTIONS                                                 |   15 +--
 devel/cmake/DEPENDS                                             |    2 
 devel/cmake/HISTORY                                             |    3 
 libs/podofo/DEPENDS                                             |    2 
 libs/podofo/HISTORY                                             |    3 
 utils/ledger/DEPENDS                                            |    5 -
 utils/ledger/HISTORY                                            |    5 +
 utils/ledger/PRE_BUILD                                          |    3 
 utils/ledger/patches/0001-Fix-compilation-with-Boost-1.76.patch |   41 
++++++++++
 11 files changed, 75 insertions(+), 12 deletions(-)

New commits:
commit 13e3aace14aba9db306e4fd3c716d48fd14f7469
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    ledger: Add missing boost subdep for python support

commit a45c01e9c449cf96a7241360bb73908bf07611d3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    ledger: Fix build with boost 1.76+

commit b53eb96c89cd3da1b23cc9fe8b974c0dac294c60
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    cmake: switch to NINJA-BUILD

commit 0f53a77f707fa6a253cf5b3c5f3b2a330d64abfd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    FUNCTIONS: add support for samurai with cmake

commit 30aeff4a20e4cd6777e88ad7f5343751eb92e2d4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    podofo: Fix typo in DEPENDS

commit d955cb573ad45bab04551675134f0cc1c64a7ad3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    MESON_FUNCTIONS: Use deps to determine samu/ninja

diff --git a/ChangeLog b/ChangeLog
index 60e806e..369e611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-03-15 Ismael Luceno <ismael AT sourcemage.org>
+       * MESON_FUNCTIONS: choose ninja/samurai based on dep
+       * FUNCTIONS: added support for samurai with cmake
+
 2022-03-15  Treeve Jelbert <treeve AT sourcemage.org>
        * python-pypi/html5lib: added
        * python-pypi/webencodings: added
diff --git a/FUNCTIONS b/FUNCTIONS
index 3d3e22e..d45e3f6 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -689,7 +689,9 @@ cmake_build() {
   if is_depends_enabled $SPELL qt6base;then
     OPTS+=" -DCMAKE_PREFIX_PATH=$QT6DIR/lib/cmake"
   fi &&
-
+  if is_depends_enabled "$SPELL" samurai; then
+    OPTS+=' -DCMAKE_MAKE_PROGRAM=samu'
+  fi &&
   cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
         -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_INSTALL_SYSCONFDIR=$INSTALL_ROOT/etc \
diff --git a/MESON_FUNCTIONS b/MESON_FUNCTIONS
index d09a247..352ed83 100755
--- a/MESON_FUNCTIONS
+++ b/MESON_FUNCTIONS
@@ -13,19 +13,18 @@ meson_build () {
   SCRIPT+=" .  builddir/"
   $SCRIPT &&
 
-  if type ninja >/dev/null 2>&1; then
-    NINJA="ninja"
-  else
-    NINJA="samu"
+  if is_depends_enabled "$SPELL" ninja-build-system; then
+    local NINJA=ninja
   fi &&
-  export NINJA &&
-
-  ${NINJA} -j "$MAKE_NJOBS" -C builddir/
+  ${NINJA:-samu} -j "$MAKE_NJOBS" -C builddir/
 }
 
 meson_install () {
   cd $SOURCE_DIRECTORY
-  ${NINJA} -C builddir/ install
+  if is_depends_enabled "$SPELL" ninja-build-system; then
+    local NINJA=ninja
+  fi &&
+  ${NINJA:-samu} -C builddir/ install
 }
 
 default_build() {
diff --git a/devel/cmake/DEPENDS b/devel/cmake/DEPENDS
index 53c84ef..cef253b 100755
--- a/devel/cmake/DEPENDS
+++ b/devel/cmake/DEPENDS
@@ -18,4 +18,4 @@ optional_depends qt4 \
        "--qt-gui" \
        "--no-qt-gui" \
        "for cmake-gui" &&
-suggest_depends ninja-build-system '' '' 'faster builds'
+suggest_depends NINJA-BUILD '' '' 'for faster builds'
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index acd03f1..e3803b0 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,6 @@
+2022-03-15 Ismael Luceno <ismael AT sourcemage.org>
+       * DEPENDS: switched to NINJA-BUILD
+
 2022-03-04 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 3.22.3
 
diff --git a/libs/podofo/DEPENDS b/libs/podofo/DEPENDS
index 2b3db0e..a28f0247 100755
--- a/libs/podofo/DEPENDS
+++ b/libs/podofo/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMIRE/CMAKE_DEPENDS
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
 depends SSL   &&
 depends freetype2 &&
 depends zlib &&
diff --git a/libs/podofo/HISTORY b/libs/podofo/HISTORY
index 428c55e..a3806db 100644
--- a/libs/podofo/HISTORY
+++ b/libs/podofo/HISTORY
@@ -1,3 +1,6 @@
+2022-03-15 Ismael Luceno <ismael AT sourcemage.org>
+       * DEPENDS: fixed typo
+
 2018-12-26 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.9.6
          SECURITY_PATCH=1 fixes CVE-2018-5783, CVE-2018-11254, 
CVE-2018-11255,
diff --git a/utils/ledger/DEPENDS b/utils/ledger/DEPENDS
index 8755cb4..c154484 100755
--- a/utils/ledger/DEPENDS
+++ b/utils/ledger/DEPENDS
@@ -10,9 +10,12 @@ sub_depends boost REGEX      &&
 optional_depends libedit \
                 '' '' \
                 'for command line editing' &&
-optional_depends PYTHON \
+optional_depends python3 \
                 -DUSE_PYTHON={ON,OFF} \
                 'Build support for the Python scripting bridge' &&
+if is_depends_enabled "$SPELL" python3; then
+  sub_depends boost PYTHON
+fi &&
 optional_depends doxygen \
                 -DUSE_DOXYGEN={ON,OFF} \
                 'Build reference documentation using Doxygen'
diff --git a/utils/ledger/HISTORY b/utils/ledger/HISTORY
index 2725ef0..973ad21 100644
--- a/utils/ledger/HISTORY
+++ b/utils/ledger/HISTORY
@@ -1,3 +1,8 @@
+2022-03-16 Ismael Luceno <ismael AT sourcemage.org>
+       * PRE_BUILD, patches/0001-Fix-compilation-with-Boost-1.76.patch:
+         fixed build with boost 1.76+
+       * DEPENDS: added missing boost subdep for python support
+
 2020-05-27 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: updated spell to 3.2.1
        * CONFIGURE, DEPENDS, BUILD, INSTALL: new build system, opts & deps
diff --git a/utils/ledger/PRE_BUILD b/utils/ledger/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/utils/ledger/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/utils/ledger/patches/0001-Fix-compilation-with-Boost-1.76.patch 
b/utils/ledger/patches/0001-Fix-compilation-with-Boost-1.76.patch
new file mode 100644
index 0000000..3181768
--- /dev/null
+++ b/utils/ledger/patches/0001-Fix-compilation-with-Boost-1.76.patch
@@ -0,0 +1,41 @@
+From 69e6b89cf8d2820d28174e7ffaea1c59a0f84d3f Mon Sep 17 00:00:00 2001
+From: Sam James <sam AT gentoo.org>
+Date: Mon, 14 Jun 2021 12:37:58 +0000
+Subject: [PATCH] Fix compilation with Boost 1.76
+
+We were previously relying on an indirect include within Boost headers. We're
+using scoped_ptr which is defined in <boost/smart_ptr/scoped_ptr.hpp>.
+
+Bug: https://bugs.gentoo.org/790176
+Closes: https://github.com/ledger/ledger/issues/2030
+---
+ src/expr.cc  | 2 ++
+ src/format.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/expr.cc b/src/expr.cc
+index c8945d3da..c19bba98a 100644
+--- a/src/expr.cc
++++ b/src/expr.cc
+@@ -35,6 +35,8 @@
+ #include "parser.h"
+ #include "scope.h"
+ 
++#include <boost/smart_ptr/scoped_ptr.hpp>
++
+ namespace ledger {
+ 
+ expr_t::expr_t() : base_type()
+diff --git a/src/format.h b/src/format.h
+index 15431cf11..48c690bec 100644
+--- a/src/format.h
++++ b/src/format.h
+@@ -45,6 +45,8 @@
+ #include "expr.h"
+ #include "unistring.h"
+ 
++#include <boost/smart_ptr/scoped_ptr.hpp>
++
+ namespace ledger {
+ 
+ class unistring;