Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

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

 x11-libs/cairo/0001-Fix-build-against-binutils-2.34.patch |   53 ----------
 x11-libs/cairo/DEPENDS                                    |   70 
++++++--------
 x11-libs/cairo/DETAILS                                    |    8 -
 x11-libs/cairo/HISTORY                                    |    7 +
 x11-libs/cairo/PRE_BUILD                                  |    7 -
 5 files changed, 48 insertions(+), 97 deletions(-)

New commits:
commit 7ec5b2b2d51373915166fe195018bf238dbe1af4
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

    x11-libs/cairo: version 1.17.6

diff --git a/x11-libs/cairo/0001-Fix-build-against-binutils-2.34.patch 
b/x11-libs/cairo/0001-Fix-build-against-binutils-2.34.patch
deleted file mode 100644
index c89bce2..0000000
--- a/x11-libs/cairo/0001-Fix-build-against-binutils-2.34.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8754b40ce3dcec160b6bdddb323a09fdb8967ffd Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Wed, 5 Feb 2020 19:36:48 +0100
-Subject: [PATCH] Fix build against binutils 2.34
-
----
- util/backtrace-symbols.c         | 4 ++--
- util/cairo-trace/lookup-symbol.c | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/util/backtrace-symbols.c b/util/backtrace-symbols.c
-index 9931413..58bed54 100644
---- a/util/backtrace-symbols.c
-+++ b/util/backtrace-symbols.c
-@@ -130,11 +130,11 @@ static void find_address_in_section(bfd *abfd, 
asection *section, void *data __a
-       if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
-               return;
- 
--      vma = bfd_get_section_vma(abfd, section);
-+      vma = bfd_section_vma(section);
-       if (pc < vma)
-               return;
- 
--      size = bfd_section_size(abfd, section);
-+      size = bfd_section_size(section);
-       if (pc >= vma + size)
-               return;
- 
-diff --git a/util/cairo-trace/lookup-symbol.c 
b/util/cairo-trace/lookup-symbol.c
-index f9665b3..14abd8f 100644
---- a/util/cairo-trace/lookup-symbol.c
-+++ b/util/cairo-trace/lookup-symbol.c
-@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd,
-     if (symbol->found)
-       return;
- 
--    if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0)
-+    if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
-       return;
- 
--    vma = bfd_get_section_vma (symtab->bfd, section);
-+    vma = bfd_section_vma (section);
-     if (symbol->pc < vma)
-       return;
- 
--    size = bfd_section_size (symtab->bfd, section);
-+    size = bfd_section_size (section);
-     if (symbol->pc >= vma + size)
-       return;
- 
--- 
-2.25.0
-
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 86a73a2..844793d 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -1,6 +1,6 @@
 . "$GRIMOIRE/FUNCTIONS" &&
 
-depends freetype2 '--enable-ft' &&
+depends freetype2 '--enable-ft=yes' &&
 depends fontconfig &&
 depends pixman &&
 depends xz-utils &&
@@ -10,73 +10,71 @@ if spell_ok pixman && is_version_less $(installed_version 
pixman) 0.30.0; then
 fi &&
 
 optional_depends zlib \
-                 "--enable-xml" \
-                 "--disable-xml" \
+                 "--enable-xml=yes" \
+                 "--enable-xml=no" \
                  "for XML surface backend" &&
 
 # uses libbfd-*.so
 optional_depends -sub LIBERTY binutils \
-                 "--enable-symbol-lookup" \
-                 "--disable-symbol-lookup" \
+                 "--enable-symbol-lookup=yes" \
+                 "--enable-symbol-lookup=no" \
                  "for symbol-lookup feature" &&
 
 optional_depends libxcb \
-                 "--enable-xcb" \
-                 "--disable-xcb" \
+                 "--enable-xcb=yes" \
+                 "--enable-xcb=no" \
                  "for XCB surface backend feature" &&
 
 optional_depends glib2 \
-                 "--enable-gobject" \
-                 "--disable-gobject" \
+                 "--enable-gobject=yes" \
+                 "--enable-gobject=no" \
                  "for gobject functions feature" &&
 
 optional_depends libx11 \
-                 "--enable-xlib" \
-                 "--disable-xlib" \
+                 "--enable-xlib=yes" \
+                 "--enable-xlib=no" \
                  "for Xlib surface backend feature" &&
 
 if is_depends_enabled $SPELL libx11; then
   depends xorgproto &&
   depends libxext &&
   optional_depends libxrender \
-                   "--enable-xlib-xrender" \
-                   "--disable-xlib-xrender" \
+                   "--enable-xlib-xrender=yes" \
+                   "--enable-xlib-xrender=no" \
                    "for Xlib Xrender surface backend" &&
 
