[fawkes] Fix error due to new graphviz api
rmattes
rmattes at fedoraproject.org
Sun Jan 27 04:47:16 UTC 2013
commit 6e09105dfc5f56e9baf4baaea5edc870063b301f
Author: Rich Mattes <richmattes at gmail.com>
Date: Sat Jan 26 23:46:52 2013 -0500
Fix error due to new graphviz api
fawkes-0.5.0-graphviz.patch | 12 ++++++++++++
fawkes.spec | 9 +++++++++
2 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/fawkes-0.5.0-graphviz.patch b/fawkes-0.5.0-graphviz.patch
new file mode 100644
index 0000000..c07c9bb
--- /dev/null
+++ b/fawkes-0.5.0-graphviz.patch
@@ -0,0 +1,12 @@
+diff -up ./src/tools/skillgui/batch_render.cpp.graphviz ./src/tools/skillgui/batch_render.cpp
+--- ./src/tools/skillgui/batch_render.cpp.graphviz 2013-01-26 23:28:28.819616603 -0500
++++ ./src/tools/skillgui/batch_render.cpp 2013-01-26 23:28:39.974046493 -0500
+@@ -215,7 +215,7 @@ class SkillGuiBatchRenderer
+ {
+
+ FILE *f = fopen(infile.c_str(), "r");
+- Agraph_t *g = agread(f);
++ Agraph_t *g = agread(f, NULL);
+ if (g) {
+ gvLayout(gvc, g, (char *)"dot");
+ gvRender(gvc, g, (char *)"skillguicairo", NULL);
diff --git a/fawkes.spec b/fawkes.spec
index 5877554..3276e3e 100644
--- a/fawkes.spec
+++ b/fawkes.spec
@@ -7,6 +7,9 @@ Group: Applications/System
License: GPLv2+ and GPLv2+ with exceptions
URL: http://www.fawkesrobotics.org
Source0: http://files.fawkesrobotics.org/releases/%{name}-%{version}.tar.bz2
+# The agread function in graphviz 2.30.0 has a new second argument, a callback.
+# This patch adds the new argument in calls to agread
+Patch0: %{name}-0.5.0-graphviz.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-c++, make >= 3.81
@@ -451,6 +454,9 @@ functionality.
%prep
%setup -q
+%if 0%{?fedora} >= 19
+%patch0 -p0 -b .graphviz
+%endif
%build
%define feature_flags HAVE_ROS=0 HAVE_OPENRAVE=0
@@ -827,6 +833,9 @@ rm -rf %{buildroot}
%{_datadir}/doc/%{name}-%{version}
%changelog
+* Sat Jan 26 2013 Rich Mattes <richmattes at gmail.com> - 0.5.0-6
+- Fix error due to new graphviz api
+
* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 0.5.0-6
- rebuild due to "jpeg8-ABI" feature drop
More information about the scm-commits
mailing list