From f8d2221d003852939a9619303b697cbb7c958b7d Mon Sep 17 00:00:00 2001
From: Pavel Vinogradov
Date: Tue, 9 Aug 2022 00:35:11 -0400
Subject: x11-libs/cairo: added fix to build with binutils 2.39

---
 x11-libs/cairo/HISTORY                             |  4 +++
 x11-libs/cairo/PRE_BUILD                           |  2 ++
 .../0001-Fix-build-against-binutils-2.39.patch     | 29 ++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch

(limited to 'x11-libs')

diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index f7e1cbffdc..4a0c6b268f 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2022-08-09 Pavel Vinogradov <public@sourcemage.org>
+	* PRE_BUILD, 0001-Fix-build-against-binutils-2.39.patch: fix build
+	  against binutils 2.39
+
 2022-08-06 Pavel Vinogradov <public@sourcemage.org>
 	* CONFIGURE, DEPENDS, DETAILS, PRE_BUILD, PRE_SUB_DEPENDS,
 	  REPAIR^all^PRE_SUB_DEPENDS, SUB_DEPENDS: mesonified
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
index 0935b877e4..f7d147eebf 100755
--- a/x11-libs/cairo/PRE_BUILD
+++ b/x11-libs/cairo/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
 
+apply_patch_dir patches &&
+
 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"
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
new file mode 100644
index 0000000000..f7551e3f18
--- /dev/null
+++ b/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
@@ -0,0 +1,29 @@
+diff --git a/meson.build b/meson.build
+index 970f49a52..14736e12e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -720,7 +720,9 @@ endif
+ bfd_dep = cc.find_library('bfd', has_headers: ['bfd.h'], required: get_option('symbol-lookup'))
+ if bfd_dep.found() and \
+    cc.has_function('bfd_openr', dependencies: [bfd_dep]) and \
+-   cc.links(files('meson-cc-tests/bfd-section-flags.c'), name: 'bfd_section_flags', dependencies: bfd_dep)
++   cc.links(files('meson-cc-tests/bfd-section-flags.c'),
++     args: ['-DPACKAGE=cairo -DPACKAGE_VERSION="@0@"'.format(meson.project_version()),],
++     name: 'bfd_section_flags', dependencies: bfd_dep)
+   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'),
+ )
-- 
cgit v1.2.3