From 616e82164a8ce5cc65a32a4de9006e363b03b848 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 21 Apr 2014 11:04:32 +0200 Subject: [PATCH] - updated to 2.38.0 - updated ming,visio patches --- graphviz-ming.patch | 81 ++++++++++++++------------------------------ graphviz-visio.patch | 77 ----------------------------------------- graphviz.spec | 21 ++++++++---- 3 files changed, 40 insertions(+), 139 deletions(-) diff --git a/graphviz-ming.patch b/graphviz-ming.patch index 7f75dcb..a838786 100644 --- a/graphviz-ming.patch +++ b/graphviz-ming.patch @@ -1,5 +1,5 @@ ---- graphviz-2.30.0/plugin/ming/Makefile.am.orig 2013-01-14 04:11:21.000000000 +0100 -+++ graphviz-2.30.0/plugin/ming/Makefile.am 2013-01-20 17:23:58.735895674 +0100 +--- graphviz-2.38.0/plugin/ming/Makefile.am.orig 2014-04-13 22:40:25.000000000 +0200 ++++ graphviz-2.38.0/plugin/ming/Makefile.am 2014-04-21 09:11:51.695995652 +0200 @@ -28,7 +28,7 @@ libgvplugin_ming_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ @@ -9,60 +9,31 @@ if WITH_WIN32 libgvplugin_ming_la_LDFLAGS += -no-undefined ---- graphviz-2.36.0/plugin/ming/gvrender_ming.c.orig 2014-01-11 23:59:44.000000000 +0100 -+++ graphviz-2.36.0/plugin/ming/gvrender_ming.c 2014-04-06 21:17:07.658768000 +0200 -@@ -91,7 +91,7 @@ - extern char* gvconfig_libdir(void); - #define FONT "Bitstream_Vera_Serif.fdb" +--- graphviz-2.38.0/plugin/ming/gvrender_ming.c.orig 2014-04-21 09:12:10.819328588 +0200 ++++ graphviz-2.38.0/plugin/ming/gvrender_ming.c 2014-04-21 09:12:14.539328512 +0200 +@@ -18,6 +18,8 @@ + #include + #include + #include "gvplugin_render.h" ++#include "gvcint.h" ++#include "gvcproc.h" --static void ming_textpara(GVJ_t * job, pointf p, textpara_t * para) -+static void ming_textspan(GVJ_t * job, pointf p, textspan_t * span) - { - SWFMovie movie = (SWFMovie)(job->context); - SWFTextField textfield; -@@ -116,29 +116,29 @@ + /* from config.h - would conflict with ming.h definitions */ + #undef PACKAGE +@@ -88,7 +90,6 @@ + SWFMovie_nextFrame(movie); + } - textfield = newSWFTextField(); - SWFTextField_setFont(textfield, (SWFBlock)font); -- SWFTextField_addChars(textfield, para->str); -- SWFTextField_addUTF8String(textfield, para->str); -+ SWFTextField_addChars(textfield, span->str); -+ SWFTextField_addUTF8String(textfield, span->str); - SWFTextField_setColor(textfield, - pencolor.u.rgba[0], - pencolor.u.rgba[1], - pencolor.u.rgba[2], - pencolor.u.rgba[3]); -- SWFTextField_setHeight(textfield, para->fontsize); -+ SWFTextField_setHeight(textfield, span->font->size); +-extern char* gvconfig_libdir(void); + #define FONT "Bitstream_Vera_Serif.fdb" -- switch (para->just) { -+ switch (span->just) { - case 'r': - offset.x = 0.; - break; - case 'l': -- offset.x = -para->width; -+ offset.x = -span->size.x; - break; - case 'n': - default: -- offset.x = -para->width/2.; -+ offset.x = -span->size.x/2.; - break; - } - /* offset to baseline */ -- offset.y = -para->height + para->fontsize*.4; /* empirically determined */ -+ offset.y = -span->size.y + span->font->size*.4; /* empirically determined */ + static void ming_textspan(GVJ_t * job, pointf p, textspan_t * span) +@@ -105,7 +106,7 @@ - item = SWFMovie_add(movie, (SWFBlock)textfield); - SWFDisplayItem_moveTo(item, p.x + offset.x, p.y + offset.y); -@@ -277,7 +277,7 @@ - 0, /* ming_end_anchor */ - 0, /* ming_begin_label */ - 0, /* ming_end_label */ -- ming_textpara, -+ ming_textspan, - 0, /* ming_resolve_color */ - ming_ellipse, - ming_polygon, + /* FIXME - hardcoded to a Times-like font */ + if (font == NULL) { +- libdir=gvconfig_libdir(); ++ libdir=gvconfig_libdir(job->gvc); + font_file_name = malloc(strlen(libdir)+strlen(FONT)+2); + strcpy(font_file_name, libdir); + strcat(font_file_name, "/"); diff --git a/graphviz-visio.patch b/graphviz-visio.patch index e66a5d4..4056c3e 100644 --- a/graphviz-visio.patch +++ b/graphviz-visio.patch @@ -1,42 +1,3 @@ ---- graphviz-2.36.0/plugin/visio/gvrender_visio_vdx.cpp.orig 2014-01-11 23:59:44.000000000 +0100 -+++ graphviz-2.36.0/plugin/visio/gvrender_visio_vdx.cpp 2014-04-07 02:59:19.161673397 +0200 -@@ -101,11 +101,11 @@ static void vdxgen_begin_anchor(GVJ_t *j - context->AddAnchor(job, url, tooltip, target, id); - } - --static void vdxgen_textpara(GVJ_t * job, pointf p, textpara_t * para) -+static void vdxgen_textspan(GVJ_t * job, pointf p, textspan_t * span) - { - Visio::Render* context = (Visio::Render*)job->context; - if (context) -- context->AddText(job, p, para); -+ context->AddText(job, p, span); - } - - static void vdxgen_ellipse(GVJ_t * job, pointf * A, int filled) -@@ -159,7 +159,7 @@ gvrender_engine_t vdxgen_engine = { - 0, /* vdxgen_end_anchor */ - 0, /* vdxgen_begin_label */ - 0, /* vdxgen_end_label */ -- vdxgen_textpara, -+ vdxgen_textspan, - 0, /* vdxgen_resolve_color */ - vdxgen_ellipse, - vdxgen_polygon, ---- graphviz-2.36.0/plugin/visio/VisioRender.cpp.orig 2014-01-11 23:59:44.000000000 +0100 -+++ graphviz-2.36.0/plugin/visio/VisioRender.cpp 2014-04-06 22:18:58.508690656 +0200 -@@ -233,9 +233,9 @@ namespace Visio - AddGraphic(job, Graphic::CreatePolyline(job, A, n)); - } - -- void Render::AddText(GVJ_t* job, pointf p, textpara_t *para) -+ void Render::AddText(GVJ_t* job, pointf p, textspan_t *span) - { -- AddText(job, Text::CreateText(job, p, para)); -+ AddText(job, Text::CreateText(job, p, span)); - } - - void Render::AddAnchor(GVJ_t *job, char *url, char *tooltip, char *target, char *id) --- graphviz-2.36.0/plugin/visio/VisioText.cpp.orig 2014-01-11 23:59:44.000000000 +0100 +++ graphviz-2.36.0/plugin/visio/VisioText.cpp 2014-04-06 22:19:55.288689473 +0200 @@ -19,6 +19,7 @@ @@ -47,41 +8,3 @@ #include extern "C" char *xml_string(char* str); -@@ -77,16 +78,16 @@ namespace Visio - gvprintf(job, "%s\n", index, index, _text ? xml_string(_text) : ""); /* para mark + char mark + actual text */ - } - -- Text* Text::CreateText(GVJ_t* job, pointf p, textpara_t* para) -+ Text* Text::CreateText(GVJ_t* job, pointf p, textspan_t* span) - { - Para::HorzAlign horzAlign; - - /* compute text bounding box and VDX horizontal align */ - boxf bounds; -- bounds.LL.y = p.y + para->yoffset_centerline; -- bounds.UR.y = p.y + para->yoffset_centerline + para->height; -- double width = para->width; -- switch (para->just) -+ bounds.LL.y = p.y + span->yoffset_centerline; -+ bounds.UR.y = p.y + span->yoffset_centerline + span->size.y; -+ double width = span->size.x; -+ switch (span->just) - { - case 'r': - horzAlign = Para::horzRight; -@@ -110,13 +111,13 @@ namespace Visio - new Para( - horzAlign), - new Char( -- para->fontsize, -+ span->font->size, - job->obj->pencolor.u.rgba[0], - job->obj->pencolor.u.rgba[1], - job->obj->pencolor.u.rgba[2]), - new Run( - bounds, -- para->str)); -+ span->str)); - } - - Text::Text(Para* para, Char* chars, Run* run): diff --git a/graphviz.spec b/graphviz.spec index ba92c65..19f6928 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -40,12 +40,12 @@ Summary: Graph Visualization Tools Summary(pl.UTF-8): Narzędzie do wizualizacji w postaci grafów Name: graphviz -Version: 2.36.0 +Version: 2.38.0 Release: 1 License: CPL v1.0 Group: X11/Applications/Graphics Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz -# Source0-md5: 1f41664dba0c93109ac8b71216bf2b57 +# Source0-md5: 5b6a829b2ac94efcd5fa3c223ed6d3ae Patch0: %{name}-fontpath.patch Patch1: %{name}-tk.patch Patch2: %{name}-bad-header.patch @@ -414,10 +414,8 @@ Wiązania graphviza dla języka R. %patch1 -p1 %patch3 -p1 %patch4 -p1 -#patch5 -p1 %patch6 -p1 %patch7 -p1 -#patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 @@ -504,8 +502,11 @@ done # created by %{_bindir}/dot -c touch $RPM_BUILD_ROOT%{_libdir}/graphviz/config -%{__rm} $RPM_BUILD_ROOT%{_libdir}/graphviz/*/lib*.la %{__rm} $RPM_BUILD_ROOT%{_libdir}/graphviz/libgvplugin_*.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}/graphviz/*/lib*.la +%if %{with java} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/graphviz/java/org/graphviz/lib*.la +%endif rm -rf doc-html doc-pdf mv $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/html doc-html @@ -546,6 +547,7 @@ fi %attr(755,root,root) %{_bindir}/dot2gxl %attr(755,root,root) %{_bindir}/dot_builtins %attr(755,root,root) %{_bindir}/dotty +%attr(755,root,root) %{_bindir}/edgepaint %attr(755,root,root) %{_bindir}/fdp %attr(755,root,root) %{_bindir}/gc %attr(755,root,root) %{_bindir}/gml2gv @@ -626,6 +628,7 @@ fi %{_mandir}/man1/dijkstra.1* %{_mandir}/man1/dot.1* %{_mandir}/man1/dotty.1* +%{_mandir}/man1/edgepaint.1* %{_mandir}/man1/fdp.1* %{_mandir}/man1/gc.1* %{_mandir}/man1/gml2gv.1* @@ -741,8 +744,12 @@ fi %files -n java-%{name} %defattr(644,root,root,755) %dir %{_libdir}/graphviz/java -%attr(755,root,root) %{_libdir}/graphviz/java/libgv_java.so -%{_libdir}/graphviz/java/*.java +%attr(755,root,root) %{_libdir}/graphviz/java/libgv.jnilib +%dir %{_libdir}/graphviz/java/org +%dir %{_libdir}/graphviz/java/org/graphviz +%attr(755,root,root) %{_libdir}/graphviz/java/org/graphviz/libgv_java.so +%{_libdir}/graphviz/java/org/graphviz/*.class +%{_libdir}/graphviz/java/org/graphviz/*.java %{_mandir}/man3/gv_java.3* %endif -- 2.44.0