- Patch to fix BZ#241790 (thanks John!)
This commit is contained in:
parent
94d5cdf204
commit
e85ca79935
29
graphviz-black.patch
Normal file
29
graphviz-black.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
--- graphviz-2.12/lib/common/colxlate.c.orig 2006-07-26 22:44:05.000000000 -0500
|
||||||
|
+++ graphviz-2.12/lib/common/colxlate.c 2007-07-12 14:07:13.000000000 -0500
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-/* $Id: colxlate.c,v 1.11 2006/07/27 03:44:05 erg Exp $ $Revision: 1.11 $ */
|
||||||
|
+/* $Id: colxlate.c,v 1.13 2007/07/12 16:47:57 erg Exp $ $Revision: 1.13 $ */
|
||||||
|
/* vim:set shiftwidth=4 ts=8: */
|
||||||
|
|
||||||
|
/**********************************************************
|
||||||
|
@@ -180,6 +180,10 @@
|
||||||
|
|
||||||
|
/* resolveColor:
|
||||||
|
* Resolve input color str allowing color scheme namespaces.
|
||||||
|
+ * 0) "black" => "black"
|
||||||
|
+ * NB: This is something of a hack due to the remaining codegen.
|
||||||
|
+ * Once these are gone, this case could be removed and all references
|
||||||
|
+ * to "black" could be replaced by "/X11/black".
|
||||||
|
* 1) No initial / =>
|
||||||
|
* if colorscheme is defined and no "X11", return /colorscheme/str
|
||||||
|
* else return str
|
||||||
|
@@ -214,7 +218,8 @@
|
||||||
|
char* ss; /* second slash */
|
||||||
|
char* c2; /* second char */
|
||||||
|
|
||||||
|
- if (*str == '/') { /* if begins with '/' */
|
||||||
|
+ if ((*str == 'b') || !strncmp(str+1,"lack",4)) return str;
|
||||||
|
+ else if (*str == '/') { /* if begins with '/' */
|
||||||
|
c2 = str+1;
|
||||||
|
if ((ss = strchr(c2, '/'))) { /* if has second '/' */
|
||||||
|
if (*c2 == '/') { /* if second '/' is second character */
|
@ -7,13 +7,14 @@
|
|||||||
#-- graphviz src.rpm --------------------------------------------------------
|
#-- graphviz src.rpm --------------------------------------------------------
|
||||||
Name: graphviz
|
Name: graphviz
|
||||||
Version: 2.12
|
Version: 2.12
|
||||||
Release: 7%{?dist}
|
Release: 8%{?dist}
|
||||||
|
|
||||||
License: CPL
|
License: CPL
|
||||||
URL: http://www.graphviz.org/
|
URL: http://www.graphviz.org/
|
||||||
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz
|
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz
|
||||||
Patch0: %{name}-php5.patch
|
Patch0: %{name}-php5.patch
|
||||||
Patch1: %{name}-libcdt.patch
|
Patch1: %{name}-libcdt.patch
|
||||||
|
Patch2: %{name}-black.patch
|
||||||
|
|
||||||
# graphviz is relocatable
|
# graphviz is relocatable
|
||||||
#Prefix: /usr
|
#Prefix: /usr
|
||||||
@ -403,6 +404,7 @@ Provides some additional PDF and HTML documentation for graphviz.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# XXX ix86 only used to have -ffast-math, let's use everywhere
|
# XXX ix86 only used to have -ffast-math, let's use everywhere
|
||||||
@ -439,6 +441,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
#-- changelog --------------------------------------------------
|
#-- changelog --------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 12 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-8
|
||||||
|
- Patch to fix BZ#241790 (thanks John!)
|
||||||
|
|
||||||
* Sat May 05 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-7
|
* Sat May 05 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-7
|
||||||
- Patch to fix BZ#237496
|
- Patch to fix BZ#237496
|
||||||
- Disabling relocatability to work around BZ#237082
|
- Disabling relocatability to work around BZ#237082
|
||||||
|
Loading…
Reference in New Issue
Block a user