Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

graphviz: WIP building

Browse Source
This commit is contained in:
Alexey Pavlov
2018-01-23 12:17:52 +03:00
parent f198c69ed9
commit 72ff4b1bf0
8 changed files with 1824 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

687
mingw-w64-graphviz/001-mingw-vs-msvc.patch
View File

@@ -1,687 +0,0 @@
diff -Naur graphviz-2.40.1-orig/cmd/dot/dot.c graphviz-2.40.1/cmd/dot/dot.c
--- graphviz-2.40.1-orig/cmd/dot/dot.c 2016-12-14 08:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/dot/dot.c 2017-03-16 12:00:22.040710500 +0300
@@ -20,7 +20,7 @@
#include "gvc.h"
#include "gvio.h"
-#ifdef WIN32_DLL
+#ifdef _MSC_VER
__declspec(dllimport) boolean MemTest;
__declspec(dllimport) int GvExitOnUsage;
/*gvc.lib cgraph.lib*/
diff -Naur graphviz-2.40.1-orig/cmd/edgepaint/edgepaintmain.c graphviz-2.40.1/cmd/edgepaint/edgepaintmain.c
--- graphviz-2.40.1-orig/cmd/edgepaint/edgepaintmain.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/edgepaint/edgepaintmain.c 2017-03-16 12:06:07.578259600 +0300
@@ -10,7 +10,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/gvmap/cluster.c graphviz-2.40.1/cmd/gvmap/cluster.c
--- graphviz-2.40.1-orig/cmd/gvmap/cluster.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/gvmap/cluster.c 2017-03-16 12:06:36.067221900 +0300
@@ -31,7 +31,7 @@
#include "DotIO.h"
#include "colorutil.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/gvmap/gvmap.c graphviz-2.40.1/cmd/gvmap/gvmap.c
--- graphviz-2.40.1-orig/cmd/gvmap/gvmap.c 2016-10-29 07:44:55.000000000 +0300
+++ graphviz-2.40.1/cmd/gvmap/gvmap.c 2017-03-16 12:06:53.633995900 +0300
@@ -40,7 +40,7 @@
enum {MAX_GRPS = 10000};
static char swork[maxlen];
-#ifdef WIN32
+#ifdef _MSC_VER
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/lib/common/geomprocs.h graphviz-2.40.1/lib/common/geomprocs.h
--- graphviz-2.40.1-orig/lib/common/geomprocs.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/common/geomprocs.h 2017-03-15 12:24:49.724951600 +0300
@@ -24,13 +24,15 @@
#include "geom.h"
-#ifdef _WIN32
#ifdef GVDLL
#define extern __declspec(dllexport)
-#else
+#elif defined(_MSC_VER)
+#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
-#endif
+#else
+#define extern
+#endif
extern box mkbox(point p, point q);
extern boxf mkboxf(pointf p, pointf q);
diff -Naur graphviz-2.40.1-orig/lib/common/globals.h graphviz-2.40.1/lib/common/globals.h
--- graphviz-2.40.1-orig/lib/common/globals.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/common/globals.h 2017-03-15 12:24:11.419760600 +0300
@@ -38,21 +38,21 @@
#if !defined(_BLD_dotneato) && defined(__IMPORT__)
# define external __IMPORT__
#endif
-#if defined(GVDLL)
+
+#ifdef GVDLL
#if !defined(_BLD_gvc)
-#define extern __declspec(dllimport)
+#define extern __declspec(dllimport)
#else
#define extern __declspec(dllexport)
#endif
-#endif
-#endif
-/*visual studio*/
-#ifdef _WIN32
+#elif defined(_MSC_VER)
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
+#else
+#define extern
+#endif
#endif
-/*end visual studio*/
#ifndef external
# define external extern
diff -Naur graphviz-2.40.1-orig/lib/common/memory.h graphviz-2.40.1/lib/common/memory.h
--- graphviz-2.40.1-orig/lib/common/memory.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/common/memory.h 2017-03-15 12:14:33.349158300 +0300
@@ -23,6 +23,16 @@
extern "C" {
#endif
+#ifdef GVDLL
+#define extern __declspec(dllexport)
+#elif defined(_MSC_VER)
+#ifndef GVC_EXPORTS
+#define extern __declspec(dllimport)
+#endif
+#else
+#define extern
+#endif
+
#ifdef DMALLOC
#define NEW(t) (t*)calloc(1,sizeof(t))
#define N_NEW(n,t) (t*)calloc((n),sizeof(t))
@@ -42,16 +52,6 @@
#define RALLOC(size,ptr,type) ((type*)grealloc(ptr,(size)*sizeof(type)))
#define ZALLOC(size,ptr,type,osize) (ptr? (type*)zrealloc(ptr,size,sizeof(type),osize):(type*)zmalloc((size)*sizeof(type)))
#endif
-#ifdef GVDLL
-#define extern __declspec(dllexport)
-#else
-#ifdef _WIN32
-#ifndef GVC_EXPORTS
-#define extern __declspec(dllimport)
-#endif
-#endif
-
-#endif
extern void *zmalloc(size_t);
extern void *zrealloc(void *, size_t, size_t, size_t);
diff -Naur graphviz-2.40.1-orig/lib/common/pointset.h graphviz-2.40.1/lib/common/pointset.h
--- graphviz-2.40.1-orig/lib/common/pointset.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/common/pointset.h 2017-03-15 12:22:42.156655100 +0300
@@ -23,20 +23,16 @@
typedef Dict_t PointSet;
typedef Dict_t PointMap;
+
#ifdef GVDLL
#define extern __declspec(dllexport)
-#else
-#define extern
-#endif
-
-/*visual studio*/
-#ifdef _WIN32
+#elif defined(_MSC_VER)
#ifndef GVC_EXPORTS
-#undef extern
#define extern __declspec(dllimport)
#endif
+#else
+#define extern
#endif
-/*end visual studio*/
extern PointSet *newPS(void);
extern void freePS(PointSet *);
diff -Naur graphviz-2.40.1-orig/lib/common/render.h graphviz-2.40.1/lib/common/render.h
--- graphviz-2.40.1-orig/lib/common/render.h 2016-12-22 08:44:41.000000000 +0300
+++ graphviz-2.40.1/lib/common/render.h 2017-03-15 12:21:40.252114300 +0300
@@ -58,13 +58,15 @@
typedef void (*nodesizefn_t) (Agnode_t *, boolean);
-/*visual studio*/
-#ifdef _WIN32
+#ifdef GVDLL
+#define extern __declspec(dllexport)
+#elif defined(_MSC_VER)
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
+#else
+#define extern
#endif
-/*end visual studio*/
extern void add_box(path *, boxf);
extern void arrow_flags(Agedge_t * e, int *sflag, int *eflag);
diff -Naur graphviz-2.40.1-orig/lib/common/utils.h graphviz-2.40.1/lib/common/utils.h
--- graphviz-2.40.1-orig/lib/common/utils.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/common/utils.h 2017-03-15 12:22:05.404553000 +0300
@@ -19,13 +19,15 @@
#endif
-/*visual studio*/
-#ifdef _WIN32
+#ifdef GVDLL
+#define extern __declspec(dllexport)
+#elif defined(_MSC_VER)
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
+#else
+#define extern
#endif
-/*end visual studio*/
#ifndef HAVE_STRCASECMP
extern int strcasecmp(const char *s1, const char *s2);
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvc.h graphviz-2.40.1/lib/gvc/gvc.h
--- graphviz-2.40.1-orig/lib/gvc/gvc.h 2016-12-18 15:58:37.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/gvc.h 2017-03-15 12:22:21.932498300 +0300
@@ -23,18 +23,13 @@
#ifdef GVDLL
#define extern __declspec(dllexport)
-#else
-#define extern
-#endif
-
-/*visual studio*/
-#ifdef WIN32
+#elif defined(_MSC_VER)
#ifndef GVC_EXPORTS
-#undef extern
#define extern __declspec(dllimport)
#endif
+#else
+#define extern
#endif
-/*end visual studio*/
#define LAYOUT_DONE(g) (agbindrec(g, "Agraphinfo_t", 0, TRUE) && GD_drawing(g))
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvcext.h graphviz-2.40.1/lib/gvc/gvcext.h
--- graphviz-2.40.1-orig/lib/gvc/gvcext.h 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/gvcext.h 2017-03-15 11:12:58.636377400 +0300
@@ -64,7 +64,7 @@
typedef struct gvplugin_available_s gvplugin_available_t;
/*visual studio*/
-#ifdef WIN32
+#ifdef _MSC_VER
#ifndef GVC_EXPORTS
__declspec(dllimport) lt_symlist_t lt_preloaded_symbols[];
#else
@@ -77,11 +77,11 @@
/*end visual studio*/
-#ifndef WIN32
+#ifndef _MSC_VER
+#if !defined(LTDL_H)
#if defined(GVDLL)
__declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
#else
-#if !defined(LTDL_H)
extern lt_symlist_t lt_preloaded_symbols[];
#endif
#endif
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvcint.h graphviz-2.40.1/lib/gvc/gvcint.h
--- graphviz-2.40.1-orig/lib/gvc/gvcint.h 2017-03-15 14:50:51.528603900 +0300
+++ graphviz-2.40.1/lib/gvc/gvcint.h 2017-03-15 14:51:13.207271100 +0300
@@ -24,6 +24,16 @@
#include "gvcommon.h"
#include "color.h"
+#ifdef GVDLL
+#define extern __declspec(dllexport)
+#elif defined(_MSC_VER)
+#ifndef VMALLOC_EXPORTS
+#define extern __declspec(dllimport)
+#endif
+#else
+#define extern
+#endif
+
/* active plugin headers */
typedef struct gvplugin_active_layout_s {
gvlayout_engine_t *engine;
@@ -146,6 +156,8 @@
extern GVC_t* gvCloneGVC (GVC_t *);
extern void gvFreeCloneGVC (GVC_t *);
+#undef extern
+
#ifdef WIN32
#define DIRSEP "\\"
#else
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvio.h graphviz-2.40.1/lib/gvc/gvio.h
--- graphviz-2.40.1-orig/lib/gvc/gvio.h 2016-09-08 07:45:03.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/gvio.h 2017-03-15 12:26:35.091978200 +0300
@@ -22,18 +22,13 @@
#ifdef GVDLL
#define extern __declspec(dllexport)
-#else
-#define extern
-#endif
-
-/*visual studio*/
-#ifdef WIN32
+#elif defined(_MSC_VER)
#ifndef GVC_EXPORTS
-#undef extern
#define extern __declspec(dllimport)
#endif
+#else
+#define extern
#endif
-/*end visual studio*/
extern size_t gvwrite (GVJ_t * job, const char *s, size_t len);
extern size_t gvfwrite (const void *ptr, size_t size, size_t nmemb, FILE *stream);
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvplugin_loadimage.h graphviz-2.40.1/lib/gvc/gvplugin_loadimage.h
--- graphviz-2.40.1-orig/lib/gvc/gvplugin_loadimage.h 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/gvplugin_loadimage.h 2017-03-15 12:27:00.020404000 +0300
@@ -23,16 +23,14 @@
#endif
#ifdef GVDLL
-# define extern __declspec(dllexport)
-#endif
-
-/*visual studio*/
-#ifdef WIN32
+#define extern __declspec(dllexport)
+#elif defined(_MSC_VER)
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
+#else
+#define extern
#endif
-/*end visual studio*/
extern boolean gvusershape_file_access(usershape_t *us);
extern void gvusershape_file_release(usershape_t *us);
diff -Naur graphviz-2.40.1-orig/lib/gvpr/gprstate.c graphviz-2.40.1/lib/gvpr/gprstate.c
--- graphviz-2.40.1-orig/lib/gvpr/gprstate.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/gvpr/gprstate.c 2017-03-16 12:10:00.361932900 +0300
@@ -17,7 +17,7 @@
*
*/
-#ifdef WIN32
+#ifdef _WIN32
#include "windows.h"
#include "shlwapi.h"
#endif
@@ -139,7 +139,7 @@
free (state);
}
-#ifdef WIN32_DLL
+#if defined(WIN32_DLL) || defined(GVDLL)
int pathisrelative (char* path)
{
return PathIsRelative(path);
diff -Naur graphviz-2.40.1-orig/lib/gvpr/gvpr.c graphviz-2.40.1/lib/gvpr/gvpr.c
--- graphviz-2.40.1-orig/lib/gvpr/gvpr.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/lib/gvpr/gvpr.c 2017-03-16 12:05:22.617541200 +0300
@@ -219,7 +219,7 @@
Sfio_t *pathp = NULL;
size_t sz;
-#ifdef WIN32_DLL
+#if defined(WIN32_DLL) || defined(GVDLL)
if (!pathisrelative(arg))
#else
if (strchr(arg, '/'))
diff -Naur graphviz-2.40.1-orig/lib/gvpr/Makefile.am graphviz-2.40.1/lib/gvpr/Makefile.am
--- graphviz-2.40.1-orig/lib/gvpr/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/gvpr/Makefile.am 2017-03-16 12:11:43.357174300 +0300
@@ -51,7 +51,7 @@
libgvpr_la_DEPENDENCIES = $(libgvpr_C_la_DEPENDENCIES)
if WITH_WIN32
-libgvpr_la_LDFLAGS += -export-symbols-regex gvpr
+libgvpr_la_LDFLAGS += -export-symbols-regex gvpr -lshlwapi
endif
mkdefs_SOURCES = mkdefs.c
diff -Naur graphviz-2.40.1-orig/lib/pathplan/pathutil.h graphviz-2.40.1/lib/pathplan/pathutil.h
--- graphviz-2.40.1-orig/lib/pathplan/pathutil.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/pathplan/pathutil.h 2017-03-15 12:27:39.732675500 +0300
@@ -31,13 +31,16 @@
#define TRUE (NOT(FALSE))
#endif
-/*visual studio*/
-#ifdef _WIN32
+#ifdef GVDLL
+#define extern __declspec(dllexport)
+#elif defined(_MSC_VER)
#ifndef PATHPLAN_EXPORTS
#define extern __declspec(dllimport)
#endif
+#else
+#define extern
#endif
-/*end visual studio*/
+
typedef double COORD;
extern COORD area2(Ppoint_t, Ppoint_t, Ppoint_t);
extern int wind(Ppoint_t a, Ppoint_t b, Ppoint_t c);
diff -Naur graphviz-2.40.1-orig/lib/pathplan/vis.h graphviz-2.40.1/lib/pathplan/vis.h
--- graphviz-2.40.1-orig/lib/pathplan/vis.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/pathplan/vis.h 2017-03-15 12:28:57.877145100 +0300
@@ -46,12 +46,17 @@
/* this is computed from the above */
array2 vis;
};
-#ifdef _WIN32
+
+
+#ifdef GVDLL
+#define extern __declspec(dllexport)
+#elif defined(_MSC_VER)
#ifndef PATHPLAN_EXPORTS
#define extern __declspec(dllimport)
#endif
+#else
+#define extern
#endif
-/*end visual studio*/
extern COORD *ptVis(vconfig_t *, int, Ppoint_t);
extern int directVis(Ppoint_t, int, Ppoint_t, int, vconfig_t *);
diff -Naur graphviz-2.40.1-orig/lib/pack/pack.h graphviz-2.40.1/lib/pack/pack.h
--- graphviz-2.40.1-orig/lib/pack/pack.h 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/pack/pack.h 2017-03-15 13:56:32.529203100 +0300
@@ -57,13 +57,15 @@
int flags;
} pack_info;
-/*visual studio*/
-#ifdef WIN32
+#ifdef GVDLL
+#define extern __declspec(dllexport)
+#elif defined(_MSC_VER)
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
+#else
+#define extern
#endif
-/*end visual studio*/
extern point *putRects(int ng, boxf* bbs, pack_info* pinfo);
extern int packRects(int ng, boxf* bbs, pack_info* pinfo);
diff -Naur graphviz-2.40.1-orig/lib/vmalloc/vmalloc.h graphviz-2.40.1/lib/vmalloc/vmalloc.h
--- graphviz-2.40.1-orig/lib/vmalloc/vmalloc.h 2016-12-22 08:44:41.000000000 +0300
+++ graphviz-2.40.1/lib/vmalloc/vmalloc.h 2017-03-15 13:58:19.217305300 +0300
@@ -109,16 +109,16 @@
#define extern __IMPORT__
#endif
-/*visual studio*/
-#ifdef WIN32
-#undef extern
+#ifdef GVDLL
+#define extern __declspec(dllexport)
+#elif defined(_MSC_VER)
#ifndef VMALLOC_EXPORTS
#define extern __declspec(dllimport)
-#else
-#define extern __declspec(dllexport)
#endif
+#else
+#define extern
#endif
-/*end visual studio*/
+
extern Vmethod_t *Vmbest; /* best allocation */
extern Vmethod_t *Vmlast; /* last-block allocation */
extern Vmethod_t *Vmpool; /* pool allocation */
diff -Naur graphviz-2.40.1-orig/plugin/core/gvplugin_core.c graphviz-2.40.1/plugin/core/gvplugin_core.c
--- graphviz-2.40.1-orig/plugin/core/gvplugin_core.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/core/gvplugin_core.c 2017-03-16 12:03:00.226254500 +0300
@@ -88,7 +88,7 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL
+#ifdef _MSC_VER
#ifndef GVPLUGIN_CORE_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_core_LTX_library = { "core", apis };
#else
@@ -98,7 +98,7 @@
-#ifndef WIN32_DLL
+#ifndef _MSC_VER
#ifdef GVDLL
__declspec(dllexport) gvplugin_library_t gvplugin_core_LTX_library = { "core", apis };
#else
diff -Naur graphviz-2.40.1-orig/plugin/core/gvrender_core_dot.c graphviz-2.40.1/plugin/core/gvrender_core_dot.c
--- graphviz-2.40.1-orig/plugin/core/gvrender_core_dot.c 2016-12-05 08:43:27.000000000 +0300
+++ graphviz-2.40.1/plugin/core/gvrender_core_dot.c 2017-03-16 08:37:04.823805300 +0300
@@ -46,7 +46,7 @@
FORMAT_XDOT14,
} format_type;
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "xdot.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/dot_layout/gvlayout_dot_layout.c graphviz-2.40.1/plugin/dot_layout/gvlayout_dot_layout.c
--- graphviz-2.40.1-orig/plugin/dot_layout/gvlayout_dot_layout.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/dot_layout/gvlayout_dot_layout.c 2017-03-16 08:26:11.984929800 +0300
@@ -18,7 +18,7 @@
typedef enum { LAYOUT_DOT, } layout_type;
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "cdt.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/dot_layout/gvplugin_dot_layout.c graphviz-2.40.1/plugin/dot_layout/gvplugin_dot_layout.c
--- graphviz-2.40.1-orig/plugin/dot_layout/gvplugin_dot_layout.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/dot_layout/gvplugin_dot_layout.c 2017-03-16 12:02:36.994886200 +0300
@@ -20,7 +20,7 @@
{(api_t)0, 0},
};
/*visual studio*/
-#ifdef WIN32_DLL
+#ifdef _MSC_VER
#ifndef GVPLUGIN_DOT_LAYOUT_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_dot_layout_LTX_library = { "dot_layout", apis };
#else
@@ -33,7 +33,7 @@
/*end visual studio*/
-#ifndef WIN32_DLL
+#ifndef _MSC_VER
#ifdef GVDLL
__declspec(dllexport) gvplugin_library_t gvplugin_dot_layout_LTX_library = { "dot_layout", apis };
#else
diff -Naur graphviz-2.40.1-orig/plugin/dot_layout/Makefile.am graphviz-2.40.1/plugin/dot_layout/Makefile.am
--- graphviz-2.40.1-orig/plugin/dot_layout/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/dot_layout/Makefile.am 2017-03-16 08:28:18.601173900 +0300
@@ -22,7 +22,8 @@
gvplugin_dot_layout.c \
gvlayout_dot_layout.c
libgvplugin_dot_layout_C_la_LIBADD = \
- $(top_builddir)/lib/dotgen/libdotgen_C.la
+ $(top_builddir)/lib/dotgen/libdotgen_C.la \
+ $(top_builddir)/lib/ortho/libortho_C.la
libgvplugin_dot_layout_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)
diff -Naur graphviz-2.40.1-orig/plugin/gd/gvdevice_gd.c graphviz-2.40.1/plugin/gd/gvdevice_gd.c
--- graphviz-2.40.1-orig/plugin/gd/gvdevice_gd.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/gd/gvdevice_gd.c 2017-03-16 08:36:36.616150400 +0300
@@ -14,7 +14,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "libpng12.lib" )
#pragma comment( lib, "libgd.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/gdk/gvloadimage_gdk.c graphviz-2.40.1/plugin/gdk/gvloadimage_gdk.c
--- graphviz-2.40.1-orig/plugin/gdk/gvloadimage_gdk.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/gdk/gvloadimage_gdk.c 2017-03-16 08:35:44.311849500 +0300
@@ -23,7 +23,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdkcairo.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "glib-2.0.lib" )
#pragma comment( lib, "cairo.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/neato_layout/gvlayout_neato_layout.c graphviz-2.40.1/plugin/neato_layout/gvlayout_neato_layout.c
--- graphviz-2.40.1-orig/plugin/neato_layout/gvlayout_neato_layout.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/neato_layout/gvlayout_neato_layout.c 2017-03-16 08:34:30.284909100 +0300
@@ -27,7 +27,7 @@
#include "globals.h"
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "pathplan.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/gd/gvplugin_gd.c graphviz-2.40.1/plugin/gd/gvplugin_gd.c
--- graphviz-2.40.1-orig/plugin/gd/gvplugin_gd.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gd/gvplugin_gd.c 2017-03-16 12:02:03.025335200 +0300
@@ -32,7 +32,7 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL /*visual studio*/
+#ifdef _MSC_VER /*visual studio*/
#ifndef GVPLUGIN_GD_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_gd_LTX_library = { "gd", apis };
#else
diff -Naur graphviz-2.40.1-orig/plugin/gdiplus/gvplugin_gdiplus.cpp graphviz-2.40.1/plugin/gdiplus/gvplugin_gdiplus.cpp
--- graphviz-2.40.1-orig/plugin/gdiplus/gvplugin_gdiplus.cpp 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gdiplus/gvplugin_gdiplus.cpp 2017-03-16 12:01:28.689777700 +0300
@@ -89,7 +89,7 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL /*visual studio*/
+#ifdef _MSC_VER /*visual studio*/
#ifndef GVPLUGIN_GDIPLUS_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_gdiplus_LTX_library = { "gdiplus", apis };
#else
diff -Naur graphviz-2.40.1-orig/plugin/neato_layout/Makefile.am graphviz-2.40.1/plugin/neato_layout/Makefile.am
--- graphviz-2.40.1-orig/plugin/neato_layout/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/neato_layout/Makefile.am 2017-03-16 08:28:18.601173900 +0300
@@ -22,6 +22,7 @@
$(top_builddir)/lib/patchwork/libpatchwork_C.la \
$(top_builddir)/lib/osage/libosage_C.la \
$(top_builddir)/lib/fdpgen/libfdpgen_C.la \
+ $(top_builddir)/lib/ortho/libortho_C.la \
$(top_builddir)/lib/sparse/libsparse_C.la \
$(top_builddir)/lib/rbtree/librbtree_C.la \
$(top_builddir)/lib/circogen/libcircogen_C.la
diff -Naur graphviz-2.40.1-orig/plugin/neato_layout/gvplugin_neato_layout.c graphviz-2.40.1/plugin/neato_layout/gvplugin_neato_layout.c
--- graphviz-2.40.1-orig/plugin/neato_layout/gvplugin_neato_layout.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/neato_layout/gvplugin_neato_layout.c 2017-03-16 12:00:48.209627600 +0300
@@ -20,7 +20,7 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL /*visual studio*/
+#ifdef _MSC_VER /*visual studio*/
#ifndef GVPLUGIN_NEATO_LAYOUT_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_neato_layout_LTX_library = { "neato_layout", apis };
#else
diff -Naur graphviz-2.40.1-orig/plugin/pango/gvloadimage_pango.c graphviz-2.40.1/plugin/pango/gvloadimage_pango.c
--- graphviz-2.40.1-orig/plugin/pango/gvloadimage_pango.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/pango/gvloadimage_pango.c 2017-03-16 08:33:32.347998200 +0300
@@ -21,7 +21,7 @@
#ifdef HAVE_PANGOCAIRO
#include <cairo.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "glib-2.0.lib" )
#pragma comment( lib, "pango-1.0.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/pango/gvplugin_pango.c graphviz-2.40.1/plugin/pango/gvplugin_pango.c
--- graphviz-2.40.1-orig/plugin/pango/gvplugin_pango.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/pango/gvplugin_pango.c 2017-03-16 11:59:45.952632400 +0300
@@ -26,7 +26,7 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL /*visual studio*/
+#ifdef _MSC_VER /*visual studio*/
#ifndef GVPLUGIN_PANGO_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_pango_LTX_library = { "cairo", apis };
#else
diff -Naur graphviz-2.40.1-orig/plugin/visio/gvplugin_visio.c graphviz-2.40.1/plugin/visio/gvplugin_visio.c
--- graphviz-2.40.1-orig/plugin/visio/gvplugin_visio.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/visio/gvplugin_visio.c 2017-03-16 12:00:10.041517000 +0300
@@ -11,7 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "gvc.lib" )
// #pragma comment( lib, "glib-2.0.lib" )
// #pragma comment( lib, "pango-1.0.lib" )
@@ -33,7 +33,7 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL /*visual studio*/
+#ifdef _MSC_VER /*visual studio*/
#ifndef GVPLUGIN_VISIO_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_visio_LTX_library = { "visio", apis };
#else

