forked from pool/python-pygraphviz
Compare commits
8 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 96df92b1b5 | |||
| b2133b1b9e | |||
| 4eb6f121f1 | |||
| caff77821c | |||
| e460db3ec7 | |||
| cb11660996 | |||
| c57e23bd57 | |||
| c712dec093 |
42
graphviz_14-0-0.patch
Normal file
42
graphviz_14-0-0.patch
Normal file
@@ -0,0 +1,42 @@
|
||||
---
|
||||
pygraphviz/graphviz_wrap.c | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: pygraphviz-1.14/pygraphviz/graphviz_wrap.c
|
||||
===================================================================
|
||||
--- pygraphviz-1.14.orig/pygraphviz/graphviz_wrap.c 2024-09-29 20:31:00.000000000 +0200
|
||||
+++ pygraphviz-1.14/pygraphviz/graphviz_wrap.c 2025-10-24 18:49:18.399642610 +0200
|
||||
@@ -3022,6 +3022,11 @@
|
||||
|
||||
#include "graphviz/cgraph.h"
|
||||
#include "graphviz/gvc.h"
|
||||
+#include "graphviz/graphviz_version.h"
|
||||
+
|
||||
+#ifndef GRAPHVIZ_VERSION_MAJOR
|
||||
+#define GRAPHVIZ_VERSION_MAJOR 12
|
||||
+#endif
|
||||
|
||||
|
||||
SWIGINTERN swig_type_info*
|
||||
@@ -5447,7 +5452,13 @@
|
||||
Agraph_t *arg2 = (Agraph_t *) 0 ;
|
||||
char *arg3 = (char *) 0 ;
|
||||
char **arg4 = (char **) 0 ;
|
||||
+#if GRAPHVIZ_VERSION_MAJOR >= 14
|
||||
+ size_t *arg5 = (size_t *) 0 ;
|
||||
+ size_t tempn4 ;
|
||||
+#else
|
||||
unsigned int *arg5 = (unsigned int *) 0 ;
|
||||
+ unsigned int tempn4 ;
|
||||
+#endif
|
||||
void *argp1 = 0 ;
|
||||
int res1 = 0 ;
|
||||
void *argp2 = 0 ;
|
||||
@@ -5456,7 +5467,6 @@
|
||||
char *buf3 = 0 ;
|
||||
int alloc3 = 0 ;
|
||||
char *temp4 = 0 ;
|
||||
- unsigned int tempn4 ;
|
||||
PyObject *swig_obj[3] ;
|
||||
int result;
|
||||
|
||||
@@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 24 16:52:44 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- More gentle version of graphviz_14-0-0.patch, which doesn’t
|
||||
change a SWIG include file, just the C generated one with the
|
||||
minimal required change (bsc#1252488).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 22 17:55:37 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- Add graphviz_14-0-0.patch making the code compatible with
|
||||
gvRenderData signature from graphviz 14.0.* (bsc#1252488).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 27 12:23:39 UTC 2025 - ecsos <ecsos@opensuse.org>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-pygraphviz
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -34,6 +34,9 @@ URL: https://github.com/pygraphviz/pygraphviz
|
||||
Source: https://files.pythonhosted.org/packages/source/p/pygraphviz/pygraphviz-%{version}.tar.gz
|
||||
# https://github.com/pygraphviz/pygraphviz/issues/532
|
||||
Source1: https://raw.githubusercontent.com/pygraphviz/pygraphviz/main/examples/README.txt
|
||||
# PATCH-FIX-UPSTREAM graphviz_14-0-0.patch bsc#1252488 mcepl@suse.com
|
||||
# make the code compatible with gvRenderData signature from graphviz 14.0.*
|
||||
Patch0: graphviz_14-0-0.patch
|
||||
BuildRequires: %{python_module devel >= 3.10}
|
||||
BuildRequires: %{python_module pip}
|
||||
BuildRequires: %{python_module pytest}
|
||||
@@ -88,8 +91,6 @@ export CFLAGS="%{optflags}"
|
||||
%if ! %{with doc}
|
||||
%pyproject_install
|
||||
%python_expand %fdupes %{buildroot}%{$python_sitearch}
|
||||
# Don't ship swig source
|
||||
%python_expand rm %{buildroot}%{$python_sitearch}/pygraphviz/graphviz_wrap.c
|
||||
%else
|
||||
mkdir -p %{buildroot}%{_docdir}/pygraphviz-%{version}
|
||||
cp -ar doc/build/html/* %{buildroot}%{_docdir}/pygraphviz-%{version}
|
||||
|
||||
Reference in New Issue
Block a user