You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
97 lines
3.2 KiB
97 lines
3.2 KiB
Index: configure |
|
--- configure.orig 2016-12-20 17:07:02.000000000 +0100 |
|
+++ configure 2016-12-20 19:37:16.133054000 +0100 |
|
@@ -21064,7 +21064,7 @@ |
|
if test "x$GUILE" = "x"; then |
|
use_guile="No (guile not available)" |
|
else |
|
- GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'` |
|
+ GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \([0-9\.]*\)$/\1/ p'` |
|
GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1` |
|
GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2` |
|
if test 0$GUILE_VERSION_MAJOR -lt 2; then |
|
@@ -21632,7 +21632,9 @@ |
|
|
|
LUA_INCLUDES="" |
|
LUA_LIBS="" |
|
- LUA_INSTALL_DIR="" |
|
+ if test -z "$LUA_INSTALL_DIR" ; then |
|
+ LUA_INSTALL_DIR="" |
|
+ fi |
|
|
|
if test -n "$lua_inc"; then |
|
CFLAGS="$CFLAGS -I$lua_inc" |
|
@@ -21694,13 +21696,13 @@ |
|
pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null` |
|
if test "x$?" = "x0" ; then |
|
LUA_VERSION=`$PKGCONFIG --modversion lua$l` |
|
- LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l` |
|
+ LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags-only-I lua$l` |
|
LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l` |
|
LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`" |
|
|
|
pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null` |
|
if test "x$?" = "x0"; then |
|
- LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l` |
|
+ LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags-only-I lualib$l` |
|
LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l` |
|
fi |
|
break |
|
Index: lib/expr/Makefile |
|
Index: lib/ortho/trapezoid.c |
|
--- lib/ortho/trapezoid.c.orig 2016-09-20 06:45:02.000000000 +0200 |
|
+++ lib/ortho/trapezoid.c 2016-12-20 19:37:17.033130000 +0100 |
|
@@ -30,6 +30,11 @@ |
|
#define log2(x) (log(x)/log(2)) |
|
#endif |
|
|
|
+#include <sys/param.h> |
|
+#if __FreeBSD_version <= 704101 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) |
|
+#define log2(x) (log(x)/log(2)) |
|
+#endif |
|
+ |
|
/* Node types */ |
|
|
|
#define T_X 1 |
|
Index: lib/sfio/sfhdr.h |
|
--- lib/sfio/sfhdr.h.orig 2016-12-08 06:43:20.000000000 +0100 |
|
+++ lib/sfio/sfhdr.h 2016-12-20 19:37:17.033504000 +0100 |
|
@@ -92,6 +92,10 @@ |
|
#include <errno.h> |
|
#include <ctype.h> |
|
|
|
+#ifndef va_copy |
|
+#define va_copy(to,fr) ((to)=(fr)) |
|
+#endif |
|
+ |
|
#if vt_threaded |
|
|
|
/* initialization */ |
|
Index: plugin/gd/gvrender_gd.c |
|
--- plugin/gd/gvrender_gd.c.orig 2016-10-08 19:56:00.000000000 +0200 |
|
+++ plugin/gd/gvrender_gd.c 2016-12-20 19:37:17.033853000 +0100 |
|
@@ -37,6 +37,10 @@ |
|
#endif |
|
|
|
|
|
+#ifndef HAVE_GD_FONTCONFIG |
|
+#define HAVE_GD_FONTCONFIG |
|
+#endif |
|
+ |
|
typedef enum { |
|
FORMAT_GIF, |
|
FORMAT_JPEG, |
|
Index: plugin/gd/gvtextlayout_gd.c |
|
--- plugin/gd/gvtextlayout_gd.c.orig 2016-09-20 06:45:02.000000000 +0200 |
|
+++ plugin/gd/gvtextlayout_gd.c 2016-12-20 19:37:17.034043000 +0100 |
|
@@ -21,6 +21,10 @@ |
|
#ifdef HAVE_LIBGD |
|
#include "gd.h" |
|
|
|
+#ifndef HAVE_GD_FONTCONFIG |
|
+#define HAVE_GD_FONTCONFIG |
|
+#endif |
|
+ |
|
#if defined(HAVE_LIBGD) && defined(HAVE_GD_FREETYPE) |
|
|
|
/* fontsize at which text is omitted entirely */
|
|
|