Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 graphics-libs/harfbuzz/CONFIGURE   |    1 +
 graphics-libs/harfbuzz/DEPENDS     |   27 ++++++++++++++-------------
 graphics-libs/harfbuzz/DETAILS     |    9 +++++----
 graphics-libs/harfbuzz/HISTORY     |    6 ++++++
 graphics-libs/harfbuzz/PRE_BUILD   |    9 ---------
 graphics-libs/harfbuzz/SUB_DEPENDS |    8 ++++----
 6 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 855068ddb9eb47bb3ae5e068f5fc250a51ffe4f0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    harfbuzz: => 2.7.0

diff --git a/graphics-libs/harfbuzz/CONFIGURE 
b/graphics-libs/harfbuzz/CONFIGURE
new file mode 100755
index 0000000..266df75
--- /dev/null
+++ b/graphics-libs/harfbuzz/CONFIGURE
@@ -0,0 +1 @@
+. "$GRIMOIRE/MESON_CONFIGURE"
diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS
index a642daa..20d7f28 100755
--- a/graphics-libs/harfbuzz/DEPENDS
+++ b/graphics-libs/harfbuzz/DEPENDS
@@ -1,8 +1,9 @@
+depends meson &&
 depends ragel &&
 
 optional_depends glib2 \
-                 "--with-glib=yes --with-gobject=yes" \
-                 "--with-glib=no --with-gobject=no" \
+                 "glib=enabled gobject=enabled" \
+                 "glib=disabled gobject=disabled" \
                  "to use glib" &&
 
 persistent_add HARFBUZZ_OPTS &&
@@ -11,41 +12,41 @@ if is_depends_enabled $SPELL glib2; then
   depends pcre &&
 
   optional_depends gobject-introspection \
-                   "--enable-introspection=yes" \
-                   "--enable-introspection=no" \
+                   "introspection=enabled" \
+                   "introspection=disabled" \
                    "to enable introspection for this build"
 else
-  list_add "HARFBUZZ_OPTS" "--enable-introspection=no"
+  list_add "HARFBUZZ_OPTS" "introspection=disabled"
 fi &&
 
 if spell_ok cairo; then
-  optional_depends cairo "--with-cairo=yes" "--with-cairo=no" \
+  optional_depends cairo "cairo=enabled" "cairo=disabled" \
                  "Enable tools used for command-line utilities?" &&
 
   if is_depends_enabled $SPELL cairo; then
     depends libpng
   fi
 else
-  list_add "HARFBUZZ_OPTS" "--with-cairo=no" &&
+  list_add "HARFBUZZ_OPTS" "cairo=disabled" &&
   message "${PROBLEM_COLOR}cyclic ${SPELL_COLOR}cairo${PROBLEM_COLOR} 
optional dependency disabled until ${SPELL_COLOR}cairo${PROBLEM_COLOR} is 
cast${DEFAULT_COLOR}"
 fi &&
 
 if spell_ok fontconfig; then
-  optional_depends fontconfig "--with-fontconfig=yes" "--with-fontconfig=no" 
\
+  optional_depends fontconfig "fontconfig=enabled" "fontconfig=disabled" \
                    "use fontconfig for command-line utilities"
 else
-  list_add HARFBUZZ_OPTS "--with-fontconfig=no" &&
+  list_add HARFBUZZ_OPTS "fontconfig=disabled" &&
   message "${PROBLEM_COLOR}cyclic ${SPELL_COLOR}fontconfig${PROBLEM_COLOR} 
optional dependency disabled until ${SPELL_COLOR}fontconfig${PROBLEM_COLOR} 
is cast${DEFAULT_COLOR}"
 fi &&
 
-optional_depends icu "--with-icu=yes" "--with-icu=no" \
+optional_depends icu "icu=enabled" "icu=disabled" \
                  "Enable icu use?" &&
 
