public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vala_0_44: fix graphviz patch

Browse Source
This commit is contained in:
worldofpeace 2019-05-03 15:28:22 -04:00
parent 56b560942c
commit 3b481dfdf9
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/vala/default.nix
View File

@ -41,7 +41,7 @@ let
# We've reverted the addition of the "--disable-valadoc" option # We've reverted the addition of the "--disable-valadoc" option
# and then applied the following patch. # and then applied the following patch.
# 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch # 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch
"0.44" = ./disable-graphviz-0.44.1.patch; "0.44" = ./disable-graphviz-0.44.3.patch;
}.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala");

8
pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch → pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch
View File

@ -23,13 +23,13 @@ index f70234759..b3d6c3833 100644
if ENABLE_UNVERSIONED if ENABLE_UNVERSIONED
aclocaldir = $(datadir)/aclocal aclocaldir = $(datadir)/aclocal
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 16ebd1f81..cf23db4b8 100644 index 504db13aa..622397747 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -156,10 +156,11 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) @@ -157,10 +157,11 @@ AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS) AC_SUBST(GMODULE_LIBS)
AC_ARG_WITH(cgraph, AS_HELP_STRING([--with-cgraph], [Required flag for cross-compilation to define capability of graphviz]), [], with_cgraph=check)
-AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes) -AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
-if test x$enable_valadoc = xyes; then -if test x$enable_valadoc = xyes; then
+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) +AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
@ -40,7 +40,7 @@ index 16ebd1f81..cf23db4b8 100644
cgraph_tmp_LIBADD="$LIBADD" cgraph_tmp_LIBADD="$LIBADD"
cgraph_tmp_CFLAGS="$CFLAGS" cgraph_tmp_CFLAGS="$CFLAGS"
LIBADD="$LIBADD $LIBGVC_LIBS" LIBADD="$LIBADD $LIBGVC_LIBS"
@@ -186,8 +187,8 @@ if test x$enable_valadoc = xyes; then @@ -198,8 +199,8 @@ if test x$enable_valadoc = xyes; then
LIBADD="$cgraph_tmp_LIBADD" LIBADD="$cgraph_tmp_LIBADD"
CFLAGS="$cgraph_tmp_CFLAGS" CFLAGS="$cgraph_tmp_CFLAGS"
fi fi