igraph: update to 0.10.8
* simplify pkgconfig patch. * fix compiler error with clang.
This commit is contained in:
@@ -1,31 +0,0 @@
|
||||
From 8daf63ab883e77b5623b8951538c5d8a37a42930 Mon Sep 17 00:00:00 2001
|
||||
From: Jannick <thirdedition@gmx.net>
|
||||
Date: Mon, 10 May 2021 00:18:28 +0200
|
||||
Subject: [PATCH] igraph.pc.in: add member 'Cflags.private'
|
||||
|
||||
Flag 'Cflags.private' is an extension of 'pkgconfig'
|
||||
(https://github.com/pkgconf/pkgconf) over 'pkg-config'
|
||||
(https://www.freedesktop.org/wiki/Software/pkg-config/).
|
||||
'Cflags.private' is additionally emitted when calling
|
||||
'pkg-config --static --cflags'.
|
||||
---
|
||||
igraph.pc.in | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/igraph.pc.in b/igraph.pc.in
|
||||
index 4c036fbdc..e755833d7 100644
|
||||
--- a/igraph.pc.in
|
||||
+++ b/igraph.pc.in
|
||||
@@ -10,3 +10,9 @@ URL: @PROJECT_HOMEPAGE_URL@
|
||||
Libs: -L${libdir} -ligraph
|
||||
Libs.private: @PKGCONFIG_LIBS_PRIVATE@
|
||||
Cflags: -I${includedir}/igraph
|
||||
+# Flag 'Cflags.private' is an extension of 'pkgconfig'
|
||||
+# (https://github.com/pkgconf/pkgconf) over 'pkg-config'
|
||||
+# (https://www.freedesktop.org/wiki/Software/pkg-config/).
|
||||
+# 'Cflags.private' is additionally emitted when calling
|
||||
+# 'pkg-config --static --cflags'.
|
||||
+Cflags.private: -DIGRAPH_STATIC=1
|
||||
--
|
||||
2.31.1.windows.1
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
--- a/igraph.pc.in
|
||||
+++ b/igraph.pc.in
|
||||
@@ -11,3 +11,4 @@
|
||||
Libs.private: @PKGCONFIG_LIBS_PRIVATE@
|
||||
Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
|
||||
Cflags: -I${includedir}/igraph
|
||||
+Cflags.private: -DIGRAPH_STATIC=1
|
||||
@@ -0,0 +1,20 @@
|
||||
--- a/src/io/graphml.c
|
||||
+++ b/src/io/graphml.c
|
||||
@@ -344,7 +344,7 @@
|
||||
}
|
||||
|
||||
static void igraph_i_graphml_parser_state_set_error_from_xmlerror(
|
||||
- struct igraph_i_graphml_parser_state *state, const xmlErrorPtr error
|
||||
+ struct igraph_i_graphml_parser_state *state, const xmlError *error
|
||||
) {
|
||||
const size_t max_error_message_length = 4096;
|
||||
|
||||
@@ -1530,7 +1530,7 @@
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
-static void igraph_i_libxml_structured_error_handler(void* ctx, xmlErrorPtr error) {
|
||||
+static void igraph_i_libxml_structured_error_handler(void* ctx, const xmlError *error) {
|
||||
struct igraph_i_graphml_parser_state* state = (struct igraph_i_graphml_parser_state*) ctx;
|
||||
igraph_i_graphml_parser_state_set_error_from_xmlerror(state, error);
|
||||
}
|
||||
@@ -3,17 +3,25 @@
|
||||
_realname=igraph
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
|
||||
pkgver=0.10.7
|
||||
pkgver=0.10.8
|
||||
pkgrel=1
|
||||
pkgdesc="Library for the analysis of networks (mingw-w64)"
|
||||
arch=('any')
|
||||
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
|
||||
url="https://igraph.org"
|
||||
msys2_references=(
|
||||
'archlinux: igraph'
|
||||
)
|
||||
msys2_repository_url='https://github.com/igraph/igraph/'
|
||||
msys2_documentation_url='https://igraph.org/c/#docs'
|
||||
msys2_issue_tracker_url='https://github.com/igraph/igraph/issues/'
|
||||
url='https://igraph.org/c/'
|
||||
license=('spdx:GPL-2.0-or-later')
|
||||
source=("https://github.com/igraph/igraph/releases/download/${pkgver}/igraph-${pkgver}.tar.gz"
|
||||
'0001-igraph-0.9.3-igraph.pc.in-add-member-Cflags.private.patch')
|
||||
sha256sums=('b9e2a46b70896a379d784ea227f076b59750cc7411463b1d4accbf9e38b361ad'
|
||||
'53e4ae45a640c10467ceaf939c78a3d27b87f1078db7555cf7acafa798a29c27')
|
||||
'0001-igraph-add-cflags-private-pkgconfig.patch'
|
||||
'0002-igraph-fix-function-pointer-error.patch')
|
||||
sha256sums=('ac5fa94ae6fd1eace651e4b235e99c056479a5c5d0d641aed30240ac33b19403'
|
||||
'07a1303781723b1e449899492431cb75156ac2b7450b48c8d28bd064b0703d35'
|
||||
'bbdcfab5d077dd53dd9c887c0532d2145dd858621488efa2b85064da1257539f')
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-glpk"
|
||||
"${MINGW_PACKAGE_PREFIX}-gmp"
|
||||
"${MINGW_PACKAGE_PREFIX}-libxml2"
|
||||
@@ -26,7 +34,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}"/${_realname}-${pkgver}
|
||||
patch -p1 -b -i "${srcdir}/0001-igraph-0.9.3-igraph.pc.in-add-member-Cflags.private.patch"
|
||||
patch -p1 -i "${srcdir}/0001-igraph-add-cflags-private-pkgconfig.patch"
|
||||
patch -p1 -i "${srcdir}/0002-igraph-fix-function-pointer-error.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
Reference in New Issue
Block a user