pool/texlive
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=163
This commit is contained in:
Dr. Werner Fink 2013-12-20 09:10:29 +00:00 committed by Git OBS Bridge
parent 976c992293
commit de9c0579ac
3 changed files with 143 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
source-bnc856363.dif Normal file
View File

@ -0,0 +1,129 @@
--- texk/xdvik/CHANGES 2013/04/05 02:34:34 1.103 xdvik_22_86
+++ texk/xdvik/CHANGES 2013/09/01 05:55:44 1.107
@@ -9,6 +9,13 @@
may contain undetected bugs. Such versions shouldn't be used
by distributors.
+ * 22.86.01 CVS2 (2013-08-31):
+ + ft.c: Avoid a compiler warning.
+ + font-open.c: Add support for .runlibfileifexists in gs Fontmap file;
+ tweak some messages.
+ + dvi-draw.c: Fixed bug #388 ("currinf.set_char_p is not a registered
+ routine!")
+
* 22.86 (2013-04-04):
+ xdvi.h, xdvi.c, x_util.h, x_util.c, dvi-init.c: Fixed bugs in
property handling on 64-bit systems (related to source specials).
--- texk/xdvik/dvi-draw.c 2013/04/05 00:14:54 1.392 xdvik_22_86
+++ texk/xdvik/dvi-draw.c 2013/09/01 05:55:44 1.393
@@ -2962,6 +2962,10 @@
}
maxchar = currinf.fontp->maxchar;
currinf.set_char_p = currinf.fontp->set_char_p;
+#if FREETYPE
+ if (currinf.set_char_p == set_ft_char)
+ do_load_freetype_font();
+#endif
}
if (currinf.set_char_p == set_char) {
@@ -3087,6 +3091,10 @@
}
maxchar = currinf.fontp->maxchar;
currinf.set_char_p = currinf.fontp->set_char_p;
+#if FREETYPE
+ if (currinf.set_char_p == set_ft_char)
+ do_load_freetype_font();
+#endif
}
if (currinf.set_char_p == set_char) {
--- texk/xdvik/font-open.c 2013/04/04 21:05:48 1.55 xdvik_22_86
+++ texk/xdvik/font-open.c 2013/05/14 05:26:19 1.56
@@ -722,6 +722,7 @@
const char *str1_end, *str2_end;
const char *p1, *p2;
FILE *f;
+ unsigned int namelen;
if (str1 == NULL) {
str1 = str2;
@@ -770,6 +771,11 @@
str1 = p1 + 1;
}
+ /* leave the file name in ffline[] for error message */
+ namelen = strlen(name) + 1;
+ if (namelen > ffline_len) expandline(namelen);
+ memcpy(ffline, name, namelen);
+
return NULL;
}
@@ -1087,6 +1093,7 @@
* Allow entries of the following types:
*
* (string) .runlibfile
+ * (string) .runlibfileifexists
* /identifier (string) ;
* /identifier /alias ;
*/
@@ -1096,6 +1103,7 @@
if (ttype == GS_EOF || ttype == GS_ERR)
break;
if (ttype == LPAREN) {
+ Boolean quiet = False;
FILE *f1;
ttype = get_gs_token(&gsf, pos1, &pos2, "Fontmap");
@@ -1106,7 +1114,10 @@
"unexpected end of Fontmap file; giving up."));
break;
}
- if (ttype != '.' || pos2 - pos1 != 11
+ if (ttype == '.' && pos2 - pos1 == 19
+ && memcmp(ffline + pos1, ".runlibfileifexists", 19) == 0)
+ quiet = True;
+ else if (ttype != '.' || pos2 - pos1 != 11
|| memcmp(ffline + pos1, ".runlibfile", 11) != 0) {
TRACE_FT((stderr, "invalid token following \"(%.*s)\" in Fontmap file; giving up.",
(int) pos1, ffline));
@@ -1125,9 +1136,15 @@
free(q);
}
- if (f1 == NULL)
- TRACE_FT((stderr, "Fontmap .runlibfile: %s: %s",
- ffline, strerror(errno)));
+ if (f1 == NULL) {
+ if (!quiet)
+ XDVI_WARNING((stderr, "Fontmap .runlibfile: %s: %s",
+ ffline, strerror(errno)));
+ else
+ TRACE_FT((stderr,
+ "Fontmap .runlibfileifexists: %s: %s\n",
+ ffline, strerror(errno)));
+ }
else {
--gs_fontmap_number;
process_gs_fontmap(f1);
@@ -1347,7 +1364,7 @@
filename = kpse_find_file(t1p->fontfile, kpse_type1_format, 0);
if (filename == NULL) {
- XDVI_WARNING((stderr, "cannot find Type 1 font file %s "
+ TRACE_FT((stderr, "cannot find Type 1 font file %s "
"(will try PK version instead).",
t1p->fontfile));
return NULL;
--- texk/xdvik/xdvi.c 2013/04/05 00:14:55 1.470 xdvik_22_86
+++ texk/xdvik/xdvi.c 2013/09/01 05:55:44 1.471
@@ -3310,7 +3310,7 @@
G_image->byte_order = *((char *)&endian);
}
- /* Store window id for use by src_client_check(). */
+ /* Store window id for use by get_xdvi_window_id(). */
{
long data = XtWindow(globals.widgets.top_level);

9
texlive.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Dec 20 08:40:42 UTC 2013 - werner@suse.de
- Add patch
source-bnc856363.dif
from upstream CVS to fix bnc#856363 - xdvi -sourceposition exits
with Fatal error: currinf.set_char_p...
compare with https://sourceforge.net/p/xdvi/bugs/388/
-------------------------------------------------------------------
Wed Nov 13 13:06:23 UTC 2013 - werner@suse.de

7
texlive.spec
View File

@ -218,7 +218,9 @@ Patch17: source-64.dif
Patch18: source-a2ping.dif
Patch19: source-dvipng.dif
Patch20: source-asymptote.dif
# PATCH-FIX-UPSTREAM build woth perl 5.18.0
# PATCH-FIX-UPSTREAM xdvi -sourceposition exits with Fatal error
Patch21: source-bnc856363.dif
# PATCH-FIX-UPSTREAM build with perl 5.18.0
Patch40: biber-dev.patch
# PATCH-EXTEND-UPSTREAM Use always system CA certificates
Patch41: biber-certs.dif
@ -405,7 +407,7 @@ Requires: perl = %{perl_version}
Recommends: ca-certificates
Recommends: ca-certificates-mozilla
%if 0%{suse_version} > 1230
Requires: perl(Biber)
Requires: perl(Biber) >= %{texlive_version}.%{texlive_release}
%endif
Requires: perl(LWP::UserAgent)
Requires: perl(Text::BibTeX)
@ -2276,6 +2278,7 @@ This package is required by the package texlive-biber-bin.
%patch18 -p0 -b .a2p
%patch19 -p0 -b .dvipng
%patch20 -p0 -b .asymptote
%patch21 -p0 -b .bnc856363
%patch0
%if %{with buildbiber}
pushd ../biblatex-biber-*