diff options
Diffstat (limited to 'media-gfx/graphviz/files')
9 files changed, 363 insertions, 0 deletions
diff --git a/media-gfx/graphviz/files/graphviz-2.26.3-automake-1.11.2.patch b/media-gfx/graphviz/files/graphviz-2.26.3-automake-1.11.2.patch new file mode 100644 index 000000000000..86280f2b05dd --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.26.3-automake-1.11.2.patch @@ -0,0 +1,35 @@ +Install dir ( buiding with media-libs/ming ): + /usr/$(get_libdir)/graphviz/Bitstream_Vera_Serif.fdb + /usr/$(get_libdir)/graphviz/Bitstream_Vera_Sans.fdb + /usr/include/graphviz/gv.cpp + /usr/include/graphviz/gv.i + +Due to the following change, {pkglib,pkginclude}_DATA is invalid: + http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf + +--- +diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am +--- a/plugin/ming/Makefile.am ++++ b/plugin/ming/Makefile.am +@@ -17,7 +17,8 @@ lib_LTLIBRARIES = libgvplugin_ming.la + else + pkglib_LTLIBRARIES = libgvplugin_ming.la + endif +-pkglib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb ++fdblibdir = $(libdir)/@PACKAGE@ ++fdblib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb + endif + + libgvplugin_ming_C_la_SOURCES = \ +diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am +--- a/tclpkg/gv/Makefile.am ++++ b/tclpkg/gv/Makefile.am +@@ -258,7 +258,7 @@ libgv_tcl_la_CPPFLAGS = $(BASECPPFLAGS) + gv_tcl.cpp: gv.i + $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i + +-pkginclude_DATA = gv.i gv.cpp ++pkginclude_HEADERS = gv.i gv.cpp + pkglib_LTLIBRARIES = + man_MANS = + pdf_DATA = diff --git a/media-gfx/graphviz/files/graphviz-2.26.3-libtool-configure.patch b/media-gfx/graphviz/files/graphviz-2.26.3-libtool-configure.patch new file mode 100644 index 000000000000..142aea2843fd --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.26.3-libtool-configure.patch @@ -0,0 +1,52 @@ +backport newer libtool logic + +https://bugs.gentoo.org/539032 + +--- a/configure.ac ++++ b/configure.ac +@@ -464,28 +464,15 @@ + dnl ----------------------------------- + dnl libtool ltdl on-demand plugin loading + +-m4_ifdef([LT_INIT], +- [ #code that is for Libtool 2.x +-AM_PROG_LIBTOOL +- ], +- [ #code that is for 1.5.x +- ]) ++LT_INIT([dlopen]) ++LT_CONFIG_LTDL_DIR([libltdl]) ++LTDL_INIT ++ + AC_ARG_ENABLE(ltdl, + [AS_HELP_STRING([--enable-ltdl],[support on-demand plugin loading])]) + if test "x$enable_ltdl" != "xno"; then + AC_DEFINE(ENABLE_LTDL,1,[Define if you want on-demand plugin loading]) +- AC_LIBTOOL_DLOPEN +-m4_ifdef([LT_INIT], +- [ #code that is for Libtool 2.x +- LT_CONFIG_LTDL_DIR([libltdl]) +- LTDL_INIT +- ], +- [ #code that is for 1.5.x +- AC_CONFIG_SUBDIRS([libltdl]) +- ]) + use_ltdl="Yes" +- +- AC_LIBLTDL_CONVENIENCE + if test "x$DARWIN9" = "xyes"; then + LIBLTDL_LDFLAGS="-Wl,-unexported_symbol,_lt_*" + fi +@@ -494,12 +483,6 @@ + AC_SUBST(INCLTDL) + AC_SUBST(LIBLTDL) + AC_SUBST(LIBLTDL_LDFLAGS) +-m4_ifdef([LT_INIT], +- [ #code that is for Libtool 2.x +- ], +- [ #code that is for 1.5.x +-AM_PROG_LIBTOOL +- ]) + + # Checks for libraries. + #AC_CHECK_LIB([ICE], [main]) diff --git a/media-gfx/graphviz/files/graphviz-2.26.3-libtool.patch b/media-gfx/graphviz/files/graphviz-2.26.3-libtool.patch new file mode 100644 index 000000000000..f82312dbbebf --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.26.3-libtool.patch @@ -0,0 +1,27 @@ +http://bugs.gentoo.org/339298 + +--- lib/gvc/gvcext.h ++++ lib/gvc/gvcext.h +@@ -80,9 +80,11 @@ + #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 ++#endif + + + #ifdef __cplusplus +--- lib/gvc/Makefile.am ++++ lib/gvc/Makefile.am +@@ -18,7 +18,7 @@ + -I$(top_srcdir)/lib/pathplan \ + -I$(top_srcdir)/lib/$(GRAPH) \ + -I$(top_srcdir)/lib/cdt \ +- $(INCLTDL) -I$(top_srcdir)/libltdl \ ++ $(INCLTDL) \ + -DGVLIBDIR=\"$(pkglibdir)\" + + if WITH_WIN32 diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch b/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch new file mode 100644 index 000000000000..095354f49536 --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch @@ -0,0 +1,71 @@ +--- configure.ac.old 2011-05-07 05:25:24.000000000 +0200 ++++ configure.ac 2011-06-24 13:24:49.000000000 +0200 +@@ -1924,6 +1924,10 @@ + # so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM + # + ++AC_ARG_WITH(lefty, ++ [AS_HELP_STRING([--with-lefty=yes],[build lefty])], ++ [],[with_xaw=yes]) ++ + AC_ARG_WITH(Xpmincludedir, + [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])], + [XPM_INCLUDES="-I$withval"]) +@@ -1931,6 +1935,17 @@ + [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])], + [XPM_LIBS="-L$withval"]) + ++AC_ARG_WITH(Xawincludedir, ++ [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])], ++ [XAW_INCLUDES="-I$withval"]) ++AC_ARG_WITH(Xawlibdir, ++ [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])], ++ [XAW_LIBS="-L$withval"]) ++ ++if test "x$with_xaw" != "xyes"; then ++ use_lefty="No (disabled)" ++else ++ + save_CPPFLAGS=$CPPFLAGS + save_LDFLAGS=$LDFLAGS + CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS" +@@ -1941,18 +1956,10 @@ + AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS]) + LDFLAGS=$save_LDFLAGS + CPPFLAGS=$save_CPPFLAGS +-AC_SUBST(XPM_INCLUDES) +-AC_SUBST(XPM_LIBS) + + dnl ----------------------------------- + dnl INCLUDES and LIBS for XAW + +-AC_ARG_WITH(Xawincludedir, +- [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])], +- [XAW_INCLUDES="-I$withval"]) +-AC_ARG_WITH(Xawlibdir, +- [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])], +- [XAW_LIBS="-L$withval"]) + save_CPPFLAGS=$CPPFLAGS + save_LDFLAGS=$LDFLAGS + CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS" +@@ -1978,12 +1985,17 @@ + fi + LDFLAGS=$save_LDFLAGS + CPPFLAGS=$save_CPPFLAGS ++ ++fi ++ ++AC_SUBST(XPM_INCLUDES) ++AC_SUBST(XPM_LIBS) + AC_SUBST(XAW_INCLUDES) + AC_SUBST(XAW_LIBS) +-AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"]) +-if test "x$with_xaw" = "xno"; then ++AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"]) ++if test "x$with_xaw" != "xyes"; then + if test "x$no_x" != "xyes"; then +- AC_MSG_WARN(Lefty cannot be built) ++ AC_MSG_WARN(Lefty will not be built) + fi + fi + diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch b/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch new file mode 100644 index 000000000000..7b279fccc145 --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch @@ -0,0 +1,33 @@ +Install dir ( buiding with media-libs/ming ): + /usr/$(get_libdir)/graphviz/Bitstream_Vera_Serif.fdb + /usr/$(get_libdir)/graphviz/Bitstream_Vera_Sans.fdb + /usr/include/graphviz/gv.cpp + /usr/include/graphviz/gv.i + +Due to the following change, {pkglib,pkginclude}_DATA is invalid: + http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf + +--- +--- a/plugin/ming/Makefile.am ++++ b/plugin/ming/Makefile.am +@@ -17,7 +17,8 @@ lib_LTLIBRARIES = libgvplugin_ming.la + else + pkglib_LTLIBRARIES = libgvplugin_ming.la + endif +-pkglib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb ++fdblibdir = $(libdir)/@PACKAGE@ ++fdblib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb + endif + + libgvplugin_ming_C_la_SOURCES = \ +--- a/tclpkg/gv/Makefile.am ++++ b/tclpkg/gv/Makefile.am +@@ -257,7 +257,7 @@ $(TCL_data): gv_tcl.cpp + gv_tcl.cpp: gv.i + $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i + +-pkginclude_DATA = gv.i gv.cpp ++pkginclude_HEADERS = gv.i gv.cpp + pkglib_LTLIBRARIES = + man_MANS = + DEVTSTS = diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch b/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch new file mode 100644 index 000000000000..cf1715cf2ad0 --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch @@ -0,0 +1,13 @@ +--- cmd/dot/Makefile.am 2012-05-29 01:00:08.965321443 +0200 ++++ cmd/dot/Makefile.am 2012-05-29 01:01:57.471964924 +0200 +@@ -115,8 +115,8 @@ + endif + + if WITH_PANGOCAIRO +-dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) +-dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) ++dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) ++dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) + endif + + EXTRA_DIST = Makefile.old dot.1 dot.1.pdf osage.1 osage.1.pdf patchwork.1 patchwork.1.pdf dot.vcproj diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch new file mode 100644 index 000000000000..ac91d4bd4d46 --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch @@ -0,0 +1,81 @@ +--- configure.ac 2011-05-07 05:25:24.000000000 +0200 ++++ configure.ac 2011-06-24 13:24:49.000000000 +0200 +@@ -560,8 +560,8 @@ + use_xlib="Yes" + #no x11.pc on centos4 + # PKG_CHECK_MODULES(X11, [x11]) +- PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no") + fi ++PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no") + AM_CONDITIONAL(WITH_X, [test "x$use_xlib" = "xYes"]) + AM_CONDITIONAL(WITH_XRENDER, [test "x$,HAVE_XRENDER" = "xyes"]) + +@@ -1924,6 +1924,10 @@ + # so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM + # + ++AC_ARG_WITH(lefty, ++ [AS_HELP_STRING([--with-lefty=yes],[build lefty])], ++ [],[with_xaw=yes]) ++ + AC_ARG_WITH(Xpmincludedir, + [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])], + [XPM_INCLUDES="-I$withval"]) +@@ -1931,6 +1935,17 @@ + [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])], + [XPM_LIBS="-L$withval"]) + ++AC_ARG_WITH(Xawincludedir, ++ [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])], ++ [XAW_INCLUDES="-I$withval"]) ++AC_ARG_WITH(Xawlibdir, ++ [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])], ++ [XAW_LIBS="-L$withval"]) ++ ++if test "x$with_xaw" != "xyes"; then ++ use_lefty="No (disabled)" ++else ++ + save_CPPFLAGS=$CPPFLAGS + save_LDFLAGS=$LDFLAGS + CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS" +@@ -1941,18 +1956,10 @@ + AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS]) + LDFLAGS=$save_LDFLAGS + CPPFLAGS=$save_CPPFLAGS +-AC_SUBST([XPM_INCLUDES]) +-AC_SUBST([XPM_LIBS]) + + dnl ----------------------------------- + dnl INCLUDES and LIBS for XAW + +-AC_ARG_WITH(Xawincludedir, +- [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])], +- [XAW_INCLUDES="-I$withval"]) +-AC_ARG_WITH(Xawlibdir, +- [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])], +- [XAW_LIBS="-L$withval"]) + save_CPPFLAGS=$CPPFLAGS + save_LDFLAGS=$LDFLAGS + CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS" +@@ -1978,12 +1985,17 @@ + fi + LDFLAGS=$save_LDFLAGS + CPPFLAGS=$save_CPPFLAGS ++ ++fi ++ ++AC_SUBST([XPM_INCLUDES]) ++AC_SUBST([XPM_LIBS]) + AC_SUBST([XAW_INCLUDES]) + AC_SUBST([XAW_LIBS]) +-AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"]) +-if test "x$with_xaw" = "xno"; then ++AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"]) ++if test "x$with_xaw" != "xyes"; then + if test "x$no_x" != "xyes"; then +- AC_MSG_WARN(Lefty cannot be built) ++ AC_MSG_WARN(Lefty will not be built) + fi + fi + diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch b/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch new file mode 100644 index 000000000000..143beabe5058 --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch @@ -0,0 +1,17 @@ +--- cmd/dot/Makefile.am 2013-01-14 04:11:21.000000000 +0100 ++++ cmd/dot/Makefile.am 2013-02-01 17:19:30.893949329 +0100 +@@ -115,12 +115,8 @@ + dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS) + dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS) + endif +-dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) +-dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) +-if WITH_WEBP +-dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS) +-dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS) +-endif ++dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) ++dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) + endif + + if WITH_LASI diff --git a/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch b/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch new file mode 100644 index 000000000000..b4e911de6a94 --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch @@ -0,0 +1,34 @@ +User reported a regression between 2.26 and 2.36 +when trying to .dot the following graph: + + digraph g { + 1 -> 2 [label="\\"] + } + +2.26 shows it as '\' while 2.36 fails as: + $ dot -Tpng a.dot -o a.png + Warning: 1.dot: syntax error in line 2 near '' + +Thanks to Ulya Trofimovich who found and bisected +the problem down to this commit, which fixes problem +only in git version. + +commit 386e47c14b3a8e83bdf3ec8772963213095a7294 +Author: Emden R. Gansner <erg@alum.mit.edu> +Date: Thu Jan 30 08:45:06 2014 -0500 + + Remove change made in d19b672a3c06f0ae95b1da38b63b068f71eb266f until we can + remember why this change was made. + +diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l +index 0a31f0c..5bb30b7 100644 +--- a/lib/cgraph/scan.l ++++ b/lib/cgraph/scan.l +@@ -199,6 +199,7 @@ ID ({NAME}|{NUMBER}) + ["] BEGIN(qstring); beginstr(); + <qstring>["] BEGIN(INITIAL); endstr(); return (T_qatom); + <qstring>[\\]["] addstr ("\""); ++<qstring>[\\][\\] addstr ("\\\\"); + <qstring>[\\][\n] line_num++; /* ignore escaped newlines */ + <qstring>([^"\\]*|[\\]) addstr(yytext); + [<] BEGIN(hstring); html_nest = 1; beginstr(); |