408
mingw-w64-graphviz/001-msvc-pragma.patch.patch Normal file
View File

@@ -0,0 +1,408 @@
diff -Naur graphviz-2.40.1-orig/cmd/dot/dot.c graphviz-2.40.1/cmd/dot/dot.c
--- graphviz-2.40.1-orig/cmd/dot/dot.c 2016-12-14 08:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/dot/dot.c 2018-01-23 08:41:57.995502800 +0300
@@ -20,7 +20,7 @@
#include "gvc.h"
#include "gvio.h"
-#ifdef WIN32_DLL
+#ifdef _MSC_VER
__declspec(dllimport) boolean MemTest;
__declspec(dllimport) int GvExitOnUsage;
/*gvc.lib cgraph.lib*/
diff -Naur graphviz-2.40.1-orig/cmd/edgepaint/edgepaintmain.c graphviz-2.40.1/cmd/edgepaint/edgepaintmain.c
--- graphviz-2.40.1-orig/cmd/edgepaint/edgepaintmain.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/edgepaint/edgepaintmain.c 2018-01-23 08:41:33.205222100 +0300
@@ -10,7 +10,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/gvedit/main.cpp graphviz-2.40.1/cmd/gvedit/main.cpp
--- graphviz-2.40.1-orig/cmd/gvedit/main.cpp 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/gvedit/main.cpp 2018-01-23 08:42:58.924321100 +0300
@@ -27,7 +27,7 @@
#include "globals.h"
-#ifdef WIN32
+#ifdef _MSC_VER
/*gvc.lib cgraph.lib*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/gvmap/cluster.c graphviz-2.40.1/cmd/gvmap/cluster.c
--- graphviz-2.40.1-orig/cmd/gvmap/cluster.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/gvmap/cluster.c 2018-01-23 08:41:33.205222100 +0300
@@ -31,7 +31,7 @@
#include "DotIO.h"
#include "colorutil.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/gvmap/gvmap.c graphviz-2.40.1/cmd/gvmap/gvmap.c
--- graphviz-2.40.1-orig/cmd/gvmap/gvmap.c 2016-10-29 07:44:55.000000000 +0300
+++ graphviz-2.40.1/cmd/gvmap/gvmap.c 2018-01-23 08:41:33.205222100 +0300
@@ -40,7 +40,7 @@
enum {MAX_GRPS = 10000};
static char swork[maxlen];
-#ifdef WIN32
+#ifdef _MSC_VER
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/gvpr/gvprmain.c graphviz-2.40.1/cmd/gvpr/gvprmain.c
--- graphviz-2.40.1-orig/cmd/gvpr/gvprmain.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/gvpr/gvprmain.c 2018-01-23 08:43:44.726867300 +0300
@@ -32,7 +32,7 @@
#include "gvpr.h"
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "gvprlib.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/mingle/minglemain.c graphviz-2.40.1/cmd/mingle/minglemain.c
--- graphviz-2.40.1-orig/cmd/mingle/minglemain.c 2016-12-10 08:44:58.000000000 +0300
+++ graphviz-2.40.1/cmd/mingle/minglemain.c 2018-01-23 08:44:41.693077100 +0300
@@ -10,7 +10,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/acyclic.c graphviz-2.40.1/cmd/tools/acyclic.c
--- graphviz-2.40.1-orig/cmd/tools/acyclic.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/acyclic.c 2018-01-23 08:44:57.994329700 +0300
@@ -20,7 +20,7 @@
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/bcomps.c graphviz-2.40.1/cmd/tools/bcomps.c
--- graphviz-2.40.1-orig/cmd/tools/bcomps.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/bcomps.c 2018-01-23 08:45:10.906971100 +0300
@@ -28,7 +28,7 @@
#include "cgraph.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/dijkstra.c graphviz-2.40.1/cmd/tools/dijkstra.c
--- graphviz-2.40.1-orig/cmd/tools/dijkstra.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/dijkstra.c 2018-01-23 08:45:22.401803300 +0300
@@ -11,7 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "cdt.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/gc.c graphviz-2.40.1/cmd/tools/gc.c
--- graphviz-2.40.1-orig/cmd/tools/gc.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gc.c 2018-01-23 08:45:32.606449900 +0300
@@ -18,7 +18,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/gml2gv.c graphviz-2.40.1/cmd/tools/gml2gv.c
--- graphviz-2.40.1-orig/cmd/tools/gml2gv.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gml2gv.c 2018-01-23 08:45:44.996889200 +0300
@@ -29,7 +29,7 @@
static FILE *outFile;
static char *CmdName;
static char **Files;
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/graphml2gv.c graphviz-2.40.1/cmd/tools/graphml2gv.c
--- graphviz-2.40.1-orig/cmd/tools/graphml2gv.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/graphml2gv.c 2018-01-23 08:46:03.906553700 +0300
@@ -19,7 +19,7 @@
#include <expat.h>
#include <ctype.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/gv2gml.c graphviz-2.40.1/cmd/tools/gv2gml.c
--- graphviz-2.40.1-orig/cmd/tools/gv2gml.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gv2gml.c 2018-01-23 08:46:23.400423900 +0300
@@ -14,7 +14,7 @@
* AT&T Research, Florham Park NJ *
**********************************************************/
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "cdt.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/gvcolor.c graphviz-2.40.1/cmd/tools/gvcolor.c
--- graphviz-2.40.1-orig/cmd/tools/gvcolor.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gvcolor.c 2018-01-23 08:46:32.155668900 +0300
@@ -19,7 +19,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "gvc.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/gvgen.c graphviz-2.40.1/cmd/tools/gvgen.c
--- graphviz-2.40.1-orig/cmd/tools/gvgen.c 2016-11-23 08:43:56.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gvgen.c 2018-01-23 08:46:39.835688700 +0300
@@ -15,7 +15,7 @@
* Written by Emden Gansner
*/
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/gvpack.c graphviz-2.40.1/cmd/tools/gvpack.c
--- graphviz-2.40.1-orig/cmd/tools/gvpack.c 2016-10-08 20:56:00.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gvpack.c 2018-01-23 08:46:49.898521100 +0300
@@ -30,7 +30,7 @@
#include "pack.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/gxl2gv.c graphviz-2.40.1/cmd/tools/gxl2gv.c
--- graphviz-2.40.1-orig/cmd/tools/gxl2gv.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gxl2gv.c 2018-01-23 08:47:09.316572300 +0300
@@ -18,7 +18,7 @@
#include <expat.h>
#include <ctype.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/mm2gv.c graphviz-2.40.1/cmd/tools/mm2gv.c
--- graphviz-2.40.1-orig/cmd/tools/mm2gv.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/mm2gv.c 2018-01-23 08:47:19.493825100 +0300
@@ -33,7 +33,7 @@
#define real double
#define BUFS 1024
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "gvc.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/nop.c graphviz-2.40.1/cmd/tools/nop.c
--- graphviz-2.40.1-orig/cmd/tools/nop.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/nop.c 2018-01-23 08:47:30.206461800 +0300
@@ -31,7 +31,7 @@
-? - print usage\n\
If no files are specified, stdin is used\n";
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/sccmap.c graphviz-2.40.1/cmd/tools/sccmap.c
--- graphviz-2.40.1-orig/cmd/tools/sccmap.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/sccmap.c 2018-01-23 08:47:39.571491500 +0300
@@ -36,7 +36,7 @@
#define INF ((unsigned int)(-1))
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/tred.c graphviz-2.40.1/cmd/tools/tred.c
--- graphviz-2.40.1-orig/cmd/tools/tred.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/tred.c 2018-01-23 08:47:50.678327400 +0300
@@ -45,7 +45,7 @@
char *CmdName;
#define MARK(n) (((Agnodeinfo_t*)(n->base.data))->mark)
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/unflatten.c graphviz-2.40.1/cmd/tools/unflatten.c
--- graphviz-2.40.1-orig/cmd/tools/unflatten.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/unflatten.c 2018-01-23 08:48:01.477762200 +0300
@@ -37,7 +37,7 @@
static FILE *outFile;
static char *cmd;
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/contrib/diffimg/diffimg.c graphviz-2.40.1/contrib/diffimg/diffimg.c
--- graphviz-2.40.1-orig/contrib/diffimg/diffimg.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/contrib/diffimg/diffimg.c 2018-01-23 08:48:20.537030200 +0300
@@ -25,7 +25,7 @@
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "libgd.lib" )
#pragma comment( lib, "png.lib" )
#pragma comment( lib, "gvc.lib" )
diff -Naur graphviz-2.40.1-orig/contrib/prune/prune.c graphviz-2.40.1/contrib/prune/prune.c
--- graphviz-2.40.1-orig/contrib/prune/prune.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/contrib/prune/prune.c 2018-01-23 08:48:34.269080300 +0300
@@ -28,7 +28,7 @@
#include "generic_list.h"
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvc.c graphviz-2.40.1/lib/gvc/gvc.c
--- graphviz-2.40.1-orig/lib/gvc/gvc.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/gvc.c 2018-01-23 08:49:03.156781600 +0300
@@ -22,7 +22,7 @@
#include "gvio.h"
#include <stdlib.h>
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "ltdl.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/core/gvrender_core_dot.c graphviz-2.40.1/plugin/core/gvrender_core_dot.c
--- graphviz-2.40.1-orig/plugin/core/gvrender_core_dot.c 2016-12-05 08:43:27.000000000 +0300
+++ graphviz-2.40.1/plugin/core/gvrender_core_dot.c 2018-01-23 08:41:33.220822200 +0300
@@ -46,7 +46,7 @@
FORMAT_XDOT14,
} format_type;
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "xdot.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/dot_layout/gvlayout_dot_layout.c graphviz-2.40.1/plugin/dot_layout/gvlayout_dot_layout.c
--- graphviz-2.40.1-orig/plugin/dot_layout/gvlayout_dot_layout.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/dot_layout/gvlayout_dot_layout.c 2018-01-23 08:41:33.220822200 +0300
@@ -18,7 +18,7 @@
typedef enum { LAYOUT_DOT, } layout_type;
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "cdt.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/gd/gvdevice_gd.c graphviz-2.40.1/plugin/gd/gvdevice_gd.c
--- graphviz-2.40.1-orig/plugin/gd/gvdevice_gd.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/gd/gvdevice_gd.c 2018-01-23 08:41:33.220822200 +0300
@@ -14,7 +14,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "libpng12.lib" )
#pragma comment( lib, "libgd.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/gdk/gvloadimage_gdk.c graphviz-2.40.1/plugin/gdk/gvloadimage_gdk.c
--- graphviz-2.40.1-orig/plugin/gdk/gvloadimage_gdk.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/gdk/gvloadimage_gdk.c 2018-01-23 08:41:33.252022200 +0300
@@ -23,7 +23,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdkcairo.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "glib-2.0.lib" )
#pragma comment( lib, "cairo.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/neato_layout/gvlayout_neato_layout.c graphviz-2.40.1/plugin/neato_layout/gvlayout_neato_layout.c
--- graphviz-2.40.1-orig/plugin/neato_layout/gvlayout_neato_layout.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/neato_layout/gvlayout_neato_layout.c 2018-01-23 08:41:33.252022200 +0300
@@ -27,7 +27,7 @@
#include "globals.h"
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "pathplan.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/pango/gvloadimage_pango.c graphviz-2.40.1/plugin/pango/gvloadimage_pango.c
--- graphviz-2.40.1-orig/plugin/pango/gvloadimage_pango.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/pango/gvloadimage_pango.c 2018-01-23 08:41:33.252022200 +0300
@@ -21,7 +21,7 @@
#ifdef HAVE_PANGOCAIRO
#include <cairo.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "glib-2.0.lib" )
#pragma comment( lib, "pango-1.0.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/visio/gvplugin_visio.c graphviz-2.40.1/plugin/visio/gvplugin_visio.c
--- graphviz-2.40.1-orig/plugin/visio/gvplugin_visio.c 2018-01-23 08:35:15.453312500 +0300
+++ graphviz-2.40.1/plugin/visio/gvplugin_visio.c 2018-01-23 08:41:33.252022200 +0300
@@ -11,7 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "gvc.lib" )
// #pragma comment( lib, "glib-2.0.lib" )
// #pragma comment( lib, "pango-1.0.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/webp/gvloadimage_webp.c graphviz-2.40.1/plugin/webp/gvloadimage_webp.c
--- graphviz-2.40.1-orig/plugin/webp/gvloadimage_webp.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/webp/gvloadimage_webp.c 2018-01-23 08:50:17.208994500 +0300
@@ -24,7 +24,7 @@
#include <cairo.h>
#include <webp/decode.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "glib-2.0.lib" )
#pragma comment( lib, "pango-1.0.lib" )

