View | Details | Raw Unified | Return to bug 234221 | Differences between
and this patch

Collapse All | Expand All

(-)print/tex-luatex/Makefile (-4 / +2 lines)
Lines 74-87 CONFIGURE_ARGS+=--with-system-$L \ Link Here
74
		--with-$L-include=${LOCALBASE}/include \
74
		--with-$L-include=${LOCALBASE}/include \
75
		--with-$L-libdir=${LOCALBASE}/lib
75
		--with-$L-libdir=${LOCALBASE}/lib
76
.endfor
76
.endfor
77
CONFIGURE_ARGS+=CC="${CC}" \
78
		CXX="${CXX}"
77
CPPFLAGS+=	-I${LOCALBASE}/include
79
CPPFLAGS+=	-I${LOCALBASE}/include
78
MAKE_JOBS_UNSAFE=	yes
80
MAKE_JOBS_UNSAFE=	yes
79
TEX_FORMATS=	luatex
81
TEX_FORMATS=	luatex
80
82
81
# Fix build on recent current -- our tex is so outdated,
82
# that it's unlikely that any upstream patches apply.
83
CFLAGS+=	-fcommon
84
85
# buildenv and dumpenv in Makefile uses hard-coded TEXMFCNF.
83
# buildenv and dumpenv in Makefile uses hard-coded TEXMFCNF.
86
post-extract:
84
post-extract:
87
	cd ${WRKSRC}/.. && \
85
	cd ${WRKSRC}/.. && \
(-)print/tex-luatex/files/patch-luatexdir_font_luatexfont.h (+11 lines)
Line 0 Link Here
1
--- luatexdir/font/luatexfont.h.orig	2015-03-20 07:59:58 UTC
2
+++ luatexdir/font/luatexfont.h
3
@@ -149,8 +149,6 @@ void replace_packet_fonts(internal_font_number f, int 
4
                           int *new_fontid, int count);
5
 int *packet_local_fonts(internal_font_number f, int *num);
6
 
7
-int packet_cur_s;               /* current |do_vf_packet()| recursion level */
8
-int packet_stack_ptr;           /* pointer into |packet_stack| */
9
 vf_struct *new_vfstruct(void);
10
 
11
 /* writecff.c */
(-)print/tex-luatex/files/patch-luatexdir_image_writeimg.h (+11 lines)
Line 0 Link Here
1
--- luatexdir/image/writeimg.h.orig	2015-03-20 07:59:58 UTC
2
+++ luatexdir/image/writeimg.h
3
@@ -27,7 +27,7 @@
4
 #  include "pdf/pdfpage.h"
5
 
6
 typedef image_dict *idict_entry;
7
-idict_entry *idict_array;
8
+extern idict_entry *idict_array;
9
 
10
 void new_img_pdfstream_struct(image_dict *);
11
 image *new_image(void);
(-)print/tex-luatex/files/patch-luatexdir_image_writeimg.w (+11 lines)
Line 0 Link Here
1
--- luatexdir/image/writeimg.w.orig	2015-03-20 07:59:58 UTC
2
+++ luatexdir/image/writeimg.w
3
@@ -125,6 +125,8 @@
4
 #define HEADER_PDF "%PDF-1."
5
 #define MAX_HEADER (sizeof(HEADER_PNG)-1)
6
 
7
+idict_entry *idict_array;
8
+
9
 static void check_type_by_header(image_dict * idict)
10
 {
11
     int i;
(-)print/tex-luatex/files/patch-luatexdir_pdf_pdftables.h (+11 lines)
Line 0 Link Here
1
--- luatexdir/pdf/pdftables.h.orig	2015-03-20 07:59:58 UTC
2
+++ luatexdir/pdf/pdftables.h
3
@@ -21,7 +21,7 @@
4
 #ifndef PDFTABLES_H
5
 #  define PDFTABLES_H
6
 
7
-const char *pdf_obj_typenames[PDF_OBJ_TYPE_MAX + 1];
8
+extern const char *pdf_obj_typenames[PDF_OBJ_TYPE_MAX + 1];
9
 
10
 typedef enum {
11
     union_type_int,
(-)print/tex-luatex/files/patch-luatexdir_tex_textoken.w (+11 lines)
Line 0 Link Here
1
--- luatexdir/tex/textoken.w.orig	2015-03-28 00:34:27 UTC
2
+++ luatexdir/tex/textoken.w
3
@@ -75,7 +75,7 @@ maximum memory usage. When code between the delimiters
4
 report these statistics when |tracing_stats| is sufficiently large.
5
 
6
 @c
7
-int var_used, dyn_used;         /* how much memory is in use */
8
+int dyn_used;                   /* how much memory is in use */
9
 
10
 halfword avail;                 /* head of the list of available one-word nodes */
11
 unsigned fix_mem_end;           /* the last one-word node used in |mem| */

Return to bug 234221