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/HISTORY                                                   |   
 5 +++
 x11-libs/cairo/PRE_BUILD                                                 |   
 6 +++-
 x11-libs/cairo/patches-scm/0001-Fix-build-against-binutils-2.39.patch    |   
14 ++++++++++
 x11-libs/cairo/patches-stable/0001-Fix-build-against-binutils-2.39.patch |   
14 ++++++++++
 x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch        |   
14 ----------
 5 files changed, 38 insertions(+), 15 deletions(-)

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

    x11-libs/cairo: split the binutils patch across all branches

diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 9ac6e2c..c686ecb 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,8 @@
+2023-88-17 Pavel Vinogradov <public AT sourcemage.org>
+       * PRE_BUILD, patches{,-{scm,stable}}/
+         0001-Fix-build-against-binutils-2.39.patch: split the patch across
+         different branches
+
 2023-03-02 Pavel Vinogradov <public AT sourcemage.org>
        * DEPENDS: refactored XML surface backend feature, apllies only for 
non-scm
          branches, changed zlib flags
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
index 02e1d7d..d2b7e8c 100755
--- a/x11-libs/cairo/PRE_BUILD
+++ b/x11-libs/cairo/PRE_BUILD
@@ -3,4 +3,8 @@ cd ${SOURCE_DIRECTORY} &&
 
 apply_patch_dir patches &&
 
-if [[ "$CAIRO_BRANCH" != "scm" ]]; then apply_patch_dir patches-stable; fi
+if [[ "$CAIRO_BRANCH" != "scm" ]]; then
+  apply_patch_dir patches-stable
+else
+  apply_patch_dir patches-scm
+fi
diff --git 
a/x11-libs/cairo/patches-scm/0001-Fix-build-against-binutils-2.39.patch 
b/x11-libs/cairo/patches-scm/0001-Fix-build-against-binutils-2.39.patch
new file mode 100644
index 0000000..35b1cfe
--- /dev/null
+++ b/x11-libs/cairo/patches-scm/0001-Fix-build-against-binutils-2.39.patch
@@ -0,0 +1,14 @@
+diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build
+index 8d4ac131b..cf05352c5 100644
+--- a/util/cairo-trace/meson.build
++++ b/util/cairo-trace/meson.build
+@@ -11,7 +11,8 @@ shared_lib_ext = libcairo.full_path().split('.')[-1]
+ libcairotrace = library('cairo-trace', cairo_trace_sources,
+   include_directories: [incbase, incsrc],
+   dependencies: deps,
+-  c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),] + 
pthread_c_args,
++  c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),
++    '-DPACKAGE=cairo 
-DPACKAGE_VERSION="@0@"'.format(meson.project_version()),] + pthread_c_args,
+   link_args: extra_link_args,
+   gnu_symbol_visibility: 'hidden',
+   install: true,
diff --git 
a/x11-libs/cairo/patches-stable/0001-Fix-build-against-binutils-2.39.patch 
b/x11-libs/cairo/patches-stable/0001-Fix-build-against-binutils-2.39.patch
new file mode 100644
index 0000000..85e3fce
--- /dev/null
+++ b/x11-libs/cairo/patches-stable/0001-Fix-build-against-binutils-2.39.patch
@@ -0,0 +1,14 @@
+diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build
+index c4a504759..d90a994ea 100644
+--- a/util/cairo-trace/meson.build
++++ b/util/cairo-trace/meson.build
+@@ -12,7 +12,8 @@ libcairotrace = library('cairo-trace', cairo_trace_sources,
+   include_directories: [incbase, incsrc],
+   dependencies: deps,
+   link_args: extra_link_args,
+-  c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),] + 
pthread_c_args,
++  c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),
++           '-DPACKAGE=cairo 
-DPACKAGE_VERSION="@0@"'.format(meson.project_version()),] + pthread_c_args,
+   install: true,
+   install_dir: join_paths(get_option('prefix'), get_option('libdir'), 
'cairo'),
+ )
diff --git 
a/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch 
b/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
index f7551e3..c88f4f1 100644
--- a/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
+++ b/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
@@ -13,17 +13,3 @@ index 970f49a52..14736e12e 100644
    conf.set('HAVE_BFD', 1)
    deps += [bfd_dep]
  elif get_option('symbol-lookup').enabled()
-diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build
-index c4a504759..d90a994ea 100644
---- a/util/cairo-trace/meson.build
-+++ b/util/cairo-trace/meson.build
-@@ -12,7 +12,8 @@ libcairotrace = library('cairo-trace', cairo_trace_sources,
-   include_directories: [incbase, incsrc],
-   dependencies: deps,
-   link_args: extra_link_args,
--  c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),] + 
pthread_c_args,
-+  c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),
-+           '-DPACKAGE=cairo 
-DPACKAGE_VERSION="@0@"'.format(meson.project_version()),] + pthread_c_args,
-   install: true,
-   install_dir: join_paths(get_option('prefix'), get_option('libdir'), 
'cairo'),
- )