70
mingw-w64-graphviz/002-no-undefined-and-def-files.patch Normal file
View File

@@ -0,0 +1,70 @@
diff -Naur graphviz-2.40.1-orig/lib/cdt/Makefile.am graphviz-2.40.1/lib/cdt/Makefile.am
--- graphviz-2.40.1-orig/lib/cdt/Makefile.am 2016-12-22 08:44:41.000000000 +0300
+++ graphviz-2.40.1/lib/cdt/Makefile.am 2018-01-22 13:05:19.169484900 +0300
@@ -24,6 +24,10 @@
libcdt_la_LDFLAGS = -version-info $(CDT_VERSION) -no-undefined
libcdt_la_SOURCES = $(libcdt_C_la_SOURCES)
+if WITH_WIN32
+libcdt_la_LDFLAGS += -export-symbols $(top_srcdir)/lib/cdt/cdt.def
+endif
+
cdt.3.pdf: $(srcdir)/cdt.3
- @GROFF@ -Tps -man $(srcdir)/cdt.3 | @PS2PDF@ - - >cdt.3.pdf
diff -Naur graphviz-2.40.1-orig/lib/cgraph/Makefile.am graphviz-2.40.1/lib/cgraph/Makefile.am
--- graphviz-2.40.1-orig/lib/cgraph/Makefile.am 2016-10-08 20:56:00.000000000 +0300
+++ graphviz-2.40.1/lib/cgraph/Makefile.am 2018-01-22 13:05:26.699526400 +0300
@@ -26,6 +26,10 @@
libcgraph_la_SOURCES = $(libcgraph_C_la_SOURCES)
libcgraph_la_LIBADD = $(top_builddir)/lib/cdt/libcdt.la
+if WITH_WIN32
+libcgraph_la_LDFLAGS += -export-symbols $(top_srcdir)/lib/cgraph/cgraph.def
+endif
+
scan.o scan.lo: scan.c grammar.h
scan.c: $(top_srcdir)/lib/cgraph/scan.l
diff -Naur graphviz-2.40.1-orig/lib/edgepaint/Makefile.am graphviz-2.40.1/lib/edgepaint/Makefile.am
--- graphviz-2.40.1-orig/lib/edgepaint/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/edgepaint/Makefile.am 2018-01-22 09:36:57.619764100 +0300
@@ -28,6 +28,10 @@
liblab_gamut_la_LDFLAGS = -version-info $(LAB_GAMUT_VERSION)
liblab_gamut_la_SOURCES = lab_gamut.c
+if WITH_WIN32
+liblab_gamut_la_LDFLAGS += -no-undefined
+liblab_gamut_la_LDFLAGS += -export-symbols $(top_srcdir)/lib/edgepaint/lab_gamut.def
+endif
lab_gamut.3.pdf: $(srcdir)/lab_gamut.3
- @GROFF@ -Tps -man $(srcdir)/lab_gamut.3 | @PS2PDF@ - - >lab_gamut.3.pdf
diff -Naur graphviz-2.40.1-orig/lib/pathplan/Makefile.am graphviz-2.40.1/lib/pathplan/Makefile.am
--- graphviz-2.40.1-orig/lib/pathplan/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/pathplan/Makefile.am 2018-01-22 09:36:57.698764300 +0300
@@ -26,6 +26,10 @@
libpathplan_la_SOURCES = $(libpathplan_C_la_SOURCES)
libpathplan_la_LIBADD = @MATH_LIBS@
+if WITH_WIN32
+libpathplan_la_LDFLAGS += -export-symbols $(top_srcdir)/lib/pathplan/pathplan.def
+endif
+
pathplan.3.pdf: $(srcdir)/pathplan.3
- @GROFF@ -Tps -man $(srcdir)/pathplan.3 | @PS2PDF@ - - >pathplan.3.pdf
diff -Naur graphviz-2.40.1-orig/tclpkg/tcldot/Makefile.am graphviz-2.40.1/tclpkg/tcldot/Makefile.am
--- graphviz-2.40.1-orig/tclpkg/tcldot/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/tclpkg/tcldot/Makefile.am 2018-01-22 09:36:57.619764100 +0300
@@ -99,6 +99,10 @@
libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la
libtcldot_builtin_la_LIBADD += $(GD_LIBS)
endif
+
+if WITH_WIN32
+libtcldot_builtin_la_LDFLAGS += -no-undefined
+endif
libtcldot_builtin_la_LIBADD += $(EXPAT_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)

