* [gentoo-commits] gentoo commit in src/patchsets/luatex/0.30.2: 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
@ 2008-10-26 12:25 Alexis Ballier (aballier)
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2008-10-26 12:25 UTC (permalink / raw
To: gentoo-commits
aballier 08/10/26 12:25:39
Added: 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
Log:
add luatex 0.30.2 patches
Revision Changes Path
1.1 src/patchsets/luatex/0.30.2/010_all_poppler.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/010_all_poppler.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/010_all_poppler.patch?rev=1.1&content-type=text/plain
Index: 010_all_poppler.patch
===================================================================
Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/image/pdftoepdf.cc
===================================================================
--- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/image/pdftoepdf.cc
+++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/image/pdftoepdf.cc
@@ -24,10 +24,11 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#include <aconf.h>
-#include <GString.h>
-#include <gmem.h>
-#include <gfile.h>
+#include <dirent.h>
+#include <poppler-config.h>
+#include <goo/GooString.h>
+#include <goo/gmem.h>
+#include <goo/gfile.h>
#include <config.h>
#include <assert.h>
#include "Object.h"
@@ -163,7 +164,7 @@ static PdfDocument *refPdfDocument(char
pdf_doc->file_path = xstrdup(file_path);
void **aa = avl_probe(PdfDocumentTree, pdf_doc);
assert(aa != NULL);
- GString *docName = new GString(pdf_doc->file_path);
+ GooString *docName = new GooString(pdf_doc->file_path);
pdf_doc->doc = new PDFDoc(docName); // takes ownership of docName
if (!pdf_doc->doc->isOk() || !pdf_doc->doc->okToPrint())
pdftex_fail("xpdf: reading PDF image failed");
@@ -534,7 +535,7 @@ static void copyObject(Object * obj)
int i, l, c;
Ref ref;
char *p;
- GString *s;
+ GooString *s;
if (obj->isBool()) {
pdf_printf("%s", obj->getBool()? "true" : "false");
} else if (obj->isInt()) {
@@ -726,7 +727,7 @@ read_pdf_info(image_dict * idict, intege
img_totalpages(idict) = pdf_doc->doc->getCatalog()->getNumPages();
if (img_pagename(idict)) {
// get page by name
- GString name(img_pagename(idict));
+ GooString name(img_pagename(idict));
LinkDest *link = pdf_doc->doc->findDest(&name);
if (link == NULL || !link->isOk())
pdftex_fail("PDF inclusion: invalid destination <%s>",
Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/utils.c
===================================================================
--- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/utils.c
+++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/utils.c
@@ -41,7 +41,7 @@
#include "ptexlib.h"
#include "png.h"
-#include "xpdf/config.h" /* just to get the xpdf version */
+#include "poppler-config.h" /* just to get the poppler version */
static const char __svn_version[] =
"$Id: 010_all_poppler.patch,v 1.1 2008/10/26 12:25:39 aballier Exp $ $URL: http://scm.foundry.supelec.fr/svn/luatex/tags/beta-0.29.0/src/texk/web2c/luatexdir/utils.c $";
@@ -1131,7 +1131,7 @@ void initversionstring(char **versions)
(void) asprintf(versions,
"Compiled with libpng %s; using libpng %s\n"
"Compiled with zlib %s; using zlib %s\n"
- "Compiled with xpdf version %s\n",
+ "Compiled with poppler version %s\n",
PNG_LIBPNG_VER_STRING, png_libpng_ver,
ZLIB_VERSION, zlib_version, xpdfVersion);
}
1.1 src/patchsets/luatex/0.30.2/020_all_includes.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/020_all_includes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/020_all_includes.patch?rev=1.1&content-type=text/plain
Index: 020_all_includes.patch
===================================================================
Index: luatex-beta-0.30.2/src/texk/web2c/luatexdir/image/image.h
===================================================================
--- luatex-beta-0.30.2.orig/src/texk/web2c/luatexdir/image/image.h
+++ luatex-beta-0.30.2/src/texk/web2c/luatexdir/image/image.h
@@ -23,7 +23,7 @@
#ifndef IMAGE_H
# define IMAGE_H
-# include <../libpng/png.h>
+# include <png.h>
# define JPG_UINT16 unsigned int
# define JPG_UINT32 unsigned long
1.1 src/patchsets/luatex/0.30.2/030_all_build.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/030_all_build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/030_all_build.patch?rev=1.1&content-type=text/plain
Index: 030_all_build.patch
===================================================================
Index: luatex-beta-0.30.1/src/libs/lua51/Makefile
===================================================================
--- luatex-beta-0.30.1.orig/src/libs/lua51/Makefile
+++ luatex-beta-0.30.1/src/libs/lua51/Makefile
@@ -7,10 +7,7 @@
# Your platform. See PLATS for possible values.
PLAT= none
-CC= gcc
-LOCALCFLAGS= -g -O2 -Wall $(MYCFLAGS) $(COCOCFLAGS)
-AR= ar rcu
-RANLIB= ranlib
+LOCALCFLAGS+= -Wall $(MYCFLAGS) $(COCOCFLAGS)
RM= rm -f
LIBS= $(XLDFLAGS) -lm $(MYLIBS)
@@ -64,7 +61,7 @@ o: $(ALL_O)
a: $(ALL_A)
$(LUA_A): $(CORE_O) $(LIB_O)
- $(AR) $@ $?
+ $(AR) rcu $@ $?
$(RANLIB) $@
$(LUA_T): $(LUA_O) $(LUA_A)
1.1 src/patchsets/luatex/0.30.2/040_all_zziplib.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/040_all_zziplib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/040_all_zziplib.patch?rev=1.1&content-type=text/plain
Index: 040_all_zziplib.patch
===================================================================
Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatexlib.mk
===================================================================
--- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/luatexlib.mk
+++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatexlib.mk
@@ -69,6 +69,7 @@ endif
ZZIPLIBDIR=../../libs/zziplib
ZZIPLIBSRCDIR=$(srcdir)/$(ZZIPLIBDIR)
+ZZIPLIBINC=-I../$(ZZIPLIBSRCDIR) -I../$(ZZIPLIBDIR)
ZZIPLIBDEP = $(ZZIPLIBDIR)/zzip/libzzip.a
$(ZZIPLIBDEP): $(ZZIPLIBSRCDIR)
@@ -80,7 +81,7 @@ $(ZZIPLIBDEP): $(ZZIPLIBSRCDIR)
LUAZIPDIR=../../libs/luazip
LUAZIPSRCDIR=$(srcdir)/$(LUAZIPDIR)
LUAZIPDEP=$(LUAZIPDIR)/src/luazip.o
-LUAZIPINC=-I../../lua51 -I../$(ZZIPLIBSRCDIR) -I../$(ZZIPLIBDIR)
+LUAZIPINC=-I../../lua51 $(ZZIPLIBINC)
$(LUAZIPDEP): $(LUAZIPDIR)/src/luazip.c
mkdir -p $(LUAZIPDIR) && cd $(LUAZIPDIR) && cp -R $(LUAZIPSRCDIR)/* . && \
@@ -154,11 +155,11 @@ LIBMPLIBDEP=$(LIBMPDIR)/lmplib.o $(LIBMP
# Convenience variables.
luatexlibs = $(luapdflib) $(LDLIBPNG) $(LDZLIB) $(LDLIBXPDF) $(LIBMD5DEP) $(LDLIBOBSD) \
- $(LIBLUADEP) $(SLNUNICODEDEP) $(LUAZIPDEP) $(ZZIPLIBDEP) $(LUAFSDEP) $(LUASOCKETDEP) \
+ $(LIBLUADEP) $(SLNUNICODEDEP) $(LUAZIPDEP) $(LDZZIPLIB) $(LUAFSDEP) $(LUASOCKETDEP) \
$(LUAPEGDEP) $(LUAMDVDEP) $(LUAZLIBDEP) $(LUAFFDEP) $(LIBMPLIBDEP)
luatexlibsdep = $(luapdflib) $(LIBPNGDEP) $(ZLIBDEP) $(LIBXPDFDEP) $(LIBMD5DEP) $(LIBOBSDDEP) \
- $(LIBLUADEP) $(SLNUNICODEDEP) $(ZZIPLIBDEP) $(LUAZIPDEP) $(LUAFSDEP) $(LUASOCKETDEP) \
+ $(LIBLUADEP) $(SLNUNICODEDEP) $(LUAZIPDEP) $(LUAFSDEP) $(LUASOCKETDEP) \
$(LUAPEGDEP) $(LUAMDVDEP) $(LUAZLIBDEP) $(LUAFFDEP) $(makecpool)
## end of luatexlib.mk - Makefile fragment for libraries used by pdf[ex]tex.
1.1 src/patchsets/luatex/0.30.2/050_all_make.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/050_all_make.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/050_all_make.patch?rev=1.1&content-type=text/plain
Index: 050_all_make.patch
===================================================================
Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatexlib.mk
===================================================================
--- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/luatexlib.mk
+++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatexlib.mk
@@ -108,7 +108,7 @@ LUASOCKETINC=-I../../lua51
$(LUASOCKETDEP): $(LUASOCKETDIR)/src/luasocket.c $(LUASOCKETDIR)/src/luasocket.h
mkdir -p $(LUASOCKETDIR) && cd $(LUASOCKETDIR) && cp -R $(LUASOCKETSRCDIR)/* . && \
- cd src && make
+ cd src && $(MAKE)
# luapeg
1.1 src/patchsets/luatex/0.30.2/060_all_xpdfincludes.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/060_all_xpdfincludes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/060_all_xpdfincludes.patch?rev=1.1&content-type=text/plain
Index: 060_all_xpdfincludes.patch
===================================================================
Index: luatex-beta-0.30.0/src/texk/web2c/luatexdir/Makefile.in
===================================================================
--- luatex-beta-0.30.0.orig/src/texk/web2c/luatexdir/Makefile.in
+++ luatex-beta-0.30.0/src/texk/web2c/luatexdir/Makefile.in
@@ -9,10 +9,12 @@ kpse_include ../make/library.mk
kpathsea_srcdir_parent = $(srcdir)/../..
kpathsea_dir_parent = ../..
+LIBXPDFCPPFLAGS=@LIBXPDFCPPFLAGS@
+
ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) \
-I. -I$(srcdir) \
-I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) \
- @LIBXPDFCPPFLAGS@ \
+ $(LIBXPDFCPPFLAGS) \
-I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \
-I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/.. \
-I$(LIBPNGSRCDIR) -I$(ZLIBSRCDIR) \
@@ -35,6 +37,7 @@ ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
LIBXPDFDIR=../../../libs/xpdf
LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
+LIBXPDFINCLUDE=-I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/.. -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/..
LIBMD5DIR=../../../libs/md5
LIBMD5SRCDIR=$(srcdir)/$(LIBMD5DIR)
@@ -44,7 +47,7 @@ LIBOBSDCOMPATSRCDIR=$(srcdir)/$(LIBOBSDC
XCPPFLAGS=-I.. -I$(srcdir)/.. -I../.. -I$(srcdir)/../.. -I$(LIBMD5DIR) \
-I$(LIBMD5SRCDIR) @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ \
- -I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/.. -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/.. \
+ $(LIBXPDFINCLUDE) \
-I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATSRCDIR) \
-I$(LIBOBSDCOMPATSRCDIR)/.. -DpdfTeX
Index: luatex-beta-0.30.0/src/texk/web2c/luatexdir/luatex.mk
===================================================================
--- luatex-beta-0.30.0.orig/src/texk/web2c/luatexdir/luatex.mk
+++ luatex-beta-0.30.0/src/texk/web2c/luatexdir/luatex.mk
@@ -16,13 +16,14 @@ LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
# libxpdf
LIBXPDFDIR=../../libs/xpdf
LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
+LIBXPDFINCLUDE=-I$(LIBXPDFSRCDIR)
# libobsdcompa
LIBOBSDCOMPATDIR=../../libs/obsdcompat
LIBOBSDCOMPATFSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR)
SVN_REV := $(shell $(srcdir)/$(luatexdir)/get_svnversion.sh $(srcdir))
-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)\"
+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)\"
Makefile: $(srcdir)/$(luatexdir)/luatex.mk
1.1 src/patchsets/luatex/0.30.2/070_all_cflags.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/070_all_cflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/070_all_cflags.patch?rev=1.1&content-type=text/plain
Index: 070_all_cflags.patch
===================================================================
Index: luatex-beta-0.29.0/src/libs/luafontforge/Makefile
===================================================================
--- luatex-beta-0.29.0.orig/src/libs/luafontforge/Makefile
+++ luatex-beta-0.29.0/src/libs/luafontforge/Makefile
@@ -5,7 +5,6 @@ srcdir=../../../src/libs/luafontforge
FF_LIB=ffdummies.o luafflib.o
_CFLAGS=-Wall -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 $(XCFLAGS)
-CFLAGS = -g -O2
.PHONY: newfile
@@ -13,11 +12,11 @@ fontforge: $(FF_LIB) newfile
rm -f libff.a
cd fontforge && $(MAKE)
cd Unicode && $(MAKE)
- sh -c "ar cru libff.a fontforge/*.o Unicode/*.o $(FF_LIB)"
- ranlib libff.a
+ sh -c "$(AR) cru libff.a fontforge/*.o Unicode/*.o $(FF_LIB)"
+ $(RANLIB) libff.a
%.o: $(srcdir)/src/%.c
- gcc $(_CFLAGS) $(CFLAGS) -I$(srcdir)/../lua51 -I$(srcdir)/fontforge/inc -I$(srcdir)/fontforge/fontforge -c $< -o $@
+ $(CC) $(_CFLAGS) $(CFLAGS) -I$(srcdir)/../lua51 -I$(srcdir)/fontforge/inc -I$(srcdir)/fontforge/fontforge -c $< -o $@
clean:
rm -f libff.a $(FF_LIB)
Index: luatex-beta-0.29.0/src/libs/luasocket/config
===================================================================
--- luatex-beta-0.29.0.orig/src/libs/luasocket/config
+++ luatex-beta-0.29.0/src/libs/luasocket/config
@@ -49,11 +49,10 @@ INSTALL_EXEC=cp
#------
# Compiler and linker settings
# for Linux
-CC=gcc
DEF=-DLUASOCKET_DEBUG
-CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
-LDFLAGS=-O -shared -fpic
-LD=gcc
+CFLAGS+= $(LUAINC) $(DEF) -pedantic -Wall -fpic
+LDFLAGS+=-O -shared -fpic
+LD=$(CC)
#------
# End of makefile configuration
Index: luatex-beta-0.29.0/src/libs/luafontforge/fontforge/Unicode/Makefile
===================================================================
--- luatex-beta-0.29.0.orig/src/libs/luafontforge/fontforge/Unicode/Makefile
+++ luatex-beta-0.29.0/src/libs/luafontforge/fontforge/Unicode/Makefile
@@ -2,12 +2,9 @@
top_srcdir = ../../../../src/libs/luafontforge/fontforge
srcdir = $(top_srcdir)/Unicode
-CC = gcc
-
OBJECTS = alphabet.o char.o memory.o cjk.o ustring.o gwwiconv.o
_CFLAGS = -I$(top_srcdir)/inc -Wall -DLUA_FF_LIB=1 $(XCFLAGS)
-CFLAGS = -g -O2
all: $(OBJECTS)
Index: luatex-beta-0.29.0/src/libs/luafontforge/fontforge/fontforge/Makefile
===================================================================
--- luatex-beta-0.29.0.orig/src/libs/luafontforge/fontforge/fontforge/Makefile
+++ luatex-beta-0.29.0/src/libs/luafontforge/fontforge/fontforge/Makefile
@@ -2,10 +2,6 @@
top_srcdir = ../../../../src/libs/luafontforge/fontforge
srcdir = $(top_srcdir)/fontforge
-CC = gcc
-AR = ar cru
-RANLIB = ranlib
-
OBJECTS =autohint.o charview.o fontinfo.o \
fontview.o fvfonts.o parsepfa.o parsettf.o prefs.o psread.o namelist.o \
splinefill.o splineoverlap.o splinestroke.o splineutil.o splineutil2.o stamp.o \
@@ -22,7 +18,7 @@ _CFLAGS = -I$(top_srcdir)/inc -I$(srcdir
-DNODYNAMIC=1 -D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 \
-DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 -UHAVE_LIBINTL_H
-CFLAGS = -Wall -g -O2
+CFLAGS += -Wall
all: $(OBJECTS)
@@ -30,7 +26,7 @@ all: $(OBJECTS)
# disasterous effects. This file may not be compiled with the optimizer.
# On the other hand we do need CPPFLAGS to get the right includes...
splinerefigure.o: $(srcdir)/splinerefigure.c $(srcdir)/splinefont.h
- $(CC) -g -c -o splinerefigure.o $(_CFLAGS) $(srcdir)/splinerefigure.c
+ $(CC) -c -o splinerefigure.o $(_CFLAGS) $(CFLAGS) $(srcdir)/splinerefigure.c
%.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
$(CC) $(_CFLAGS) $(CFLAGS) -c $< -o $@
Index: luatex-beta-0.29.0/src/libs/luasocket/src/Makefile
===================================================================
--- luatex-beta-0.29.0.orig/src/libs/luasocket/src/Makefile
+++ luatex-beta-0.29.0/src/libs/luasocket/src/Makefile
@@ -5,11 +5,9 @@ INSTALL_TOP_SHARE=/usr/local/share/lua/5
INSTALL_TOP_LIB=/usr/local/lib/lua/5.1
LUAINC = -I../../lua51
-CC = gcc
DEF = -DLUASOCKET_DEBUG
-CFLAGS = $(LUAINC) $(DEF) -pedantic -Wall -O2 $(XCFLAGS)
-AR=ar
+CFLAGS += $(LUAINC) $(DEF) -pedantic -Wall $(XCFLAGS)
ARFLAGS=rc
SOCKET_OBJS:= \
1.1 src/patchsets/luatex/0.30.2/080_all_libpngincludes.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/080_all_libpngincludes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/080_all_libpngincludes.patch?rev=1.1&content-type=text/plain
Index: 080_all_libpngincludes.patch
===================================================================
Index: luatex-beta-0.30.0/src/texk/web2c/luatexdir/Makefile.in
===================================================================
--- luatex-beta-0.30.0.orig/src/texk/web2c/luatexdir/Makefile.in
+++ luatex-beta-0.30.0/src/texk/web2c/luatexdir/Makefile.in
@@ -17,7 +17,7 @@ ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFL
$(LIBXPDFCPPFLAGS) \
-I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \
-I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/.. \
- -I$(LIBPNGSRCDIR) -I$(ZLIBSRCDIR) \
+ $(LIBPNGINCLUDES) -I$(ZLIBSRCDIR) \
-DPDF_PARSER_ONLY -DDISABLE_OUTLINE
CXX = @CXX@
@@ -31,6 +31,7 @@ CTANGLE = ../ctangle
LIBPNGDIR=../../../libs/libpng
LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
+LIBPNGINCLUDES=-I$(LIBPNGSRCDIR)
ZLIBDIR=../../../libs/zlib
ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
Index: luatex-beta-0.30.0/src/texk/web2c/luatexdir/luatex.mk
===================================================================
--- luatex-beta-0.30.0.orig/src/texk/web2c/luatexdir/luatex.mk
+++ luatex-beta-0.30.0/src/texk/web2c/luatexdir/luatex.mk
@@ -13,6 +13,7 @@ ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
# libpng
LIBPNGDIR=../../libs/libpng
LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
+LIBPNGINCLUDES=-I$(LIBPNGSRCDIR)
# libxpdf
LIBXPDFDIR=../../libs/xpdf
LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
@@ -23,7 +24,7 @@ LIBOBSDCOMPATFSRCDIR=$(srcdir)/$(LIBOBSD
SVN_REV := $(shell $(srcdir)/$(luatexdir)/get_svnversion.sh $(srcdir))
-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)\"
+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)\"
Makefile: $(srcdir)/$(luatexdir)/luatex.mk
1.1 src/patchsets/luatex/0.30.2/090_all_texlua.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/090_all_texlua.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/090_all_texlua.patch?rev=1.1&content-type=text/plain
Index: 090_all_texlua.patch
===================================================================
Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatex.mk
===================================================================
--- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/luatex.mk
+++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/luatex.mk
@@ -127,6 +127,8 @@ install-luatex: install-luatex-exec
install-programs: @LTEX@ install-luatex-exec
install-luatex-exec: $(luatex) $(bindir)
for p in luatex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ cd $(DESTDIR)$(bindir) && rm -f texlua && $(LN) luatex texlua
+ cd $(DESTDIR)$(bindir) && rm -f texluac && $(LN) luatex texluac
# \f
# luatex binaries archive
1.1 src/patchsets/luatex/0.30.2/100_all_xpdfversion.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/100_all_xpdfversion.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/100_all_xpdfversion.patch?rev=1.1&content-type=text/plain
Index: 100_all_xpdfversion.patch
===================================================================
Index: luatex-beta-0.29.0/src/texk/web2c/luatexdir/utils.c
===================================================================
--- luatex-beta-0.29.0.orig/src/texk/web2c/luatexdir/utils.c
+++ luatex-beta-0.29.0/src/texk/web2c/luatexdir/utils.c
@@ -1131,9 +1131,9 @@ void initversionstring(char **versions)
(void) asprintf(versions,
"Compiled with libpng %s; using libpng %s\n"
"Compiled with zlib %s; using zlib %s\n"
- "Compiled with poppler version %s\n",
+ "Compiled with poppler\n",
PNG_LIBPNG_VER_STRING, png_libpng_ver,
- ZLIB_VERSION, zlib_version, xpdfVersion);
+ ZLIB_VERSION, zlib_version);
}
1.1 src/patchsets/luatex/0.30.2/series
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/series?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.30.2/series?rev=1.1&content-type=text/plain
Index: series
===================================================================
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo commit in src/patchsets/luatex/0.30.2: 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
@ 2009-05-14 17:23 Alexis Ballier (aballier)
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2009-05-14 17:23 UTC (permalink / raw
To: gentoo-commits
aballier 09/05/14 17:23:53
Removed: 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
Log:
remove old patchsets
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-14 17:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-26 12:25 [gentoo-commits] gentoo commit in src/patchsets/luatex/0.30.2: 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 Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2009-05-14 17:23 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox