Hello community,
here is the log from the commit of package texlive for openSUSE:Factory checked in at 2015-04-25 09:50:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive (Old)
and /work/SRC/openSUSE:Factory/.texlive.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive"
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive/texlive.changes 2015-03-29 20:14:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.texlive.new/texlive.changes 2015-04-25 09:51:13.000000000 +0200
@@ -1,0 +2,57 @@
+Fri Apr 17 13:40:24 UTC 2015 - werner@suse.de
+
+- Port the patch set 'remove or clarify "nosell" material' from
+ upstream to TeXlive source tar ball of 2014 (bsc#926106)
+
+-------------------------------------------------------------------
+Wed Apr 1 08:58:37 UTC 2015 - werner@suse.de
+
+- Add patch source-asymptote-gs9.15.dif to switch from espwrite
+ device to eos2write device of ghostscript (boo#912398)
+
+-------------------------------------------------------------------
+Tue Mar 31 15:49:35 UTC 2015 - werner@suse.de
+
+- Luajittex does only compile on Intel, PPC, and ARM_LE (EABI)
+
+-------------------------------------------------------------------
+Thu Mar 26 14:05:48 UTC 2015 - werner@suse.de
+
+- Update to TeXLive 2014 (timestamp 20140525 revision 34252)
+ * Support DVIPDFMx
+ * [fix] avoid luatex crash under math_mode 'decimal'
+ * luaotfload: Fix incorrect handling of font file formats luaotfload)
+ * Sync with Context beta as of 2014-04-05
+ * pdfTeX: sync with Knuth TeX 3.14159265, e-TeX 2.6
+ * Many more ...
+- Update biblatex-biber to 1.8
+- Add upstrema patch
+ source-xdvik-events.dif
+ to make Xaw3d work
+- Remove the now included patches
+ biber-av.patch
+ biber-certs.dif
+ biber-dev.patch
+ source-asymptote.dif
+ source-bnc856363.dif
+ source-dvipdfmx.dif
+ source-poppler-0.26.patch
+ source-psutils-flip.dif
+- Adapted the following patches
+ biber-decode.diff
+ biber-noreadonly.diff
+ biblatex-encoding.dif
+ source-64.dif
+ source-arraysubs.dif
+ source-configure.dif
+ source-dviutils.dif
+ source-lacheck.dif
+ source-poppler.dif
+ source-psutils.dif
+ source-texdoc.dif
+ source-warns.dif
+ source-x11r7.dif
+ source-xdvizilla.dif
+ source.dif
+
+-------------------------------------------------------------------
Old:
----
biber-av.patch
biber-certs.dif
biber-dev.patch
biblatex-biber-1.7.tar.xz
source-asymptote.dif
source-bnc856363.dif
source-dvipdfmx.dif
source-poppler-0.26.patch
source-psutils-flip.dif
texlive-20130620-source.tar.xz
New:
----
biblatex-biber-1.8.tar.xz
source-asymptote-gs9.15.dif
source-xdvik-events.dif
texlive-20140525-source.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive.spec ++++++
++++ 2064 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive/texlive.spec
++++ and /work/SRC/openSUSE:Factory/.texlive.new/texlive.spec
++++++ biber-decode.diff ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:15.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:15.000000000 +0200
@@ -2,9 +2,35 @@
# longer short-circuits if the input is already utf8. Instead,
# it dies with a 'Cannot decode string with wide characters'
# error message.
---- ./lib/Biber/Input/file/bibtex.pm.orig 2014-07-15 16:11:39.039227206 +0000
-+++ ./lib/Biber/Input/file/bibtex.pm 2014-07-15 16:15:57.321972318 +0000
-@@ -592,7 +592,8 @@ sub _literal {
+---
+ lib/Biber/Input/file/bibtex.pm | 5 +++--
+ lib/Biber/Output/bibtex.pm | 3 ++-
+ lib/Biber/Utils.pm | 4 ++--
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+--- lib/Biber/Utils.pm
++++ lib/Biber/Utils.pm 2014-07-15 16:17:58.000000000 +0000
+@@ -147,7 +147,7 @@ sub locate_biber_file {
+ chomp $found;
+ $found =~ s/\cM\z//xms; # kpsewhich in cygwin sometimes returns ^M at the end
+ # filename can be UTF-8 and run3() isn't clever with UTF-8
+- return decode_utf8($found);
++ return Encode::is_utf8($found) ? $found : decode_utf8($found);
+ }
+ else {
+ $logger->debug("Could not find '$filename' via kpsewhich");
+@@ -935,7 +935,7 @@ sub parse_date {
+ =cut
+
+ sub biber_decode_utf8 {
+- return NFD(decode_utf8(shift));# Unicode NFD boundary
++ return NFD(Encode::is_utf8($_[0]) ? $_[0] : decode_utf8($_[0]));# Unicode NFD boundary
+ }
+
+ =head2 out
+--- lib/Biber/Input/file/bibtex.pm
++++ lib/Biber/Input/file/bibtex.pm 2014-07-15 16:15:57.000000000 +0000
+@@ -605,7 +605,8 @@ sub _literal {
# URI fields
sub _uri {
my ($bibentry, $entry, $f) = @_;
@@ -14,7 +40,7 @@
my ($field, $form, $lang) = $f =~ m/$fl_re/xms;
# If there are some escapes in the URI, unescape them
-@@ -600,7 +601,7 @@ sub _uri {
+@@ -613,7 +614,7 @@ sub _uri {
$value =~ s/\\%/%/g; # just in case someone BibTeX escaped the "%"
# This is what uri_unescape() does but it's faster
$value =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
@@ -23,35 +49,15 @@
}
$value = URI->new($value)->as_string;
---- ./lib/Biber/Output/bibtex.pm.orig 2014-07-15 16:14:07.925503890 +0000
-+++ ./lib/Biber/Output/bibtex.pm 2014-07-15 16:18:47.922143172 +0000
+--- lib/Biber/Output/bibtex.pm
++++ lib/Biber/Output/bibtex.pm 2015-03-26 11:32:20.345519079 +0000
@@ -100,7 +100,8 @@ sub set_output_entry {
next if first {lc($f) eq $_} ('xdata', 'crossref');
}
- # Save post-mapping data for tool mode
+
- my $value = decode_utf8($be->get_rawfield($f));
+ my $value = $be->get_rawfield($f);
+ $value = decode_utf8($value) unless Encode::is_utf8($value);
- $acc .= ' ' x Biber::Config->getoption('tool_indent');
+ $acc .= ' ' x Biber::Config->getoption('output_indent');
$acc .= $casing->($f);
- $acc .= ' ' x ($max_field_len - Unicode::GCString->new($f)->length) if Biber::Config->getoption('tool_align');
---- ./lib/Biber/Utils.pm.orig 2014-07-15 16:12:11.829067919 +0000
-+++ ./lib/Biber/Utils.pm 2014-07-15 16:17:57.874386675 +0000
-@@ -147,7 +147,7 @@ sub locate_biber_file {
- chomp $found;
- $found =~ s/\cM\z//xms; # kpsewhich in cygwin sometimes returns ^M at the end
- # filename can be UTF-8 and run3() isn't clever with UTF-8
-- return decode_utf8($found);
-+ return Encode::is_utf8($found) ? $found : decode_utf8($found);
- }
- else {
- $logger->debug("Could not find '$filename' via kpsewhich");
-@@ -935,7 +935,7 @@ sub parse_date {
- =cut
-
- sub biber_decode_utf8 {
-- return NFD(decode_utf8(shift));# Unicode NFD boundary
-+ return NFD(Encode::is_utf8($_[0]) ? $_[0] : decode_utf8($_[0]));# Unicode NFD boundary
- }
-
- =head2 out
+ $acc .= ' ' x ($max_field_len - Unicode::GCString->new($f)->length) if Biber::Config->getoption('output_align');
++++++ biber-noreadonly.diff ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:15.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:15.000000000 +0200
@@ -3,9 +3,13 @@
# the namespace variable is readoonly as the unregistration attempts to
# modify the value
diff -ru biblatex-biber-1.7.org/lib/Biber/Input/file/biblatexml.pm biblatex-biber-1.7/lib/Biber/Input/file/biblatexml.pm
---- biblatex-biber-1.7.org/lib/Biber/Input/file/biblatexml.pm 2014-01-31 14:22:27.906441935 -0500
-+++ biblatex-biber-1.7/lib/Biber/Input/file/biblatexml.pm 2014-01-31 14:25:36.144787433 -0500
-@@ -23,7 +23,6 @@
+---
+ lib/Biber/Input/file/biblatexml.pm | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- lib/Biber/Input/file/biblatexml.pm
++++ lib/Biber/Input/file/biblatexml.pm 2014-01-31 19:25:36.000000000 +0000
+@@ -23,7 +23,6 @@ use Log::Log4perl qw(:no_extra_logdie_me
use List::AllUtils qw( uniq );
use XML::LibXML;
use XML::LibXML::Simple;
@@ -13,7 +17,7 @@
use Data::Dump qw(dump);
use Unicode::Normalize;
use Unicode::GCString;
-@@ -32,8 +31,8 @@
+@@ -32,8 +31,8 @@ use URI;
my $logger = Log::Log4perl::get_logger('main');
my $orig_key_order = {};
++++++ biblatex-biber-1.7.tar.xz -> biblatex-biber-1.8.tar.xz ++++++
++++ 15741 lines of diff (skipped)
++++++ biblatex-encoding.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:16.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:16.000000000 +0200
@@ -1,5 +1,11 @@
+---
+ lib/Biber/Output/base.pm | 1 +
+ lib/Biber/Output/bbl.pm | 1 +
+ lib/Biber/Output/dot.pm | 1 +
+ 3 files changed, 3 insertions(+)
+
--- lib/Biber/Output/base.pm
-+++ lib/Biber/Output/base.pm 2013-08-08 09:42:55.189939067 +0000
++++ lib/Biber/Output/base.pm 2013-08-08 09:42:55.000000000 +0000
@@ -5,6 +5,7 @@ use warnings;
use Biber::Entry;
@@ -9,7 +15,7 @@
$Text::Wrap::columns = 80;
use Log::Log4perl qw( :no_extra_logdie_message );
--- lib/Biber/Output/bbl.pm
-+++ lib/Biber/Output/bbl.pm 2013-08-08 09:43:01.225438687 +0000
++++ lib/Biber/Output/bbl.pm 2013-08-08 09:43:01.000000000 +0000
@@ -10,6 +10,7 @@ use Biber::Entry;
use Biber::Utils;
use List::AllUtils qw( :all );
@@ -19,7 +25,7 @@
use Text::Wrap;
$Text::Wrap::columns = 80;
--- lib/Biber/Output/dot.pm
-+++ lib/Biber/Output/dot.pm 2013-08-08 09:43:06.605439073 +0000
++++ lib/Biber/Output/dot.pm 2013-08-08 09:43:07.000000000 +0000
@@ -10,6 +10,7 @@ use Biber::Entry;
use Biber::Utils;
use List::AllUtils qw( :all );
++++++ source-64.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:16.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:16.000000000 +0200
@@ -1,6 +1,11 @@
+---
+ configure | 4 ++++
+ m4/libtool.m4 | 4 ++++
+ 2 files changed, 8 insertions(+)
+
--- configure
-+++ configure 2009-08-28 15:44:29.774401466 +0000
-@@ -19120,6 +19120,10 @@ rm -f core conftest.err conftest.$ac_obj
++++ configure 2009-08-28 15:44:30.000000000 +0000
+@@ -19830,6 +19830,10 @@ fi
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
@@ -12,8 +17,8 @@
;;
--- m4/libtool.m4
-+++ m4/libtool.m4 2009-08-28 15:46:57.481902434 +0000
-@@ -2622,6 +2622,10 @@ linux* | k*bsd*-gnu)
++++ m4/libtool.m4 2009-08-28 15:46:57.000000000 +0000
+@@ -2681,6 +2681,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
@@ -24,116 +29,3 @@
dynamic_linker='GNU/Linux ld.so'
;;
---- texk/web2c/luatexdir/font/mapfile.w
-+++ texk/web2c/luatexdir/font/mapfile.w 2013-06-28 09:55:26.505439260 +0000
-@@ -23,8 +23,8 @@ static const char _svn_version[] =
- "$Id: mapfile.w 4442 2012-05-25 22:40:34Z hhenkel $"
- "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/lua... $";
-
--#include
- #include "ptexlib.h"
-+#include
- #include
- #include
- #include
---- texk/web2c/luatexdir/font/sfnt.w
-+++ texk/web2c/luatexdir/font/sfnt.w 2013-06-28 09:57:18.877439867 +0000
-@@ -28,10 +28,9 @@ static const char _svn_version[] =
- #if HAVE_CONFIG_H
- # include
- #endif /* |HAVE_CONFIG_H_| */
-+#include "ptexlib.h"
-
- #include
--
--# include "ptexlib.h"
- #include "font/sfnt.h"
-
- @ type:
---- texk/web2c/luatexdir/font/tt_table.w
-+++ texk/web2c/luatexdir/font/tt_table.w 2013-06-28 09:57:42.537938970 +0000
-@@ -24,8 +24,8 @@ static const char _svn_version[] =
- "$Id: tt_table.w 4442 2012-05-25 22:40:34Z hhenkel $"
- "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/lua... $";
-
--#include
- #include "ptexlib.h"
-+#include
- #include "font/sfnt.h"
- #include "font/tt_table.h"
-
---- texk/web2c/luatexdir/image/writejbig2.w
-+++ texk/web2c/luatexdir/image/writejbig2.w 2013-06-28 09:58:16.518102785 +0000
-@@ -89,10 +89,10 @@ static const char _svn_version[] =
- #ifdef HAVE_CONFIG_H
- #include
- #endif
-+#include "ptexlib.h"
- #include
- #include
- #include
--#include "ptexlib.h"
- #include "image/image.h"
-
- @ @c
---- texk/web2c/luatexdir/image/writejp2.w
-+++ texk/web2c/luatexdir/image/writejp2.w 2013-06-28 09:58:29.725989863 +0000
-@@ -28,9 +28,9 @@ Information technology --- JPEG~2000 ima
- ISO/IEC 15444-1, Second edition, 2004-09-15, file |15444-1annexi.pdf|.
-
- @c
-+#include "ptexlib.h"
- #include
- #include
--#include "ptexlib.h"
- #include "image/image.h"
- #include "image/writejp2.h"
- #include "image/writejbig2.h" /* read2bytes(), read4bytes() */
---- texk/web2c/luatexdir/image/writejpg.w
-+++ texk/web2c/luatexdir/image/writejpg.w 2013-06-28 12:46:45.321439150 +0000
-@@ -23,8 +23,8 @@ static const char _svn_version[] =
- "$Id: writejpg.w 4442 2012-05-25 22:40:34Z hhenkel $"
- "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/lua... $";
-
--#include
- #include "ptexlib.h"
-+#include
- #include "image/image.h"
- #include "image/writejpg.h"
-
---- texk/web2c/luatexdir/image/writepng.w
-+++ texk/web2c/luatexdir/image/writepng.w 2013-06-28 09:58:59.837438998 +0000
-@@ -23,8 +23,8 @@ static const char _svn_version[] =
- "$Id: writepng.w 4442 2012-05-25 22:40:34Z hhenkel $"
- "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/lua... $";
-
--#include
- #include "ptexlib.h"
-+#include
- #include "image/image.h"
- #include "image/writepng.h"
-
---- texk/web2c/luatexdir/tex/texfileio.w
-+++ texk/web2c/luatexdir/tex/texfileio.w 2013-06-28 10:00:24.621439403 +0000
-@@ -22,8 +22,8 @@ static const char _svn_version[] =
- "$Id: texfileio.w 4521 2012-12-14 13:54:54Z taco $"
- "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/lua... $";
-
--#include
- #include "ptexlib.h"
-+#include
- #include
-
- @ @c
---- texk/web2c/luatexdir/utils/unistring.w
-+++ texk/web2c/luatexdir/utils/unistring.w 2013-06-28 10:00:55.485439104 +0000
-@@ -23,8 +23,8 @@ static const char _svn_version[] =
- "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/lua... $";
-
- @ @c
--#include
- #include "ptexlib.h"
-+#include
-
- @ @c
- static void utf_error(void)
++++++ source-arraysubs.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:16.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:16.000000000 +0200
@@ -1,5 +1,9 @@
+---
+ texk/web2c/bibtex.web | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- texk/web2c/bibtex.web
-+++ texk/web2c/bibtex.web 2009-11-12 11:50:51.699429941 +0000
++++ texk/web2c/bibtex.web 2009-11-12 11:50:52.000000000 +0000
@@ -4315,9 +4315,9 @@ special markers |quote_next_fn| and |end
|wiz_functions| array.
++++++ source-asymptote-gs9.15.dif ++++++
The device epswrite is gone with ghostscript 9.15 and the
eps2write has to be used officially. Only the new device
seems to not very handy with latex (boo#912398).
---
utils/asymptote/runlabel.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- utils/asymptote/runlabel.in
+++ utils/asymptote/runlabel.in 2015-01-11 15:41:30.000000000 +0000
@@ -111,7 +111,7 @@ array *readpath(const string& psname, bo
#else
const string null="/dev/null";
#endif
- cmd.push_back("-sDEVICE=epswrite");
+ cmd.push_back("-sDEVICE=eps2write");
cmd.push_back("-sOutputFile="+null);
cmd.push_back(stripDir(psname));
iopipestream gs(cmd,"gs","Ghostscript");
@@ -309,7 +309,7 @@ patharray2 *_texpath(stringarray *s, pen
cmd.push_back("-dNOPAUSE");
cmd.push_back("-dBATCH");
if(safe) cmd.push_back("-dSAFER");
- cmd.push_back("-sDEVICE=epswrite");
+ cmd.push_back("-sDEVICE=eps2write");
cmd.push_back("-sOutputFile=-");
cmd.push_back(pdfname);
iopipestream gs(cmd,"gs","Ghostscript");
@@ -398,7 +398,7 @@ patharray2 *textpath(stringarray *s, pen
cmd2.push_back("-dBATCH");
cmd2.push_back("-P");
if(safe) cmd2.push_back("-dSAFER");
- cmd2.push_back("-sDEVICE=epswrite");
+ cmd2.push_back("-sDEVICE=eps2write");
cmd2.push_back("-sOutputFile=-");
cmd2.push_back("-");
iopipestream gs(cmd2,"gs","Ghostscript");
++++++ source-configure.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:16.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:16.000000000 +0200
@@ -1,6 +1,29 @@
+---
+ configure | 9 ---------
+ configure.ac | 3 ---
+ libs/configure | 6 ------
+ texk/configure | 6 ------
+ texk/dvipdfm-x/configure | 2 +-
+ texk/dvipdfm-x/configure.ac | 2 +-
+ texk/dvisvgm/ac/libgs.ac | 3 ---
+ utils/configure | 6 ------
+ 8 files changed, 2 insertions(+), 35 deletions(-)
+
+--- configure.ac
++++ configure.ac 2011-09-13 14:11:39.000000000 +0000
+@@ -126,9 +126,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([
+ if test "x$syslib_status" = xno; then
+ AC_MSG_ERROR([some requested system libraries failed])
+ fi
+-if test "x$syslib_used:$enable_native_texlive_build" = xyes:yes; then
+- AC_MSG_ERROR([you can not use system libraries for a native TeX Live build])
+-fi
+ KPSE_RESTORE_FLAGS
+
+ AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
--- configure
-+++ configure 2011-09-13 14:13:35.252427069 +0000
-@@ -4688,13 +4688,6 @@ if test "${with_libgs_libdir+set}" = set
++++ configure 2015-03-26 09:27:45.318018917 +0000
+@@ -5087,12 +5087,6 @@ if test "${with_libgs_libdir+set}" = set
fi
@@ -10,11 +33,10 @@
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
--
## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
## configure options and TL libraries required for gsftopk
# Check whether --enable-gsftopk was given.
-@@ -20437,9 +20430,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -21190,9 +21184,6 @@ fi
if test "x$syslib_status" = xno; then
as_fn_error $? "some requested system libraries failed" "$LINENO" 5
fi
@@ -24,21 +46,9 @@
CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
---- configure.ac
-+++ configure.ac 2011-09-13 14:11:39.156427284 +0000
-@@ -131,9 +131,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([
- if test "x$syslib_status" = xno; then
- AC_MSG_ERROR([some requested system libraries failed])
- fi
--if test "x$syslib_used:$enable_native_texlive_build" = xyes:yes; then
-- AC_MSG_ERROR([you can not use system libraries for a native TeX Live build])
--fi
- KPSE_RESTORE_FLAGS
-
- AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
--- libs/configure
-+++ libs/configure 2011-09-13 14:11:51.207926324 +0000
-@@ -4021,13 +4021,6 @@ if test "${with_libgs_libdir+set}" = set
++++ libs/configure 2015-03-26 09:28:44.382019625 +0000
+@@ -4337,12 +4337,6 @@ if test "${with_libgs_libdir+set}" = set
fi
@@ -48,13 +58,12 @@
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
--
## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
## configure options and TL libraries required for gsftopk
# Check whether --enable-gsftopk was given.
--- texk/configure
-+++ texk/configure 2011-09-13 14:12:16.719926873 +0000
-@@ -4041,13 +4041,6 @@ if test "${with_libgs_libdir+set}" = set
++++ texk/configure 2015-03-26 09:37:13.349518912 +0000
+@@ -4350,12 +4350,6 @@ if test "${with_libgs_libdir+set}" = set
fi
@@ -64,12 +73,33 @@
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
--
## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
## configure options and TL libraries required for gsftopk
# Check whether --enable-gsftopk was given.
+--- texk/dvipdfm-x/configure.ac
++++ texk/dvipdfm-x/configure.ac 2015-03-26 09:30:34.909518259 +0000
+@@ -6,7 +6,7 @@ dnl This file is free software; the co
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+ dnl
+-AC_INIT([dvipdfm-x (TeX Live)], [20140317], [tex-k@tug.org])
++AC_INIT([dvipdfmx (TeX Live)], [20140317], [tex-k@tug.org])
+ AC_PREREQ([2.65])
+ AC_CONFIG_SRCDIR([agl.c])
+ AC_CONFIG_AUX_DIR([../../build-aux])
+--- texk/dvipdfm-x/configure
++++ texk/dvipdfm-x/configure 2015-03-26 09:36:34.993519313 +0000
+@@ -7892,7 +7892,7 @@ fi
+
+
+ # Define the identity of the package.
+- PACKAGE='dvipdfm-x--tex-live-'
++ PACKAGE='dvipdfmx'
+ VERSION='20140317'
+
+
--- texk/dvisvgm/ac/libgs.ac
-+++ texk/dvisvgm/ac/libgs.ac 2011-09-13 14:12:02.947925410 +0000
++++ texk/dvisvgm/ac/libgs.ac 2011-09-13 14:12:03.000000000 +0000
@@ -4,6 +4,3 @@ dnl Copyright (C) 2009 Peter Breitenlohn
dnl You may freely use, modify and/or distribute this file.
dnl
@@ -78,8 +108,8 @@
- AC_MSG_ERROR([you can not use system libraries for a native TeX Live build])
-fi
--- utils/configure
-+++ utils/configure 2011-09-13 14:12:29.125501986 +0000
-@@ -4018,13 +4018,6 @@ if test "${with_libgs_libdir+set}" = set
++++ utils/configure 2015-03-26 09:37:31.906018530 +0000
+@@ -4329,12 +4329,6 @@ if test "${with_libgs_libdir+set}" = set
fi
@@ -89,29 +119,6 @@
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
--
## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
## configure options and TL libraries required for gsftopk
# Check whether --enable-gsftopk was given.
---- texk/dvipdfm-x/configure.ac
-+++ texk/dvipdfm-x/configure.ac 2014-01-13 11:10:27.000000000 +0000
-@@ -6,7 +6,7 @@ dnl This file is free software; the co
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
- dnl
--AC_INIT([dvipdfm-x], [20130405], [tex-k@tug.org])
-+AC_INIT([dvipdfmx], [20130405], [tex-k@tug.org])
- AC_PREREQ([2.65])
- AC_CONFIG_SRCDIR([src/dvipdfmx.c])
- AC_CONFIG_AUX_DIR([../../build-aux])
---- texk/dvipdfm-x/configure
-+++ texk/dvipdfm-x/configure 2014-01-13 11:11:08.000000000 +0000
-@@ -7883,7 +7883,7 @@ fi
-
-
- # Define the identity of the package.
-- PACKAGE='dvipdfm-x'
-+ PACKAGE='dvipdfmx'
- VERSION='20130405'
-
-
++++++ source-dviutils.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:16.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:16.000000000 +0200
@@ -1,5 +1,25 @@
+---
+ m4/kpse-kpathsea-flags.m4 | 2 +-
+ texk/seetexk/a4toa5 | 26 ++++++++++++++++++++++++++
+ texk/seetexk/configure | 2 +-
+ texk/seetexk/dvibook.c | 6 +++---
+ texk/seetexk/dviconcat.c | 6 ++----
+ texk/seetexk/dviselect.c | 9 ++++-----
+ texk/seetexk/dvitodvi.c | 40 ++++++++++++++++++++++++++++++++--------
+ texk/seetexk/error.c | 14 +++++---------
+ texk/seetexk/gripes.h | 21 +++++++++++----------
+ texk/seetexk/gripes0.c | 12 +++++-------
+ texk/seetexk/gripes1.c | 17 +++++++++--------
+ texk/seetexk/mydvichk | 12 ++++++++++++
+ texk/seetexk/odd2even | 22 ++++++++++++++++++++++
+ texk/seetexk/search.c | 5 +----
+ texk/seetexk/seek.c | 11 +++++------
+ texk/seetexk/tempfile.c | 5 ++---
+ texk/seetexk/types.h | 2 +-
+ 17 files changed, 142 insertions(+), 70 deletions(-)
+
--- m4/kpse-kpathsea-flags.m4
-+++ m4/kpse-kpathsea-flags.m4 2010-11-12 11:51:59.947926203 +0000
++++ m4/kpse-kpathsea-flags.m4 2015-03-26 09:47:05.605560584 +0000
@@ -19,7 +19,7 @@
AC_DEFUN([KPSE_KPATHSEA_FLAGS],
[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
@@ -9,29 +29,8 @@
[${top_srcdir}/../kpathsea/*.[ch]],
[${top_builddir}/../kpathsea/paths.h])
m4_if(m4_index([ $1 ], [ no-debug ]), [-1],
---- texk/seetexk/search.c
-+++ texk/seetexk/search.c 2009-08-28 14:13:32.877901585 +0000
-@@ -19,6 +19,7 @@
- * it runs in increasing-key-value sequence).
- */
-
-+#include
- #include "types.h"
- #include "search.h"
-
-@@ -30,10 +31,6 @@
-
- static int DOffset; /* part of alignment code */
-
--#ifndef KPATHSEA
--char *malloc(), *realloc();
--#endif
--
- struct search *
- SCreate(unsigned int dsize)
- {
--- texk/seetexk/a4toa5
-+++ texk/seetexk/a4toa5 2010-11-12 11:50:39.552426619 +0000
++++ texk/seetexk/a4toa5 2010-11-12 11:50:40.000000000 +0000
@@ -0,0 +1,26 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink
@@ -60,8 +59,8 @@
+#
+exec dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(190mm,-10mm)' $1 $2
--- texk/seetexk/configure
-+++ texk/seetexk/configure 2012-06-12 16:08:20.232473178 +0200
-@@ -14258,7 +14258,7 @@ if test "x$with_kpathsea_libdir" != x &&
++++ texk/seetexk/configure 2012-06-12 14:08:20.000000000 +0000
+@@ -14570,7 +14570,7 @@ if test "x$with_kpathsea_libdir" != x &&
KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS"
fi
else
@@ -71,8 +70,8 @@
KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la'
KPATHSEA_RULE='# Rebuild libkpathsea
--- texk/seetexk/dvibook.c
-+++ texk/seetexk/dvibook.c 2009-08-28 14:13:32.721901870 +0000
-@@ -27,6 +27,7 @@ extern char *optarg;
++++ texk/seetexk/dvibook.c 2009-08-28 14:13:33.000000000 +0000
+@@ -43,6 +43,7 @@ extern char *optarg;
extern int optind;
#endif
@@ -80,7 +79,7 @@
#include "types.h"
#include "dviclass.h"
#include "dvicodes.h"
-@@ -35,6 +36,8 @@ extern int optind;
+@@ -51,6 +52,8 @@ extern int optind;
#include "gripes.h"
#include "search.h"
#include
@@ -89,7 +88,7 @@
#include
#include "seek.h"
-@@ -101,9 +104,6 @@ i32 Count[10]; /* the 10 \count variabl
+@@ -117,9 +120,6 @@ i32 Count[10]; /* the 10 \count variabl
/* save some string space: we use this a lot */
char writeerr[] = "error writing DVI file";
@@ -100,8 +99,8 @@
* You may get lint warnings about sprintf's return value.
* Older versions of 4BSD have `char *sprintf()'. ANSI and
--- texk/seetexk/dviconcat.c
-+++ texk/seetexk/dviconcat.c 2009-08-28 14:31:09.497902049 +0000
-@@ -25,6 +25,8 @@ extern char *optarg;
++++ texk/seetexk/dviconcat.c 2015-03-26 09:48:14.217518786 +0000
+@@ -40,6 +40,8 @@ extern char *optarg;
extern int optind;
#endif
@@ -110,25 +109,20 @@
#include "types.h"
#include "dviclass.h"
#include "dvicodes.h"
-@@ -87,15 +89,9 @@ i16 DVIStackSize; /* max of all stack s
- char writeerr[] = "error writing DVI file";
+@@ -103,10 +105,6 @@ char writeerr[] = "error writing DVI fil
static void HandleDVIFile(void);
--#ifdef _AMIGA
- #define bcmp(s1, s2, len) memcmp(s1, s2, len)
- #define bzero(s, len) memset(s, '\0', len)
- #define index(s, c) strchr(s, c)
--#endif /* _AMIGA */
--
+
-#ifndef KPATHSEA
-char *malloc(), *realloc();
-#endif
-
+-
/* extern int getopt(int, char **, char*); */
+ /*
--- texk/seetexk/dviselect.c
-+++ texk/seetexk/dviselect.c 2009-08-28 14:32:32.286401443 +0000
-@@ -38,7 +38,10 @@ extern int optind;
++++ texk/seetexk/dviselect.c 2015-03-26 09:48:41.726020097 +0000
+@@ -54,7 +54,10 @@ extern int optind;
#include "gripes.h"
#include "search.h"
#include
@@ -139,23 +133,18 @@
#define white(x) ((x) == ' ' || (x) == '\t' || (x) == ',')
-@@ -148,15 +151,9 @@ static int ParsePages(char *);
- static void HandleDVIFile(void);
+@@ -166,10 +169,6 @@ static void HandleDVIFile(void);
static void PutFontSelector(i32);
+ static void WritePreAmble(void);
--#ifdef _AMIGA
- #define bcmp(s1, s2, len) memcmp(s1, s2, len)
- #define bzero(s, len) memset(s, '\0', len)
- #define index(s, c) strchr(s, c)
--#endif /* _AMIGA */
--
-#ifndef KPATHSEA
-char *malloc(), *realloc();
-#endif /* not KPATHSEA */
-
+-
/*
* You may get lint warnings about sprintf's return value.
-@@ -550,7 +547,7 @@ Usage: %s [-s] [-i infile] [-o outfile]
+ * Older versions of 4BSD have `char *sprintf()'. ANSI and
+@@ -601,7 +600,7 @@ Usage: %s [-s] [-i infile] [-o outfile]
static struct pagelist *
InstallPL(struct pagesel *ps, int n, int absolute)
{
@@ -165,8 +154,8 @@
pl = (struct pagelist *)malloc(sizeof *pl);
if (pl == NULL)
--- texk/seetexk/dvitodvi.c
-+++ texk/seetexk/dvitodvi.c 2012-04-13 14:45:18.261443109 +0000
-@@ -42,6 +42,7 @@ extern char *optarg;
++++ texk/seetexk/dvitodvi.c 2012-04-13 14:45:18.000000000 +0000
+@@ -43,6 +43,7 @@ extern char *optarg;
extern int optind;
#endif
@@ -174,7 +163,7 @@
#include "types.h"
#include "dviclass.h"
#include "dvicodes.h"
-@@ -50,6 +51,8 @@ extern int optind;
+@@ -51,6 +52,8 @@ extern int optind;
#include "gripes.h"
#include "search.h"
#include
@@ -183,7 +172,7 @@
#include
#define white(x) ((x) == ' ' || (x) == '\t' || (x) == ',')
-@@ -86,6 +89,7 @@ struct fontinfo {
+@@ -87,6 +90,7 @@ struct fontinfo {
i32 Width; /* width of page */
i32 Height; /* height of page */
i32 Magnification; /* Magnification of pages */
@@ -191,7 +180,7 @@
int Modulo; /* page spec modulo */
struct pagespec *PageSpecs; /* page specification list */
-@@ -122,9 +126,6 @@ i32 Count[10]; /* the 10 \count variabl
+@@ -123,9 +127,6 @@ i32 Count[10]; /* the 10 \count variabl
/* save some string space: we use this a lot */
char writeerr[] = "error writing DVI file";
@@ -201,7 +190,7 @@
static void WriteFont(struct fontinfo *fi);
static void PutFontSelector(i32 index);
-@@ -185,6 +186,15 @@ scale(i32 whole, int num, int den, i32 s
+@@ -186,6 +187,15 @@ scale(i32 whole, int num, int den, i32 s
return (v) ;
}
@@ -217,7 +206,7 @@
struct pagespec {
int reversed, pageno, add;
i32 xoff, yoff;
-@@ -292,6 +302,8 @@ parsedimen(char **sp)
+@@ -293,6 +303,8 @@ parsedimen(char **sp)
fac = Height;
s++;
}
@@ -226,7 +215,7 @@
whole = scale(whole, num, den, fac) ;
*sp = s;
return (neg ? -whole : whole);
-@@ -492,9 +504,15 @@ HandlePostAmble(void)
+@@ -493,9 +505,15 @@ HandlePostAmble(void)
PutLong(outf, Denominator);
PutLong(outf, DVIMag);
c = GetLong(inf);
@@ -244,7 +233,7 @@
c = GetWord(inf)+1;
PutWord(outf, c); /* DVI stack size */
PutWord(outf, NumberOfOutputPages);
-@@ -587,7 +605,8 @@ HandlePreAmble(void)
+@@ -588,7 +606,8 @@ HandlePreAmble(void)
DVIFileName, DVI_VERSION);
Numerator = GetLong(inf);
Denominator = GetLong(inf);
@@ -254,7 +243,7 @@
putbyte(outf, DVI_PRE);
putbyte(outf, DVI_VERSION);
PutLong(outf, Numerator);
-@@ -614,6 +633,7 @@ main(int argc, char **argv)
+@@ -615,6 +634,7 @@ main(int argc, char **argv)
Width = 0;
Height = 0;
Magnification = 1000;
@@ -262,7 +251,7 @@
Modulo = 1;
ProgName = *argv;
-@@ -710,12 +730,16 @@ Usage: %s [-q] [-i infile] [-o outfile]
+@@ -711,12 +731,16 @@ Usage: %s [-q] [-i infile] [-o outfile]
if (fseek(inf, 16L, 1) == -1)
error(1, -1, "can't seek postamble");
if (Height == 0) /* get height from postamble */
@@ -282,11 +271,11 @@
HandleDVIFile();
if (WritingPage)
--- texk/seetexk/error.c
-+++ texk/seetexk/error.c 2010-11-12 11:52:47.916425348 +0000
-@@ -10,7 +10,12 @@
- * optionally quit.
- *
- */
++++ texk/seetexk/error.c 2015-03-26 09:49:34.658018778 +0000
+@@ -29,7 +29,12 @@
+ #include
+ #endif
+
+#include
#include
+#include
@@ -294,9 +283,9 @@
+#include
+#include
- #ifdef HAVE_CONFIG_H
- #include
-@@ -22,20 +27,11 @@
+ #include "types.h" /* for HAVE_VPRINTF */
+ #include "error.h"
+@@ -37,20 +42,11 @@
extern char *ProgName; /* program name from argv[0] */
@@ -318,8 +307,8 @@
static char *
strerror (int errnum)
--- texk/seetexk/gripes.h
-+++ texk/seetexk/gripes.h 2010-11-12 11:55:39.148426060 +0000
-@@ -13,16 +13,17 @@ extern const char *DVIFileName;
++++ texk/seetexk/gripes.h 2010-11-12 11:55:39.000000000 +0000
+@@ -28,16 +28,17 @@ extern const char *DVIFileName;
* Declarations for the various gripes.
*/
@@ -348,25 +337,21 @@
+void GripeUndefinedOp(int n) __NR__;
void GripeBadGlyph(i32 c, struct font *f);
--- texk/seetexk/gripes0.c
-+++ texk/seetexk/gripes0.c 2009-08-28 14:38:06.501901818 +0000
-@@ -10,14 +10,12 @@
- */
-
- #include
-+#include
-+#include
- #include "types.h"
++++ texk/seetexk/gripes0.c 2015-03-26 09:50:17.725518659 +0000
+@@ -28,10 +28,8 @@
#include "error.h"
#include "gripes.h"
-
+ #include
+-
-#ifndef WIN32
-extern int errno;
-#endif
--
++#include
++#include
+
/*
* Cannot allocate memory.
- */
-@@ -26,7 +24,7 @@ GripeOutOfMemory(int n, const char *why)
+@@ -41,7 +39,7 @@ GripeOutOfMemory(int n, const char *why)
{
error(1, -1, "ran out of memory allocating %d bytes for %s", n, why);
@@ -375,7 +360,7 @@
}
/*
-@@ -71,7 +69,7 @@ WARNING: TeX and I have different checks
+@@ -86,7 +84,7 @@ WARNING: TeX and I have different checks
\t\"%s\"\n\
\tPlease notify your TeX maintainer\n\
\t(TFM checksum = 0%lo, my checksum = 0%lo)",
@@ -384,7 +369,7 @@
}
/*
-@@ -84,5 +82,5 @@ GripeMissingFontsPreventOutput(int n)
+@@ -99,5 +97,5 @@ GripeMissingFontsPreventOutput(int n)
error(1, 0, "%d missing font%s prevent%s output (sorry)", n,
n > 1 ? s : &s[1], n == 1 ? s : &s[1]);
@@ -392,16 +377,16 @@
+ exit(0); /* NOTREACHED */
}
--- texk/seetexk/gripes1.c
-+++ texk/seetexk/gripes1.c 2009-08-28 14:13:32.869901244 +0000
-@@ -10,6 +10,7 @@
- */
-
++++ texk/seetexk/gripes1.c 2015-03-26 09:50:41.873518821 +0000
+@@ -29,6 +29,7 @@
+ #include "font.h"
+ #include "gripes.h"
#include
+#include
- #include "types.h"
- #include "error.h"
- #include "font.h"
-@@ -25,7 +26,7 @@ dfn(void)
+
+ static const char *
+ dfn(void)
+@@ -40,7 +41,7 @@ dfn(void)
/*
* Save string space by declaring these here.
*/
@@ -410,7 +395,7 @@
static const char dfl[] = "DVI file";
static const char areyousure[] = "(are you sure %s is a %s?)";
#else
-@@ -42,7 +43,7 @@ GripeNoSuchFont(i32 n)
+@@ -57,7 +58,7 @@ GripeNoSuchFont(i32 n)
error(0, 0, "%s wants font %ld, which it never defined", dfl, (long)n);
error(1, 0, areyousure, dfn(), dfl);
@@ -419,7 +404,7 @@
}
/*
-@@ -54,7 +55,7 @@ GripeFontAlreadyDefined(i32 n)
+@@ -69,7 +70,7 @@ GripeFontAlreadyDefined(i32 n)
error(0, 0, "%s redefines font %ld", dfl, n);
error(1, 0, areyousure, dfn(), dfl);
@@ -428,7 +413,7 @@
}
/*
-@@ -77,7 +78,7 @@ GripeUnexpectedOp(const char *s)
+@@ -92,7 +93,7 @@ GripeUnexpectedOp(const char *s)
error(0, 0, "unexpected %s in %s", s, dfl);
error(1, 0, areyousure, dfn(), dfl);
@@ -437,7 +422,7 @@
}
/*
-@@ -89,7 +90,7 @@ GripeMissingOp(const char *s)
+@@ -104,7 +105,7 @@ GripeMissingOp(const char *s)
error(0, 0, "missing %s in %s", s, dfl);
error(1, 0, areyousure, dfn(), dfl);
@@ -446,7 +431,7 @@
}
/*
-@@ -101,7 +102,7 @@ GripeCannotFindPostamble(void)
+@@ -116,7 +117,7 @@ GripeCannotFindPostamble(void)
error(0, 0, "cannot find postamble");
error(1, 0, areyousure, dfn(), dfl);
@@ -455,7 +440,7 @@
}
/*
-@@ -113,7 +114,7 @@ GripeMismatchedValue(const char *s)
+@@ -128,7 +129,7 @@ GripeMismatchedValue(const char *s)
error(0, 0, "mismatched %s in %s", s, dfl);
error(1, 0, areyousure, dfn(), dfl);
@@ -464,7 +449,7 @@
}
/*
-@@ -125,7 +126,7 @@ GripeUndefinedOp(int n)
+@@ -140,7 +141,7 @@ GripeUndefinedOp(int n)
error(0, 0, "undefined DVI opcode %d", n);
error(1, 0, areyousure, dfn(), dfl);
@@ -474,7 +459,7 @@
/*
--- texk/seetexk/mydvichk
-+++ texk/seetexk/mydvichk 2010-11-12 11:50:39.783926350 +0000
++++ texk/seetexk/mydvichk 2010-11-12 11:50:40.000000000 +0000
@@ -0,0 +1,12 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink
@@ -489,7 +474,7 @@
+
+exit(0)
--- texk/seetexk/odd2even
-+++ texk/seetexk/odd2even 2010-11-12 11:50:39.783926350 +0000
++++ texk/seetexk/odd2even 2010-11-12 11:50:40.000000000 +0000
@@ -0,0 +1,22 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink
@@ -513,9 +498,30 @@
+endif
+
+exit 0
+--- texk/seetexk/search.c
++++ texk/seetexk/search.c 2009-08-28 14:13:33.000000000 +0000
+@@ -34,6 +34,7 @@
+ * it runs in increasing-key-value sequence).
+ */
+
++#include
+ #include "types.h"
+ #include "search.h"
+
+@@ -45,10 +46,6 @@
+
+ static int DOffset; /* part of alignment code */
+
+-#ifndef KPATHSEA
+-char *malloc(), *realloc();
+-#endif
+-
+ struct search *
+ SCreate(unsigned int dsize)
+ {
--- texk/seetexk/seek.c
-+++ texk/seetexk/seek.c 2009-08-28 14:13:32.877901585 +0000
-@@ -32,6 +32,10 @@
++++ texk/seetexk/seek.c 2009-08-28 14:13:33.000000000 +0000
+@@ -43,6 +43,10 @@
#endif
#include
@@ -526,7 +532,7 @@
#include "types.h" /* for BSD_FILE_SYSTEM */
#include "seek.h"
#include "tempfile.h"
-@@ -44,12 +48,7 @@
+@@ -55,12 +59,7 @@
#endif
#include
@@ -541,8 +547,8 @@
/*
* Make and return a version of `f' on which fseek works (unconditionally).
--- texk/seetexk/tempfile.c
-+++ texk/seetexk/tempfile.c 2009-08-28 14:13:32.905901116 +0000
-@@ -10,6 +10,7 @@
++++ texk/seetexk/tempfile.c 2009-08-28 14:13:33.000000000 +0000
+@@ -25,6 +25,7 @@
#endif
#include
@@ -550,7 +556,7 @@
#include
#ifdef HAVE_UNISTD_H
-@@ -24,9 +25,7 @@
+@@ -39,9 +40,7 @@
#include "types.h"
#else
#include
@@ -562,16 +568,13 @@
#include "tempfile.h"
--- texk/seetexk/types.h
-+++ texk/seetexk/types.h 2009-08-28 14:13:32.921901032 +0000
-@@ -43,8 +43,9 @@
++++ texk/seetexk/types.h 2015-03-26 09:52:09.921518904 +0000
+@@ -58,7 +58,7 @@
*
* (The bcopy provided in lib/bcopy.c does handle overlap.)
*/
-/* #define BLOCK_COPY(from, to, len) memmove(to, from, len) */
--#define BLOCK_COPY(from, to, len) bcopy(from, to, len)
+#include
-+#define BLOCK_COPY(from, to, len) memmove(to, from, len)
-+/* #define BLOCK_COPY(from, to, len) bcopy(from, to, len) */
+ #define BLOCK_COPY(from, to, len) memmove(to, from, len)
/*
- * Define void as int if your compiler does not support void,
++++++ source-lacheck.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:16.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:16.000000000 +0200
@@ -1,6 +1,10 @@
+---
+ texk/lacheck/lacheck-1.26/lacheck.l | 1 +
+ 1 file changed, 1 insertion(+)
+
--- texk/lacheck/lacheck-1.26/lacheck.l
+++ texk/lacheck/lacheck-1.26/lacheck.l 2008-03-05 13:59:37.000000000 +0000
-@@ -117,6 +117,7 @@
+@@ -119,6 +119,7 @@
#include
#include
++++++ source-poppler.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:16.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:16.000000000 +0200
@@ -1,6 +1,11 @@
+---
+ texk/web2c/pdftexdir/pdftoepdf.cc | 4 ++++
+ texk/web2c/pdftexdir/pdftosrc.cc | 4 ++++
+ 2 files changed, 8 insertions(+)
+
--- texk/web2c/pdftexdir/pdftoepdf.cc
-+++ texk/web2c/pdftexdir/pdftoepdf.cc 2012-04-13 16:56:57.780022236 +0200
-@@ -30,6 +29,10 @@ with this program. If not, see
#include
@@ -12,8 +17,8 @@
#include
#include
--- texk/web2c/pdftexdir/pdftosrc.cc
-+++ texk/web2c/pdftexdir/pdftosrc.cc 2012-04-13 16:59:10.136510522 +0200
-@@ -23,6 +23,10 @@ with this program. If not, see
#include
++++++ source-psutils.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:16.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:16.000000000 +0200
@@ -1,47 +1,10 @@
---- utils/psutils/psutils-1.17/Makefile.unix
-+++ utils/psutils/psutils-1.17/Makefile.unix 2009-08-28 14:44:14.829902235 +0000
-@@ -25,10 +25,10 @@ PAPER=a4
-
- OS = UNIX
-
--BINDIR = /usr/local/bin
-+BINDIR = /usr/bin
- SCRIPTDIR = $(BINDIR)
--INCLUDEDIR = /usr/local/share/psutils
--PERL = /usr/local/bin/perl
-+INCLUDEDIR = /usr/share/psutils
-+PERL = /usr/bin/perl
-
- BINMODE = 0755
- MANMODE = 0644
-@@ -36,10 +36,11 @@ CHMOD = chmod
- INSTALL = install -c -m $(BINMODE)
- INSTALLMAN = install -c -m $(MANMODE)
- MANEXT = 1
--MANDIR = /usr/local/share/man/man$(MANEXT)
-+MANDIR = /usr/share/man/man$(MANEXT)
-
- CC = gcc
--CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
-+CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX $(RPM_OPT_FLAGS) -pipe -Wall
-+CCFLAGS = $(CFLAGS)
-
- BIN = psbook psselect pstops epsffit psnup \
- psresize
---- utils/psutils/psutils-1.17/epsffit.c
-+++ utils/psutils/psutils-1.17/epsffit.c 2009-08-28 14:47:36.941903881 +0000
-@@ -47,8 +47,8 @@ int main(int argc, char **argv)
- int furx, fury, fllx, flly;
- int showpage = 0, centre = 0, rotate = 0, aspect = 0, maximise = 0;
- char buf[BUFSIZ];
-- FILE *input;
-- FILE *output;
-+ FILE *input = stdin;
-+ FILE *output = stdout;
-
- program = *argv++; argc--;
-
-@@ -164,9 +164,14 @@ int main(int argc, char **argv)
+---
+ texk/psutils/psutils-1.23/epsffit.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+--- texk/psutils/psutils-1.23/epsffit.c
++++ texk/psutils/psutils-1.23/epsffit.c 2009-08-28 14:47:37.000000000 +0000
+@@ -147,9 +147,14 @@ main(int argc, char **argv)
yoffset -= lly * yscale;
}
fputs("%%EndComments\n", output);
@@ -59,317 +22,12 @@
fputs("%%BeginProcSet: epsffit 1 0\n", output);
fputs("gsave\n", output);
fprintf(output, "%.3f %.3f translate\n", xoffset, yoffset);
-@@ -182,7 +187,7 @@ int main(int argc, char **argv)
+@@ -165,7 +170,7 @@ main(int argc, char **argv)
if (bbfound) {
fputs("grestore\n", output);
if (showpage)
- fputs("restore showpage\n", output); /* just in case */
+ fputs("end EpsffitSave restore showpage\n", output); /* just in case */
} else
- message(FATAL, "no %%%%BoundingBox:\n");
-
---- utils/psutils/psutils-1.17/fixmacps.pl
-+++ utils/psutils/psutils-1.17/fixmacps.pl 2009-08-28 14:44:14.833901961 +0000
-@@ -7,7 +7,7 @@
- use File::Basename;
-
- $line = 0; # keep line count
--$predir = `kpsewhich -progname=dvips -format="other text files" md71_0.ps`;
-+$predir = `kpsewhich -progname=dvips/psutils -format="other text files" md71_0.ps`;
- $dir=`dirname $predir`;
- $prefix = "md";
- $default = "md71_0.ps";
---- utils/psutils/psutils-1.17/getafm
-+++ utils/psutils/psutils-1.17/getafm 2009-08-28 14:44:14.833901961 +0000
-@@ -1,7 +1,7 @@
- #!/bin/sh
-
- if [ $# -ne 1 ]; then
-- echo "usage: $0 font-name | gsnd - >font-name.afm" >&2
-+ echo "usage: $0 font-name | gsnd -q - >font-name.afm" >&2
- exit 1
- fi
-
-@@ -66,8 +66,9 @@ cat << EOF
- (isFixedPitch)(IsFixedPitch) prany
- (UnderlinePosition)dup prany
- (UnderlineThickness)dup prany
-- (Version)(version) prany
-+ (version)(Version) prany
- (Notice)dup prany
-+ (Copyright)dup prany
- pop
- }
- {
---- utils/psutils/psutils-1.17/pserror.c
-+++ utils/psutils/psutils-1.17/pserror.c 2009-08-28 14:44:14.833901961 +0000
-@@ -17,7 +17,7 @@ extern char *program ; /* Defined by mai
- warnings, and errors sent to stderr. If called with the flags MESSAGE_EXIT
- set, the routine does not return */
-
--#define MAX_MESSAGE 256 /* maximum formatted message length */
-+#define MAX_MESSAGE 1024 /* maximum formatted message length */
- #define MAX_FORMAT 16 /* maximum format length */
- #define MAX_COLUMN 78 /* maximum column to print upto */
-
-@@ -27,6 +27,7 @@ void message(int flags, char *format, ..
- static int column = 0 ; /* current screen column for message wrap */
- char msgbuf[MAX_MESSAGE] ; /* buffer in which to put the message */
- char *bufptr = msgbuf ; /* message buffer pointer */
-+ char *tail = bufptr + MAX_MESSAGE;
-
- if ( (flags & MESSAGE_NL) && column != 0 ) { /* new line if not already */
- putc('\n', stderr) ;
-@@ -34,8 +35,11 @@ void message(int flags, char *format, ..
- }
-
- if ( flags & MESSAGE_PROGRAM ) {
-+ const size_t len = strlen(program);
-+ if (len + 2 >= tail - bufptr)
-+ goto out;
- strcpy(bufptr, program) ;
-- bufptr += strlen(program) ;
-+ bufptr += len;
- *bufptr++ = ':' ;
- *bufptr++ = ' ' ;
- }
-@@ -55,13 +59,15 @@ void message(int flags, char *format, ..
- fmtbuf[index] = '\0' ;
- switch (c) {
- case '%':
-+ if (bufptr >= tail)
-+ goto out;
- *bufptr++ = '%' ;
- case '\0':
- break ;
- case 'e': case 'E': case 'f': case 'g': case 'G':
- {
- double d = va_arg(args, double) ;
-- sprintf(bufptr, fmtbuf, d) ;
-+ snprintf(bufptr, tail - bufptr, fmtbuf, d);
- bufptr += strlen(bufptr) ;
- }
- break ;
-@@ -69,17 +75,17 @@ void message(int flags, char *format, ..
- case 'p': case 'u': case 'x': case 'X':
- if ( longform ) {
- long l = va_arg(args, long) ;
-- sprintf(bufptr, fmtbuf, l) ;
-+ snprintf(bufptr, tail - bufptr, fmtbuf, l);
- } else {
- int i = va_arg(args, int) ;
-- sprintf(bufptr, fmtbuf, i) ;
-+ snprintf(bufptr, tail - bufptr, fmtbuf, i);
- }
- bufptr += strlen(bufptr) ;
- break ;
- case 's':
- {
- char *s = va_arg(args, char *) ;
-- sprintf(bufptr, fmtbuf, s) ;
-+ snprintf(bufptr, tail - bufptr, fmtbuf, s);
- bufptr += strlen(bufptr) ;
- }
- break ;
-@@ -92,6 +98,8 @@ void message(int flags, char *format, ..
- } while ( !done ) ;
- } else if ( c == '\n' ) { /* write out message so far and reset column */
- int len = bufptr - msgbuf ; /* length of current message */
-+ if (bufptr >= tail)
-+ goto out;
- *bufptr++ = '\n' ;
- *bufptr = '\0' ;
- if ( column + len > MAX_COLUMN && column > 0 ) {
-@@ -100,8 +108,11 @@ void message(int flags, char *format, ..
- }
- fputs(bufptr = msgbuf, stderr) ;
- column = 0 ;
-- } else
-+ } else {
-+ if (bufptr >= tail)
-+ goto out;
- *bufptr++ = c ;
-+ }
- }
- *bufptr = '\0' ;
- {
-@@ -117,6 +128,7 @@ void message(int flags, char *format, ..
- }
- va_end(args) ;
-
-- if ( flags & MESSAGE_EXIT ) /* don't return to program */
-+out:
-+ if (flags & MESSAGE_EXIT) /* don't return to program */
- exit(1) ;
- }
---- utils/psutils/psutils-1.17/psmerge.man
-+++ utils/psutils/psutils-1.17/psmerge.man 2009-08-28 14:44:14.833901961 +0000
-@@ -24,6 +24,26 @@ standard output.
- .I Psmerge
- will merge multiple files concatenated into a single file as if they
- were in separate files.
-+.SH BUGS
-+.I psmerge
-+is for a very specific case; it does not merge files in the general case.
-+.br
-+For all those cases which can not be handled by
-+.I psmerge
-+the program
-+.I gs
-+(known as ghostscript) may help:
-+
-+.sp 1
-+.in +1c
-+.nf
-+ gs -dNOPAUSE -sDEVICE=pswrite -sOutputFile=out.ps \\
-+ file1.ps file2.ps ... -c quit
-+.fi
-+.in -1c
-+.sp 1
-+
-+This is rather slow and generates bigger output files.
- .SH AUTHOR
- Copyright (C) Angus J. C. Duggan 1991-1995
- .SH "SEE ALSO"
-@@ -31,6 +51,3 @@ Copyright (C) Angus J. C. Duggan 1991-19
- .SH TRADEMARKS
- .B PostScript
- is a trademark of Adobe Systems Incorporated.
--.SH BUGS
--.I psmerge
--is for a very specific case; it does not merge files in the general case.
---- utils/psutils/psutils-1.17/psselect.c
-+++ utils/psutils/psutils-1.17/psselect.c 2009-08-28 14:44:14.837902516 +0000
-@@ -52,6 +52,9 @@ static PageRange *addrange(char *str, Pa
- {
- int first=0;
- int sign;
-+
-+ if(!str) return NULL;
-+
- sign = (*str == '_' && ++str) ? -1 : 1;
- if (isdigit(*str)) {
- first = sign*atoi(str);
---- utils/psutils/psutils-1.17/psspec.c
-+++ utils/psutils/psutils-1.17/psspec.c 2009-08-28 14:44:14.837902516 +0000
-@@ -12,6 +12,9 @@
-
- #include
-
-+/* #define SHOWPAGE_LOAD 1 */
-+#undef SHOWPAGE_LOAD
-+
- double width = -1;
- double height = -1;
-
---- utils/psutils/psutils-1.17/pstops.man
-+++ utils/psutils/psutils-1.17/pstops.man 2009-08-28 14:44:14.837902516 +0000
-@@ -86,7 +86,7 @@ the document, instead of the start.
- If page \fIspec\fRs are separated by
- .B \+
- the pages will be merged into one page; if they are separated by
--.B \,
-+.B ,
- they will be on separate pages.
- If there is only one page specification, with
- .I pageno
---- utils/psutils/psutils-1.17/psutil.c
-+++ utils/psutils/psutils-1.17/psutil.c 2009-08-28 14:44:14.837902516 +0000
-@@ -44,14 +44,45 @@ static long *pageptr;
-
- /* list of paper sizes supported */
- static Paper papersizes[] = {
-- { "a3", 842, 1191 }, /* 29.7cm * 42cm */
-- { "a4", 595, 842 }, /* 21cm * 29.7cm */
-- { "a5", 421, 595 }, /* 14.85cm * 21cm */
-- { "b5", 516, 729 }, /* 18.2cm * 25.72cm */
-- { "A3", 842, 1191 }, /* 29.7cm * 42cm */
-- { "A4", 595, 842 }, /* 21cm * 29.7cm */
-- { "A5", 421, 595 }, /* 14.85cm * 21cm */
-- { "B5", 516, 729 }, /* 18.2cm * 25.72cm */
-+ { "a0", 2384, 3370 },
-+ { "a1", 1684, 2384 },
-+ { "a2", 1191, 1684 },
-+ { "a3", 842, 1191 }, /* 29.7cm * 42cm */
-+ { "a4", 595, 842 }, /* 21cm * 29.7cm */
-+ { "a5", 421, 595 }, /* 14.85cm * 21cm */
-+ { "a6", 297, 420 },
-+ { "a7", 210, 297 },
-+ { "a8", 148, 210 },
-+ { "a9", 105, 148 },
-+ { "a10", 73, 105 },
-+ { "isob0", 2835, 4008 },
-+ { "b0", 2835, 4008 },
-+ { "isob1", 2004, 2835 },
-+ { "b1", 2004, 2835 },
-+ { "isob2", 1417, 2004 },
-+ { "b2", 1417, 2004 },
-+ { "isob3", 1001, 1417 },
-+ { "b3", 1001, 1417 },
-+ { "isob4", 709, 1001 },
-+ { "b4", 709, 1001 },
-+ { "isob5", 499, 709 },
-+ { "b5", 499, 709 },
-+ { "isob6", 354, 499 },
-+ { "b6", 354, 499 },
-+ { "jisb0", 2920, 4127 },
-+ { "jisb1", 2064, 2920 },
-+ { "jisb2", 1460, 2064 },
-+ { "jisb3", 1032, 1460 },
-+ { "jisb4", 729, 1032 },
-+ { "jisb5", 516, 729 },
-+ { "jisb6", 363, 516 },
-+ { "c0", 2599, 3677 },
-+ { "c1", 1837, 2599 },
-+ { "c2", 1298, 1837 },
-+ { "c3", 918, 1298 },
-+ { "c4", 649, 918 },
-+ { "c5", 459, 649 },
-+ { "c6", 323, 459 },
- { "letter", 612, 792 }, /* 8.5in * 11in */
- { "legal", 612, 1008 }, /* 8.5in * 14in */
- { "ledger", 1224, 792 }, /* 17in * 11in */
-@@ -61,6 +92,14 @@ static Paper papersizes[] = {
- { "folio", 612, 936 }, /* 8.5in * 13in */
- { "quarto", 610, 780 }, /* 8.5in * 10.83in */
- { "10x14", 720, 1008 }, /* 10in * 14in */
-+ { "archE", 2592, 3456 },
-+ { "archD", 1728, 2592 },
-+ { "archC", 1296, 1728 },
-+ { "archB", 864, 1296 },
-+ { "archA", 648, 864 },
-+ { "flsa", 612, 936 }, /* U.S. foolscap */
-+ { "flse", 612, 936 }, /* European foolscap */
-+ { "halfletter", 396, 612 },
- { NULL, 0, 0 }
- };
-
-@@ -69,7 +108,7 @@ Paper* findpaper(char *name)
- {
- Paper *pp;
- for (pp = papersizes; PaperName(pp); pp++) {
-- if (strcmp(PaperName(pp), name) == 0) {
-+ if (strncasecmp(PaperName(pp), name, strlen(PaperName(pp))) == 0) {
- return pp;
- }
- }
-@@ -88,16 +127,15 @@ FILE *seekable(FILE *fp)
- #if defined(WINNT) || defined(WIN32)
- struct _stat fs ;
- #else
-- long fpos;
-+ struct stat fs;
- #endif
-
- #if defined(WINNT) || defined(WIN32)
- if (_fstat(fileno(fp), &fs) == 0 && (fs.st_mode&_S_IFREG) != 0)
- return (fp);
- #else
-- if ((fpos = ftell(fp)) >= 0)
-- if (!fseek(fp, 0L, SEEK_END) && !fseek(fp, fpos, SEEK_SET))
-- return (fp);
-+ if (fstat(fileno(fp), &fs) == 0 && S_ISREG(fs.st_mode))
-+ return (fp);
- #endif
+ die("no %%%%BoundingBox:");
- #if defined(MSDOS)
++++++ source-texdoc.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:16.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:16.000000000 +0200
@@ -1,3 +1,7 @@
+---
+ utils/texdoctk/texdoctk.pl | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
--- utils/texdoctk/texdoctk.pl
+++ utils/texdoctk/texdoctk.pl 2008-09-24 14:56:14.000000000 +0000
@@ -1461,7 +1461,7 @@ sub writerc {
++++++ source-warns.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:17.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:17.000000000 +0200
@@ -1,5 +1,19 @@
---- libs/icu/icu-51.1/source/i18n/decNumber.h
-+++ libs/icu/icu-51.1/source/i18n/decNumber.h 2010-11-16 10:35:02.000000000 +0000
+---
+ libs/icu/icu-53.1/source/i18n/decNumber.h | 22 ++++++++++++---------
+ libs/icu/icu-53.1/source/tools/pkgdata/pkgdata.cpp | 4 +--
+ libs/lua52/Makefile.in | 2 -
+ libs/teckit/TECkit-2.5.3/source/Compiler.cpp | 17 +++++++++-------
+ texk/chktex/chktex-1.7.2/FindErrs.c | 2 -
+ texk/makeindexk/genind.h | 16 ++++++++++++++-
+ texk/makeindexk/mkind.h | 20 ++++++++++++++++---
+ texk/makeindexk/scanid.h | 16 ++++++++++++++-
+ texk/makeindexk/scanst.h | 16 ++++++++++++++-
+ texk/ps2pkm/t1funcs.c | 2 -
+ texk/ps2pkm/token.c | 2 -
+ 11 files changed, 91 insertions(+), 28 deletions(-)
+
+--- libs/icu/icu-53.1/source/i18n/decNumber.h
++++ libs/icu/icu-53.1/source/i18n/decNumber.h 2010-11-16 10:35:02.000000000 +0000
@@ -54,26 +54,30 @@
/* For ICU, use one digit per byte, to make it easier to emulate the
* old DigitList interface on top of a decNumber
@@ -40,20 +54,31 @@
/* The number of units needed is ceil(DECNUMDIGITS/DECDPUN) */
#define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN)
---- libs/icu/icu-51.1/source/tools/pkgdata/pkgdata.cpp
-+++ libs/icu/icu-51.1/source/pkgdata/pkgdata.cpp 2012-04-13 17:09:26.690772599 +0200
-@@ -1917,9 +1917,9 @@ static void loadLists(UPKGOptions *o, UE
+--- libs/icu/icu-53.1/source/tools/pkgdata/pkgdata.cpp
++++ libs/icu/icu-53.1/source/tools/pkgdata/pkgdata.cpp 2012-04-13 15:09:27.000000000 +0000
+@@ -2072,9 +2072,9 @@ static void loadLists(UPKGOptions *o, UE
findDirname(progname, cmdBuf, 1024, &status);
if(U_SUCCESS(status)) {
if (cmdBuf[0] != 0) {
- uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
+ uprv_strncat(cmdBuf, U_FILE_SEP_STRING, strlen(U_FILE_SEP_STRING));
}
-- uprv_strncat(cmdBuf, cmd, 1024);
+- uprv_strncat(cmdBuf, cmd, 1023);
+ uprv_strncat(cmdBuf, cmd, strlen(cmd));
if(verbose) {
fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf);
+--- libs/lua52/Makefile.in
++++ libs/lua52/Makefile.in 2015-03-26 14:44:10.323096423 +0000
+@@ -180,7 +180,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
+ AM_V_CC = $(am__v_CC_@AM_V@)
+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
--- libs/teckit/TECkit-2.5.3/source/Compiler.cpp
+++ libs/teckit/TECkit-2.5.3/source/Compiler.cpp 2009-08-28 15:16:33.000000000 +0000
@@ -1451,13 +1451,16 @@ Compiler::Compiler(const char* txt, UInt
@@ -80,6 +105,17 @@
}
else
free(dest);
+--- texk/chktex/chktex-1.7.2/FindErrs.c
++++ texk/chktex/chktex-1.7.2/FindErrs.c 2015-03-26 14:59:06.597518850 +0000
+@@ -1171,7 +1171,7 @@ int CheckSilentRegex(void)
+ tmp = stpcpy(tmp, SilentCase.Stack.Data[i]);
+ *tmp++ = '|';
+ }
+- tmp = stpcpy(--tmp, ")");
++ tmp = stpcpy((tmp-1), ")");
+
+ SilentRegex = malloc( sizeof(regex_t) );
+ rc = regcomp(SilentRegex, pattern, REGEX_FLAGS);
--- texk/makeindexk/genind.h
+++ texk/makeindexk/genind.h 2009-08-28 15:18:03.000000000 +0000
@@ -25,6 +25,20 @@
@@ -114,7 +150,7 @@
--- texk/makeindexk/mkind.h
+++ texk/makeindexk/mkind.h 2009-08-28 15:20:13.000000000 +0000
-@@ -245,6 +245,20 @@ extern int mk_getc (FILE *str);
+@@ -244,6 +244,20 @@ extern int mk_getc (FILE *str);
#define STREQ(A, B) (strcmp(A, B) == 0)
#define STRNEQ(A, B) (strcmp(A, B) != 0)
@@ -135,7 +171,7 @@
#define MESSAGE(F) { \
if (verbose) \
fprintf(stderr, F); \
-@@ -253,8 +267,8 @@ extern int mk_getc (FILE *str);
+@@ -252,8 +266,8 @@ extern int mk_getc (FILE *str);
#define MESSAGE1(F, S) { \
if (verbose) \
@@ -146,7 +182,7 @@
}
#if USE_KPATHSEA /* kpathsea defines a different FATAL */
-@@ -272,7 +286,7 @@ extern int mk_getc (FILE *str);
+@@ -271,7 +285,7 @@ extern int mk_getc (FILE *str);
#endif
#define FATAL1(F, S) { \
@@ -189,7 +225,7 @@
--- texk/makeindexk/scanst.h
+++ texk/makeindexk/scanst.h 2009-08-28 15:21:39.000000000 +0000
-@@ -157,6 +157,20 @@
+@@ -158,6 +158,20 @@
put_dot = FALSE; \
}
@@ -210,7 +246,7 @@
#define STY_ERROR1(F, D) { \
if (idx_dot) { \
fprintf(ilg_fp, "\n"); \
-@@ -164,7 +178,7 @@
+@@ -165,7 +179,7 @@
} \
fprintf(ilg_fp, "** Input style error (file = %s, line = %d):\n -- ", \
sty_fn, sty_lc); \
++++++ source-x11r7.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:17.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:17.000000000 +0200
@@ -1,6 +1,10 @@
+---
+ texk/xdvik/xdvi.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
--- texk/xdvik/xdvi.h
+++ texk/xdvik/xdvi.h 2008-09-24 15:43:29.000000000 +0000
-@@ -202,6 +202,12 @@ typedef unsigned long xuint32;
+@@ -196,6 +196,12 @@ extern unsigned long time_start, time_en
#include
#endif
++++++ source-xdvik-events.dif ++++++
--- texk/xdvik/events.c 2014/04/17 07:12:06 1.413
+++ texk/xdvik/events.c 2014/04/27 05:35:02 1.414
@@ -5306,7 +5306,7 @@
}
if (actp->proc == Act_wheel) {
-# if XAW
+# if !MOTIF
if (globals.widgets.y_bar != NULL)
XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
cast_int_to_XtPointer(dist));
@@ -5317,7 +5317,7 @@
# endif /* MOTIF */
}
else { /* Act_hwheel */
-# if XAW
+# if !MOTIF
if (globals.widgets.x_bar != NULL)
XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc,
cast_int_to_XtPointer(dist));
++++++ source-xdvizilla.dif ++++++
--- /var/tmp/diff_new_pack.FiTuKd/_old 2015-04-25 09:51:17.000000000 +0200
+++ /var/tmp/diff_new_pack.FiTuKd/_new 2015-04-25 09:51:17.000000000 +0200
@@ -1,5 +1,9 @@
+---
+ texk/xdvik/xdvizilla | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
--- texk/xdvik/xdvizilla
-+++ texk/xdvik/xdvizilla 2008-09-25 10:38:16.072122050 +0000
++++ texk/xdvik/xdvizilla 2008-09-25 10:38:16.000000000 +0000
@@ -89,12 +89,7 @@ trap 'do_cleanup' 1 2 3 7 13 15
### create a temporary directory only read/writable by user
### try mktemp if it's available
++++++ source.dif ++++++
++++ 772 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive/source.dif
++++ and /work/SRC/openSUSE:Factory/.texlive.new/source.dif
++++++ texlive-20130620-source.tar.xz -> texlive-20140525-source.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive/texlive-20130620-source.tar.xz /work/SRC/openSUSE:Factory/.texlive.new/texlive-20140525-source.tar.xz differ: char 25, line 1