Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/luatex/0.30.0: 010_all_poppler.patch 020_all_includes.patch 030_all_build.patch 040_all_zziplib.patch 050_all_make.patch 060_all_xpdfincludes.patch 070_all_cflags.patch 080_all_libpngincludes.patch 090_all_texlua.patch 100_all_xpdfversion.patch series
Date: Thu, 02 Oct 2008 10:00:10
Message-Id: E1KlKyb-0005Wk-LO@stork.gentoo.org
1 aballier 08/10/02 10:00:05
2
3 Added: 010_all_poppler.patch 020_all_includes.patch
4 030_all_build.patch 040_all_zziplib.patch
5 050_all_make.patch 060_all_xpdfincludes.patch
6 070_all_cflags.patch 080_all_libpngincludes.patch
7 090_all_texlua.patch 100_all_xpdfversion.patch
8 series
9 Log:
10 add patches for 0.30.0
11
12 Revision Changes Path
13 1.1 src/patchsets/luatex/0.30.0/010_all_poppler.patch
14
15 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/010_all_poppler.patch?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/010_all_poppler.patch?rev=1.1&content-type=text/plain
17
18 Index: 010_all_poppler.patch
19 ===================================================================
20 Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/image/pdftoepdf.cc
21 ===================================================================
22 --- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/image/pdftoepdf.cc
23 +++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/image/pdftoepdf.cc
24 @@ -24,10 +24,11 @@
25 #include <stdio.h>
26 #include <string.h>
27 #include <ctype.h>
28 -#include <aconf.h>
29 -#include <GString.h>
30 -#include <gmem.h>
31 -#include <gfile.h>
32 +#include <dirent.h>
33 +#include <poppler-config.h>
34 +#include <goo/GooString.h>
35 +#include <goo/gmem.h>
36 +#include <goo/gfile.h>
37 #include <config.h>
38 #include <assert.h>
39 #include "Object.h"
40 @@ -163,7 +164,7 @@ static PdfDocument *refPdfDocument(char
41 pdf_doc->file_path = xstrdup(file_path);
42 void **aa = avl_probe(PdfDocumentTree, pdf_doc);
43 assert(aa != NULL);
44 - GString *docName = new GString(pdf_doc->file_path);
45 + GooString *docName = new GooString(pdf_doc->file_path);
46 pdf_doc->doc = new PDFDoc(docName); // takes ownership of docName
47 if (!pdf_doc->doc->isOk() || !pdf_doc->doc->okToPrint())
48 pdftex_fail("xpdf: reading PDF image failed");
49 @@ -534,7 +535,7 @@ static void copyObject(Object * obj)
50 int i, l, c;
51 Ref ref;
52 char *p;
53 - GString *s;
54 + GooString *s;
55 if (obj->isBool()) {
56 pdf_printf("%s", obj->getBool()? "true" : "false");
57 } else if (obj->isInt()) {
58 @@ -726,7 +727,7 @@ read_pdf_info(image_dict * idict, intege
59 img_totalpages(idict) = pdf_doc->doc->getCatalog()->getNumPages();
60 if (img_pagename(idict)) {
61 // get page by name
62 - GString name(img_pagename(idict));
63 + GooString name(img_pagename(idict));
64 LinkDest *link = pdf_doc->doc->findDest(&name);
65 if (link == NULL || !link->isOk())
66 pdftex_fail("PDF inclusion: invalid destination <%s>",
67 Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/utils.c
68 ===================================================================
69 --- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/utils.c
70 +++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/utils.c
71 @@ -41,7 +41,7 @@
72 #include "ptexlib.h"
73
74 #include "png.h"
75 -#include "xpdf/config.h" /* just to get the xpdf version */
76 +#include "poppler-config.h" /* just to get the poppler version */
77
78 static const char __svn_version[] =
79 "$Id: 010_all_poppler.patch,v 1.1 2008/10/02 10:00:05 aballier Exp $ $URL: http://scm.foundry.supelec.fr/svn/luatex/tags/beta-0.29.0/src/texk/web2c/luatexdir/utils.c $";
80 @@ -1131,7 +1131,7 @@ void initversionstring(char **versions)
81 (void) asprintf(versions,
82 "Compiled with libpng %s; using libpng %s\n"
83 "Compiled with zlib %s; using zlib %s\n"
84 - "Compiled with xpdf version %s\n",
85 + "Compiled with poppler version %s\n",
86 PNG_LIBPNG_VER_STRING, png_libpng_ver,
87 ZLIB_VERSION, zlib_version, xpdfVersion);
88 }
89
90
91
92 1.1 src/patchsets/luatex/0.30.0/020_all_includes.patch
93
94 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/020_all_includes.patch?rev=1.1&view=markup
95 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/020_all_includes.patch?rev=1.1&content-type=text/plain
96
97 Index: 020_all_includes.patch
98 ===================================================================
99 Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/image/image.h
100 ===================================================================
101 --- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/image/image.h
102 +++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/image/image.h
103 @@ -23,7 +23,7 @@
104 #ifndef IMAGE_H
105 # define IMAGE_H
106
107 -# include <../libpng/png.h>
108 +# include <png.h>
109
110 # define JPG_UINT16 unsigned int
111 # define JPG_UINT32 unsigned long
112
113
114
115 1.1 src/patchsets/luatex/0.30.0/030_all_build.patch
116
117 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/030_all_build.patch?rev=1.1&view=markup
118 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/030_all_build.patch?rev=1.1&content-type=text/plain
119
120 Index: 030_all_build.patch
121 ===================================================================
122 Index: luatex-beta-0.29.0/src/libs/lua51/Makefile
123 ===================================================================
124 --- luatex-beta-0.29.0.orig/src/libs/lua51/Makefile
125 +++ luatex-beta-0.29.0/src/libs/lua51/Makefile
126 @@ -7,10 +7,7 @@
127 # Your platform. See PLATS for possible values.
128 PLAT= none
129
130 -CC= gcc
131 -CFLAGS= -g -O2 -Wall $(XCFLAGS) $(MYCFLAGS) $(COCOFLAGS)
132 -AR= ar rcu
133 -RANLIB= ranlib
134 +CFLAGS+= -Wall $(XCFLAGS) $(MYCFLAGS) $(COCOFLAGS)
135 RM= rm -f
136 LIBS= $(XLDFLAGS) -lm $(MYLIBS)
137
138 @@ -64,7 +61,7 @@ o: $(ALL_O)
139 a: $(ALL_A)
140
141 $(LUA_A): $(CORE_O) $(LIB_O)
142 - $(AR) $@ $?
143 + $(AR) rcu $@ $?
144 $(RANLIB) $@
145
146 $(LUA_T): $(LUA_O) $(LUA_A)
147
148
149
150 1.1 src/patchsets/luatex/0.30.0/040_all_zziplib.patch
151
152 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/040_all_zziplib.patch?rev=1.1&view=markup
153 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/040_all_zziplib.patch?rev=1.1&content-type=text/plain
154
155 Index: 040_all_zziplib.patch
156 ===================================================================
157 Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatexlib.mk
158 ===================================================================
159 --- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/luatexlib.mk
160 +++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatexlib.mk
161 @@ -69,6 +69,7 @@ endif
162
163 ZZIPLIBDIR=../../libs/zziplib
164 ZZIPLIBSRCDIR=$(srcdir)/$(ZZIPLIBDIR)
165 +ZZIPLIBINC=-I../$(ZZIPLIBSRCDIR) -I../$(ZZIPLIBDIR)
166 ZZIPLIBDEP = $(ZZIPLIBDIR)/zzip/libzzip.a
167
168 $(ZZIPLIBDEP): $(ZZIPLIBSRCDIR)
169 @@ -80,7 +81,7 @@ $(ZZIPLIBDEP): $(ZZIPLIBSRCDIR)
170 LUAZIPDIR=../../libs/luazip
171 LUAZIPSRCDIR=$(srcdir)/$(LUAZIPDIR)
172 LUAZIPDEP=$(LUAZIPDIR)/src/luazip.o
173 -LUAZIPINC=-I../../lua51 -I../$(ZZIPLIBSRCDIR) -I../$(ZZIPLIBDIR)
174 +LUAZIPINC=-I../../lua51 $(ZZIPLIBINC)
175
176 $(LUAZIPDEP): $(LUAZIPDIR)/src/luazip.c
177 mkdir -p $(LUAZIPDIR) && cd $(LUAZIPDIR) && cp -R $(LUAZIPSRCDIR)/* . && \
178 @@ -154,11 +155,11 @@ LIBMPLIBDEP=$(LIBMPDIR)/lmplib.o $(LIBMP
179 # Convenience variables.
180
181 luatexlibs = $(luapdflib) $(LDLIBPNG) $(LDZLIB) $(LDLIBXPDF) $(LIBMD5DEP) $(LDLIBOBSD) \
182 - $(LIBLUADEP) $(SLNUNICODEDEP) $(LUAZIPDEP) $(ZZIPLIBDEP) $(LUAFSDEP) $(LUASOCKETDEP) \
183 + $(LIBLUADEP) $(SLNUNICODEDEP) $(LUAZIPDEP) $(LDZZIPLIB) $(LUAFSDEP) $(LUASOCKETDEP) \
184 $(LUAPEGDEP) $(LUAMDVDEP) $(LUAZLIBDEP) $(LUAFFDEP) $(LIBMPLIBDEP)
185
186 luatexlibsdep = $(luapdflib) $(LIBPNGDEP) $(ZLIBDEP) $(LIBXPDFDEP) $(LIBMD5DEP) $(LIBOBSDDEP) \
187 - $(LIBLUADEP) $(SLNUNICODEDEP) $(ZZIPLIBDEP) $(LUAZIPDEP) $(LUAFSDEP) $(LUASOCKETDEP) \
188 + $(LIBLUADEP) $(SLNUNICODEDEP) $(LUAZIPDEP) $(LUAFSDEP) $(LUASOCKETDEP) \
189 $(LUAPEGDEP) $(LUAMDVDEP) $(LUAZLIBDEP) $(LUAFFDEP) $(makecpool)
190
191 ## end of luatexlib.mk - Makefile fragment for libraries used by pdf[ex]tex.
192
193
194
195 1.1 src/patchsets/luatex/0.30.0/050_all_make.patch
196
197 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/050_all_make.patch?rev=1.1&view=markup
198 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/050_all_make.patch?rev=1.1&content-type=text/plain
199
200 Index: 050_all_make.patch
201 ===================================================================
202 Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatexlib.mk
203 ===================================================================
204 --- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/luatexlib.mk
205 +++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatexlib.mk
206 @@ -108,7 +108,7 @@ LUASOCKETINC=-I../../lua51
207
208 $(LUASOCKETDEP): $(LUASOCKETDIR)/src/luasocket.c $(LUASOCKETDIR)/src/luasocket.h
209 mkdir -p $(LUASOCKETDIR) && cd $(LUASOCKETDIR) && cp -R $(LUASOCKETSRCDIR)/* . && \
210 - cd src && make
211 + cd src && $(MAKE)
212
213
214 # luapeg
215
216
217
218 1.1 src/patchsets/luatex/0.30.0/060_all_xpdfincludes.patch
219
220 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/060_all_xpdfincludes.patch?rev=1.1&view=markup
221 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/060_all_xpdfincludes.patch?rev=1.1&content-type=text/plain
222
223 Index: 060_all_xpdfincludes.patch
224 ===================================================================
225 Index: luatex-beta-0.30.0/src/texk/web2c/luatexdir/Makefile.in
226 ===================================================================
227 --- luatex-beta-0.30.0.orig/src/texk/web2c/luatexdir/Makefile.in
228 +++ luatex-beta-0.30.0/src/texk/web2c/luatexdir/Makefile.in
229 @@ -9,10 +9,12 @@ kpse_include ../make/library.mk
230 kpathsea_srcdir_parent = $(srcdir)/../..
231 kpathsea_dir_parent = ../..
232
233 +LIBXPDFCPPFLAGS=@LIBXPDFCPPFLAGS@
234 +
235 ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) \
236 -I. -I$(srcdir) \
237 -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) \
238 - @LIBXPDFCPPFLAGS@ \
239 + $(LIBXPDFCPPFLAGS) \
240 -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \
241 -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/.. \
242 -I$(LIBPNGSRCDIR) -I$(ZLIBSRCDIR) \
243 @@ -35,6 +37,7 @@ ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
244
245 LIBXPDFDIR=../../../libs/xpdf
246 LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
247 +LIBXPDFINCLUDE=-I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/.. -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/..
248
249 LIBMD5DIR=../../../libs/md5
250 LIBMD5SRCDIR=$(srcdir)/$(LIBMD5DIR)
251 @@ -44,7 +47,7 @@ LIBOBSDCOMPATSRCDIR=$(srcdir)/$(LIBOBSDC
252
253 XCPPFLAGS=-I.. -I$(srcdir)/.. -I../.. -I$(srcdir)/../.. -I$(LIBMD5DIR) \
254 -I$(LIBMD5SRCDIR) @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ \
255 - -I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/.. -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/.. \
256 + $(LIBXPDFINCLUDE) \
257 -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATSRCDIR) \
258 -I$(LIBOBSDCOMPATSRCDIR)/.. -DpdfTeX
259
260 Index: luatex-beta-0.30.0/src/texk/web2c/luatexdir/luatex.mk
261 ===================================================================
262 --- luatex-beta-0.30.0.orig/src/texk/web2c/luatexdir/luatex.mk
263 +++ luatex-beta-0.30.0/src/texk/web2c/luatexdir/luatex.mk
264 @@ -16,13 +16,14 @@ LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
265 # libxpdf
266 LIBXPDFDIR=../../libs/xpdf
267 LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
268 +LIBXPDFINCLUDE=-I$(LIBXPDFSRCDIR)
269 # libobsdcompa
270 LIBOBSDCOMPATDIR=../../libs/obsdcompat
271 LIBOBSDCOMPATFSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR)
272
273 SVN_REV := $(shell $(srcdir)/$(luatexdir)/get_svnversion.sh $(srcdir))
274
275 -XCPPFLAGS=-I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/.. -I$(ZLIBSRCDIR) -I$(LIBPNGSRCDIR) -I$(LIBXPDFSRCDIR) -Dextra_version_info=`date +-%Y%m%d%H` -DSVN_REV=\"$(SVN_REV)\"
276 +XCPPFLAGS=-I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/.. -I$(ZLIBSRCDIR) -I$(LIBPNGSRCDIR) $(LIBXPDFINCLUDE) -Dextra_version_info=`date +-%Y%m%d%H` -DSVN_REV=\"$(SVN_REV)\"
277
278 Makefile: $(srcdir)/$(luatexdir)/luatex.mk
279
280
281
282
283 1.1 src/patchsets/luatex/0.30.0/070_all_cflags.patch
284
285 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/070_all_cflags.patch?rev=1.1&view=markup
286 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/070_all_cflags.patch?rev=1.1&content-type=text/plain
287
288 Index: 070_all_cflags.patch
289 ===================================================================
290 Index: luatex-beta-0.29.0/src/libs/luafontforge/Makefile
291 ===================================================================
292 --- luatex-beta-0.29.0.orig/src/libs/luafontforge/Makefile
293 +++ luatex-beta-0.29.0/src/libs/luafontforge/Makefile
294 @@ -5,7 +5,6 @@ srcdir=../../../src/libs/luafontforge
295 FF_LIB=ffdummies.o luafflib.o
296
297 _CFLAGS=-Wall -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 $(XCFLAGS)
298 -CFLAGS = -g -O2
299
300 .PHONY: newfile
301
302 @@ -13,11 +12,11 @@ fontforge: $(FF_LIB) newfile
303 rm -f libff.a
304 cd fontforge && $(MAKE)
305 cd Unicode && $(MAKE)
306 - sh -c "ar cru libff.a fontforge/*.o Unicode/*.o $(FF_LIB)"
307 - ranlib libff.a
308 + sh -c "$(AR) cru libff.a fontforge/*.o Unicode/*.o $(FF_LIB)"
309 + $(RANLIB) libff.a
310
311 %.o: $(srcdir)/src/%.c
312 - gcc $(_CFLAGS) $(CFLAGS) -I$(srcdir)/../lua51 -I$(srcdir)/fontforge/inc -I$(srcdir)/fontforge/fontforge -c $< -o $@
313 + $(CC) $(_CFLAGS) $(CFLAGS) -I$(srcdir)/../lua51 -I$(srcdir)/fontforge/inc -I$(srcdir)/fontforge/fontforge -c $< -o $@
314
315 clean:
316 rm -f libff.a $(FF_LIB)
317 Index: luatex-beta-0.29.0/src/libs/luasocket/config
318 ===================================================================
319 --- luatex-beta-0.29.0.orig/src/libs/luasocket/config
320 +++ luatex-beta-0.29.0/src/libs/luasocket/config
321 @@ -49,11 +49,10 @@ INSTALL_EXEC=cp
322 #------
323 # Compiler and linker settings
324 # for Linux
325 -CC=gcc
326 DEF=-DLUASOCKET_DEBUG
327 -CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
328 -LDFLAGS=-O -shared -fpic
329 -LD=gcc
330 +CFLAGS+= $(LUAINC) $(DEF) -pedantic -Wall -fpic
331 +LDFLAGS+=-O -shared -fpic
332 +LD=$(CC)
333
334 #------
335 # End of makefile configuration
336 Index: luatex-beta-0.29.0/src/libs/luafontforge/fontforge/Unicode/Makefile
337 ===================================================================
338 --- luatex-beta-0.29.0.orig/src/libs/luafontforge/fontforge/Unicode/Makefile
339 +++ luatex-beta-0.29.0/src/libs/luafontforge/fontforge/Unicode/Makefile
340 @@ -2,12 +2,9 @@
341 top_srcdir = ../../../../src/libs/luafontforge/fontforge
342 srcdir = $(top_srcdir)/Unicode
343
344 -CC = gcc
345 -
346 OBJECTS = alphabet.o char.o memory.o cjk.o ustring.o gwwiconv.o
347
348 _CFLAGS = -I$(top_srcdir)/inc -Wall -DLUA_FF_LIB=1 $(XCFLAGS)
349 -CFLAGS = -g -O2
350
351 all: $(OBJECTS)
352
353 Index: luatex-beta-0.29.0/src/libs/luafontforge/fontforge/fontforge/Makefile
354 ===================================================================
355 --- luatex-beta-0.29.0.orig/src/libs/luafontforge/fontforge/fontforge/Makefile
356 +++ luatex-beta-0.29.0/src/libs/luafontforge/fontforge/fontforge/Makefile
357 @@ -2,10 +2,6 @@
358 top_srcdir = ../../../../src/libs/luafontforge/fontforge
359 srcdir = $(top_srcdir)/fontforge
360
361 -CC = gcc
362 -AR = ar cru
363 -RANLIB = ranlib
364 -
365 OBJECTS =autohint.o charview.o fontinfo.o \
366 fontview.o fvfonts.o parsepfa.o parsettf.o prefs.o psread.o namelist.o \
367 splinefill.o splineoverlap.o splinestroke.o splineutil.o splineutil2.o stamp.o \
368 @@ -22,7 +18,7 @@ _CFLAGS = -I$(top_srcdir)/inc -I$(srcdir
369 -DNODYNAMIC=1 -D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 \
370 -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 -UHAVE_LIBINTL_H
371
372 -CFLAGS = -Wall -g -O2
373 +CFLAGS += -Wall
374
375 all: $(OBJECTS)
376
377 @@ -30,7 +26,7 @@ all: $(OBJECTS)
378 # disasterous effects. This file may not be compiled with the optimizer.
379 # On the other hand we do need CPPFLAGS to get the right includes...
380 splinerefigure.o: $(srcdir)/splinerefigure.c $(srcdir)/splinefont.h
381 - $(CC) -g -c -o splinerefigure.o $(_CFLAGS) $(srcdir)/splinerefigure.c
382 + $(CC) -c -o splinerefigure.o $(_CFLAGS) $(CFLAGS) $(srcdir)/splinerefigure.c
383
384 %.o: $(srcdir)/%.c $(srcdir)/splinefont.h $(srcdir)/views.h $(srcdir)/stemdb.h $(srcdir)/ttf.h $(srcdir)/unicoderange.h $(srcdir)/psfont.h $(srcdir)/groups.h $(srcdir)/edgelist.h $(srcdir)/edgelist2.h
385 $(CC) $(_CFLAGS) $(CFLAGS) -c $< -o $@
386 Index: luatex-beta-0.29.0/src/libs/luasocket/src/Makefile
387 ===================================================================
388 --- luatex-beta-0.29.0.orig/src/libs/luasocket/src/Makefile
389 +++ luatex-beta-0.29.0/src/libs/luasocket/src/Makefile
390 @@ -5,11 +5,9 @@ INSTALL_TOP_SHARE=/usr/local/share/lua/5
391 INSTALL_TOP_LIB=/usr/local/lib/lua/5.1
392
393 LUAINC = -I../../lua51
394 -CC = gcc
395
396 DEF = -DLUASOCKET_DEBUG
397 -CFLAGS = $(LUAINC) $(DEF) -pedantic -Wall -O2 $(XCFLAGS)
398 -AR=ar
399 +CFLAGS += $(LUAINC) $(DEF) -pedantic -Wall $(XCFLAGS)
400 ARFLAGS=rc
401
402 SOCKET_OBJS:= \
403
404
405
406 1.1 src/patchsets/luatex/0.30.0/080_all_libpngincludes.patch
407
408 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/080_all_libpngincludes.patch?rev=1.1&view=markup
409 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/080_all_libpngincludes.patch?rev=1.1&content-type=text/plain
410
411 Index: 080_all_libpngincludes.patch
412 ===================================================================
413 Index: luatex-beta-0.30.0/src/texk/web2c/luatexdir/Makefile.in
414 ===================================================================
415 --- luatex-beta-0.30.0.orig/src/texk/web2c/luatexdir/Makefile.in
416 +++ luatex-beta-0.30.0/src/texk/web2c/luatexdir/Makefile.in
417 @@ -17,7 +17,7 @@ ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFL
418 $(LIBXPDFCPPFLAGS) \
419 -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \
420 -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/.. \
421 - -I$(LIBPNGSRCDIR) -I$(ZLIBSRCDIR) \
422 + $(LIBPNGINCLUDES) -I$(ZLIBSRCDIR) \
423 -DPDF_PARSER_ONLY -DDISABLE_OUTLINE
424 CXX = @CXX@
425
426 @@ -31,6 +31,7 @@ CTANGLE = ../ctangle
427
428 LIBPNGDIR=../../../libs/libpng
429 LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
430 +LIBPNGINCLUDES=-I$(LIBPNGSRCDIR)
431
432 ZLIBDIR=../../../libs/zlib
433 ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
434 Index: luatex-beta-0.30.0/src/texk/web2c/luatexdir/luatex.mk
435 ===================================================================
436 --- luatex-beta-0.30.0.orig/src/texk/web2c/luatexdir/luatex.mk
437 +++ luatex-beta-0.30.0/src/texk/web2c/luatexdir/luatex.mk
438 @@ -13,6 +13,7 @@ ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
439 # libpng
440 LIBPNGDIR=../../libs/libpng
441 LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
442 +LIBPNGINCLUDES=-I$(LIBPNGSRCDIR)
443 # libxpdf
444 LIBXPDFDIR=../../libs/xpdf
445 LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
446 @@ -23,7 +24,7 @@ LIBOBSDCOMPATFSRCDIR=$(srcdir)/$(LIBOBSD
447
448 SVN_REV := $(shell $(srcdir)/$(luatexdir)/get_svnversion.sh $(srcdir))
449
450 -XCPPFLAGS=-I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/.. -I$(ZLIBSRCDIR) -I$(LIBPNGSRCDIR) $(LIBXPDFINCLUDE) -Dextra_version_info=`date +-%Y%m%d%H` -DSVN_REV=\"$(SVN_REV)\"
451 +XCPPFLAGS=-I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/.. -I$(ZLIBSRCDIR) $(LIBPNGINCLUDES) $(LIBXPDFINCLUDE) -Dextra_version_info=`date +-%Y%m%d%H` -DSVN_REV=\"$(SVN_REV)\"
452
453 Makefile: $(srcdir)/$(luatexdir)/luatex.mk
454
455
456
457
458 1.1 src/patchsets/luatex/0.30.0/090_all_texlua.patch
459
460 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/090_all_texlua.patch?rev=1.1&view=markup
461 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/090_all_texlua.patch?rev=1.1&content-type=text/plain
462
463 Index: 090_all_texlua.patch
464 ===================================================================
465 Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatex.mk
466 ===================================================================
467 --- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/luatex.mk
468 +++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatex.mk
469 @@ -127,6 +127,8 @@ install-luatex: install-luatex-exec
470 install-programs: @LTEX@ install-luatex-exec
471 install-luatex-exec: $(luatex) $(bindir)
472 for p in luatex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
473 + cd $(DESTDIR)$(bindir) && rm -f texlua && $(LN) luatex texlua
474 + cd $(DESTDIR)$(bindir) && rm -f texluac && $(LN) luatex texluac
475
476 #
477 # luatex binaries archive
478
479
480
481 1.1 src/patchsets/luatex/0.30.0/100_all_xpdfversion.patch
482
483 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/100_all_xpdfversion.patch?rev=1.1&view=markup
484 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/100_all_xpdfversion.patch?rev=1.1&content-type=text/plain
485
486 Index: 100_all_xpdfversion.patch
487 ===================================================================
488 Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/utils.c
489 ===================================================================
490 --- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/utils.c
491 +++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/utils.c
492 @@ -1131,9 +1131,9 @@ void initversionstring(char **versions)
493 (void) asprintf(versions,
494 "Compiled with libpng %s; using libpng %s\n"
495 "Compiled with zlib %s; using zlib %s\n"
496 - "Compiled with poppler version %s\n",
497 + "Compiled with poppler\n",
498 PNG_LIBPNG_VER_STRING, png_libpng_ver,
499 - ZLIB_VERSION, zlib_version, xpdfVersion);
500 + ZLIB_VERSION, zlib_version);
501 }
502
503
504
505
506
507 1.1 src/patchsets/luatex/0.30.0/series
508
509 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/series?rev=1.1&view=markup
510 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.0/series?rev=1.1&content-type=text/plain
511
512 Index: series
513 ===================================================================
514 010_all_poppler.patch
515 020_all_includes.patch
516 030_all_build.patch
517 040_all_zziplib.patch
518 050_all_make.patch
519 060_all_xpdfincludes.patch
520 070_all_cflags.patch
521 080_all_libpngincludes.patch
522 090_all_texlua.patch
523 100_all_xpdfversion.patch
Report Message
Find on MARC Find on Google Groups