20170731:

This incorporates a large number of adjustments and fixes and adds packages for newer Ubuntu releases.

2 files changed, 29 insertions, 26 deletions

diff --git a/fonts/fontforge/patches/patch-configure b/fonts/fontforge/patches/patch-configure
index 29fd675b9b6..4991c5ec633 100644
--- a/fonts/fontforge/patches/patch-configure
+++ b/fonts/fontforge/patches/patch-configure
@@ -1,19 +1,11 @@
-$NetBSD: patch-configure,v 1.2 2016/04/07 10:09:02 adam Exp $
+$NetBSD: patch-configure,v 1.3 2017/08/25 09:20:38 adam Exp $
 
-Fix building on OS X.
-Portability fix.
+Portability fixes.
+Disable IPython modules.
 
---- configure.orig	2016-04-05 01:57:34.000000000 +0000
+--- configure.orig	2017-07-31 08:30:42.386015000 +0000
 +++ configure
-@@ -15228,7 +15228,6 @@ $as_echo "#define __Mac 1" >>confdefs.h
-        MACAPP=""
-       fi
- 
--      RAW_COMPILE_PLATFORM_CFLAGS=" $CFLAGS -arch x86_64 -arch i386 "
- 
- 
- 
-@@ -19653,7 +19652,7 @@ fi
+@@ -20382,7 +20382,7 @@ fi
  
  fi
  
@@ -22,7 +14,18 @@ Portability fix.
        ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
  if test "x$ac_cv_header_zlib_h" = xyes; then :
  
-@@ -35279,7 +35278,7 @@ fi
+@@ -37045,9 +37045,8 @@ if test x"${i_do_have_python_scripting}"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPython" >&5
+ $as_echo_n "checking for IPython... " >&6; }
+    if $( $PYTHON -c 'import IPython' 2>&5 ); then
+-        have_ipython=yes;
++        have_ipython=no;
+ 
+-$as_echo "#define HAVE_IPYTHON 1" >>confdefs.h
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -37090,7 +37089,7 @@ fi
  #--------------------------------------------------------------------------
  
  # Check whether --enable-breakpad was given.
@@ -31,3 +34,12 @@ Portability fix.
    enableval=$enable_breakpad; have_breakpad=yes
  fi
  
+@@ -37307,7 +37306,7 @@ FONTFORGE_DATE_NOW=${SOURCE_DATE_EPOCH:-
+ FONTFORGE_DATE_OPTS="--date=@${FONTFORGE_DATE_NOW}"
+ if ! date --version 2>/dev/null ; then
+   # Use POSIX date instead of GNU date on BSD systems
+-  FONTFORGE_DATE_OPTS="-j -f %s ${FONTFORGE_DATE_NOW}"
++  FONTFORGE_DATE_OPTS="-j -r ${FONTFORGE_DATE_NOW}"
+ fi
+ FONTFORGE_MODTIME="$(date -u $FONTFORGE_DATE_OPTS +'%s')L"
+ FONTFORGE_MODTIME_STR="$(date -u $FONTFORGE_DATE_OPTS +'%H:%M %Z %e-%b-%Y')"
diff --git a/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in b/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in
index a86aaf2134d..c864d79ba25 100644
--- a/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in
+++ b/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-fontforgeexe_Makefile.in,v 1.2 2017/08/24 10:45:00 jperkin Exp $
+$NetBSD: patch-fontforgeexe_Makefile.in,v 1.3 2017/08/25 09:20:38 adam Exp $
 
 Fix linking Objective-C code.
 
---- fontforgeexe/Makefile.in.orig	2016-10-04 12:30:31.000000000 +0000
+--- fontforgeexe/Makefile.in.orig	2017-07-31 08:30:47.000000000 +0000
 +++ fontforgeexe/Makefile.in
-@@ -380,7 +380,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -391,7 +391,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
  am__v_lt_1 = 
  libfontforgeexe_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
@@ -13,12 +13,3 @@ Fix linking Objective-C code.
  	$(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) \
  	$(libfontforgeexe_la_LDFLAGS) $(LDFLAGS) -o $@
  PROGRAMS = $(bin_PROGRAMS)
-@@ -2039,7 +2039,7 @@ fontforge-main.obj: main.c
- 	$(AM_V_OBJC)$(LTOBJCCOMPILE) -c -o $@ $<
- 
- libfontforgeexe_la-macobjective.lo: macobjective.m
--	$(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfontforgeexe_la_CPPFLAGS) $(CPPFLAGS) $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) -c -o libfontforgeexe_la-macobjective.lo `test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m
-+	$(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=CC --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfontforgeexe_la_CPPFLAGS) $(CPPFLAGS) $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) -c -o libfontforgeexe_la-macobjective.lo `test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m
- 
- mostlyclean-libtool:
- 	-rm -f *.lo