|
|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
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 @@
|
|
|
|
|
--- configure.orig 2017-12-01 06:44:35.000000000 +0100
|
|
|
|
|
+++ configure 2019-01-19 01:10:20.718390000 +0100
|
|
|
|
|
@@ -20451,7 +20451,7 @@
|
|
|
|
|
if test "x$GUILE" = "x"; then
|
|
|
|
|
use_guile="No (guile not available)"
|
|
|
|
|
else
|
|
|
|
|
@ -10,7 +10,7 @@ Index: configure
|
|
|
|
|
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 @@
|
|
|
|
|
@@ -21019,7 +21019,9 @@
|
|
|
|
|
|
|
|
|
|
LUA_INCLUDES=""
|
|
|
|
|
LUA_LIBS=""
|
|
|
|
|
@ -21,29 +21,29 @@ Index: configure
|
|
|
|
|
|
|
|
|
|
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`
|
|
|
|
|
@@ -21038,13 +21040,13 @@
|
|
|
|
|
pkgconfig_lua_found=`$PKG_CONFIG --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`"
|
|
|
|
|
LUA_VERSION=`$PKG_CONFIG --modversion lua$l`
|
|
|
|
|
- LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l`
|
|
|
|
|
+ LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags-only-I lua$l`
|
|
|
|
|
LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l`
|
|
|
|
|
LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`"
|
|
|
|
|
|
|
|
|
|
pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
|
|
|
|
|
pkgconfig_lualib_found=`$PKG_CONFIG --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`
|
|
|
|
|
- LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lualib$l`
|
|
|
|
|
+ LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags-only-I lualib$l`
|
|
|
|
|
LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --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
|
|
|
|
|
--- lib/ortho/trapezoid.c.orig 2017-08-19 06:44:12.000000000 +0200
|
|
|
|
|
+++ lib/ortho/trapezoid.c 2019-01-16 07:58:14.973760000 +0100
|
|
|
|
|
@@ -26,6 +26,11 @@
|
|
|
|
|
#include <memory.h>
|
|
|
|
|
#include <trap.h>
|
|
|
|
|
|
|
|
|
|
+#include <sys/param.h>
|
|
|
|
|
+#if __FreeBSD_version <= 704101 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
|
|
|
|
|
@ -54,23 +54,23 @@ Index: lib/ortho/trapezoid.c
|
|
|
|
|
|
|
|
|
|
#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>
|
|
|
|
|
--- lib/sfio/sfhdr.h.orig 2019-01-16 07:58:14.973994000 +0100
|
|
|
|
|
+++ lib/sfio/sfhdr.h 2019-01-19 01:10:46.827497000 +0100
|
|
|
|
|
@@ -31,6 +31,10 @@
|
|
|
|
|
#include "sfio_t.h"
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
|
|
+#ifndef va_copy
|
|
|
|
|
+#define va_copy(to,fr) ((to)=(fr))
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
#if vt_threaded
|
|
|
|
|
#include <vthread.h>
|
|
|
|
|
|
|
|
|
|
/* initialization */
|
|
|
|
|
#if defined(__mips) && __mips == 2 && !defined(_NO_LARGEFILE64_SOURCE)
|
|
|
|
|
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 @@
|
|
|
|
|
--- plugin/gd/gvrender_gd.c.orig 2017-04-07 06:44:57.000000000 +0200
|
|
|
|
|
+++ plugin/gd/gvrender_gd.c 2019-01-16 07:58:14.974240000 +0100
|
|
|
|
|
@@ -32,6 +32,10 @@
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -82,16 +82,16 @@ Index: plugin/gd/gvrender_gd.c
|
|
|
|
|
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
|
|
|
|
|
--- plugin/gd/gvtextlayout_gd.c.orig 2019-01-16 07:58:14.974379000 +0100
|
|
|
|
|
+++ plugin/gd/gvtextlayout_gd.c 2019-01-19 01:11:11.709694000 +0100
|
|
|
|
|
@@ -19,6 +19,10 @@
|
|
|
|
|
#include "gvplugin_textlayout.h"
|
|
|
|
|
#include "gd.h"
|
|
|
|
|
|
|
|
|
|
+#ifndef HAVE_GD_FONTCONFIG
|
|
|
|
|
+#define HAVE_GD_FONTCONFIG
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
#if defined(HAVE_LIBGD) && defined(HAVE_GD_FREETYPE)
|
|
|
|
|
#ifdef HAVE_GD_FREETYPE
|
|
|
|
|
|
|
|
|
|
/* fontsize at which text is omitted entirely */
|
|
|
|
|
|