16
mingw-w64-graphviz/002-fix-dependency-detect.patch → mingw-w64-graphviz/003-fix-dependency-detect.patch
View File

@@ -15,11 +15,11 @@ diff -Naur graphviz-2.40.1-orig/configure.ac graphviz-2.40.1/configure.ac
fi
],[
- PKG_CHECK_MODULES([RUBY], [ruby-1.9],[
+ PKG_CHECK_MODULES([RUBY], [ruby-2.4],[
+ PKG_CHECK_MODULES([RUBY], [ruby-2.5],[
AC_CHECK_PROG(RUBY,ruby,ruby)
if test "x$RUBY" = "x"; then
use_ruby="No (ruby not available)"
@@ -2809,8 +2809,8 @@
@@ -2808,8 +2808,8 @@
LDFLAGS="$LDFLAGS $GLUT_LIBS"
AC_CHECK_HEADER(GL/glut.h,
@@ -30,15 +30,3 @@ diff -Naur graphviz-2.40.1-orig/configure.ac graphviz-2.40.1/configure.ac
use_glut="Yes"
AC_DEFINE_UNQUOTED(HAVE_GLUT,1,[Define if you have the GLUT library])],
use_glut="No (missing libglut)"
diff -Naur graphviz-2.40.1-orig/lib/gvc/Makefile.am graphviz-2.40.1/lib/gvc/Makefile.am
--- graphviz-2.40.1-orig/lib/gvc/Makefile.am 2016-12-17 08:44:53.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/Makefile.am 2017-03-15 13:55:02.393047600 +0300
@@ -19,7 +19,7 @@
AM_CPPFLAGS += -O0
endif
-LIBS = $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS)
+LIBS = $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS) -lregex
pkginclude_HEADERS = gvc.h gvcext.h gvplugin.h gvcjob.h \
gvcommon.h gvplugin_render.h gvplugin_layout.h gvconfig.h \

413
mingw-w64-graphviz/004-exports.patch Normal file
View File

@@ -0,0 +1,413 @@
diff -Naur graphviz-2.40.1-orig/lib/common/geomprocs.h graphviz-2.40.1/lib/common/geomprocs.h
--- graphviz-2.40.1-orig/lib/common/geomprocs.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/common/geomprocs.h 2018-01-23 10:25:03.844181100 +0300
@@ -24,13 +24,15 @@
#include "geom.h"
-#ifdef _WIN32
-#ifdef GVDLL
+#ifdef _MSC_VER
+#ifndef GVC_EXPORTS
+#define extern __declspec(dllimport)
+#endif
+#elif defined(GVDLL)
#define extern __declspec(dllexport)
#else
-#define extern __declspec(dllimport)
+#define extern
#endif
-#endif
extern box mkbox(point p, point q);
extern boxf mkboxf(pointf p, pointf q);
diff -Naur graphviz-2.40.1-orig/lib/common/globals.h graphviz-2.40.1/lib/common/globals.h
--- graphviz-2.40.1-orig/lib/common/globals.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/common/globals.h 2018-01-23 10:24:14.974596900 +0300
@@ -38,19 +38,21 @@
#if !defined(_BLD_dotneato) && defined(__IMPORT__)
# define external __IMPORT__
#endif
-#if defined(GVDLL)
-#if !defined(_BLD_gvc)
-#define extern __declspec(dllimport)
-#else
-#define extern __declspec(dllexport)
-#endif
-#endif
#endif
+
/*visual studio*/
-#ifdef _WIN32
+#ifdef _MSC_VER
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
+#elif defined(GVDLL)
+#if !defined(_BLD_gvc)
+#define extern __declspec(dllimport)
+#else
+#define extern __declspec(dllexport)
+#endif
+#else
+#define extern
#endif
/*end visual studio*/
diff -Naur graphviz-2.40.1-orig/lib/common/memory.h graphviz-2.40.1/lib/common/memory.h
--- graphviz-2.40.1-orig/lib/common/memory.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/common/memory.h 2018-01-23 10:23:24.065991300 +0300
@@ -42,15 +42,15 @@
#define RALLOC(size,ptr,type) ((type*)grealloc(ptr,(size)*sizeof(type)))
#define ZALLOC(size,ptr,type,osize) (ptr? (type*)zrealloc(ptr,size,sizeof(type),osize):(type*)zmalloc((size)*sizeof(type)))
#endif
-#ifdef GVDLL
-#define extern __declspec(dllexport)
-#else
-#ifdef _WIN32
+
+#ifdef _MSC_VER
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
-#endif
-
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
#endif
extern void *zmalloc(size_t);
diff -Naur graphviz-2.40.1-orig/lib/common/pointset.h graphviz-2.40.1/lib/common/pointset.h
--- graphviz-2.40.1-orig/lib/common/pointset.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/common/pointset.h 2018-01-23 10:23:05.753309100 +0300
@@ -23,18 +23,16 @@
typedef Dict_t PointSet;
typedef Dict_t PointMap;
-#ifdef GVDLL
-#define extern __declspec(dllexport)
-#else
-#define extern
-#endif
/*visual studio*/
-#ifdef _WIN32
+#ifdef _MSC_VER
#ifndef GVC_EXPORTS
-#undef extern
#define extern __declspec(dllimport)
#endif
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
#endif
/*end visual studio*/
diff -Naur graphviz-2.40.1-orig/lib/common/render.h graphviz-2.40.1/lib/common/render.h
--- graphviz-2.40.1-orig/lib/common/render.h 2016-12-22 08:44:41.000000000 +0300
+++ graphviz-2.40.1/lib/common/render.h 2018-01-23 10:22:28.726960600 +0300
@@ -58,13 +58,16 @@
typedef void (*nodesizefn_t) (Agnode_t *, boolean);
-/*visual studio*/
-#ifdef _WIN32
+
+#if defined(_MSC_VER)
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
#endif
-/*end visual studio*/
extern void add_box(path *, boxf);
extern void arrow_flags(Agedge_t * e, int *sflag, int *eflag);
diff -Naur graphviz-2.40.1-orig/lib/common/utils.h graphviz-2.40.1/lib/common/utils.h
--- graphviz-2.40.1-orig/lib/common/utils.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/common/utils.h 2018-01-23 10:21:21.231508300 +0300
@@ -20,10 +20,14 @@
/*visual studio*/
-#ifdef _WIN32
+#ifdef _MSC_VER
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
#endif
/*end visual studio*/
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvc.h graphviz-2.40.1/lib/gvc/gvc.h
--- graphviz-2.40.1-orig/lib/gvc/gvc.h 2016-12-18 15:58:37.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/gvc.h 2018-01-23 10:25:52.228393600 +0300
@@ -21,18 +21,15 @@
extern "C" {
#endif
-#ifdef GVDLL
-#define extern __declspec(dllexport)
-#else
-#define extern
-#endif
-
/*visual studio*/
-#ifdef WIN32
+#ifdef _MSC_VER
#ifndef GVC_EXPORTS
-#undef extern
#define extern __declspec(dllimport)
#endif
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
#endif
/*end visual studio*/
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvcext.h graphviz-2.40.1/lib/gvc/gvcext.h
--- graphviz-2.40.1-orig/lib/gvc/gvcext.h 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/gvcext.h 2018-01-23 09:40:58.273501000 +0300
@@ -64,7 +64,7 @@
typedef struct gvplugin_available_s gvplugin_available_t;
/*visual studio*/
-#ifdef WIN32
+#ifdef _MSC_VER
#ifndef GVC_EXPORTS
__declspec(dllimport) lt_symlist_t lt_preloaded_symbols[];
#else
@@ -77,11 +77,11 @@
/*end visual studio*/
-#ifndef WIN32
+#ifndef _MSC_VER
+#if !defined(LTDL_H)
#if defined(GVDLL)
__declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
#else
-#if !defined(LTDL_H)
extern lt_symlist_t lt_preloaded_symbols[];
#endif
#endif
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvcint.h graphviz-2.40.1/lib/gvc/gvcint.h
--- graphviz-2.40.1-orig/lib/gvc/gvcint.h 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/gvcint.h 2018-01-23 10:27:04.653316800 +0300
@@ -24,6 +24,16 @@
#include "gvcommon.h"
#include "color.h"
+#ifdef _MSC_VER
+#ifndef GVC_EXPORTS
+#define extern __declspec(dllimport)
+#endif
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
+#endif
+
/* active plugin headers */
typedef struct gvplugin_active_layout_s {
gvlayout_engine_t *engine;
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvio.h graphviz-2.40.1/lib/gvc/gvio.h
--- graphviz-2.40.1-orig/lib/gvc/gvio.h 2016-09-08 07:45:03.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/gvio.h 2018-01-23 10:27:43.497868100 +0300
@@ -20,18 +20,15 @@
extern "C" {
#endif
-#ifdef GVDLL
-#define extern __declspec(dllexport)
-#else
-#define extern
-#endif
-
/*visual studio*/
-#ifdef WIN32
+#ifdef _MSC_VER
#ifndef GVC_EXPORTS
-#undef extern
#define extern __declspec(dllimport)
#endif
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
#endif
/*end visual studio*/
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvplugin_loadimage.h graphviz-2.40.1/lib/gvc/gvplugin_loadimage.h
--- graphviz-2.40.1-orig/lib/gvc/gvplugin_loadimage.h 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/gvplugin_loadimage.h 2018-01-23 10:28:02.997557700 +0300
@@ -22,15 +22,15 @@
extern "C" {
#endif
-#ifdef GVDLL
-# define extern __declspec(dllexport)
-#endif
-
/*visual studio*/
-#ifdef WIN32
+#ifdef _MSC_VER
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
#endif
/*end visual studio*/
diff -Naur graphviz-2.40.1-orig/lib/gvpr/gprstate.c graphviz-2.40.1/lib/gvpr/gprstate.c
--- graphviz-2.40.1-orig/lib/gvpr/gprstate.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/gvpr/gprstate.c 2018-01-23 09:09:14.250538500 +0300
@@ -17,6 +17,8 @@
*
*/
+#include "config.h"
+
#ifdef WIN32
#include "windows.h"
#include "shlwapi.h"
@@ -139,7 +141,7 @@
free (state);
}
-#ifdef WIN32_DLL
+#if defined(WIN32_DLL) || defined(GVDLL)
int pathisrelative (char* path)
{
return PathIsRelative(path);
diff -Naur graphviz-2.40.1-orig/lib/gvpr/gvpr.c graphviz-2.40.1/lib/gvpr/gvpr.c
--- graphviz-2.40.1-orig/lib/gvpr/gvpr.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/lib/gvpr/gvpr.c 2018-01-23 09:10:13.915402100 +0300
@@ -219,7 +219,7 @@
Sfio_t *pathp = NULL;
size_t sz;
-#ifdef WIN32_DLL
+#if defined(WIN32_DLL) || defined(GVDLL)
if (!pathisrelative(arg))
#else
if (strchr(arg, '/'))
diff -Naur graphviz-2.40.1-orig/lib/pack/pack.h graphviz-2.40.1/lib/pack/pack.h
--- graphviz-2.40.1-orig/lib/pack/pack.h 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/pack/pack.h 2018-01-23 10:28:28.999274600 +0300
@@ -58,10 +58,14 @@
} pack_info;
/*visual studio*/
-#ifdef WIN32
+#ifdef _MSC_VER
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
#endif
/*end visual studio*/
diff -Naur graphviz-2.40.1-orig/lib/pathplan/pathutil.h graphviz-2.40.1/lib/pathplan/pathutil.h
--- graphviz-2.40.1-orig/lib/pathplan/pathutil.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/pathplan/pathutil.h 2018-01-23 10:29:52.419556600 +0300
@@ -32,10 +32,14 @@
#endif
/*visual studio*/
-#ifdef _WIN32
+#ifdef _MSC_VER
#ifndef PATHPLAN_EXPORTS
#define extern __declspec(dllimport)
#endif
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
#endif
/*end visual studio*/
typedef double COORD;
diff -Naur graphviz-2.40.1-orig/lib/pathplan/vis.h graphviz-2.40.1/lib/pathplan/vis.h
--- graphviz-2.40.1-orig/lib/pathplan/vis.h 2016-12-08 08:43:20.000000000 +0300
+++ graphviz-2.40.1/lib/pathplan/vis.h 2018-01-23 10:30:37.277179400 +0300
@@ -46,10 +46,16 @@
/* this is computed from the above */
array2 vis;
};
-#ifdef _WIN32
+
+/*visual studio*/
+#ifdef _MSC_VER
#ifndef PATHPLAN_EXPORTS
#define extern __declspec(dllimport)
#endif
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
#endif
/*end visual studio*/
diff -Naur graphviz-2.40.1-orig/lib/vmalloc/vmalloc.h graphviz-2.40.1/lib/vmalloc/vmalloc.h
--- graphviz-2.40.1-orig/lib/vmalloc/vmalloc.h 2016-12-22 08:44:41.000000000 +0300
+++ graphviz-2.40.1/lib/vmalloc/vmalloc.h 2018-01-23 10:31:24.766384500 +0300
@@ -110,15 +110,17 @@
#endif
/*visual studio*/
-#ifdef WIN32
-#undef extern
+#ifdef _MSC_VER
#ifndef VMALLOC_EXPORTS
#define extern __declspec(dllimport)
-#else
-#define extern __declspec(dllexport)
#endif
+#elif defined(GVDLL)
+#define extern __declspec(dllexport)
+#else
+#define extern
#endif
/*end visual studio*/
+
extern Vmethod_t *Vmbest; /* best allocation */
extern Vmethod_t *Vmlast; /* last-block allocation */
extern Vmethod_t *Vmpool; /* pool allocation */
diff -Naur graphviz-2.40.1-orig/tclpkg/gdtclft/gdtclft.c graphviz-2.40.1/tclpkg/gdtclft/gdtclft.c
--- graphviz-2.40.1-orig/tclpkg/gdtclft/gdtclft.c 2018-01-23 11:35:08.100504600 +0300
+++ graphviz-2.40.1/tclpkg/gdtclft/gdtclft.c 2018-01-23 11:35:11.352690600 +0300
@@ -1270,7 +1270,8 @@
#ifdef __CYGWIN__
int Gdtclft_Init(Tcl_Interp * interp)
#else
-#ifdef __WIN32__
+#ifdef _MSC_VER
+
EXPORT(int, Gdtclft_Init) (interp)
#else
int Gdtclft_Init(Tcl_Interp * interp)
@@ -1296,7 +1297,7 @@
#ifdef __CYGWIN__
int Gdtclft_SafeInit(Tcl_Interp * interp)
#else
-#ifdef __WIN32__
+#ifdef _MSC_VER
EXPORT(int, Gdtclft_SafeInit) (interp)
#else
int Gdtclft_SafeInit(Tcl_Interp * interp)

812
mingw-w64-graphviz/005-plugin-exports.patch Normal file
View File

@@ -0,0 +1,812 @@
diff -Naur graphviz-2.40.1-orig/plugin/core/gvplugin_core.c graphviz-2.40.1/plugin/core/gvplugin_core.c
--- graphviz-2.40.1-orig/plugin/core/gvplugin_core.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/core/gvplugin_core.c 2018-01-23 08:02:03.964079300 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvdevice_dot_types[];
@@ -88,22 +89,16 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL
+#ifdef _MSC_VER
#ifndef GVPLUGIN_CORE_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_core_LTX_library = { "core", apis };
#else
__declspec(dllexport) gvplugin_library_t gvplugin_core_LTX_library = { "core", apis };
#endif
-#endif
-
-
-
-#ifndef WIN32_DLL
+#else
#ifdef GVDLL
__declspec(dllexport) gvplugin_library_t gvplugin_core_LTX_library = { "core", apis };
#else
gvplugin_library_t gvplugin_core_LTX_library = { "core", apis };
#endif
#endif
-
-
diff -Naur graphviz-2.40.1-orig/plugin/core/Makefile.am graphviz-2.40.1/plugin/core/Makefile.am
--- graphviz-2.40.1-orig/plugin/core/Makefile.am 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/core/Makefile.am 2018-01-23 08:12:35.710656500 +0300
@@ -51,7 +51,7 @@
$(AWK) -f $(top_srcdir)/awk/stringize.awk $(srcdir)/ps.txt > ps.h
if WITH_WIN32
-libgvplugin_core_la_LDFLAGS += -no-undefined
+libgvplugin_core_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/core/gvplugin_core.def
libgvplugin_core_la_LIBADD += $(top_builddir)/lib/cgraph/libcgraph.la
endif
diff -Naur graphviz-2.40.1-orig/plugin/devil/gvplugin_devil.c graphviz-2.40.1/plugin/devil/gvplugin_devil.c
--- graphviz-2.40.1-orig/plugin/devil/gvplugin_devil.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/devil/gvplugin_devil.c 2018-01-23 08:04:14.088209400 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvdevice_devil_types[];
@@ -20,4 +21,16 @@
{(api_t)0, 0},
};
+#ifdef _MSC_VER
+#ifndef GVPLUGIN_DEVIL_EXPORTS
+__declspec(dllimport) gvplugin_library_t gvplugin_devil_LTX_library = { "devil", apis };
+#else
+__declspec(dllexport) gvplugin_library_t gvplugin_devil_LTX_library = { "devil", apis };
+#endif
+#else
+#ifdef GVDLL
+__declspec(dllexport) gvplugin_library_t gvplugin_devil_LTX_library = { "devil", apis };
+#else
gvplugin_library_t gvplugin_devil_LTX_library = { "devil", apis };
+#endif
+#endif
diff -Naur graphviz-2.40.1-orig/plugin/devil/gvplugin_devil.def graphviz-2.40.1/plugin/devil/gvplugin_devil.def
--- graphviz-2.40.1-orig/plugin/devil/gvplugin_devil.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/devil/gvplugin_devil.def 2018-01-23 08:11:13.401536800 +0300
@@ -0,0 +1,4 @@
+LIBRARY "gvplugin_devil"
+EXPORTS
+gvplugin_devil_LTX_library
+
diff -Naur graphviz-2.40.1-orig/plugin/devil/Makefile.am graphviz-2.40.1/plugin/devil/Makefile.am
--- graphviz-2.40.1-orig/plugin/devil/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/devil/Makefile.am 2018-01-23 08:11:52.942287300 +0300
@@ -28,7 +28,7 @@
libgvplugin_devil_la_LIBADD = @DEVIL_LIBS@
if WITH_WIN32
-libgvplugin_devil_la_LDFLAGS += -no-undefined
+libgvplugin_devil_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/devil/gvplugin_devil.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/dot_layout/gvplugin_dot_layout.c graphviz-2.40.1/plugin/dot_layout/gvplugin_dot_layout.c
--- graphviz-2.40.1-orig/plugin/dot_layout/gvplugin_dot_layout.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/dot_layout/gvplugin_dot_layout.c 2018-01-23 08:07:12.062433200 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvlayout_dot_layout[];
@@ -19,26 +20,17 @@
{API_layout, gvlayout_dot_layout},
{(api_t)0, 0},
};
-/*visual studio*/
-#ifdef WIN32_DLL
+
+#ifdef _MSC_VER
#ifndef GVPLUGIN_DOT_LAYOUT_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_dot_layout_LTX_library = { "dot_layout", apis };
#else
__declspec(dllexport) gvplugin_library_t gvplugin_dot_layout_LTX_library = { "dot_layout", apis };
#endif
-#endif
-
-
-
-/*end visual studio*/
-
-
-#ifndef WIN32_DLL
+#else
#ifdef GVDLL
__declspec(dllexport) gvplugin_library_t gvplugin_dot_layout_LTX_library = { "dot_layout", apis };
#else
gvplugin_library_t gvplugin_dot_layout_LTX_library = { "dot_layout", apis };
#endif
#endif
-
-
diff -Naur graphviz-2.40.1-orig/plugin/dot_layout/Makefile.am graphviz-2.40.1/plugin/dot_layout/Makefile.am
--- graphviz-2.40.1-orig/plugin/dot_layout/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/dot_layout/Makefile.am 2018-01-23 08:10:02.459053100 +0300
@@ -33,7 +33,7 @@
$(top_builddir)/lib/pathplan/libpathplan.la $(MATH_LIBS)
if WITH_WIN32
-libgvplugin_dot_layout_la_LDFLAGS += -no-undefined
+libgvplugin_dot_layout_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/dot_layout/gvplugin_dot_layout.def
libgvplugin_dot_layout_la_LIBADD += $(top_builddir)/lib/cgraph/libcgraph.la
endif
diff -Naur graphviz-2.40.1-orig/plugin/gd/gvplugin_gd.c graphviz-2.40.1/plugin/gd/gvplugin_gd.c
--- graphviz-2.40.1-orig/plugin/gd/gvplugin_gd.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gd/gvplugin_gd.c 2018-01-23 08:07:35.375314300 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvrender_gd_types[];
@@ -32,18 +33,16 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL /*visual studio*/
+#ifdef _MSC_VER
#ifndef GVPLUGIN_GD_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_gd_LTX_library = { "gd", apis };
#else
__declspec(dllexport) gvplugin_library_t gvplugin_gd_LTX_library = { "gd", apis };
#endif
-#else /*end visual studio*/
+#else
#ifdef GVDLL
__declspec(dllexport) gvplugin_library_t gvplugin_gd_LTX_library = { "gd", apis };
#else
gvplugin_library_t gvplugin_gd_LTX_library = { "gd", apis };
#endif
#endif
-
-
diff -Naur graphviz-2.40.1-orig/plugin/gd/Makefile.am graphviz-2.40.1/plugin/gd/Makefile.am
--- graphviz-2.40.1-orig/plugin/gd/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gd/Makefile.am 2018-01-23 08:20:09.217596000 +0300
@@ -39,7 +39,7 @@
libgvplugin_gd_la_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la
if WITH_WIN32
-libgvplugin_gd_la_LDFLAGS += -no-undefined
+libgvplugin_gd_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/gd/gvplugin_gd.def
libgvplugin_gd_la_LIBADD += $(top_builddir)/lib/cgraph/libcgraph.la $(top_builddir)/lib/pathplan/libpathplan.la
endif
diff -Naur graphviz-2.40.1-orig/plugin/gdiplus/gvplugin_gdiplus.cpp graphviz-2.40.1/plugin/gdiplus/gvplugin_gdiplus.cpp
--- graphviz-2.40.1-orig/plugin/gdiplus/gvplugin_gdiplus.cpp 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gdiplus/gvplugin_gdiplus.cpp 2018-01-23 08:15:12.039264600 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
#include "gvplugin_gdiplus.h"
@@ -89,17 +90,16 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL /*visual studio*/
+#ifdef _MSC_VER
#ifndef GVPLUGIN_GDIPLUS_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_gdiplus_LTX_library = { "gdiplus", apis };
#else
__declspec(dllexport) gvplugin_library_t gvplugin_gdiplus_LTX_library = { "gdiplus", apis };
#endif
-#else /*end visual studio*/
+#else
#ifdef GVDLL
__declspec(dllexport) gvplugin_library_t gvplugin_gdiplus_LTX_library = { "gdiplus", apis };
#else
extern "C" gvplugin_library_t gvplugin_gdiplus_LTX_library = { "gdiplus", apis };
#endif
#endif
-
diff -Naur graphviz-2.40.1-orig/plugin/gdiplus/Makefile.am graphviz-2.40.1/plugin/gdiplus/Makefile.am
--- graphviz-2.40.1-orig/plugin/gdiplus/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gdiplus/Makefile.am 2018-01-23 08:14:05.571784700 +0300
@@ -39,7 +39,7 @@
libgvplugin_gdiplus_la_LIBADD = -lgdi32 -lole32 -lstdc++ -luuid $(top_builddir)/lib/gvc/libgvc.la
if WITH_WIN32
-libgvplugin_gdiplus_la_LDFLAGS += -no-undefined
+libgvplugin_gdiplus_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/gdiplus/gvplugin_gdiplus.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/gdk/gvplugin_gdk.c graphviz-2.40.1/plugin/gdk/gvplugin_gdk.c
--- graphviz-2.40.1-orig/plugin/gdk/gvplugin_gdk.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gdk/gvplugin_gdk.c 2018-01-23 08:17:03.275743900 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvdevice_gdk_types[];
@@ -22,4 +23,16 @@
{(api_t)0, 0},
};
+#ifdef _MSC_VER
+#ifndef GVPLUGIN_GDK_EXPORTS
+__declspec(dllimport) gvplugin_library_t gvplugin_gdk_LTX_library = { "gdk", apis };
+#else
+__declspec(dllexport) gvplugin_library_t gvplugin_gdk_LTX_library = { "gdk", apis };
+#endif
+#else
+#ifdef GVDLL
+__declspec(dllexport) gvplugin_library_t gvplugin_gdk_LTX_library = { "gdk", apis };
+#else
gvplugin_library_t gvplugin_gdk_LTX_library = { "gdk", apis };
+#endif
+#endif
diff -Naur graphviz-2.40.1-orig/plugin/gdk/gvplugin_gdk.def graphviz-2.40.1/plugin/gdk/gvplugin_gdk.def
--- graphviz-2.40.1-orig/plugin/gdk/gvplugin_gdk.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/gdk/gvplugin_gdk.def 2018-01-23 08:17:20.259996900 +0300
@@ -0,0 +1,5 @@
+LIBRARY "gvplugin_gdk"
+EXPORTS
+gvplugin_gdk_LTX_library
+
+
diff -Naur graphviz-2.40.1-orig/plugin/gdk/Makefile.am graphviz-2.40.1/plugin/gdk/Makefile.am
--- graphviz-2.40.1-orig/plugin/gdk/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gdk/Makefile.am 2018-01-23 08:16:07.200675500 +0300
@@ -34,7 +34,7 @@
$(top_builddir)/lib/gvc/libgvc.la @GDK_PIXBUF_LIBS@ @PANGOCAIRO_LIBS@ @GDK_LIBS@
if WITH_WIN32
-libgvplugin_gdk_la_LDFLAGS += -no-undefined
+libgvplugin_gdk_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/gdk/gvplugin_gdk.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/glitz/gvplugin_glitz.c graphviz-2.40.1/plugin/glitz/gvplugin_glitz.c
--- graphviz-2.40.1-orig/plugin/glitz/gvplugin_glitz.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/glitz/gvplugin_glitz.c 2018-01-23 08:19:06.248401200 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvdevice_types_glitz[];
@@ -20,4 +21,16 @@
{(api_t)0, 0},
};
+#ifdef _MSC_VER
+#ifndef GVPLUGIN_GLITZ_EXPORTS
+__declspec(dllimport) gvplugin_library_t gvplugin_glitz_LTX_library = { "glitz", apis };
+#else
+__declspec(dllexport) gvplugin_library_t gvplugin_glitz_LTX_library = { "glitz", apis };
+#endif
+#else
+#ifdef GVDLL
+__declspec(dllexport) gvplugin_library_t gvplugin_glitz_LTX_library = { "glitz", apis };
+#else
gvplugin_library_t gvplugin_glitz_LTX_library = { "glitz", apis };
+#endif
+#endif
diff -Naur graphviz-2.40.1-orig/plugin/glitz/gvplugin_glitz.def graphviz-2.40.1/plugin/glitz/gvplugin_glitz.def
--- graphviz-2.40.1-orig/plugin/glitz/gvplugin_glitz.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/glitz/gvplugin_glitz.def 2018-01-23 08:18:50.011725200 +0300
@@ -0,0 +1,5 @@
+LIBRARY "gvplugin_glitz"
+EXPORTS
+gvplugin_glitz_LTX_library
+
+
diff -Naur graphviz-2.40.1-orig/plugin/glitz/Makefile.am graphviz-2.40.1/plugin/glitz/Makefile.am
--- graphviz-2.40.1-orig/plugin/glitz/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/glitz/Makefile.am 2018-01-23 08:19:50.859738100 +0300
@@ -30,7 +30,7 @@
libgvplugin_glitz_la_LIBADD = @PANGOCAIRO_LIBS@ @GLITZ_LIBS@
if WITH_WIN32
-libgvplugin_glitz_la_LDFLAGS += -no-undefined
+libgvplugin_glitz_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/glitz/gvplugin_glitz.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/gs/gvplugin_gs.c graphviz-2.40.1/plugin/gs/gvplugin_gs.c
--- graphviz-2.40.1-orig/plugin/gs/gvplugin_gs.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gs/gvplugin_gs.c 2018-01-23 08:21:57.037950500 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvloadimage_gs_types[];
@@ -20,4 +21,16 @@
{(api_t)0, 0},
};
+#ifdef _MSC_VER
+#ifndef GVPLUGIN_GS_EXPORTS
+__declspec(dllimport) gvplugin_library_t gvplugin_gs_LTX_library = { "gs", apis };
+#else
+__declspec(dllexport) gvplugin_library_t gvplugin_gs_LTX_library = { "gs", apis };
+#endif
+#else
+#ifdef GVDLL
+__declspec(dllexport) gvplugin_library_t gvplugin_gs_LTX_library = { "gs", apis };
+#else
gvplugin_library_t gvplugin_gs_LTX_library = { "gs", apis };
+#endif
+#endif
diff -Naur graphviz-2.40.1-orig/plugin/gs/gvplugin_gs.def graphviz-2.40.1/plugin/gs/gvplugin_gs.def
--- graphviz-2.40.1-orig/plugin/gs/gvplugin_gs.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/gs/gvplugin_gs.def 2018-01-23 08:21:45.625916200 +0300
@@ -0,0 +1,5 @@
+LIBRARY "gvplugin_gs"
+EXPORTS
+gvplugin_gs_LTX_library
+
+
diff -Naur graphviz-2.40.1-orig/plugin/gs/Makefile.am graphviz-2.40.1/plugin/gs/Makefile.am
--- graphviz-2.40.1-orig/plugin/gs/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gs/Makefile.am 2018-01-23 08:21:00.107564900 +0300
@@ -31,7 +31,7 @@
$(top_builddir)/lib/gvc/libgvc.la $(PANGOCAIRO_LIBS) $(GS_LIBS)
if WITH_WIN32
-libgvplugin_gs_la_LDFLAGS += -no-undefined
+libgvplugin_gs_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/gs/gvplugin_gs.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/gtk/gvplugin_gtk.c graphviz-2.40.1/plugin/gtk/gvplugin_gtk.c
--- graphviz-2.40.1-orig/plugin/gtk/gvplugin_gtk.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gtk/gvplugin_gtk.c 2018-01-23 08:23:47.288735700 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvdevice_types_gtk[];
@@ -20,4 +21,16 @@
{(api_t)0, 0},
};
+#ifdef _MSC_VER
+#ifndef GVPLUGIN_GTK_EXPORTS
+__declspec(dllimport) gvplugin_library_t gvplugin_gtk_LTX_library = { "gtk", apis };
+#else
+__declspec(dllexport) gvplugin_library_t gvplugin_gtk_LTX_library = { "gtk", apis };
+#endif
+#else
+#ifdef GVDLL
+__declspec(dllexport) gvplugin_library_t gvplugin_gtk_LTX_library = { "gtk", apis };
+#else
gvplugin_library_t gvplugin_gtk_LTX_library = { "gtk", apis };
+#endif
+#endif
diff -Naur graphviz-2.40.1-orig/plugin/gtk/gvplugin_gtk.def graphviz-2.40.1/plugin/gtk/gvplugin_gtk.def
--- graphviz-2.40.1-orig/plugin/gtk/gvplugin_gtk.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/gtk/gvplugin_gtk.def 2018-01-23 08:23:40.781511100 +0300
@@ -0,0 +1,5 @@
+LIBRARY "gvplugin_gtk"
+EXPORTS
+gvplugin_gtk_LTX_library
+
+
diff -Naur graphviz-2.40.1-orig/plugin/gtk/Makefile.am graphviz-2.40.1/plugin/gtk/Makefile.am
--- graphviz-2.40.1-orig/plugin/gtk/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/gtk/Makefile.am 2018-01-23 08:22:55.144538100 +0300
@@ -34,7 +34,7 @@
libgvplugin_gtk_la_LIBADD = $(GTK_LIBS)
if WITH_WIN32
-libgvplugin_gtk_la_LDFLAGS += -no-undefined
+libgvplugin_gtk_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/gtk/gvplugin_gtk.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/lasi/gvplugin_lasi.c graphviz-2.40.1/plugin/lasi/gvplugin_lasi.c
--- graphviz-2.40.1-orig/plugin/lasi/gvplugin_lasi.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/lasi/gvplugin_lasi.c 2018-01-23 08:26:00.230259700 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvdevice_lasi_types[];
@@ -24,4 +25,16 @@
{(api_t)0, 0},
};
+#ifdef _MSC_VER
+#ifndef GVPLUGIN_LASI_EXPORTS
+__declspec(dllimport) gvplugin_library_t gvplugin_lasi_LTX_library = { "lasi", apis };
+#else
+__declspec(dllexport) gvplugin_library_t gvplugin_lasi_LTX_library = { "lasi", apis };
+#endif
+#else
+#ifdef GVDLL
+__declspec(dllexport) gvplugin_library_t gvplugin_lasi_LTX_library = { "lasi", apis };
+#else
gvplugin_library_t gvplugin_lasi_LTX_library = { "lasi", apis };
+#endif
+#endif
diff -Naur graphviz-2.40.1-orig/plugin/lasi/gvplugin_lasi.def graphviz-2.40.1/plugin/lasi/gvplugin_lasi.def
--- graphviz-2.40.1-orig/plugin/lasi/gvplugin_lasi.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/lasi/gvplugin_lasi.def 2018-01-23 08:26:08.558687200 +0300
@@ -0,0 +1,5 @@
+LIBRARY "gvplugin_lasi"
+EXPORTS
+gvplugin_lasi_LTX_library
+
+
diff -Naur graphviz-2.40.1-orig/plugin/lasi/Makefile.am graphviz-2.40.1/plugin/lasi/Makefile.am
--- graphviz-2.40.1-orig/plugin/lasi/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/lasi/Makefile.am 2018-01-23 08:25:26.223527400 +0300
@@ -38,7 +38,7 @@
$(AWK) -f $(top_srcdir)/awk/stringize.awk $(top_srcdir)/plugin/core/ps.txt > ps.h
if WITH_WIN32
-libgvplugin_lasi_la_LDFLAGS += -no-undefined
+libgvplugin_lasi_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/lasi/gvplugin_lasi.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/ming/gvplugin_ming.c graphviz-2.40.1/plugin/ming/gvplugin_ming.c
--- graphviz-2.40.1-orig/plugin/ming/gvplugin_ming.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/ming/gvplugin_ming.c 2018-01-23 08:26:58.189040800 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvrender_ming_types[];
@@ -22,4 +23,16 @@
{(api_t)0, 0},
};
+#ifdef _MSC_VER
+#ifndef GVPLUGIN_MING_EXPORTS
+__declspec(dllimport) gvplugin_library_t gvplugin_ming_LTX_library = { "ming", apis };
+#else
+__declspec(dllexport) gvplugin_library_t gvplugin_ming_LTX_library = { "ming", apis };
+#endif
+#else
+#ifdef GVDLL
+__declspec(dllexport) gvplugin_library_t gvplugin_ming_LTX_library = { "ming", apis };
+#else
gvplugin_library_t gvplugin_ming_LTX_library = { "ming", apis };
+#endif
+#endif
diff -Naur graphviz-2.40.1-orig/plugin/ming/gvplugin_ming.def graphviz-2.40.1/plugin/ming/gvplugin_ming.def
--- graphviz-2.40.1-orig/plugin/ming/gvplugin_ming.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/ming/gvplugin_ming.def 2018-01-23 08:27:48.151221700 +0300
@@ -0,0 +1,5 @@
+LIBRARY "gvplugin_ming"
+EXPORTS
+gvplugin_ming_LTX_library
+
+
diff -Naur graphviz-2.40.1-orig/plugin/ming/Makefile.am graphviz-2.40.1/plugin/ming/Makefile.am
--- graphviz-2.40.1-orig/plugin/ming/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/ming/Makefile.am 2018-01-23 08:27:27.756351800 +0300
@@ -31,7 +31,7 @@
libgvplugin_ming_la_LIBADD = @MING_LIBS@ @MATH_LIBS@
if WITH_WIN32
-libgvplugin_ming_la_LDFLAGS += -no-undefined
+libgvplugin_ming_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/ming/gvplugin_ming.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/neato_layout/gvplugin_neato_layout.c graphviz-2.40.1/plugin/neato_layout/gvplugin_neato_layout.c
--- graphviz-2.40.1-orig/plugin/neato_layout/gvplugin_neato_layout.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/neato_layout/gvplugin_neato_layout.c 2018-01-23 08:29:11.100307200 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvlayout_neato_types[];
@@ -20,17 +21,16 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL /*visual studio*/
+#ifdef _MSC_VER
#ifndef GVPLUGIN_NEATO_LAYOUT_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_neato_layout_LTX_library = { "neato_layout", apis };
#else
__declspec(dllexport) gvplugin_library_t gvplugin_neato_layout_LTX_library = { "neato_layout", apis };
#endif
-#else /*end visual studio*/
+#else
#ifdef GVDLL
__declspec(dllexport) gvplugin_library_t gvplugin_neato_layout_LTX_library = { "neato_layout", apis };
#else
gvplugin_library_t gvplugin_neato_layout_LTX_library = { "neato_layout", apis };
#endif
#endif
-
diff -Naur graphviz-2.40.1-orig/plugin/pango/gvplugin_pango.c graphviz-2.40.1/plugin/pango/gvplugin_pango.c
--- graphviz-2.40.1-orig/plugin/pango/gvplugin_pango.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/pango/gvplugin_pango.c 2018-01-23 08:30:13.337119300 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvrender_pango_types[];
@@ -26,17 +27,16 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL /*visual studio*/
+#ifdef _MSC_VER
#ifndef GVPLUGIN_PANGO_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_pango_LTX_library = { "cairo", apis };
#else
__declspec(dllexport) gvplugin_library_t gvplugin_pango_LTX_library = { "cairo", apis };
#endif
-#else /*end visual studio*/
+#else
#ifdef GVDLL
__declspec(dllexport) gvplugin_library_t gvplugin_pango_LTX_library = { "cairo", apis };
#else
gvplugin_library_t gvplugin_pango_LTX_library = { "cairo", apis };
#endif
#endif
-
diff -Naur graphviz-2.40.1-orig/plugin/pango/gvplugin_pango.def graphviz-2.40.1/plugin/pango/gvplugin_pango.def
--- graphviz-2.40.1-orig/plugin/pango/gvplugin_pango.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/pango/gvplugin_pango.def 2018-01-23 08:29:59.899874600 +0300
@@ -0,0 +1,5 @@
+LIBRARY "gvplugin_pango"
+EXPORTS
+gvplugin_pango_LTX_library
+
+
diff -Naur graphviz-2.40.1-orig/plugin/pango/Makefile.am graphviz-2.40.1/plugin/pango/Makefile.am
--- graphviz-2.40.1-orig/plugin/pango/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/pango/Makefile.am 2018-01-23 08:30:27.883759100 +0300
@@ -35,7 +35,7 @@
$(top_builddir)/lib/gvc/libgvc.la @PANGOCAIRO_LIBS@ @PANGOFT2_LIBS@ @MATH_LIBS@
if WITH_WIN32
-libgvplugin_pango_la_LDFLAGS += -no-undefined
+libgvplugin_pango_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/pango/gvplugin_pango.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/poppler/gvplugin_poppler.c graphviz-2.40.1/plugin/poppler/gvplugin_poppler.c
--- graphviz-2.40.1-orig/plugin/poppler/gvplugin_poppler.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/poppler/gvplugin_poppler.c 2018-01-23 08:31:17.432530300 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvloadimage_poppler_types[];
@@ -20,4 +21,16 @@
{(api_t)0, 0},
};
+#ifdef _MSC_VER
+#ifndef GVPLUGIN_POPPLER_EXPORTS
+__declspec(dllimport) gvplugin_library_t gvplugin_poppler_LTX_library = { "poppler", apis };
+#else
+__declspec(dllexport) gvplugin_library_t gvplugin_poppler_LTX_library = { "poppler", apis };
+#endif
+#else
+#ifdef GVDLL
+__declspec(dllexport) gvplugin_library_t gvplugin_poppler_LTX_library = { "poppler", apis };
+#else
gvplugin_library_t gvplugin_poppler_LTX_library = { "poppler", apis };
+#endif
+#endif
\ В конце файла нет новой строки
diff -Naur graphviz-2.40.1-orig/plugin/poppler/gvplugin_poppler.def graphviz-2.40.1/plugin/poppler/gvplugin_poppler.def
--- graphviz-2.40.1-orig/plugin/poppler/gvplugin_poppler.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/poppler/gvplugin_poppler.def 2018-01-23 08:31:28.105759600 +0300
@@ -0,0 +1,5 @@
+LIBRARY "gvplugin_poppler"
+EXPORTS
+gvplugin_poppler_LTX_library
+
+
diff -Naur graphviz-2.40.1-orig/plugin/poppler/Makefile.am graphviz-2.40.1/plugin/poppler/Makefile.am
--- graphviz-2.40.1-orig/plugin/poppler/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/poppler/Makefile.am 2018-01-23 08:31:46.733830400 +0300
@@ -31,7 +31,7 @@
$(top_builddir)/lib/gvc/libgvc.la $(PANGOCAIRO_LIBS) $(POPPLER_LIBS)
if WITH_WIN32
-libgvplugin_poppler_la_LDFLAGS += -no-undefined
+libgvplugin_poppler_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/poppler/gvplugin_poppler.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/rsvg/gvplugin_rsvg.c graphviz-2.40.1/plugin/rsvg/gvplugin_rsvg.c
--- graphviz-2.40.1-orig/plugin/rsvg/gvplugin_rsvg.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/rsvg/gvplugin_rsvg.c 2018-01-23 08:33:33.619596600 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvloadimage_rsvg_types[];
@@ -19,9 +20,17 @@
{API_loadimage, gvloadimage_rsvg_types},
{(api_t)0, 0},
};
+
+#ifdef _MSC_VER
+#ifndef GVPLUGIN_RSVG_EXPORTS
+__declspec(dllimport) gvplugin_library_t gvplugin_rsvg_LTX_library = { "rsvg", apis };
+#else
+__declspec(dllexport) gvplugin_library_t gvplugin_rsvg_LTX_library = { "rsvg", apis };
+#endif
+#else
#ifdef GVDLL
__declspec(dllexport) gvplugin_library_t gvplugin_rsvg_LTX_library = { "rsvg", apis };
#else
gvplugin_library_t gvplugin_rsvg_LTX_library = { "rsvg", apis };
#endif
-
+#endif
diff -Naur graphviz-2.40.1-orig/plugin/rsvg/gvplugin_rsvg.def graphviz-2.40.1/plugin/rsvg/gvplugin_rsvg.def
--- graphviz-2.40.1-orig/plugin/rsvg/gvplugin_rsvg.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/rsvg/gvplugin_rsvg.def 2018-01-23 08:33:16.327343400 +0300
@@ -0,0 +1,5 @@
+LIBRARY "gvplugin_rsvg"
+EXPORTS
+gvplugin_rsvg_LTX_library
+
+
diff -Naur graphviz-2.40.1-orig/plugin/rsvg/Makefile.am graphviz-2.40.1/plugin/rsvg/Makefile.am
--- graphviz-2.40.1-orig/plugin/rsvg/Makefile.am 2016-12-05 02:18:35.000000000 +0300
+++ graphviz-2.40.1/plugin/rsvg/Makefile.am 2018-01-23 08:33:49.681659100 +0300
@@ -30,7 +30,7 @@
@RSVG_LIBS@ @PANGOCAIRO_LIBS@ @XRENDER_LIBS@
if WITH_WIN32
-libgvplugin_rsvg_la_LDFLAGS += -no-undefined
+libgvplugin_rsvg_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/rsvg/gvplugin_rsvg.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/visio/gvplugin_visio.c graphviz-2.40.1/plugin/visio/gvplugin_visio.c
--- graphviz-2.40.1-orig/plugin/visio/gvplugin_visio.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/visio/gvplugin_visio.c 2018-01-23 08:35:15.453312500 +0300
@@ -21,7 +21,7 @@
#pragma comment( lib, "graph.lib" )
#endif
-
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvdevice_vdx_types[];
@@ -33,13 +33,13 @@
{(api_t)0, 0},
};
-#ifdef WIN32_DLL /*visual studio*/
+#ifdef _MSC_VER
#ifndef GVPLUGIN_VISIO_EXPORTS
__declspec(dllimport) gvplugin_library_t gvplugin_visio_LTX_library = { "visio", apis };
#else
__declspec(dllexport) gvplugin_library_t gvplugin_visio_LTX_library = { "visio", apis };
#endif
-#else /*end visual studio*/
+#else
#ifdef GVDLL
__declspec(dllexport) gvplugin_library_t gvplugin_visio_LTX_library = { "visio", apis };
#else
diff -Naur graphviz-2.40.1-orig/plugin/visio/gvplugin_visio.def graphviz-2.40.1/plugin/visio/gvplugin_visio.def
--- graphviz-2.40.1-orig/plugin/visio/gvplugin_visio.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/visio/gvplugin_visio.def 2018-01-23 08:34:56.547260400 +0300
@@ -0,0 +1,5 @@
+LIBRARY "gvplugin_visio"
+EXPORTS
+gvplugin_visio_LTX_library
+
+
diff -Naur graphviz-2.40.1-orig/plugin/visio/Makefile.am graphviz-2.40.1/plugin/visio/Makefile.am
--- graphviz-2.40.1-orig/plugin/visio/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/visio/Makefile.am 2018-01-23 08:35:31.750961700 +0300
@@ -34,7 +34,7 @@
$(top_builddir)/lib/gvc/libgvc.la @VISIO_LIBS@
if WITH_WIN32
-libgvplugin_visio_la_LDFLAGS += -no-undefined
+libgvplugin_visio_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/visio/gvplugin_visio.def
endif
if WITH_DARWIN9
diff -Naur graphviz-2.40.1-orig/plugin/webp/gvplugin_webp.c graphviz-2.40.1/plugin/webp/gvplugin_webp.c
--- graphviz-2.40.1-orig/plugin/webp/gvplugin_webp.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/webp/gvplugin_webp.c 2018-01-23 08:36:33.828777100 +0300
@@ -11,6 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
+#include "config.h"
#include "gvplugin.h"
extern gvplugin_installed_t gvdevice_webp_types[];
@@ -22,4 +23,16 @@
{(api_t)0, 0},
};
+#ifdef _MSC_VER
+#ifndef GVPLUGIN_WEBP_EXPORTS
+__declspec(dllimport) gvplugin_library_t gvplugin_webp_LTX_library = { "webp", apis };
+#else
+__declspec(dllexport) gvplugin_library_t gvplugin_webp_LTX_library = { "webp", apis };
+#endif
+#else
+#ifdef GVDLL
+__declspec(dllexport) gvplugin_library_t gvplugin_webp_LTX_library = { "webp", apis };
+#else
gvplugin_library_t gvplugin_webp_LTX_library = { "webp", apis };
+#endif
+#endif
diff -Naur graphviz-2.40.1-orig/plugin/webp/gvplugin_webp.def graphviz-2.40.1/plugin/webp/gvplugin_webp.def
--- graphviz-2.40.1-orig/plugin/webp/gvplugin_webp.def 1970-01-01 03:00:00.000000000 +0300
+++ graphviz-2.40.1/plugin/webp/gvplugin_webp.def 2018-01-23 08:36:20.911122400 +0300
@@ -0,0 +1,5 @@
+LIBRARY "gvplugin_webp"
+EXPORTS
+gvplugin_webp_LTX_library
+
+
diff -Naur graphviz-2.40.1-orig/plugin/webp/Makefile.am graphviz-2.40.1/plugin/webp/Makefile.am
--- graphviz-2.40.1-orig/plugin/webp/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/webp/Makefile.am 2018-01-23 08:36:53.207895300 +0300
@@ -29,7 +29,7 @@
libgvplugin_webp_la_LIBADD = @WEBP_LIBS@ @PANGOCAIRO_LIBS@
if WITH_WIN32
-libgvplugin_webp_la_LDFLAGS += -no-undefined
+libgvplugin_webp_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/webp/gvplugin_webp.def
endif
if WITH_DARWIN9

