sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (8472ff77a6b68097ebe46724e5874ce75db4fa9f)
- From: Thomas Orgis <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (8472ff77a6b68097ebe46724e5874ce75db4fa9f)
- Date: Fri, 28 Feb 2025 12:07:59 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
x11-libs/cairo/HISTORY | 3 +++
x11-libs/cairo/PRE_BUILD | 5 +++++
x11-libs/cairo/patches/0002-bfd-usage.patch | 21 +++++++++++++++++++++
3 files changed, 29 insertions(+)
New commits:
commit 8472ff77a6b68097ebe46724e5874ce75db4fa9f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
cairo: un-break build with bfd.h
I am not sure why cairo insists on using bfd here, but since a long time
now,
it needs to fake some autoconf-like config.h settings to be able to do so.
Probably it broke during transition to meson? Why is that not more
prominent?
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 3442160..765e53e 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2025-02-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * patches-stable/0002-bfd-usage.patch: enable bfd.h usage
+
2024-10-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.18.2
* patchs/* PRE_BUILD: deleted
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
new file mode 100755
index 0000000..b4b407d
--- /dev/null
+++ b/x11-libs/cairo/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+apply_patch_dir patches
+
diff --git a/x11-libs/cairo/patches/0002-bfd-usage.patch
b/x11-libs/cairo/patches/0002-bfd-usage.patch
new file mode 100644
index 0000000..c2ed38a
--- /dev/null
+++ b/x11-libs/cairo/patches/0002-bfd-usage.patch
@@ -0,0 +1,21 @@
+--- cairo-1.18.2/meson-cc-tests/bfd-section-flags.c.orig 2025-02-28
12:33:31.306663221 +0100
++++ cairo-1.18.2/meson-cc-tests/bfd-section-flags.c 2025-02-28
12:43:50.864663147 +0100
+@@ -1,3 +1,5 @@
++/* The bfd.h requires some trace of an autoconf config.h file. */
++#define PACKAGE "cairo"
+ #include <bfd.h>
+
+ int
+--- cairo-1.18.2/util/cairo-trace/lookup-symbol.c.orig 2025-02-28
12:56:08.216663059 +0100
++++ cairo-1.18.2/util/cairo-trace/lookup-symbol.c 2025-02-28
12:57:02.155663052 +0100
+@@ -60,6 +60,10 @@
+ #include <pthread.h>
+
+ #if HAVE_BFD
++/* bfd.h requiring some autoconf-like traces of config.h */
++#ifndef PACKAGE
++#define PACKAGE "cairo"
++#endif
+ #include <bfd.h>
+
+ struct symtab {
- [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (8472ff77a6b68097ebe46724e5874ce75db4fa9f), Thomas Orgis, 02/28/2025
Archive powered by MHonArc 2.6.24.