- Added upstream-provided patch for building under GCC 4.3 (thanks John!)
This commit is contained in:
parent
3eaeba865a
commit
34b34a56ce
32
graphviz-gcc43.patch
Normal file
32
graphviz-gcc43.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
--- graphviz-2.16/lib/vpsc/generate-constraints.cpp.orig 2008-02-11 13:42:16.000000000 -0500
|
||||||
|
+++ graphviz-2.16/lib/vpsc/generate-constraints.cpp 2008-02-11 13:05:19.000000000 -0500
|
||||||
|
@@ -18,6 +18,7 @@
|
||||||
|
|
||||||
|
#include <set>
|
||||||
|
#include <cassert>
|
||||||
|
+#include <cstdlib>
|
||||||
|
#include "generate-constraints.h"
|
||||||
|
#include "constraint.h"
|
||||||
|
|
||||||
|
--- graphviz-2.16/lib/vpsc/csolve_VPSC.cpp.orig 2008-02-11 13:42:00.000000000 -0500
|
||||||
|
+++ graphviz-2.16/lib/vpsc/csolve_VPSC.cpp 2008-02-11 13:05:19.000000000 -0500
|
||||||
|
@@ -21,6 +21,7 @@
|
||||||
|
#include <constraint.h>
|
||||||
|
#include <generate-constraints.h>
|
||||||
|
#include <solve_VPSC.h>
|
||||||
|
+#include <cstdlib>
|
||||||
|
#include <cassert>
|
||||||
|
#include "csolve_VPSC.h"
|
||||||
|
extern "C" {
|
||||||
|
--- graphviz-2.16/tclpkg/gv/gv.i.orig 2008-02-11 13:41:21.000000000 -0500
|
||||||
|
+++ graphviz-2.16/tclpkg/gv/gv.i 2008-02-11 13:38:57.000000000 -0500
|
||||||
|
@@ -25,6 +25,9 @@
|
||||||
|
#undef TRUE
|
||||||
|
#undef FALSE
|
||||||
|
|
||||||
|
+#ifdef HAVE_CONFIG_H
|
||||||
|
+#include "config.h"
|
||||||
|
+#endif
|
||||||
|
#include "gvc.h"
|
||||||
|
%}
|
||||||
|
|
@ -8,7 +8,7 @@ Name: graphviz
|
|||||||
Summary: Graph Visualization Tools
|
Summary: Graph Visualization Tools
|
||||||
Version: 2.16
|
Version: 2.16
|
||||||
|
|
||||||
%define truerelease 3.2
|
%define truerelease 3.3
|
||||||
%{?distroagnostic: %define release %{truerelease}}
|
%{?distroagnostic: %define release %{truerelease}}
|
||||||
%{!?distroagnostic: %define release %{truerelease}%{?dist}}
|
%{!?distroagnostic: %define release %{truerelease}%{?dist}}
|
||||||
|
|
||||||
@ -19,6 +19,7 @@ License: CPL
|
|||||||
URL: http://www.graphviz.org/
|
URL: http://www.graphviz.org/
|
||||||
Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
|
Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
|
||||||
Patch0: %{name}-tk8.5.patch
|
Patch0: %{name}-tk8.5.patch
|
||||||
|
Patch1: %{name}-gcc43.patch
|
||||||
|
|
||||||
# graphviz is relocatable - Caution: this feature is used in AT&T,
|
# graphviz is relocatable - Caution: this feature is used in AT&T,
|
||||||
# but probably will not be supported in Redhat/Fedora/Centos distros
|
# but probably will not be supported in Redhat/Fedora/Centos distros
|
||||||
@ -506,6 +507,7 @@ Provides some additional PDF and HTML documentation for graphviz.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if ! %{SHARP}
|
%if ! %{SHARP}
|
||||||
@ -584,6 +586,9 @@ rm -rf %{buildroot}
|
|||||||
#-- changelog --------------------------------------------------
|
#-- changelog --------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 12 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-3.3
|
||||||
|
- Added upstream-provided patch for building under GCC 4.3 (thanks John!)
|
||||||
|
|
||||||
* Thu Jan 3 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-3.2
|
* Thu Jan 3 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-3.2
|
||||||
- Re-added tcl/tk 8.5 patch
|
- Re-added tcl/tk 8.5 patch
|
||||||
- Tweaked ming stuff
|
- Tweaked ming stuff
|
||||||
|
Loading…
Reference in New Issue
Block a user