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