reinit the tree, so we can have metadata

3 files changed, 130 insertions, 0 deletions

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..2283cc5dab40
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
@@ -0,0 +1,81 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -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..df5ea34d3297
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
@@ -0,0 +1,17 @@
+--- a/cmd/dot/Makefile.am
++++ b/cmd/dot/Makefile.am
+@@ -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.0-ghostscript-9.18.patch b/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch
new file mode 100644
index 000000000000..9d0d78a1580a
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch
@@ -0,0 +1,32 @@
+From 8da53964edec8a665c3996d483df243eb150c2c4 Mon Sep 17 00:00:00 2001
+From: Jakob Nixdorf <flocke@shadowice.org>
+Date: Fri, 22 Jan 2016 20:10:42 +0100
+Subject: [PATCH] Fix build with ghostscript-9.18.
+
+--- a/plugin/gs/gvloadimage_gs.c
++++ b/plugin/gs/gvloadimage_gs.c
+@@ -32,6 +32,24 @@
+ #include <ghostscript/ierrors.h>
+ #include <cairo/cairo.h>
+ 
++
++/**
++ * Ensure compatibility with Ghostscipt versions newer than 9.18
++ * while maintaining compatibility with the older versions.
++ **/
++
++#ifndef e_VMerror
++#define e_VMerror gs_error_VMerror
++#endif
++
++#ifndef e_unregistered
++#define e_unregistered gs_error_unregistered
++#endif
++
++#ifndef e_invalidid
++#define e_invalidid gs_error_invalidid
++#endif
++
+ #ifdef WIN32
+ #define NUL_FILE "nul"
+ #else