inkscape: revbump for libpoppler110-21.05.0.
And import patch to build with glib >= 2.67.3.
This commit is contained in:
parent
db6160e2a5
commit
dff0b5f10a
2 changed files with 67 additions and 1 deletions
65
srcpkgs/inkscape/patches/glib-extern-C.patch
Normal file
65
srcpkgs/inkscape/patches/glib-extern-C.patch
Normal file
|
@ -0,0 +1,65 @@
|
|||
From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
|
||||
From: Harald van Dijk <harald@gigawatt.nl>
|
||||
Date: Wed, 17 Feb 2021 09:13:49 +0000
|
||||
Subject: [PATCH] Fix build with glib 2.67.3.
|
||||
|
||||
As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
|
||||
blocks. It was indirectly included by both "types.h" and "color.h".
|
||||
"types.h" already does not need to be wrapped in an extern "C" block,
|
||||
"color.h" does but can be modified not to, so with that changed they can
|
||||
be moved out.
|
||||
---
|
||||
src/3rdparty/autotrace/autotrace.h | 6 +++---
|
||||
src/3rdparty/autotrace/color.h | 7 +++++++
|
||||
2 files changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
|
||||
index 2ce6f272a9..e56be9a74c 100644
|
||||
--- a/src/3rdparty/autotrace/autotrace.h
|
||||
+++ b/src/3rdparty/autotrace/autotrace.h
|
||||
@@ -23,6 +23,9 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
+#include "types.h"
|
||||
+#include "color.h"
|
||||
+
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
@@ -35,9 +38,6 @@ extern "C" {
|
||||
* Typedefs
|
||||
* ===================================================================== */
|
||||
|
||||
-#include "types.h"
|
||||
-#include "color.h"
|
||||
-
|
||||
/* Third degree is the highest we deal with. */
|
||||
enum _at_polynomial_degree {
|
||||
AT_LINEARTYPE = 1,
|
||||
diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
|
||||
index e50ab30ae0..88651db9f7 100644
|
||||
--- a/src/3rdparty/autotrace/color.h
|
||||
+++ b/src/3rdparty/autotrace/color.h
|
||||
@@ -24,6 +24,10 @@
|
||||
#include <glib.h>
|
||||
#include <glib-object.h>
|
||||
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif /* __cplusplus */
|
||||
+
|
||||
typedef struct _at_color at_color;
|
||||
struct _at_color {
|
||||
guint8 r;
|
||||
@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
|
||||
GType at_color_get_type(void);
|
||||
#define AT_TYPE_COLOR (at_color_get_type ())
|
||||
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif /* __cplusplus */
|
||||
#endif /* not AT_COLOR_H */
|
||||
--
|
||||
GitLab
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'inkscape'
|
||||
pkgname=inkscape
|
||||
version=1.0.2
|
||||
revision=2
|
||||
revision=3
|
||||
wrksrc="inkscape-${version}_2021-01-15_e86c870879"
|
||||
build_style=cmake
|
||||
# builds executables then runs checks
|
||||
|
@ -23,6 +23,7 @@ homepage="http://inkscape.org/"
|
|||
distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz"
|
||||
checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
|
||||
python_version=3
|
||||
patch_args=-Np1
|
||||
|
||||
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
|
||||
makedepends+=" libatomic-devel"
|
||||
|
|
Loading…
Reference in a new issue