Module Name: pkgsrc
Committed By: markd
Date: Sun Dec 31 00:36:05 UTC 2017
Modified Files:
pkgsrc/print/luatex: Makefile distinfo
Added Files:
pkgsrc/print/luatex/patches: patch-texk_web2c_luatexdir_luaffi_ctype.c
patch-texk_web2c_luatexdir_luaffi_ffi.h
Log Message:
luatex: gcc-7 fix
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/print/luatex/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/print/luatex/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ctype.c \
pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ffi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/print/luatex/Makefile
diff -u pkgsrc/print/luatex/Makefile:1.62 pkgsrc/print/luatex/Makefile:1.63
--- pkgsrc/print/luatex/Makefile:1.62 Thu Sep 7 14:17:07 2017
+++ pkgsrc/print/luatex/Makefile Sun Dec 31 00:36:04 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2017/09/07 14:17:07 tnn Exp $
+# $NetBSD: Makefile,v 1.63 2017/12/31 00:36:04 markd Exp $
DISTNAME= texlive-20170524-source
PKGNAME= luatex-1.0.4
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= print
MASTER_SITES= ftp://tug.org/historic/systems/texlive/2017/
EXTRACT_SUFX= .tar.xz
Index: pkgsrc/print/luatex/distinfo
diff -u pkgsrc/print/luatex/distinfo:1.26 pkgsrc/print/luatex/distinfo:1.27
--- pkgsrc/print/luatex/distinfo:1.26 Mon Aug 21 11:14:26 2017
+++ pkgsrc/print/luatex/distinfo Sun Dec 31 00:36:04 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2017/08/21 11:14:26 jperkin Exp $
+$NetBSD: distinfo,v 1.27 2017/12/31 00:36:04 markd Exp $
SHA1 (texlive-20170524-source.tar.xz) = 1c1383ddb1b871c6b8ce49a4ae3c1a33d454a7b6
RMD160 (texlive-20170524-source.tar.xz) = a8430c19fe1727cf308fe03e5838105260c0d71e
@@ -8,3 +8,5 @@ SHA1 (patch-ac) = 1ee83833a03eace2eada89
SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69
SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f
SHA1 (patch-texk_web2c_luatexdir_image_pdftoepdf.w) = 9f7563e5d3011c183092c9eb157560f912113d77
+SHA1 (patch-texk_web2c_luatexdir_luaffi_ctype.c) = 57d51564d5dd0200be10154216158fe801d7c630
+SHA1 (patch-texk_web2c_luatexdir_luaffi_ffi.h) = 2fbf91152fc3438d8e989d5f5f95877faaec6790
Added files:
Index: pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ctype.c
diff -u /dev/null pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ctype.c:1.1
--- /dev/null Sun Dec 31 00:36:05 2017
+++ pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ctype.c Sun Dec 31 00:36:04 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-texk_web2c_luatexdir_luaffi_ctype.c,v 1.1 2017/12/31 00:36:04 markd Exp $
+gcc-7 fix - Dr. Werner Fink <werner%suse.de@localhost>
+
+--- texk/web2c/luatexdir/luaffi/ctype.c.orig 2017-02-10 01:03:59.000000000 +0000
++++ texk/web2c/luatexdir/luaffi/ctype.c
+@@ -245,6 +245,10 @@ void* to_cdata(lua_State* L, int idx, st
+
+ lua_pop(L, 1); /* mt */
+ cd = (struct cdata*) lua_touserdata(L, idx);
++ if (!cd) {
++ lua_pushnil(L);
++ return NULL;
++ }
+ *ct = cd->type;
+ lua_getuservalue(L, idx);
+
Index: pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ffi.h
diff -u /dev/null pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ffi.h:1.1
--- /dev/null Sun Dec 31 00:36:05 2017
+++ pkgsrc/print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ffi.h Sun Dec 31 00:36:04 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-texk_web2c_luatexdir_luaffi_ffi.h,v 1.1 2017/12/31 00:36:04 markd Exp $
+gcc-7 fix - Dr. Werner Fink <werner%suse.de@localhost>
+
+--- texk/web2c/luatexdir/luaffi/ffi.h.orig 2017-03-11 01:04:06.000000000 +0000
++++ texk/web2c/luatexdir/luaffi/ffi.h
+@@ -370,7 +370,7 @@ __declspec(align(16))
+ #endif
+ struct cdata {
+ const struct ctype type
+-#ifdef __GNUC__
++#if 0 /* def __GNUC__ */
+ __attribute__ ((aligned(16)))
+ #endif
+ ;