-optional_depends freetype2 "--with-freetype=yes" "--with-freetype=no" \
+optional_depends freetype2 "freetype=enabled" "freetype=disabled" \
                  "Enable freetype2 use?" &&
 
-optional_depends graphite2 "--with-graphite2=yes" "--with-graphite2=no" \
+optional_depends graphite2 "graphite2=enabled" "graphite2=disabled" \
                  "Enable graphite2 use?" &&
 
-optional_depends gtk-doc "--enable-gtk-doc" "--disable-gtk-doc" \
+optional_depends gtk-doc "docs=enabled" "docs=disabled" \
                  "Enable gtk-doc to build documentation?"
diff --git a/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS
index 2bde8a1..a4820ae 100755
--- a/graphics-libs/harfbuzz/DETAILS
+++ b/graphics-libs/harfbuzz/DETAILS
@@ -1,4 +1,5 @@
 . "$GRIMOIRE/FUNCTIONS"
+. "$GRIMOIRE/MESON_FUNCTIONS"
            SPELL=harfbuzz
 if [[ "$HARFBUZZ_BRANCH" == "scm" ]]; then
          VERSION=$(get_scm_version)
@@ -8,11 +9,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=2.6.8
-     
SOURCE_HASH="sha256:6648a571a27f186e47094121f0095e1b809e918b3037c630c7f38ffad86e3035:UPSTREAM_HASH"
-          SOURCE=$SPELL-$VERSION.tar.xz
+         VERSION=2.7.0
+     
SOURCE_HASH="sha512:65d5b9bd3a53be659dd7d220da220f6873f7246c2ab11205132998e4ac4245fcf51b6968e705b81cc7652db5bbacc90c8db977cf1020edf7957a626a19e055c0"
+          SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   
SOURCE_URL[0]=https://github.com/harfbuzz/harfbuzz/releases/download/$VERSION/$SOURCE
+   SOURCE_URL[0]=https://github.com/harfbuzz/harfbuzz/archive/$VERSION.tar.gz
 fi
         WEB_SITE=http://www.freedesktop.org/wiki/Software/HarfBuzz
          ENTERED=20111217
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 360784e..897822c 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,9 @@
+2020-07-25 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.7.0
+       * DEPENDS SUB_DEPENDS: convert to meson, as recommended by project
+       * CONFIGURE: added
+       ^ PRE_BUILD: deleted
+
 2020-06-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.6.8
 
diff --git a/graphics-libs/harfbuzz/PRE_BUILD 
b/graphics-libs/harfbuzz/PRE_BUILD
deleted file mode 100755
index 97ef57b..0000000
--- a/graphics-libs/harfbuzz/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sed -i '/ustring/ i\
-#include <unicode/utf16.h>
-' src/hb-icu.cc &&
-if [[ "$HARFBUZZ_BRANCH" == "scm" ]]; then
-  cd $SOURCE_DIRECTORY &&
-  NOCONFIGURE=y ./autogen.sh
-fi
diff --git a/graphics-libs/harfbuzz/SUB_DEPENDS 
b/graphics-libs/harfbuzz/SUB_DEPENDS
index 4ef60f7..059297b 100755
--- a/graphics-libs/harfbuzz/SUB_DEPENDS
+++ b/graphics-libs/harfbuzz/SUB_DEPENDS
@@ -1,9 +1,9 @@
 case $THIS_SUB_DEPENDS in
-          GLIB2) depends glib2 "--with-glib=yes --with-gobject=yes" &&
+          GLIB2) depends glib2 "glib=enabled gobject=enabled" &&
                  depends pcre ;;
-      GRAPHITE2) depends graphite2 "--with-graphite2" ;;
-             FT) depends freetype2 "--with-freetype=yes" ;;
-            ICU) depends icu "--with-icu" ;;
+      GRAPHITE2) depends graphite2 "graphite2=enabled" ;;
+             FT) depends freetype2 "freetype=enabled" ;;
+            ICU) depends icu "icu=enabled" ;;
               *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
                  return 1;;
 esac