Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 x11-libs/cairo/DEPENDS |   18 ++++++++++++++----
 x11-libs/cairo/HISTORY |    4 ++++
 2 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 2eb0b9978272b62df4dc9733fd0457c2e8d9d036
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    x11-libs/cairo: refactored XML surface backend, updated zlib flags

diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 9d66f73..c492560 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -6,6 +6,8 @@ case "$HOST" in
 esac &&
 
 if [[ "${CAIRO_BRANCH}" == "scm" ]]; then
+  list_remove CAIRO_OPTS "xml=enabled" &&
+  list_remove CAIRO_OPTS "xml=disabled" &&
   depends git
 fi &&
 
@@ -16,9 +18,9 @@ if spell_ok pixman && is_version_less $(installed_version 
pixman) 0.30.0; then
 fi &&
 
 optional_depends zlib \
-                 "xml=enabled" \
-                 "xml=disabled" \
-                 "for XML surface backend" &&
+                 "zlib=enabled" \
+                 "zlib=disabled" \
+                 "for script, ps, pdf and XML surfaces" &&
 
 # uses libbfd-*.so
 optional_depends -sub LIBERTY binutils \
@@ -74,4 +76,12 @@ optional_depends lzo "" "" "for LZO compression support" &&
 optional_depends gtk-doc \
                  "gtk_doc=true" \
                  "gtk_doc=false" \
-                 "Build documentation with gtk-doc"
+                 "Build documentation with gtk-doc" &&
+
+if [[ "${CAIRO_BRANCH}" != "scm" ]] &&
+is_depends_enabled "${SPELL}" "zlib" &&
+is_depends_enabled "${SPELL}" "libpng"; then
+    config_query_option CAIRO_OPTS "Enable XML surface backend?" y \
+                        "xml=enabled" \
+                        "xml=disabled"
+fi
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index becb90e..9ac6e2c 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2023-03-02 Pavel Vinogradov <public AT sourcemage.org>
+       * DEPENDS: refactored XML surface backend feature, apllies only for 
non-scm
+         branches, changed zlib flags
+
 2023-02-27 Ismael Luceno <ismael AT sourcemage.org>
        * 0001-tee-Fix-cairo-wrapper-functions.patch:
          added build fix for tee surface backend