da0ecc79a3
elements in the array. - Add graphviz-proper_prototypes.patch that changes dthdr.h to include ast_common.h to get __STD_C defined, which in turn enables proper prototypes. - Remove graphviz-2.18-do_not_use_ocamlopt.patch as it's not needed anymore. - Adapt graphviz-guile.patch, graphviz-plugins-fix_install_dirs.patch and graphviz-python_version.patch to the new sources. - Add graphviz-java_in_lib64.patch to search in /usr/lib64/jvm for the java headers on platforms using lib64. - Add graphviz-proper_use_of_qw.patch to put the use of qw in config/config_perl.pl in brackets. - Add graphviz-useless_warnings.patch to make gcc not warn about harmless issues that arise from code generated by swig. - Add patch tags in the spec files - Upstreamed all patches that aren't SUSE specific. lib/common/shapes.c(round_corners) by increasing the number of elements in the array. - Add graphviz-proper_prototypes.patch that changes dthdr.h to include ast_common.h to get __STD_C defined, which in turn enables proper prototypes. - Add patch tags in the spec files - Upstreamed all patches that aren't SUSE specific. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=60
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
---
|
|
configure | 6 +++---
|
|
configure.ac | 4 ++--
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
Index: configure
|
|
===================================================================
|
|
--- configure.orig 2013-08-01 19:39:03.000000000 +0200
|
|
+++ configure 2013-09-03 18:16:16.259887587 +0200
|
|
@@ -22152,8 +22152,8 @@ done
|
|
else
|
|
PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
|
|
fi
|
|
- PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
|
|
- PHP_INSTALL_DATADIR="/usr/share/php"
|
|
+ PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php5/extensions"
|
|
+ PHP_INSTALL_DATADIR="/usr/share/php5"
|
|
PHP_LIBS=
|
|
save_CPPFLAGS=$CPPFLAGS
|
|
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
|
|
@@ -23704,7 +23704,7 @@ $as_echo "using $TCLCONFIG" >&6; }
|
|
$as_echo "$as_me: WARNING: Unable to find tclConfig.sh. The Tcl packages will not be built" >&2;}
|
|
use_tcl="No (missing tclConfig.sh)"
|
|
fi
|
|
- TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}"
|
|
+ TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}"
|
|
fi
|
|
|
|
if test "x$use_tcl" == "x"; then
|
|
Index: configure.ac
|
|
===================================================================
|
|
--- configure.ac.orig 2013-09-03 18:11:59.386022594 +0200
|
|
+++ configure.ac 2013-09-03 18:11:59.427021615 +0200
|
|
@@ -1091,8 +1091,8 @@ else
|
|
else
|
|
PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
|
|
fi
|
|
- PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
|
|
- PHP_INSTALL_DATADIR="/usr/share/php"
|
|
+ PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php5/extensions"
|
|
+ PHP_INSTALL_DATADIR="/usr/share/php5"
|
|
PHP_LIBS=
|
|
save_CPPFLAGS=$CPPFLAGS
|
|
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
|