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.40.5: 010_all_poppler.patch 020_all_zzip.patch series
Date: Fri, 19 Jun 2009 20:25:47
Message-Id: E1MHkeg-00057J-AC@stork.gentoo.org
1 aballier 09/06/19 20:25:46
2
3 Added: 010_all_poppler.patch 020_all_zzip.patch series
4 Log:
5 add patches for 0.40.5
6
7 Revision Changes Path
8 1.1 src/patchsets/luatex/0.40.5/010_all_poppler.patch
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.40.5/010_all_poppler.patch?rev=1.1&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.40.5/010_all_poppler.patch?rev=1.1&content-type=text/plain
12
13 Index: 010_all_poppler.patch
14 ===================================================================
15 Index: luatex-beta-0.40.5/source/texk/web2c/luatexdir/image/pdftoepdf.cc
16 ===================================================================
17 --- luatex-beta-0.40.5.orig/source/texk/web2c/luatexdir/image/pdftoepdf.cc
18 +++ luatex-beta-0.40.5/source/texk/web2c/luatexdir/image/pdftoepdf.cc
19 @@ -666,7 +666,7 @@ static void writeEncodings()
20 }
21 for (r = encodingList; r != NULL; r = n) {
22 n = r->next;
23 - delete r->font;
24 + r->font->decRefCnt();
25 delete r;
26 }
27 }
28
29
30
31 1.1 src/patchsets/luatex/0.40.5/020_all_zzip.patch
32
33 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.40.5/020_all_zzip.patch?rev=1.1&view=markup
34 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.40.5/020_all_zzip.patch?rev=1.1&content-type=text/plain
35
36 Index: 020_all_zzip.patch
37 ===================================================================
38 Index: luatex-beta-0.40.5/source/texk/web2c/configure.ac
39 ===================================================================
40 --- luatex-beta-0.40.5.orig/source/texk/web2c/configure.ac
41 +++ luatex-beta-0.40.5/source/texk/web2c/configure.ac
42 @@ -249,6 +249,7 @@ KPSE_FREETYPE2_FLAGS
43 KPSE_TECKIT_FLAGS
44 KPSE_ICU_FLAGS
45 KPSE_OBSDCOMPAT_FLAGS
46 +PKG_CHECK_MODULES(ZZIP, zziplib )
47
48 dnl Write output here, instead of putting a zillion -D's on the command line.
49 AC_CONFIG_HEADERS([c-auto.h:c-auto.in],
50 Index: luatex-beta-0.40.5/source/texk/web2c/luatexdir/am/luasocket.am
51 ===================================================================
52 --- luatex-beta-0.40.5.orig/source/texk/web2c/luatexdir/am/luasocket.am
53 +++ luatex-beta-0.40.5/source/texk/web2c/luatexdir/am/luasocket.am
54 @@ -7,9 +7,8 @@
55 ##
56 EXTRA_LIBRARIES += libluasocket.a
57
58 -libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) libzzip.a
59 +libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND)
60
61 -$(libluasocket_a_OBJECTS): libzzip.a
62
63 libluasocket_a_CPPFLAGS = \
64 -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51
65 Index: luatex-beta-0.40.5/source/texk/web2c/luatexdir/am/luatex.am
66 ===================================================================
67 --- luatex-beta-0.40.5.orig/source/texk/web2c/luatexdir/am/luatex.am
68 +++ luatex-beta-0.40.5/source/texk/web2c/luatexdir/am/luatex.am
69 @@ -15,20 +15,20 @@ nodist_EXTRA_luatex_SOURCES = dummy.cxx
70
71 luatex_tangle = WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(LUATANGLE)
72
73 -luatex_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES)
74 +luatex_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) $(ZZIP_CFLAGS)
75 luatex_CPPFLAGS += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5
76 luatex_CPPFLAGS += -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 -I$(srcdir)/mplibdir
77 luatex_CPPFLAGS += -Dextra_version_info=`date +-%Y%m%d%H`
78
79 -luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a libluasocket.a liblua51.a
80 -luatex_ldadd += $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS)
81 +luatex_ldadd = libluatex.a libff.a libluamisc.a libluasocket.a liblua51.a
82 +luatex_ldadd += $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) $(ZZIP_LIBS)
83 luatex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a
84
85 luatex_LDADD = $(luatex_ldadd) $(LDADD) $(lua_socketlibs)
86
87 luatex_DEPENDENCIES = $(proglib) libluatex.a
88 luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND)
89 -luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a
90 +luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a liblua51.a
91
92 $(luatex_OBJECTS): libluatex.a libmplib.a
93
94
95
96
97 1.1 src/patchsets/luatex/0.40.5/series
98
99 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.40.5/series?rev=1.1&view=markup
100 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/luatex/0.40.5/series?rev=1.1&content-type=text/plain
101
102 Index: series
103 ===================================================================
104 010_all_poppler.patch
105 020_all_zzip.patch