patches/vala/vala-0.42.2-avoid_graphviz-1.patch

   1 Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
   2 Date: 2018-09-28
   3 Initial Package Version: 2.7.8
   4 Upstream Status: BLFS-specific
   5 Origin: BLFS
   6 Description: For a while we have been using a sed to allow graphviz
   7 to be treated as optional instead of required. With new releases it
   8 becomes hard to determine what changes to make so that the sed will
   9 do the right thing. In this case a patch shows what we want to
  10 achieve, and often (e.g. from 0.40.8 to 0.42.0) applies with only
  11 an offset.
  12
  13 diff -Naur vala-0.42.0.orig/configure.ac vala-0.42.0/configure.ac
  14 --- vala-0.42.0.orig/configure.ac       2018-08-20 17:17:35.000000000 +0100
  15 +++ vala-0.42.0/configure.ac    2018-09-28 20:21:07.645337464 +0100
  16 @@ -119,32 +119,12 @@
  17  AC_SUBST(GMODULE_CFLAGS)
  18  AC_SUBST(GMODULE_LIBS)
  19
  20 -PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
  21  AC_MSG_CHECKING([for CGRAPH])
  22  cgraph_tmp_LIBADD="$LIBADD"
  23  cgraph_tmp_CFLAGS="$CFLAGS"
  24  LIBADD="$LIBADD $LIBGVC_LIBS"
  25  CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
  26 -AC_RUN_IFELSE(
  27 -       [AC_LANG_SOURCE([
  28 -               #include <gvc.h>
  29 -
  30 -               int main(void) {
  31 -                       #ifdef WITH_CGRAPH
  32 -                               return 0;
  33 -                       #else
  34 -                               return -1;
  35 -                       #endif
  36 -               }
  37 -       ])], [
  38 -               AC_MSG_RESULT([yes])
  39 -               VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
  40 -               have_cgraph=yes
  41 -       ], [
  42 -               AC_MSG_RESULT([no])
  43                 have_cgraph=no
  44 -       ]
  45 -)
  46  LIBADD="$cgraph_tmp_LIBADD"
  47  CFLAGS="$cgraph_tmp_CFLAGS"
  48  AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
  49 diff -Naur vala-0.42.0.orig/configure.ac.orig vala-0.42.0/configure.ac.orig
  50 diff -Naur vala-0.42.0.orig/Makefile.am vala-0.42.0/Makefile.am
  51 --- vala-0.42.0.orig/Makefile.am        2018-08-20 17:17:34.000000000 +0100
  52 +++ vala-0.42.0/Makefile.am     2018-09-28 20:21:07.645337464 +0100
  53 @@ -13,8 +13,6 @@
  54         doc \
  55         gobject-introspection \
  56         vapigen \
  57 -       libvaladoc \
  58 -       valadoc \
  59         $(NULL)
  60
  61  if ENABLE_UNVERSIONED