91
mingw-w64-graphviz/006-missing-libs.patch Normal file
View File

@@ -0,0 +1,91 @@
diff -Naur graphviz-2.40.1-orig/cmd/gvmap/Makefile.am graphviz-2.40.1/cmd/gvmap/Makefile.am
--- graphviz-2.40.1-orig/cmd/gvmap/Makefile.am 2016-12-17 08:44:53.000000000 +0300
+++ graphviz-2.40.1/cmd/gvmap/Makefile.am 2017-03-15 13:55:02.393047600 +0300
@@ -42,6 +42,7 @@
$(top_builddir)/lib/common/libcommon_C.la \
$(top_builddir)/lib/edgepaint/liblab_gamut.la \
$(top_builddir)/lib/cgraph/libcgraph.la \
+ $(top_builddir)/lib/gvc/libgvc.la \
$(GTS_LIBS) -lm
cluster_LDADD = \
@@ -55,6 +56,7 @@
$(top_builddir)/lib/common/libcommon_C.la \
$(top_builddir)/lib/edgepaint/liblab_gamut.la \
$(top_builddir)/lib/cgraph/libcgraph.la \
+ $(top_builddir)/lib/gvc/libgvc.la \
$(GTS_LIBS) -lm
gvmap.sh :
diff -Naur graphviz-2.40.1-orig/cmd/edgepaint/Makefile.am graphviz-2.40.1/cmd/edgepaint/Makefile.am
--- graphviz-2.40.1-orig/cmd/edgepaint/Makefile.am 2016-12-17 08:44:53.000000000 +0300
+++ graphviz-2.40.1/cmd/edgepaint/Makefile.am 2017-03-15 13:55:02.393047600 +0300
@@ -31,6 +31,7 @@
$(top_builddir)/lib/edgepaint/liblab_gamut.la \
$(top_builddir)/lib/cgraph/libcgraph.la \
$(top_builddir)/lib/cdt/libcdt.la \
+ $(top_builddir)/lib/gvc/libgvc.la \
$(ANN_LIBS) -lstdc++ -lm
edgepaint.1.pdf: $(srcdir)/edgepaint.1
diff -Naur graphviz-2.40.1-orig/lib/gvc/Makefile.am graphviz-2.40.1/lib/gvc/Makefile.am
--- graphviz-2.40.1-orig/lib/gvc/Makefile.am 2016-12-17 08:44:53.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/Makefile.am 2017-03-15 13:55:02.393047600 +0300
@@ -19,7 +19,7 @@
AM_CPPFLAGS += -O0
endif
-LIBS = $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS)
+LIBS = $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS) -lregex
pkginclude_HEADERS = gvc.h gvcext.h gvplugin.h gvcjob.h \
gvcommon.h gvplugin_render.h gvplugin_layout.h gvconfig.h \
diff -Naur graphviz-2.40.1-orig/lib/gvpr/Makefile.am graphviz-2.40.1/lib/gvpr/Makefile.am
--- graphviz-2.40.1-orig/lib/gvpr/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/lib/gvpr/Makefile.am 2018-01-22 09:36:57.683164300 +0300
@@ -51,7 +51,7 @@
libgvpr_la_DEPENDENCIES = $(libgvpr_C_la_DEPENDENCIES)
if WITH_WIN32
-libgvpr_la_LDFLAGS += -export-symbols-regex gvpr
+libgvpr_la_LDFLAGS += -export-symbols-regex gvpr -lshlwapi
endif
mkdefs_SOURCES = mkdefs.c
diff -Naur graphviz-2.40.1-orig/plugin/dot_layout/Makefile.am graphviz-2.40.1/plugin/dot_layout/Makefile.am
--- graphviz-2.40.1-orig/plugin/dot_layout/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/dot_layout/Makefile.am 2018-01-19 10:34:36.164949100 +0300
@@ -22,7 +22,8 @@
gvplugin_dot_layout.c \
gvlayout_dot_layout.c
libgvplugin_dot_layout_C_la_LIBADD = \
- $(top_builddir)/lib/dotgen/libdotgen_C.la
+ $(top_builddir)/lib/dotgen/libdotgen_C.la \
+ $(top_builddir)/lib/ortho/libortho_C.la
libgvplugin_dot_layout_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)
diff -Naur graphviz-2.40.1-orig/plugin/neato_layout/Makefile.am graphviz-2.40.1/plugin/neato_layout/Makefile.am
--- graphviz-2.40.1-orig/plugin/neato_layout/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/neato_layout/Makefile.am 2018-01-19 10:49:55.452864000 +0300
@@ -27,6 +27,7 @@
$(top_builddir)/lib/patchwork/libpatchwork_C.la \
$(top_builddir)/lib/osage/libosage_C.la \
$(top_builddir)/lib/fdpgen/libfdpgen_C.la \
+ $(top_builddir)/lib/ortho/libortho_C.la \
$(top_builddir)/lib/sparse/libsparse_C.la \
$(top_builddir)/lib/rbtree/librbtree_C.la \
$(top_builddir)/lib/circogen/libcircogen_C.la
diff -Naur graphviz-2.40.1-orig/plugin/webp/Makefile.am graphviz-2.40.1/plugin/webp/Makefile.am
--- graphviz-2.40.1-orig/plugin/webp/Makefile.am 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/plugin/webp/Makefile.am 2018-01-19 10:49:55.452864000 +0300
@@ -27,6 +27,7 @@
libgvplugin_webp_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
libgvplugin_webp_la_SOURCES = $(libgvplugin_webp_C_la_SOURCES)
-libgvplugin_webp_la_LIBADD = @WEBP_LIBS@ @PANGOCAIRO_LIBS@
+libgvplugin_webp_la_LIBADD = @WEBP_LIBS@ @PANGOCAIRO_LIBS@ \
+ $(top_builddir)/lib/gvc/libgvc.la
if WITH_WIN32
libgvplugin_webp_la_LDFLAGS += -no-undefined -export-symbols $(top_srcdir)/plugin/webp/gvplugin_webp.def