-  # Crashes firefox, see https://bugzilla.mozilla.org/show_bug.cgi?id=1136417
-  # Verified the crash with cairo-1.12.18 and cairo-1.14.2.
-  # It's off by default upstream, too, we just avoid suggestion dumb things
-  # to our users. They can always enable it via CONFIG_LOCAL.
-#  config_query_option CAIRO_OPTS "Enable Xlib/XCB functions feature?" n \
-#                                 "--enable-xlib-xcb" \
-#                                 "--disable-xlib-xcb"
-  message "${MESSAGE_COLOR}WARNING: Disabling xlib-xcb, which is unstable 
(crashes firefox).$DEFAULT_COLOR" &&
-  # Still need to disable it in case CAIRO_OPTS has it still in it.
-  list_add CAIRO_OPTS "--disable-xlib-xcb"
-
+  if is_depends_enabled ${SPELL} libxcb; then
+    config_query_option CAIRO_OPTS "Enable Xlib/XCB functions feature?" n \
+                                   "--enable-xlib-xcb=yes" \
+                                   "--enable-xlib-xcb=no" &&
+   list_remove CAIRO_OPTS "--enable-xlib-xcb" &&
+   list_remove CAIRO_OPTS "--disable-xlib-xcb"
+  fi
 fi &&
 
 optional_depends libpng \
-                 "--enable-png --enable-svg" \
-                 "--disable-png --disable-svg" \
+                 "--enable-png=yes" \
+                 "--enable-png=no" \
                  "for PNG support" &&
+if is_depends_enabled ${SPELL} libpng; then
+  optional_depends librsvg2 \
+                   "--enable-svg=yees" \
+                   "--enable-svg=no" \
+                   "for SVG support"
+fi &&
 
 optional_depends OPENGL \
-                 "--enable-gl" \
-                 "--disable-gl" \
+                 "--enable-gl=yes" \
+                 "--enable-gl=no" \
                  "for OpenGL accelerated graphics" &&
 
-optional_depends directfb \
-                 "--enable-directfb" \
-                 "--disable-directfb" \
-                 "for directfb surface backend feature" &&
 
 optional_depends gtk-doc \
-                 "--enable-gtk-doc" \
-                 "--disable-gtk-doc" \
+                 "--enable-gtk-doc=yes" \
+                 "--enable-gtk-doc=no" \
                  "Build documentation with gtk-doc" &&
 
 optional_depends valgrind \
-                 "--enable-valgrind" \
-                 "--disable-valgrind" \
+                 "--enable-valgrind=yes" \
+                 "--enable-valgrind=no" \
                  "for Valgrind support"
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 3067f09..3a93fef 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -8,10 +8,10 @@ if [[ "${CAIRO_BRANCH}" == "scm" ]]; then
   FORCE_DOWNLOAD=1
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
 else
-         VERSION=1.17.4
-     
SOURCE_HASH=sha512:843dce4f1cb5d9fb0c33240dff658ba2723bf04697045d16669e4b7674a5287ef0eb3d960a688a129902fb714230263e35d085186dc220b65307b5ad7fa09d23
-          SOURCE=$SPELL-$VERSION.tar.xz
-   SOURCE_URL[0]=https://cairographics.org/snapshots/$SOURCE
+         VERSION=1.17.6
+     
SOURCE_HASH=sha512:1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   
SOURCE_URL[0]=https://gitlab.freedesktop.org/cairo/cairo/-/archive/${VERSION}/${SOURCE}
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 fi
         WEB_SITE=http://cairographics.org/
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 7bb9173..e3e6e85 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,10 @@
+2022-08-03 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 1.17.6, updated SOURCE_URL[0], xz -> bz2
+       * DEPENDS: overhauled all flags, removed directfb, added optional 
librsvg2,
+         reenabled Xlib/XCB feature
+       * PRE_BUILD, 0001-Fix-build-against-binutils-2.34.patch: dropped the 
patch,
+         autogen.sh is needed by all branches
+
 2021-07-19 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 1.17.4, updated SOURCE_URL[1]
        * PRE_BUILD: apply patches only for stable branch, simplicity++
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
index cec142a..de0c1f8 100755
--- a/x11-libs/cairo/PRE_BUILD
+++ b/x11-libs/cairo/PRE_BUILD
@@ -1,10 +1,9 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
 
-if [[ "$CAIRO_BRANCH" == "scm" ]]; then
-    NOCONFIGURE=1 ./autogen.sh
-else
-    patch -p1 < 
"$SPELL_DIRECTORY/0001-Fix-build-against-binutils-2.34.patch" &&
+NOCONFIGURE=1 ./autogen.sh
+
+if [[ "$CAIRO_BRANCH" != "scm" ]]; then
     # http://bugs.gentoo.org/show_bug.cgi?id=336696
     patch -p1 -d "$SOURCE_DIRECTORY" < 
"$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch"
 fi