37
mingw-w64-graphviz/PKGBUILD
View File

@@ -22,6 +22,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo"
"${MINGW_PACKAGE_PREFIX}-libgd"
"${MINGW_PACKAGE_PREFIX}-libpng"
"${MINGW_PACKAGE_PREFIX}-libsystre"
"${MINGW_PACKAGE_PREFIX}-libwebp"
"${MINGW_PACKAGE_PREFIX}-pango"
"${MINGW_PACKAGE_PREFIX}-poppler"
"${MINGW_PACKAGE_PREFIX}-zlib")
@@ -32,24 +33,37 @@ makedepends=(#"${MINGW_PACKAGE_PREFIX}-ocaml"
"${MINGW_PACKAGE_PREFIX}-ruby"
"${MINGW_PACKAGE_PREFIX}-tcl"
"${MINGW_PACKAGE_PREFIX}-zlib")
options=(libtool)
source=("http://www.graphviz.org/pub/${_realname}/stable/SOURCES/${_realname}-${pkgver}.tar.gz"
001-mingw-vs-msvc.patch
002-fix-dependency-detect.patch)
001-msvc-pragma.patch.patch
002-no-undefined-and-def-files.patch
003-fix-dependency-detect.patch
004-exports.patch
005-plugin-exports.patch
006-missing-libs.patch)
sha256sums=('ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421'
'1a9d4da42a083fb497c36aa446f8207770331599d24a4f8ec1aa9a22d71becfd'
'985ade9fb44e9ea78d6cc7d4c6b94fbc160ab5ab05880adaa0df7ccc632e3b54')
'f64a7c0fdfd15aedc8cf31c39c5017df1ac8e21f3ffa6f362e62952a8b990aef'
'62c4a7c92b6400a836ee5ee8f669d9ca57c457e82b74cd4af2c6537a72a61b5c'
'125ab01113fb39b8c42ab65a6e286193deb565171269462e764dbfe2ef78aeec'
'4d8b322664411bd82356825c9798b94b2843618134e9bcb8ad8bb1f138d6bc37'
'1b4ca68365a14c926fd42a20b7ee094eda7f4747a05af302fc109f66fab5e528'
'f90d3e43d3bb3b16a576ed9f4158498b0d6579c08f2f93d664a530d2097bda43')
prepare() {
cd "${srcdir}"/${_realname}-${pkgver}
patch -p1 -i ${srcdir}/001-mingw-vs-msvc.patch
patch -p1 -i ${srcdir}/002-fix-dependency-detect.patch
patch -p1 -i ${srcdir}/001-msvc-pragma.patch.patch
patch -p1 -i ${srcdir}/002-no-undefined-and-def-files.patch
patch -p1 -i ${srcdir}/003-fix-dependency-detect.patch
patch -p1 -i ${srcdir}/004-exports.patch
patch -p1 -i ${srcdir}/005-plugin-exports.patch
patch -p1 -i ${srcdir}/006-missing-libs.patch
autoreconf -fiv
}
build() {
local gd_incdir=$(pkg-config --variable=includedir gdlib)
cd "$srcdir"/${_realname}-${pkgver}
cd "${srcdir}"/${_realname}-${pkgver}
[[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
../${_realname}-${pkgver}/configure \
@@ -57,9 +71,14 @@ build() {
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
--target=${MINGW_CHOST} \
--enable-static \
--enable-guile=no \
--enable-perl=no \
--enable-php=no \
--enable-ocaml=no \
--with-webp=yes \
--with-gdincludedir=${gd_incdir} \
--enable-shared \
--with-gdincludedir=${gd_incdir}
--disable-static
make
}