From 5ef2fb04a27cd5ef7c85fbefec889b2503259290 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Feb 2017 18:43:14 +0000 Subject: rename foo/foo-PATCHES to foo/TLPATCHES for better completion git-svn-id: svn://tug.org/texlive/trunk@43212 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/cairo/TLPATCHES/ChangeLog | 37 ++ Build/source/libs/cairo/TLPATCHES/TL-Changes | 33 ++ Build/source/libs/cairo/cairo-PATCHES/ChangeLog | 37 -- Build/source/libs/cairo/cairo-PATCHES/TL-Changes | 33 -- Build/source/libs/freetype2/TLPATCHES/ChangeLog | 102 +++++ Build/source/libs/freetype2/TLPATCHES/TL-Changes | 2 + .../libs/freetype2/freetype-PATCHES/ChangeLog | 102 ----- .../libs/freetype2/freetype-PATCHES/TL-Changes | 2 - Build/source/libs/gd/TLPATCHES/ChangeLog | 58 +++ Build/source/libs/gd/TLPATCHES/TL-Changes | 30 ++ Build/source/libs/gd/TLPATCHES/patch-01-win32 | 20 + Build/source/libs/gd/TLPATCHES/patch-02-no-stdcall | 12 + Build/source/libs/gd/libgd-PATCHES/ChangeLog | 58 --- Build/source/libs/gd/libgd-PATCHES/TL-Changes | 30 -- Build/source/libs/gd/libgd-PATCHES/patch-01-win32 | 20 - .../libs/gd/libgd-PATCHES/patch-02-no-stdcall | 12 - Build/source/libs/gmp/TLPATCHES/ChangeLog | 15 + Build/source/libs/gmp/TLPATCHES/TL-Changes | 38 ++ Build/source/libs/gmp/gmp-PATCHES/ChangeLog | 15 - Build/source/libs/gmp/gmp-PATCHES/TL-Changes | 38 -- Build/source/libs/graphite2/TLPATCHES/ChangeLog | 72 +++ Build/source/libs/graphite2/TLPATCHES/TL-Changes | 9 + .../libs/graphite2/graphite2-PATCHES/ChangeLog | 72 --- .../libs/graphite2/graphite2-PATCHES/TL-Changes | 9 - Build/source/libs/harfbuzz/TLPATCHES/ChangeLog | 164 +++++++ Build/source/libs/harfbuzz/TLPATCHES/TL-Changes | 28 ++ .../libs/harfbuzz/harfbuzz-PATCHES/ChangeLog | 164 ------- .../libs/harfbuzz/harfbuzz-PATCHES/TL-Changes | 28 -- Build/source/libs/icu/TLPATCHES/ChangeLog | 483 +++++++++++++++++++++ Build/source/libs/icu/TLPATCHES/TL-Changes | 56 +++ .../source/libs/icu/TLPATCHES/patch-03-gcc-atomic | 13 + Build/source/libs/icu/TLPATCHES/patch-12-mingw | 32 ++ .../libs/icu/TLPATCHES/patch-13-STATIC_PREFIX | 31 ++ Build/source/libs/icu/TLPATCHES/patch-14-xopen | 19 + Build/source/libs/icu/TLPATCHES/patch-16-putil | 45 ++ .../libs/icu/TLPATCHES/patch-17-cygwin-no-w32api | 452 +++++++++++++++++++ Build/source/libs/icu/TLPATCHES/patch-20-private | 73 ++++ Build/source/libs/icu/icu-PATCHES/ChangeLog | 483 --------------------- Build/source/libs/icu/icu-PATCHES/TL-Changes | 56 --- .../libs/icu/icu-PATCHES/patch-03-gcc-atomic | 13 - Build/source/libs/icu/icu-PATCHES/patch-12-mingw | 32 -- .../libs/icu/icu-PATCHES/patch-13-STATIC_PREFIX | 31 -- Build/source/libs/icu/icu-PATCHES/patch-14-xopen | 19 - Build/source/libs/icu/icu-PATCHES/patch-16-putil | 45 -- .../libs/icu/icu-PATCHES/patch-17-cygwin-no-w32api | 452 ------------------- Build/source/libs/icu/icu-PATCHES/patch-20-private | 73 ---- Build/source/libs/libpaper/TLPATCHES/ChangeLog | 16 + Build/source/libs/libpaper/TLPATCHES/TL-Changes | 23 + Build/source/libs/libpaper/TLPATCHES/patch-01-JIS | 44 ++ Build/source/libs/libpaper/TLPATCHES/patch-02-TL | 171 ++++++++ .../source/libs/libpaper/TLPATCHES/patch-03-getopt | 49 +++ .../libs/libpaper/TLPATCHES/patch-04-unsigned | 29 ++ .../libs/libpaper/libpaper-PATCHES/ChangeLog | 16 - .../libs/libpaper/libpaper-PATCHES/TL-Changes | 23 - .../libs/libpaper/libpaper-PATCHES/patch-01-JIS | 44 -- .../libs/libpaper/libpaper-PATCHES/patch-02-TL | 171 -------- .../libs/libpaper/libpaper-PATCHES/patch-03-getopt | 49 --- .../libpaper/libpaper-PATCHES/patch-04-unsigned | 29 -- Build/source/libs/libpng/TLPATCHES/ChangeLog | 52 +++ Build/source/libs/libpng/TLPATCHES/TL-Changes | 18 + Build/source/libs/libpng/libpng-PATCHES/ChangeLog | 52 --- Build/source/libs/libpng/libpng-PATCHES/TL-Changes | 18 - Build/source/libs/lua52/TLPATCHES/ChangeLog | 36 ++ Build/source/libs/lua52/TLPATCHES/patch-01-utf-8 | 26 ++ Build/source/libs/lua52/TLPATCHES/patch-02-FreeBSD | 13 + Build/source/libs/lua52/TLPATCHES/patch-03-export | 33 ++ Build/source/libs/lua52/lua52-PATCHES/ChangeLog | 36 -- .../source/libs/lua52/lua52-PATCHES/patch-01-utf-8 | 26 -- .../libs/lua52/lua52-PATCHES/patch-02-FreeBSD | 13 - .../libs/lua52/lua52-PATCHES/patch-03-export | 33 -- Build/source/libs/luajit/LuaJIT-PATCHES/ChangeLog | 68 --- .../libs/luajit/LuaJIT-PATCHES/patch-01-LuaJITTeX | 221 ---------- .../libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX | 86 ---- .../libs/luajit/LuaJIT-PATCHES/patch-06-ppc-darwin | 25 -- .../luajit/LuaJIT-PATCHES/patch-07-x86_64-cygwin | 12 - Build/source/libs/luajit/TLPATCHES/ChangeLog | 68 +++ .../libs/luajit/TLPATCHES/patch-01-LuaJITTeX | 221 ++++++++++ .../libs/luajit/TLPATCHES/patch-05-LuaJITTeX | 86 ++++ .../libs/luajit/TLPATCHES/patch-06-ppc-darwin | 25 ++ .../libs/luajit/TLPATCHES/patch-07-x86_64-cygwin | 12 + Build/source/libs/mpfr/TLPATCHES/ChangeLog | 21 + Build/source/libs/mpfr/TLPATCHES/TL-Changes | 25 ++ Build/source/libs/mpfr/TLPATCHES/patch-01-TL | 42 ++ Build/source/libs/mpfr/mpfr-PATCHES/ChangeLog | 21 - Build/source/libs/mpfr/mpfr-PATCHES/TL-Changes | 25 -- Build/source/libs/mpfr/mpfr-PATCHES/patch-01-TL | 42 -- Build/source/libs/pixman/TLPATCHES/ChangeLog | 41 ++ Build/source/libs/pixman/TLPATCHES/TL-Changes | 22 + .../libs/pixman/TLPATCHES/patch-01-hide-symbols | 12 + Build/source/libs/pixman/pixman-PATCHES/ChangeLog | 41 -- Build/source/libs/pixman/pixman-PATCHES/TL-Changes | 22 - .../pixman/pixman-PATCHES/patch-01-hide-symbols | 12 - Build/source/libs/poppler/TLPATCHES/ChangeLog | 383 ++++++++++++++++ Build/source/libs/poppler/TLPATCHES/TL-Changes | 29 ++ .../libs/poppler/TLPATCHES/patch-02-LLONG_MAX | 25 ++ .../poppler/TLPATCHES/patch-03-Object-functions | 43 ++ .../source/libs/poppler/poppler-PATCHES/ChangeLog | 383 ---------------- .../source/libs/poppler/poppler-PATCHES/TL-Changes | 29 -- .../poppler/poppler-PATCHES/patch-02-LLONG_MAX | 25 -- .../poppler-PATCHES/patch-03-Object-functions | 43 -- Build/source/libs/potrace/TLPATCHES/ChangeLog | 14 + Build/source/libs/potrace/TLPATCHES/TL-Changes | 22 + .../source/libs/potrace/potrace-PATCHES/ChangeLog | 14 - .../source/libs/potrace/potrace-PATCHES/TL-Changes | 22 - Build/source/libs/teckit/TECkit-PATCHES/ChangeLog | 79 ---- Build/source/libs/teckit/TECkit-PATCHES/TL-Changes | 34 -- .../libs/teckit/TECkit-PATCHES/patch-02-warning | 14 - .../libs/teckit/TECkit-PATCHES/patch-03-warnings | 104 ----- .../libs/teckit/TECkit-PATCHES/patch-04-pragmas | 61 --- .../libs/teckit/TECkit-PATCHES/patch-05-static | 44 -- .../TECkit-PATCHES/patch-06-dont-build-sfconv | 12 - Build/source/libs/teckit/TLPATCHES/ChangeLog | 79 ++++ Build/source/libs/teckit/TLPATCHES/TL-Changes | 34 ++ .../source/libs/teckit/TLPATCHES/patch-02-warning | 14 + .../source/libs/teckit/TLPATCHES/patch-03-warnings | 104 +++++ .../source/libs/teckit/TLPATCHES/patch-04-pragmas | 61 +++ Build/source/libs/teckit/TLPATCHES/patch-05-static | 44 ++ .../teckit/TLPATCHES/patch-06-dont-build-sfconv | 12 + Build/source/libs/xpdf/TLPATCHES/ChangeLog | 157 +++++++ Build/source/libs/xpdf/TLPATCHES/TL-Changes | 6 + .../patch-10-exclude-body-of-Page_getDefaultCTM | 23 + .../TLPATCHES/patch-20-skip-reading-config-file | 60 +++ .../xpdf/TLPATCHES/patch-22-exclude-openTempFile | 34 ++ .../libs/xpdf/TLPATCHES/patch-30-include-strings_h | 15 + Build/source/libs/xpdf/TLPATCHES/patch-40-W32TeX | 29 ++ Build/source/libs/xpdf/TLPATCHES/patch-41-W32TeX | 177 ++++++++ Build/source/libs/xpdf/xpdf-PATCHES/ChangeLog | 157 ------- Build/source/libs/xpdf/xpdf-PATCHES/TL-Changes | 6 - .../patch-10-exclude-body-of-Page_getDefaultCTM | 23 - .../xpdf-PATCHES/patch-20-skip-reading-config-file | 60 --- .../xpdf-PATCHES/patch-22-exclude-openTempFile | 34 -- .../xpdf/xpdf-PATCHES/patch-30-include-strings_h | 15 - .../source/libs/xpdf/xpdf-PATCHES/patch-40-W32TeX | 29 -- .../source/libs/xpdf/xpdf-PATCHES/patch-41-W32TeX | 177 -------- Build/source/libs/zlib/TLPATCHES/ChangeLog | 21 + Build/source/libs/zlib/TLPATCHES/TL-Changes | 75 ++++ .../patch-01-not-define-WIDECHAR-for-cygwin | 12 + Build/source/libs/zlib/zlib-PATCHES/ChangeLog | 21 - Build/source/libs/zlib/zlib-PATCHES/TL-Changes | 75 ---- .../patch-01-not-define-WIDECHAR-for-cygwin | 12 - Build/source/libs/zziplib/TLPATCHES/ChangeLog | 48 ++ Build/source/libs/zziplib/TLPATCHES/TL-Changes | 26 ++ .../source/libs/zziplib/TLPATCHES/patch-01-binary | 15 + .../source/libs/zziplib/TLPATCHES/patch-02-bugfix | 111 +++++ .../source/libs/zziplib/TLPATCHES/patch-03-w64-ptr | 27 ++ .../source/libs/zziplib/zziplib-PATCHES/ChangeLog | 48 -- .../source/libs/zziplib/zziplib-PATCHES/TL-Changes | 26 -- .../libs/zziplib/zziplib-PATCHES/patch-01-binary | 15 - .../libs/zziplib/zziplib-PATCHES/patch-02-bugfix | 111 ----- .../libs/zziplib/zziplib-PATCHES/patch-03-w64-ptr | 27 -- 150 files changed, 4609 insertions(+), 4609 deletions(-) create mode 100644 Build/source/libs/cairo/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/cairo/TLPATCHES/TL-Changes delete mode 100644 Build/source/libs/cairo/cairo-PATCHES/ChangeLog delete mode 100644 Build/source/libs/cairo/cairo-PATCHES/TL-Changes create mode 100644 Build/source/libs/freetype2/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/freetype2/TLPATCHES/TL-Changes delete mode 100644 Build/source/libs/freetype2/freetype-PATCHES/ChangeLog delete mode 100644 Build/source/libs/freetype2/freetype-PATCHES/TL-Changes create mode 100644 Build/source/libs/gd/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/gd/TLPATCHES/TL-Changes create mode 100644 Build/source/libs/gd/TLPATCHES/patch-01-win32 create mode 100644 Build/source/libs/gd/TLPATCHES/patch-02-no-stdcall delete mode 100644 Build/source/libs/gd/libgd-PATCHES/ChangeLog delete mode 100644 Build/source/libs/gd/libgd-PATCHES/TL-Changes delete mode 100644 Build/source/libs/gd/libgd-PATCHES/patch-01-win32 delete mode 100644 Build/source/libs/gd/libgd-PATCHES/patch-02-no-stdcall create mode 100644 Build/source/libs/gmp/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/gmp/TLPATCHES/TL-Changes delete mode 100644 Build/source/libs/gmp/gmp-PATCHES/ChangeLog delete mode 100644 Build/source/libs/gmp/gmp-PATCHES/TL-Changes create mode 100644 Build/source/libs/graphite2/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/graphite2/TLPATCHES/TL-Changes delete mode 100644 Build/source/libs/graphite2/graphite2-PATCHES/ChangeLog delete mode 100644 Build/source/libs/graphite2/graphite2-PATCHES/TL-Changes create mode 100644 Build/source/libs/harfbuzz/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/harfbuzz/TLPATCHES/TL-Changes delete mode 100644 Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog delete mode 100644 Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes create mode 100644 Build/source/libs/icu/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/icu/TLPATCHES/TL-Changes create mode 100644 Build/source/libs/icu/TLPATCHES/patch-03-gcc-atomic create mode 100644 Build/source/libs/icu/TLPATCHES/patch-12-mingw create mode 100644 Build/source/libs/icu/TLPATCHES/patch-13-STATIC_PREFIX create mode 100644 Build/source/libs/icu/TLPATCHES/patch-14-xopen create mode 100644 Build/source/libs/icu/TLPATCHES/patch-16-putil create mode 100644 Build/source/libs/icu/TLPATCHES/patch-17-cygwin-no-w32api create mode 100644 Build/source/libs/icu/TLPATCHES/patch-20-private delete mode 100644 Build/source/libs/icu/icu-PATCHES/ChangeLog delete mode 100644 Build/source/libs/icu/icu-PATCHES/TL-Changes delete mode 100644 Build/source/libs/icu/icu-PATCHES/patch-03-gcc-atomic delete mode 100644 Build/source/libs/icu/icu-PATCHES/patch-12-mingw delete mode 100644 Build/source/libs/icu/icu-PATCHES/patch-13-STATIC_PREFIX delete mode 100644 Build/source/libs/icu/icu-PATCHES/patch-14-xopen delete mode 100644 Build/source/libs/icu/icu-PATCHES/patch-16-putil delete mode 100644 Build/source/libs/icu/icu-PATCHES/patch-17-cygwin-no-w32api delete mode 100644 Build/source/libs/icu/icu-PATCHES/patch-20-private create mode 100644 Build/source/libs/libpaper/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/libpaper/TLPATCHES/TL-Changes create mode 100644 Build/source/libs/libpaper/TLPATCHES/patch-01-JIS create mode 100644 Build/source/libs/libpaper/TLPATCHES/patch-02-TL create mode 100644 Build/source/libs/libpaper/TLPATCHES/patch-03-getopt create mode 100644 Build/source/libs/libpaper/TLPATCHES/patch-04-unsigned delete mode 100644 Build/source/libs/libpaper/libpaper-PATCHES/ChangeLog delete mode 100644 Build/source/libs/libpaper/libpaper-PATCHES/TL-Changes delete mode 100644 Build/source/libs/libpaper/libpaper-PATCHES/patch-01-JIS delete mode 100644 Build/source/libs/libpaper/libpaper-PATCHES/patch-02-TL delete mode 100644 Build/source/libs/libpaper/libpaper-PATCHES/patch-03-getopt delete mode 100644 Build/source/libs/libpaper/libpaper-PATCHES/patch-04-unsigned create mode 100644 Build/source/libs/libpng/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/libpng/TLPATCHES/TL-Changes delete mode 100644 Build/source/libs/libpng/libpng-PATCHES/ChangeLog delete mode 100644 Build/source/libs/libpng/libpng-PATCHES/TL-Changes create mode 100644 Build/source/libs/lua52/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/lua52/TLPATCHES/patch-01-utf-8 create mode 100644 Build/source/libs/lua52/TLPATCHES/patch-02-FreeBSD create mode 100644 Build/source/libs/lua52/TLPATCHES/patch-03-export delete mode 100644 Build/source/libs/lua52/lua52-PATCHES/ChangeLog delete mode 100644 Build/source/libs/lua52/lua52-PATCHES/patch-01-utf-8 delete mode 100644 Build/source/libs/lua52/lua52-PATCHES/patch-02-FreeBSD delete mode 100644 Build/source/libs/lua52/lua52-PATCHES/patch-03-export delete mode 100644 Build/source/libs/luajit/LuaJIT-PATCHES/ChangeLog delete mode 100644 Build/source/libs/luajit/LuaJIT-PATCHES/patch-01-LuaJITTeX delete mode 100644 Build/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX delete mode 100644 Build/source/libs/luajit/LuaJIT-PATCHES/patch-06-ppc-darwin delete mode 100644 Build/source/libs/luajit/LuaJIT-PATCHES/patch-07-x86_64-cygwin create mode 100644 Build/source/libs/luajit/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/luajit/TLPATCHES/patch-01-LuaJITTeX create mode 100644 Build/source/libs/luajit/TLPATCHES/patch-05-LuaJITTeX create mode 100644 Build/source/libs/luajit/TLPATCHES/patch-06-ppc-darwin create mode 100644 Build/source/libs/luajit/TLPATCHES/patch-07-x86_64-cygwin create mode 100644 Build/source/libs/mpfr/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/mpfr/TLPATCHES/TL-Changes create mode 100644 Build/source/libs/mpfr/TLPATCHES/patch-01-TL delete mode 100644 Build/source/libs/mpfr/mpfr-PATCHES/ChangeLog delete mode 100644 Build/source/libs/mpfr/mpfr-PATCHES/TL-Changes delete mode 100644 Build/source/libs/mpfr/mpfr-PATCHES/patch-01-TL create mode 100644 Build/source/libs/pixman/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/pixman/TLPATCHES/TL-Changes create mode 100644 Build/source/libs/pixman/TLPATCHES/patch-01-hide-symbols delete mode 100644 Build/source/libs/pixman/pixman-PATCHES/ChangeLog delete mode 100644 Build/source/libs/pixman/pixman-PATCHES/TL-Changes delete mode 100644 Build/source/libs/pixman/pixman-PATCHES/patch-01-hide-symbols create mode 100644 Build/source/libs/poppler/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/poppler/TLPATCHES/TL-Changes create mode 100644 Build/source/libs/poppler/TLPATCHES/patch-02-LLONG_MAX create mode 100644 Build/source/libs/poppler/TLPATCHES/patch-03-Object-functions delete mode 100644 Build/source/libs/poppler/poppler-PATCHES/ChangeLog delete mode 100644 Build/source/libs/poppler/poppler-PATCHES/TL-Changes delete mode 100644 Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX delete mode 100644 Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions create mode 100644 Build/source/libs/potrace/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/potrace/TLPATCHES/TL-Changes delete mode 100644 Build/source/libs/potrace/potrace-PATCHES/ChangeLog delete mode 100644 Build/source/libs/potrace/potrace-PATCHES/TL-Changes delete mode 100644 Build/source/libs/teckit/TECkit-PATCHES/ChangeLog delete mode 100644 Build/source/libs/teckit/TECkit-PATCHES/TL-Changes delete mode 100644 Build/source/libs/teckit/TECkit-PATCHES/patch-02-warning delete mode 100644 Build/source/libs/teckit/TECkit-PATCHES/patch-03-warnings delete mode 100644 Build/source/libs/teckit/TECkit-PATCHES/patch-04-pragmas delete mode 100644 Build/source/libs/teckit/TECkit-PATCHES/patch-05-static delete mode 100644 Build/source/libs/teckit/TECkit-PATCHES/patch-06-dont-build-sfconv create mode 100644 Build/source/libs/teckit/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/teckit/TLPATCHES/TL-Changes create mode 100644 Build/source/libs/teckit/TLPATCHES/patch-02-warning create mode 100644 Build/source/libs/teckit/TLPATCHES/patch-03-warnings create mode 100644 Build/source/libs/teckit/TLPATCHES/patch-04-pragmas create mode 100644 Build/source/libs/teckit/TLPATCHES/patch-05-static create mode 100644 Build/source/libs/teckit/TLPATCHES/patch-06-dont-build-sfconv create mode 100644 Build/source/libs/xpdf/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/xpdf/TLPATCHES/TL-Changes create mode 100644 Build/source/libs/xpdf/TLPATCHES/patch-10-exclude-body-of-Page_getDefaultCTM create mode 100644 Build/source/libs/xpdf/TLPATCHES/patch-20-skip-reading-config-file create mode 100644 Build/source/libs/xpdf/TLPATCHES/patch-22-exclude-openTempFile create mode 100644 Build/source/libs/xpdf/TLPATCHES/patch-30-include-strings_h create mode 100644 Build/source/libs/xpdf/TLPATCHES/patch-40-W32TeX create mode 100644 Build/source/libs/xpdf/TLPATCHES/patch-41-W32TeX delete mode 100644 Build/source/libs/xpdf/xpdf-PATCHES/ChangeLog delete mode 100644 Build/source/libs/xpdf/xpdf-PATCHES/TL-Changes delete mode 100644 Build/source/libs/xpdf/xpdf-PATCHES/patch-10-exclude-body-of-Page_getDefaultCTM delete mode 100644 Build/source/libs/xpdf/xpdf-PATCHES/patch-20-skip-reading-config-file delete mode 100644 Build/source/libs/xpdf/xpdf-PATCHES/patch-22-exclude-openTempFile delete mode 100644 Build/source/libs/xpdf/xpdf-PATCHES/patch-30-include-strings_h delete mode 100644 Build/source/libs/xpdf/xpdf-PATCHES/patch-40-W32TeX delete mode 100644 Build/source/libs/xpdf/xpdf-PATCHES/patch-41-W32TeX create mode 100644 Build/source/libs/zlib/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/zlib/TLPATCHES/TL-Changes create mode 100644 Build/source/libs/zlib/TLPATCHES/patch-01-not-define-WIDECHAR-for-cygwin delete mode 100644 Build/source/libs/zlib/zlib-PATCHES/ChangeLog delete mode 100644 Build/source/libs/zlib/zlib-PATCHES/TL-Changes delete mode 100644 Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin create mode 100644 Build/source/libs/zziplib/TLPATCHES/ChangeLog create mode 100644 Build/source/libs/zziplib/TLPATCHES/TL-Changes create mode 100644 Build/source/libs/zziplib/TLPATCHES/patch-01-binary create mode 100644 Build/source/libs/zziplib/TLPATCHES/patch-02-bugfix create mode 100644 Build/source/libs/zziplib/TLPATCHES/patch-03-w64-ptr delete mode 100644 Build/source/libs/zziplib/zziplib-PATCHES/ChangeLog delete mode 100644 Build/source/libs/zziplib/zziplib-PATCHES/TL-Changes delete mode 100644 Build/source/libs/zziplib/zziplib-PATCHES/patch-01-binary delete mode 100644 Build/source/libs/zziplib/zziplib-PATCHES/patch-02-bugfix delete mode 100644 Build/source/libs/zziplib/zziplib-PATCHES/patch-03-w64-ptr (limited to 'Build/source/libs') diff --git a/Build/source/libs/cairo/TLPATCHES/ChangeLog b/Build/source/libs/cairo/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..6f5e722812f --- /dev/null +++ b/Build/source/libs/cairo/TLPATCHES/ChangeLog @@ -0,0 +1,37 @@ +2016-12-09 Akira Kakuto + + Import cairo-1.14.8. + +2015-12-28 Akira Kakuto + + Import cairo-1.14.6. + +2015-03-11 Peter Breitenlohner + + Import cairo-1.14.2. + +2014-10-15 Peter Breitenlohner + + Import cairo-1.14.0. + +2013-09-10 Peter Breitenlohner + + Import cairo-1.12.16. + +2013-05-25 Peter Breitenlohner + + Import cairo-1.12.14. + +2012-11-16 Peter Breitenlohner + + Import cairo-1.12.8. + * patch-01-mingw (removed): Obsolete. + +2012-11-15 Peter Breitenlohner + + Import cairo-1.10.2. + * patch-01-mingw (new): Build fix for MinGW. + +2012-11-10 Taco Hoekwater + + Import cairo-1.12.8. diff --git a/Build/source/libs/cairo/TLPATCHES/TL-Changes b/Build/source/libs/cairo/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..05c12b8a4ff --- /dev/null +++ b/Build/source/libs/cairo/TLPATCHES/TL-Changes @@ -0,0 +1,33 @@ +Changes applied to the cairo-1.14.8/ tree as obtained from: + http://cairographics.org/releases/cairo-1.14.8.tar.xz + +Removed: + Makefile.in + ChangeLog* + aclocal.m4 + build/ar-lib + build/compile + build/config.guess + build/config.sub + build/depcomp + build/install-sh + build/libtool.m4 + build/ltmain.sh + build/ltoptions.m4 + build/ltsugar.m4 + build/ltversion.m4 + build/lt~obsolete.m4 + build/missing + build/test-driver + configure + src/Makefile.in + +Removed unused dirs: + boilerplate + doc + perf + src/drm + src/skia + src/win32 + test + util diff --git a/Build/source/libs/cairo/cairo-PATCHES/ChangeLog b/Build/source/libs/cairo/cairo-PATCHES/ChangeLog deleted file mode 100644 index 6f5e722812f..00000000000 --- a/Build/source/libs/cairo/cairo-PATCHES/ChangeLog +++ /dev/null @@ -1,37 +0,0 @@ -2016-12-09 Akira Kakuto - - Import cairo-1.14.8. - -2015-12-28 Akira Kakuto - - Import cairo-1.14.6. - -2015-03-11 Peter Breitenlohner - - Import cairo-1.14.2. - -2014-10-15 Peter Breitenlohner - - Import cairo-1.14.0. - -2013-09-10 Peter Breitenlohner - - Import cairo-1.12.16. - -2013-05-25 Peter Breitenlohner - - Import cairo-1.12.14. - -2012-11-16 Peter Breitenlohner - - Import cairo-1.12.8. - * patch-01-mingw (removed): Obsolete. - -2012-11-15 Peter Breitenlohner - - Import cairo-1.10.2. - * patch-01-mingw (new): Build fix for MinGW. - -2012-11-10 Taco Hoekwater - - Import cairo-1.12.8. diff --git a/Build/source/libs/cairo/cairo-PATCHES/TL-Changes b/Build/source/libs/cairo/cairo-PATCHES/TL-Changes deleted file mode 100644 index 05c12b8a4ff..00000000000 --- a/Build/source/libs/cairo/cairo-PATCHES/TL-Changes +++ /dev/null @@ -1,33 +0,0 @@ -Changes applied to the cairo-1.14.8/ tree as obtained from: - http://cairographics.org/releases/cairo-1.14.8.tar.xz - -Removed: - Makefile.in - ChangeLog* - aclocal.m4 - build/ar-lib - build/compile - build/config.guess - build/config.sub - build/depcomp - build/install-sh - build/libtool.m4 - build/ltmain.sh - build/ltoptions.m4 - build/ltsugar.m4 - build/ltversion.m4 - build/lt~obsolete.m4 - build/missing - build/test-driver - configure - src/Makefile.in - -Removed unused dirs: - boilerplate - doc - perf - src/drm - src/skia - src/win32 - test - util diff --git a/Build/source/libs/freetype2/TLPATCHES/ChangeLog b/Build/source/libs/freetype2/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..d4fe552186d --- /dev/null +++ b/Build/source/libs/freetype2/TLPATCHES/ChangeLog @@ -0,0 +1,102 @@ +2016-12-30 Akira Kakuto + + Imported freetype-2.7.1 source tree from: + http://savannah.nongnu.org/download/freetype/ + +2016-09-13 Akira Kakuto + + Imported freetype-2.7.0 source tree from: + http://savannah.nongnu.org/download/freetype/ + +2016-07-12 Akira Kakuto + + Imported freetype-2.6.5 source tree from: + http://savannah.nongnu.org/download/freetype/ + +2016-07-07 Akira Kakuto + + Imported freetype-2.6.4 source tree from: + http://savannah.nongnu.org/download/freetype/ + +2016-02-12 Akira Kakuto + + Imported freetype-2.6.3 source tree from: + http://savannah.nongnu.org/download/freetype/ + +2015-12-28 Akira Kakuto + + Imported freetype-2.6.2 source tree from: + http://savannah.nongnu.org/download/freetype/ + +2015-06-09 Peter Breitenlohner + + Imported freetype-2.6 source tree from: + http://savannah.nongnu.org/download/freetype/ + * patch-01-cff (removed): Applied upstream. + +2015-04-29 Peter Breitenlohner + + * patch-01-cff (new): Backport patch from upstream + commit 3cc076dae by Jiang Jiang . + +2015-01-07 Peter Breitenlohner + + Imported freetype-2.5.5 source tree from: + http://savannah.nongnu.org/download/freetype/ + +2014-12-07 Peter Breitenlohner + + Imported freetype-2.5.4 source tree from: + http://savannah.nongnu.org/download/freetype/ + +2014-03-08 Peter Breitenlohner + + Imported freetype-2.5.3 source tree from: + http://savannah.nongnu.org/download/freetype/ + +2013-12-09 Peter Breitenlohner + + Imported freetype-2.5.2 source tree from: + http://savannah.nongnu.org/download/freetype/ + +2013-11-25 Peter Breitenlohner + + Imported freetype-2.5.1 source tree from: + http://savannah.nongnu.org/download/freetype/ + +2013-06-21 Peter Breitenlohner + + Imported freetype-2.5.0.1 source tree from: + http://savannah.nongnu.org/download/freetype/ + * patch-01-CONFIG_SHELL (removed): Applied upstream. + * patch-02-DISABLE_OLD_INTERNALS (removed): ditto. + * patch-03-RESPECT-MAKE (removed): ditto. + +2013-03-31 Mojca Miklavec + + * patch-03-RESPECT-MAKE: Another update from git repository. + +2013-03-22 Peter Breitenlohner + + * patch-03-RESPECT-MAKE: Update from git repository. + +2013-03-21 Peter Breitenlohner + + * patch-03-RESPECT-MAKE (new): Backport from git repository. + +2013-03-03 Khaled Hosny + + * patch-02-DISABLE_OLD_INTERNALS (new): Build FreeType without + FT_CONFIG_OPTION_OLD_INTERNALS to fix a bug in loading some Mac fonts. + This is the default in the next FreeType release. + +2013-01-02 Peter Breitenlohner + + * patch-01-CONFIG_SHELL (new): Build fix for ancient systems + (e.g., AIX 4.3.3) with insuffient /bin/sh. + +2012-12-31 Peter Breitenlohner + + Imported freetype-2.4.11 source tree from: + http://savannah.nongnu.org/download/freetype/ + diff --git a/Build/source/libs/freetype2/TLPATCHES/TL-Changes b/Build/source/libs/freetype2/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..2e27e172fa6 --- /dev/null +++ b/Build/source/libs/freetype2/TLPATCHES/TL-Changes @@ -0,0 +1,2 @@ +Changes applied to the freetype-2.7.1/ tree as obtained from: + http://savannah.nongnu.org/download/freetype/. diff --git a/Build/source/libs/freetype2/freetype-PATCHES/ChangeLog b/Build/source/libs/freetype2/freetype-PATCHES/ChangeLog deleted file mode 100644 index d4fe552186d..00000000000 --- a/Build/source/libs/freetype2/freetype-PATCHES/ChangeLog +++ /dev/null @@ -1,102 +0,0 @@ -2016-12-30 Akira Kakuto - - Imported freetype-2.7.1 source tree from: - http://savannah.nongnu.org/download/freetype/ - -2016-09-13 Akira Kakuto - - Imported freetype-2.7.0 source tree from: - http://savannah.nongnu.org/download/freetype/ - -2016-07-12 Akira Kakuto - - Imported freetype-2.6.5 source tree from: - http://savannah.nongnu.org/download/freetype/ - -2016-07-07 Akira Kakuto - - Imported freetype-2.6.4 source tree from: - http://savannah.nongnu.org/download/freetype/ - -2016-02-12 Akira Kakuto - - Imported freetype-2.6.3 source tree from: - http://savannah.nongnu.org/download/freetype/ - -2015-12-28 Akira Kakuto - - Imported freetype-2.6.2 source tree from: - http://savannah.nongnu.org/download/freetype/ - -2015-06-09 Peter Breitenlohner - - Imported freetype-2.6 source tree from: - http://savannah.nongnu.org/download/freetype/ - * patch-01-cff (removed): Applied upstream. - -2015-04-29 Peter Breitenlohner - - * patch-01-cff (new): Backport patch from upstream - commit 3cc076dae by Jiang Jiang . - -2015-01-07 Peter Breitenlohner - - Imported freetype-2.5.5 source tree from: - http://savannah.nongnu.org/download/freetype/ - -2014-12-07 Peter Breitenlohner - - Imported freetype-2.5.4 source tree from: - http://savannah.nongnu.org/download/freetype/ - -2014-03-08 Peter Breitenlohner - - Imported freetype-2.5.3 source tree from: - http://savannah.nongnu.org/download/freetype/ - -2013-12-09 Peter Breitenlohner - - Imported freetype-2.5.2 source tree from: - http://savannah.nongnu.org/download/freetype/ - -2013-11-25 Peter Breitenlohner - - Imported freetype-2.5.1 source tree from: - http://savannah.nongnu.org/download/freetype/ - -2013-06-21 Peter Breitenlohner - - Imported freetype-2.5.0.1 source tree from: - http://savannah.nongnu.org/download/freetype/ - * patch-01-CONFIG_SHELL (removed): Applied upstream. - * patch-02-DISABLE_OLD_INTERNALS (removed): ditto. - * patch-03-RESPECT-MAKE (removed): ditto. - -2013-03-31 Mojca Miklavec - - * patch-03-RESPECT-MAKE: Another update from git repository. - -2013-03-22 Peter Breitenlohner - - * patch-03-RESPECT-MAKE: Update from git repository. - -2013-03-21 Peter Breitenlohner - - * patch-03-RESPECT-MAKE (new): Backport from git repository. - -2013-03-03 Khaled Hosny - - * patch-02-DISABLE_OLD_INTERNALS (new): Build FreeType without - FT_CONFIG_OPTION_OLD_INTERNALS to fix a bug in loading some Mac fonts. - This is the default in the next FreeType release. - -2013-01-02 Peter Breitenlohner - - * patch-01-CONFIG_SHELL (new): Build fix for ancient systems - (e.g., AIX 4.3.3) with insuffient /bin/sh. - -2012-12-31 Peter Breitenlohner - - Imported freetype-2.4.11 source tree from: - http://savannah.nongnu.org/download/freetype/ - diff --git a/Build/source/libs/freetype2/freetype-PATCHES/TL-Changes b/Build/source/libs/freetype2/freetype-PATCHES/TL-Changes deleted file mode 100644 index 2e27e172fa6..00000000000 --- a/Build/source/libs/freetype2/freetype-PATCHES/TL-Changes +++ /dev/null @@ -1,2 +0,0 @@ -Changes applied to the freetype-2.7.1/ tree as obtained from: - http://savannah.nongnu.org/download/freetype/. diff --git a/Build/source/libs/gd/TLPATCHES/ChangeLog b/Build/source/libs/gd/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..db52775694e --- /dev/null +++ b/Build/source/libs/gd/TLPATCHES/ChangeLog @@ -0,0 +1,58 @@ +2017-01-18 Akira Kakuto + + Import libgd-2.2.4 source tree from: + https://github.com/libgd/libgd/releases + * patch-01-win32: Adapted. + * patch-02-no-stdcall: Adapted. + +2016-12-23 Akira Kakuto + + Import libgd-2.2.3 source tree from: + https://github.com/libgd/libgd/releases + * patch-01-win32: Adapted. + * patch-02-no-stdcall: Adapted. + * patch-03-ceill: Removed. + * patch-04-double-semicolon: Removed. + +2015-01-15 Peter Breitenlohner + + * patch-04-double-semicolon: Build fix for Visual Studio 2010, + from Akira Kakuto . + +2015-01-14 Peter Breitenlohner + + Imported libgd-2.1.1 source tree from: + https://bitbucket.org/libgd/gd-libgd/downloads + + * patch-01-win32: Adapted. + * patch-02-no-stdcall: Adapted. + * patch-03-ceill: Adapted. + +2014-06-20 Peter Breitenlohner + + * patch-03-ceill (new): Replace ceill() by ceil() as everywhere. + +2013-06-26 Peter Breitenlohner + + Imported libgd-2.1.0 source tree from: + https://bitbucket.org/libgd/gd-libgd/downloads + + * patch-01-win32: Adapted. + * patch-02-no-stdcall: Adapted. + +2013-06-02 Peter Breitenlohner + + Imported libgd-2.1.0-rc1 source tree from: + https://bitbucket.org/libgd/gd-libgd/downloads + + * patch-01-win32: Adapted, some parts now upstream. + * patch-02-no-stdcall (new): Avoid '__stdcall'. + +2012-07-19 Peter Breitenlohner + + * patch-01-win32 [WIN32] (new): Avoid 'redefined' warnings. + Add $SYSTEMROOT\fonts fontsearchpath. + Mail from Akira, 18 Jul 2012 19:11:09. + +Copyright (C) 2012-2013 Peter Breitenlohner +You may freely use, modify and/or distribute this file. diff --git a/Build/source/libs/gd/TLPATCHES/TL-Changes b/Build/source/libs/gd/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..21b8cec668a --- /dev/null +++ b/Build/source/libs/gd/TLPATCHES/TL-Changes @@ -0,0 +1,30 @@ +Changes applied to the libgd-2.2.4/ tree as obtained from: + https://github.com/libgd/libgd/releases + +Removed: + Makefile.in + aclocal.m4 + config/Makefile.in + config/ar-lib + config/compile + config/config.guess + config/config.rpath + config/config.sub + config/depcomp + config/install-sh + config/ltmain.sh + config/missing + configure + m4/libtool.m4 + m4/ltoptions.m4 + m4/ltsugar.m4 + m4/ltversion.m4 + m4/lt~obsolete.m4 + src/Makefile.in + src/depcomp + tests/Makefile.in + +Removed execute permission: + windows/libgd.rc + windows/msys/deps.mk + diff --git a/Build/source/libs/gd/TLPATCHES/patch-01-win32 b/Build/source/libs/gd/TLPATCHES/patch-01-win32 new file mode 100644 index 00000000000..814ed38e1e9 --- /dev/null +++ b/Build/source/libs/gd/TLPATCHES/patch-01-win32 @@ -0,0 +1,20 @@ +diff -ur libgd-2.2.4.orig/src/gdft.c libgd-2.2.4/src/gdft.c +--- libgd-2.2.4.orig/src/gdft.c Wed Jan 18 20:01:19 2017 ++++ libgd-2.2.4/src/gdft.c Thu Jan 19 07:20:24 2017 +@@ -1683,6 +1683,16 @@ + */ + *fontpath = NULL; + fontsearchpath = getenv ("GDFONTPATH"); ++#ifdef _WIN32 ++ if (!fontsearchpath) { ++ char *ffptr = getenv ("SYSTEMROOT"); ++ if (ffptr) { ++ fontsearchpath = malloc (strlen(ffptr) + strlen("\\fonts") + 1); ++ strcpy(fontsearchpath, ffptr); ++ strcat(fontsearchpath, "\\fonts"); ++ } ++ } ++#endif + if (!fontsearchpath) + fontsearchpath = DEFAULT_FONTPATH; + path = (char *) gdMalloc(sizeof(char) * strlen(fontsearchpath) + 1); diff --git a/Build/source/libs/gd/TLPATCHES/patch-02-no-stdcall b/Build/source/libs/gd/TLPATCHES/patch-02-no-stdcall new file mode 100644 index 00000000000..efde64e3ccf --- /dev/null +++ b/Build/source/libs/gd/TLPATCHES/patch-02-no-stdcall @@ -0,0 +1,12 @@ +diff -ur libgd-2.2.4.orig/src/gd.h libgd-2.2.4/src/gd.h +--- libgd-2.2.4.orig/src/gd.h Wed Jan 18 20:01:19 2017 ++++ libgd-2.2.4/src/gd.h Thu Jan 19 07:22:18 2017 +@@ -63,7 +63,7 @@ + # define BGD_EXPORT_DATA_PROT __declspec(dllimport) + # endif + # endif +-# define BGD_STDCALL __stdcall ++# define BGD_STDCALL + # define BGD_EXPORT_DATA_IMPL + #else + # if defined(__GNUC__) || defined(__clang__) diff --git a/Build/source/libs/gd/libgd-PATCHES/ChangeLog b/Build/source/libs/gd/libgd-PATCHES/ChangeLog deleted file mode 100644 index db52775694e..00000000000 --- a/Build/source/libs/gd/libgd-PATCHES/ChangeLog +++ /dev/null @@ -1,58 +0,0 @@ -2017-01-18 Akira Kakuto - - Import libgd-2.2.4 source tree from: - https://github.com/libgd/libgd/releases - * patch-01-win32: Adapted. - * patch-02-no-stdcall: Adapted. - -2016-12-23 Akira Kakuto - - Import libgd-2.2.3 source tree from: - https://github.com/libgd/libgd/releases - * patch-01-win32: Adapted. - * patch-02-no-stdcall: Adapted. - * patch-03-ceill: Removed. - * patch-04-double-semicolon: Removed. - -2015-01-15 Peter Breitenlohner - - * patch-04-double-semicolon: Build fix for Visual Studio 2010, - from Akira Kakuto . - -2015-01-14 Peter Breitenlohner - - Imported libgd-2.1.1 source tree from: - https://bitbucket.org/libgd/gd-libgd/downloads - - * patch-01-win32: Adapted. - * patch-02-no-stdcall: Adapted. - * patch-03-ceill: Adapted. - -2014-06-20 Peter Breitenlohner - - * patch-03-ceill (new): Replace ceill() by ceil() as everywhere. - -2013-06-26 Peter Breitenlohner - - Imported libgd-2.1.0 source tree from: - https://bitbucket.org/libgd/gd-libgd/downloads - - * patch-01-win32: Adapted. - * patch-02-no-stdcall: Adapted. - -2013-06-02 Peter Breitenlohner - - Imported libgd-2.1.0-rc1 source tree from: - https://bitbucket.org/libgd/gd-libgd/downloads - - * patch-01-win32: Adapted, some parts now upstream. - * patch-02-no-stdcall (new): Avoid '__stdcall'. - -2012-07-19 Peter Breitenlohner - - * patch-01-win32 [WIN32] (new): Avoid 'redefined' warnings. - Add $SYSTEMROOT\fonts fontsearchpath. - Mail from Akira, 18 Jul 2012 19:11:09. - -Copyright (C) 2012-2013 Peter Breitenlohner -You may freely use, modify and/or distribute this file. diff --git a/Build/source/libs/gd/libgd-PATCHES/TL-Changes b/Build/source/libs/gd/libgd-PATCHES/TL-Changes deleted file mode 100644 index 21b8cec668a..00000000000 --- a/Build/source/libs/gd/libgd-PATCHES/TL-Changes +++ /dev/null @@ -1,30 +0,0 @@ -Changes applied to the libgd-2.2.4/ tree as obtained from: - https://github.com/libgd/libgd/releases - -Removed: - Makefile.in - aclocal.m4 - config/Makefile.in - config/ar-lib - config/compile - config/config.guess - config/config.rpath - config/config.sub - config/depcomp - config/install-sh - config/ltmain.sh - config/missing - configure - m4/libtool.m4 - m4/ltoptions.m4 - m4/ltsugar.m4 - m4/ltversion.m4 - m4/lt~obsolete.m4 - src/Makefile.in - src/depcomp - tests/Makefile.in - -Removed execute permission: - windows/libgd.rc - windows/msys/deps.mk - diff --git a/Build/source/libs/gd/libgd-PATCHES/patch-01-win32 b/Build/source/libs/gd/libgd-PATCHES/patch-01-win32 deleted file mode 100644 index 814ed38e1e9..00000000000 --- a/Build/source/libs/gd/libgd-PATCHES/patch-01-win32 +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur libgd-2.2.4.orig/src/gdft.c libgd-2.2.4/src/gdft.c ---- libgd-2.2.4.orig/src/gdft.c Wed Jan 18 20:01:19 2017 -+++ libgd-2.2.4/src/gdft.c Thu Jan 19 07:20:24 2017 -@@ -1683,6 +1683,16 @@ - */ - *fontpath = NULL; - fontsearchpath = getenv ("GDFONTPATH"); -+#ifdef _WIN32 -+ if (!fontsearchpath) { -+ char *ffptr = getenv ("SYSTEMROOT"); -+ if (ffptr) { -+ fontsearchpath = malloc (strlen(ffptr) + strlen("\\fonts") + 1); -+ strcpy(fontsearchpath, ffptr); -+ strcat(fontsearchpath, "\\fonts"); -+ } -+ } -+#endif - if (!fontsearchpath) - fontsearchpath = DEFAULT_FONTPATH; - path = (char *) gdMalloc(sizeof(char) * strlen(fontsearchpath) + 1); diff --git a/Build/source/libs/gd/libgd-PATCHES/patch-02-no-stdcall b/Build/source/libs/gd/libgd-PATCHES/patch-02-no-stdcall deleted file mode 100644 index efde64e3ccf..00000000000 --- a/Build/source/libs/gd/libgd-PATCHES/patch-02-no-stdcall +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur libgd-2.2.4.orig/src/gd.h libgd-2.2.4/src/gd.h ---- libgd-2.2.4.orig/src/gd.h Wed Jan 18 20:01:19 2017 -+++ libgd-2.2.4/src/gd.h Thu Jan 19 07:22:18 2017 -@@ -63,7 +63,7 @@ - # define BGD_EXPORT_DATA_PROT __declspec(dllimport) - # endif - # endif --# define BGD_STDCALL __stdcall -+# define BGD_STDCALL - # define BGD_EXPORT_DATA_IMPL - #else - # if defined(__GNUC__) || defined(__clang__) diff --git a/Build/source/libs/gmp/TLPATCHES/ChangeLog b/Build/source/libs/gmp/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..e1f2fae0d7d --- /dev/null +++ b/Build/source/libs/gmp/TLPATCHES/ChangeLog @@ -0,0 +1,15 @@ +2016-12-16 Akira Kakuto + + * Import 6.1.2. + +2016-06-19 Akira Kakuto + + * Import 6.1.1. + +2015-12-28 Akira Kakuto + + * patch-01-const: Removed, since it is applied in 6.1.0. + +2014-05-26 Peter Breitenlohner + + patch-01-const (new): Avoid incompatible pointer type warning. diff --git a/Build/source/libs/gmp/TLPATCHES/TL-Changes b/Build/source/libs/gmp/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..94a5f87ca3d --- /dev/null +++ b/Build/source/libs/gmp/TLPATCHES/TL-Changes @@ -0,0 +1,38 @@ +Changes applied to the gmp-6.1.2/ tree as obtained from: + http://ftp.gnu.org/gnu/gmp/ + +Removed: + .gdbinit + COPYING + COPYING.LESSERv3 + COPYINGv2 + COPYINGv3 + INSTALL.autoconf + Makefile.in + aclocal.m4 + compile + configfsf.guess + configfsf.sub + configure + cxx/ + demos/ + doc/ + install-sh + ltmain.sh + mini-gmp/tests/ + missing + mpf/Makefile.in + mpn/Makefile.in + mpq/Makefile.in + mpz/Makefile.in + printf/Makefile.in + rand/Makefile.in + scanf/Makefile.in + test-driver + tests/ + tune/ + ylwrap + +Renamed: + config.guess => configgmp.guess + config.sub => configgmp.sub diff --git a/Build/source/libs/gmp/gmp-PATCHES/ChangeLog b/Build/source/libs/gmp/gmp-PATCHES/ChangeLog deleted file mode 100644 index e1f2fae0d7d..00000000000 --- a/Build/source/libs/gmp/gmp-PATCHES/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -2016-12-16 Akira Kakuto - - * Import 6.1.2. - -2016-06-19 Akira Kakuto - - * Import 6.1.1. - -2015-12-28 Akira Kakuto - - * patch-01-const: Removed, since it is applied in 6.1.0. - -2014-05-26 Peter Breitenlohner - - patch-01-const (new): Avoid incompatible pointer type warning. diff --git a/Build/source/libs/gmp/gmp-PATCHES/TL-Changes b/Build/source/libs/gmp/gmp-PATCHES/TL-Changes deleted file mode 100644 index 94a5f87ca3d..00000000000 --- a/Build/source/libs/gmp/gmp-PATCHES/TL-Changes +++ /dev/null @@ -1,38 +0,0 @@ -Changes applied to the gmp-6.1.2/ tree as obtained from: - http://ftp.gnu.org/gnu/gmp/ - -Removed: - .gdbinit - COPYING - COPYING.LESSERv3 - COPYINGv2 - COPYINGv3 - INSTALL.autoconf - Makefile.in - aclocal.m4 - compile - configfsf.guess - configfsf.sub - configure - cxx/ - demos/ - doc/ - install-sh - ltmain.sh - mini-gmp/tests/ - missing - mpf/Makefile.in - mpn/Makefile.in - mpq/Makefile.in - mpz/Makefile.in - printf/Makefile.in - rand/Makefile.in - scanf/Makefile.in - test-driver - tests/ - tune/ - ylwrap - -Renamed: - config.guess => configgmp.guess - config.sub => configgmp.sub diff --git a/Build/source/libs/graphite2/TLPATCHES/ChangeLog b/Build/source/libs/graphite2/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..6394156bb04 --- /dev/null +++ b/Build/source/libs/graphite2/TLPATCHES/ChangeLog @@ -0,0 +1,72 @@ +2016-11-13 Akira Kakuto + + Imported graphite2-1.3.9 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2016-03-31 Akira Kakuto + + Imported graphite2-1.3.8 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2016-03-15 Akira Kakuto + + Imported graphite2-1.3.7 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2016-03-01 Akira Kakuto + + Imported graphite2-1.3.6 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2016-01-20 Akira Kakuto + + Imported graphite2-1.3.5 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2013-12-02 Peter Breitenlohner + + Imported graphite2-1.2.4 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2013-06-12 Peter Breitenlohner + + Imported graphite2-1.2.3 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +2013-06-02 Peter Breitenlohner + + Imported graphite2-1.2.2 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + + * patch-01-case-sensitive (removed): Applied upstream. + * patch-02-attribute-hot (removed): ditto. + +2013-03-27 Peter Breitenlohner + + * patch-02-solaris-variables (new): Upstream patch to not clash + with on Solaris. + From http://projects.palaso.org/projects/graphitedev/repository/ + revisions/1132 and revisions/1136. + +2013-03-07 Peter Breitenlohner + + Imported graphite2-1.2.1 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + + * patch-02-attribute-hot (removed): Now in graphite2-1.2.1. + * patch-01-case-sensitive: Adapted. + +2012-12-06 Peter Breitenlohner + + * patch-03-old-gcc (removed): No longer needed since HarfBuzz + requires gcc-4.x. + +2012-12-04 Peter Breitenlohner + + Imported graphite2-1.2.0 source tree from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + + * patch-01-case-sensitive (new): Windows.h => windows.h. + * patch-02-attribute-hot (new): Test for gcc-4.3 or better. + * patch-03-old-gcc (new): Allow to build with, e.g., gcc-3.4. + diff --git a/Build/source/libs/graphite2/TLPATCHES/TL-Changes b/Build/source/libs/graphite2/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..d17789537ed --- /dev/null +++ b/Build/source/libs/graphite2/TLPATCHES/TL-Changes @@ -0,0 +1,9 @@ +Changes applied to the graphite2-1.3.9/ tree as obtained from: + http://sourceforge.net/projects/silgraphite/files/graphite2/ + +Removed unused dirs: + contrib + debian-src + doc + gr2fonttest + tests diff --git a/Build/source/libs/graphite2/graphite2-PATCHES/ChangeLog b/Build/source/libs/graphite2/graphite2-PATCHES/ChangeLog deleted file mode 100644 index 6394156bb04..00000000000 --- a/Build/source/libs/graphite2/graphite2-PATCHES/ChangeLog +++ /dev/null @@ -1,72 +0,0 @@ -2016-11-13 Akira Kakuto - - Imported graphite2-1.3.9 source tree from: - http://sourceforge.net/projects/silgraphite/files/graphite2/ - -2016-03-31 Akira Kakuto - - Imported graphite2-1.3.8 source tree from: - http://sourceforge.net/projects/silgraphite/files/graphite2/ - -2016-03-15 Akira Kakuto - - Imported graphite2-1.3.7 source tree from: - http://sourceforge.net/projects/silgraphite/files/graphite2/ - -2016-03-01 Akira Kakuto - - Imported graphite2-1.3.6 source tree from: - http://sourceforge.net/projects/silgraphite/files/graphite2/ - -2016-01-20 Akira Kakuto - - Imported graphite2-1.3.5 source tree from: - http://sourceforge.net/projects/silgraphite/files/graphite2/ - -2013-12-02 Peter Breitenlohner - - Imported graphite2-1.2.4 source tree from: - http://sourceforge.net/projects/silgraphite/files/graphite2/ - -2013-06-12 Peter Breitenlohner - - Imported graphite2-1.2.3 source tree from: - http://sourceforge.net/projects/silgraphite/files/graphite2/ - -2013-06-02 Peter Breitenlohner - - Imported graphite2-1.2.2 source tree from: - http://sourceforge.net/projects/silgraphite/files/graphite2/ - - * patch-01-case-sensitive (removed): Applied upstream. - * patch-02-attribute-hot (removed): ditto. - -2013-03-27 Peter Breitenlohner - - * patch-02-solaris-variables (new): Upstream patch to not clash - with on Solaris. - From http://projects.palaso.org/projects/graphitedev/repository/ - revisions/1132 and revisions/1136. - -2013-03-07 Peter Breitenlohner - - Imported graphite2-1.2.1 source tree from: - http://sourceforge.net/projects/silgraphite/files/graphite2/ - - * patch-02-attribute-hot (removed): Now in graphite2-1.2.1. - * patch-01-case-sensitive: Adapted. - -2012-12-06 Peter Breitenlohner - - * patch-03-old-gcc (removed): No longer needed since HarfBuzz - requires gcc-4.x. - -2012-12-04 Peter Breitenlohner - - Imported graphite2-1.2.0 source tree from: - http://sourceforge.net/projects/silgraphite/files/graphite2/ - - * patch-01-case-sensitive (new): Windows.h => windows.h. - * patch-02-attribute-hot (new): Test for gcc-4.3 or better. - * patch-03-old-gcc (new): Allow to build with, e.g., gcc-3.4. - diff --git a/Build/source/libs/graphite2/graphite2-PATCHES/TL-Changes b/Build/source/libs/graphite2/graphite2-PATCHES/TL-Changes deleted file mode 100644 index d17789537ed..00000000000 --- a/Build/source/libs/graphite2/graphite2-PATCHES/TL-Changes +++ /dev/null @@ -1,9 +0,0 @@ -Changes applied to the graphite2-1.3.9/ tree as obtained from: - http://sourceforge.net/projects/silgraphite/files/graphite2/ - -Removed unused dirs: - contrib - debian-src - doc - gr2fonttest - tests diff --git a/Build/source/libs/harfbuzz/TLPATCHES/ChangeLog b/Build/source/libs/harfbuzz/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..dad487f7a86 --- /dev/null +++ b/Build/source/libs/harfbuzz/TLPATCHES/ChangeLog @@ -0,0 +1,164 @@ +2017-01-25 Akira Kakuto + + Imported harfbuzz-1.4.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-01-06 Akira Kakuto + + Imported harfbuzz-1.4.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2017-01-05 Akira Kakuto + + Imported harfbuzz-1.4.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-12-06 Akira Kakuto + + Imported harfbuzz-1.3.4 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-10-26 Akira Kakuto + + Imported harfbuzz-1.3.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-09-28 Akira Kakuto + + Imported harfbuzz-1.3.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-09-07 Akira Kakuto + + Imported harfbuzz-1.3.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-07-22 Akira Kakuto + + Imported harfbuzz-1.3.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-05-02 Akira Kakuto + + Imported harfbuzz-1.2.7 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-04-09 Akira Kakuto + + Imported harfbuzz-1.2.6 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-04-05 Akira Kakuto + + Imported harfbuzz-1.2.5 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-03-17 Akira Kakuto + + Imported harfbuzz-1.2.4 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-02-25 Akira Kakuto + + Imported harfbuzz-1.2.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-02-24 Akira Kakuto + + Imported harfbuzz-1.2.1 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-02-19 Akira Kakuto + + Imported harfbuzz-1.2.0 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2016-01-12 Akira Kakuto + + Imported harfbuzz-1.1.3 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2015-12-28 Akira Kakuto + + Imported harfbuzz-1.1.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2014-07-23 Peter Breitenlohner + + Imported harfbuzz-0.9.33 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin (removed): Applied upstream. + +2014-07-18 Peter Breitenlohner + + Imported harfbuzz-0.9.32 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin: Adapted. + +2014-07-17 Peter Breitenlohner + + Imported harfbuzz-0.9.31 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin: Adapted. + +2014-07-10 Peter Breitenlohner + + Imported harfbuzz-0.9.30 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + + * patch-01-cygwin: Adapted. + +2014-06-23 Peter Breitenlohner + + * patch-01-cygwin (new): Avoid 'not supported' warnings. + +2014-06-16 Peter Breitenlohner + + Imported harfbuzz-0.9.29 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + +2013-01-11 Peter Breitenlohner + + Imported harfbuzz-0.9.11 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + * patch-01-const (removed): Applied upstream. + +2013-01-04 Peter Breitenlohner + + * patch-01-const (new): Backport from upstream. + +2013-01-03 Khaled Hosny + + Imported harfbuzz-0.9.10 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + * patch-03-VOID (removed): Applied upstream. + * patch-04-MSV (removed): ditto. + +2012-12-06 Peter Breitenlohner + + * patch-04-MSV (new): From Akira for MS Visual Studio 2005. + +2012-12-05 Peter Breitenlohner + + Imported harfbuzz-0.9.8 source tree from: + http://cgit.freedesktop.org/harfbuzz/ + * patch-01-Khaled (removed): Now distributed, with + hb_ot_layout_position_get_size() renamed into + hb_ot_layout_get_size_params(). + * patch-02-oldmsvc (removed): Not needed. + +2012-12-02 Akira Kakuto + + * patch-02-oldmsvc (new): #error is not recognized by old msvcs. + +2012-11-30 Peter Breitenlohner + + * patch-01-Khaled (new): Partial update from git, from Khaled. + +2012-11-29 Peter Breitenlohner + + Imported harfbuzz-0.9.7 source tree from: + http://cgit.freedesktop.org/harfbuzz/ diff --git a/Build/source/libs/harfbuzz/TLPATCHES/TL-Changes b/Build/source/libs/harfbuzz/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..be2b4ac1d4d --- /dev/null +++ b/Build/source/libs/harfbuzz/TLPATCHES/TL-Changes @@ -0,0 +1,28 @@ +Changes applied to the harfbuzz-1.4.2/ tree as obtained from: + http://www.freedesktop.org/software/harfbuzz/release/ + +Removed: + COPYING + INSTALL + Makefile.in + aclocal.m4 + ar-lib + compile + config.guess + config.sub + configure + depcomp + install-sh + ltmain.sh + missing + src/Makefile.in + src/hb-version.h + test-driver + +Removed unused dirs: + docs + m4 + test + util + win32 + src/hb-ucdn diff --git a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog deleted file mode 100644 index dad487f7a86..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog +++ /dev/null @@ -1,164 +0,0 @@ -2017-01-25 Akira Kakuto - - Imported harfbuzz-1.4.2 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2017-01-06 Akira Kakuto - - Imported harfbuzz-1.4.1 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2017-01-05 Akira Kakuto - - Imported harfbuzz-1.4.0 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-12-06 Akira Kakuto - - Imported harfbuzz-1.3.4 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-10-26 Akira Kakuto - - Imported harfbuzz-1.3.3 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-09-28 Akira Kakuto - - Imported harfbuzz-1.3.2 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-09-07 Akira Kakuto - - Imported harfbuzz-1.3.1 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-07-22 Akira Kakuto - - Imported harfbuzz-1.3.0 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-05-02 Akira Kakuto - - Imported harfbuzz-1.2.7 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-04-09 Akira Kakuto - - Imported harfbuzz-1.2.6 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-04-05 Akira Kakuto - - Imported harfbuzz-1.2.5 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-03-17 Akira Kakuto - - Imported harfbuzz-1.2.4 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-02-25 Akira Kakuto - - Imported harfbuzz-1.2.3 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-02-24 Akira Kakuto - - Imported harfbuzz-1.2.1 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-02-19 Akira Kakuto - - Imported harfbuzz-1.2.0 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2016-01-12 Akira Kakuto - - Imported harfbuzz-1.1.3 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2015-12-28 Akira Kakuto - - Imported harfbuzz-1.1.2 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2014-07-23 Peter Breitenlohner - - Imported harfbuzz-0.9.33 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - - * patch-01-cygwin (removed): Applied upstream. - -2014-07-18 Peter Breitenlohner - - Imported harfbuzz-0.9.32 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - - * patch-01-cygwin: Adapted. - -2014-07-17 Peter Breitenlohner - - Imported harfbuzz-0.9.31 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - - * patch-01-cygwin: Adapted. - -2014-07-10 Peter Breitenlohner - - Imported harfbuzz-0.9.30 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - - * patch-01-cygwin: Adapted. - -2014-06-23 Peter Breitenlohner - - * patch-01-cygwin (new): Avoid 'not supported' warnings. - -2014-06-16 Peter Breitenlohner - - Imported harfbuzz-0.9.29 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - -2013-01-11 Peter Breitenlohner - - Imported harfbuzz-0.9.11 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - * patch-01-const (removed): Applied upstream. - -2013-01-04 Peter Breitenlohner - - * patch-01-const (new): Backport from upstream. - -2013-01-03 Khaled Hosny - - Imported harfbuzz-0.9.10 source tree from: - http://www.freedesktop.org/software/harfbuzz/release/ - * patch-03-VOID (removed): Applied upstream. - * patch-04-MSV (removed): ditto. - -2012-12-06 Peter Breitenlohner - - * patch-04-MSV (new): From Akira for MS Visual Studio 2005. - -2012-12-05 Peter Breitenlohner - - Imported harfbuzz-0.9.8 source tree from: - http://cgit.freedesktop.org/harfbuzz/ - * patch-01-Khaled (removed): Now distributed, with - hb_ot_layout_position_get_size() renamed into - hb_ot_layout_get_size_params(). - * patch-02-oldmsvc (removed): Not needed. - -2012-12-02 Akira Kakuto - - * patch-02-oldmsvc (new): #error is not recognized by old msvcs. - -2012-11-30 Peter Breitenlohner - - * patch-01-Khaled (new): Partial update from git, from Khaled. - -2012-11-29 Peter Breitenlohner - - Imported harfbuzz-0.9.7 source tree from: - http://cgit.freedesktop.org/harfbuzz/ diff --git a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes deleted file mode 100644 index be2b4ac1d4d..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes +++ /dev/null @@ -1,28 +0,0 @@ -Changes applied to the harfbuzz-1.4.2/ tree as obtained from: - http://www.freedesktop.org/software/harfbuzz/release/ - -Removed: - COPYING - INSTALL - Makefile.in - aclocal.m4 - ar-lib - compile - config.guess - config.sub - configure - depcomp - install-sh - ltmain.sh - missing - src/Makefile.in - src/hb-version.h - test-driver - -Removed unused dirs: - docs - m4 - test - util - win32 - src/hb-ucdn diff --git a/Build/source/libs/icu/TLPATCHES/ChangeLog b/Build/source/libs/icu/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..4be9800d1d8 --- /dev/null +++ b/Build/source/libs/icu/TLPATCHES/ChangeLog @@ -0,0 +1,483 @@ +2016-03-30 Karl Berry + + * patch-20-private: new file, per Dick Koch. + http://tug.org/pipermail/tlbuild/2016q1/003438.html + +2016-03-27 Karl Berry + + * Imported icu-57.1 from + http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz + See ./TL-Changes for procedure. + +2015-10-08 Peter Breitenlohner + + Updated icu-56.1 source tree (icu4c-56_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/56.1/ + +2015-09-27 Peter Breitenlohner + + Imported icu-56.1 source tree (icu4c-56_rc-src.tgz) from: + http://download.icu-project.org/files/icu4c/56rc/ + + * patch-03-gcc-atomic, patch-12-mingw, + patch-13-STATIC_PREFIX, patch-14-xopen, patch-16-putil, + patch-17-cygwin-no-w32api: Adapted. + +2015-04-12 Peter Breitenlohner + + Updated icu-55.1 source tree (icu4c-55_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/55.1/ + +2015-03-19 Peter Breitenlohner + + Imported icu-55.1 source tree (icu4c-55_rc-src.tgz) from: + http://download.icu-project.org/files/icu4c/55rc/ + + * patch-03-gcc-atomic, patch-12-mingw, + patch-13-STATIC_PREFIX, patch-14-xopen, patch-16-putil, + patch-17-cygwin-no-w32api: Adapted. + +2014-10-02 Peter Breitenlohner + + Updated icu-54.1 source tree (icu4c-54_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/54.1/ + +2014-09-18 Peter Breitenlohner + + Imported icu-54.1 source tree (icu4c-54_rc-src.tgz) from: + http://download.icu-project.org/files/icu4c/54rc/ + + * patch-11-cygwin64, patch-15-solaris, + patch-18-solaris-depend (removed): Included upstream. + + * patch-03-gcc-atomic, patch-12-mingw, + patch-13-STATIC_PREFIX, patch-14-xopen, patch-16-putil, + patch-17-cygwin-no-w32api: Adapted. + +2014-05-14 Peter Breitenlohner + + * patch-18-solaris-depend (new): Minor build fix for solaris, + dependencies for C files require $(CFLAGS), i.e., -std=c99. + +2014-04-03 Peter Breitenlohner + + Updated icu-53.1 source tree (icu4c-53_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/53.1/ + +2014-03-22 Peter Breitenlohner + + * patch-16-putil (new): Build fix for Cygwin/MinGW with -ansi, + * patch-17-cygwin-no-w32api (new): Use Posix instead of Win32 + API for Cygwin, + from Ken Brown . + +2014-03-20 Peter Breitenlohner + + Imported icu-53.1 source tree (icu4c-53_rc-src.tgz) from: + http://download.icu-project.org/files/icu4c/53rc/ + + * patch-04-Windows2000 (removed): Drop Windows2000 support. + * patch-08-avoid-rebuild (removed): Included upstream. + + * patch-03-gcc-atomic, patch-11-cygwin64, patch-12-mingw, + patch-13-STATIC_PREFIX, patch-14-xopen: Adapted. + + * patch-15-solaris (new): Build fix for Solaris, from + http://bugs.icu-project.org/trac/ticket/10580 + +2014-02-21 Peter Breitenlohner + + * patch-11-cygwin64 (new): Enable Cygwin64 (from Cygwin64 port). + +2013-10-10 Peter Breitenlohner + + Updated icu-52.1 source tree (icu4c-52_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/52.1/ + +2013-09-26 Peter Breitenlohner + + Imported icu-52.1 source tree (icu4c-52_rc2-src.tgz) from: + http://download.icu-project.org/files/icu4c/52rc/ + + * patch-03-gcc-atomic, patch-04-Windows2000, + patch-08-avoid-rebuild, patch-12-mingw, patch-13-STATIC_PREFIX, + patch-14-xopen: Adapted. + +2013-04-02 Karl Berry + + * patch-14-xopen: do not define _XOPEN_SOURCE_EXTENDED on Solaris, + notwithstanding comments in icu source. + From Apostolos, tlbuild 27 Mar 2013 15:52:26 (and Ettore, later). + +2013-03-21 Peter Breitenlohner + + Updated icu-51.1 source tree (icu4c-51_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/51.1/ + +2013-03-14 Peter Breitenlohner + + * patch-08-avoid-rebuild: Really avoid to run pkgdata again. + +2013-03-07 Peter Breitenlohner + + Imported icu-51.1 source tree (icu4c-51_rc-src.tgz) from: + http://download.icu-project.org/files/icu4c/51rc/ + + * patch-11-CURR_FULL_DIR, patch-14-mingw-cross, + patch-83-zonemeta-bugfix, patch-84-c++11-bugfix (removed): + Now in icu-51.1. + * patch-{40,50,60,70,82}-* (removed): Obsolete, layout not used. + * patch-02-kFreeBSD (removed): Not needed. + + * patch-03-gcc-atomic, patch-04-Windows2000, + patch-08-avoid-rebuild, patch-12-mingw, patch-13-STATIC_PREFIX: + Adapted. + +2012-11-29 Peter Breitenlohner + + * patch-04-Windows2000 (new): From Akira. + +2012-11-16 Peter Breitenlohner + + * patch-84-c++11-bugfix (new): Required for gcc-4.7. + From http://bugs.icu-project.org/trac/ticket/9728. + +2012-11-06 Peter Breitenlohner + + Updated icu-50.1 source tree (icu4c-50_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/50.1/ + + * patch-83-zonemeta-bugfix (new): Required for MinGW. + +2012-10-24 Peter Breitenlohner + + Imported icu-50.1 source tree (icu4c-50_rc-src.tgz) from: + http://download.icu-project.org/files/icu4c/50rc/ + + * patch-01-Cygwin, patch-02-FreeBSD (removed): Now in icu-50.1. + * patch-14-GENCCODE_ASSEMBLY (removed): Obsolete. + + * patch-{08,11,12,13,40,50,60,70,82}-*:Adapted. + + * patch-02-kFreeBSD (new): Use Posix conform timezone decl. + * patch-03-gcc-atomic (new): Required for gcc-4.4. + * patch-14-mingw-cross (new): Required for linux->MinGW32 cross. + +2012-06-18 Peter Breitenlohner + + * patch-82-Indic-bugfix (new): Revert ICU SVN commit 26090. + +2012-06-09 Peter Breitenlohner + + Imported icu-49.1.2 source tree (icu4c-49_1_2-src.tgz) from: + http://download.icu-project.org/files/icu4c/49.1.2/ + + * patch-07-configure-utf16-string, patch-09-generated (removed): + Obsolete. + + * patch-{01,02,08,11,12,13,14,40,50,60,70}-*: Adapted. + +2012-04-24 Peter Breitenlohner + + * patch-02-FreeBSD (new): Build fix for FreeBSD. + Reported by Nikola Lecic + +2012-04-18 Peter Breitenlohner + + Imported icu-49.1.1 source tree (icu4c-49_1_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/49.1.1/ + + * patch-05-m4-quoting: Removed, now in icu-49.1.1. + + * patch-{01,07,08,09,11,12,13,14,40,50,60,70}-*: Adapted. + +2012-03-23 Peter Breitenlohner + + * patch-01-Cygwin (new): Build fix for Cygwin. + Reported by Ken Brown . + +2012-03-22 Peter Breitenlohner + + Updated icu-49.1 source tree (icu4c-49_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/49.1/ + + * patch-{01,02,03,04}-*: Removed, now in icu-49.1. + + * patch-{05,07,08,09,11,12,13,14,40,50,60,70}-*: Adapted. + +2012-03-21 Peter Breitenlohner + + * patch-05-m4-quoting (new): Correct m4 quoting in configure.in. + +2012-03-17 Peter Breitenlohner + + * patch-04-FreeBSD (new): From ICU. + +2012-03-15 Peter Breitenlohner + + * patch-40-auxParam: Fix a typo (auxillary => auxiliary). + * patch-70-Arabic: Remove useless changes of original code. + +2012-03-12 Peter Breitenlohner + + * patch-03-U_PF_UNKNOWN (new): Bug fix for the case that + U_PLATFORM == U_PF_UNKNOWN as, e.g., for FreeBSD (why?). + Reported by Hilmar Preusse . + +2012-03-03 Peter Breitenlohner + + Imported icu-49.1 source tree (icu4c-49_rc-src.tgz) from: + http://download.icu-project.org/files/icu4c/49rc/ + + * patch-40-LESwaps, patch-81-Indic: Removed, now in icu-49.1. + + * patch-01-UVoidFunction (new): Bug fix for '--disable-dyload'. + * patch-02-AC_CHECK_TOOL (new): Bug fix for cross compilation. + + * TL-Changes, patch-07-configure-utf16-string, + patch-08-avoid-rebuild, patch-09-generated, + patch-11-CURR_FULL_DIR, patch-12-mingw, patch-13-STATIC_PREFIX, + patch-14-GENCCODE_ASSEMBLY, patch-50-Vertical, patch-60-KernPair, + patch-70-Arabic: Adapted. + * patch-05-auxParam (removed): Renamed ... + * patch-40-auxParam (new): ... to this and adapted. + +2011-08-31 Peter Breitenlohner + + * patch-40-LESwaps: See ICU Ticket #8657, comment 11. + +2011-08-09 Peter Breitenlohner + + Imported icu-4.8.1 source tree (icu4c-4_8_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/4.8.1/ + + * patch-06-mingw: Removed, included in icu-4.8.1. + + * TL-Changes, patch-05-auxParam, + patch-07-configure-utf16-string, patch-08-avoid-rebuild, + patch-09-generated, patch-11-CURR_FULL_DIR, patch-12-mingw, + patch-13-STATIC_PREFIX, patch-14-GENCCODE_ASSEMBLY, + patch-50-Vertical, patch-60-KernPair, patch-70-Arabic, + patch-81-Indic: Adapted. + + * patch-40-LESwaps: Rewritten, see ICU Ticket #8657, comment 7. + +2011-06-19 Karl Berry + + * patch-40-LESwaps: revert to ICU 4.4, as 4.6 and 4.8 code + is broken on BigEndian machines. + http://bugs.icu-project.org/trac/ticket/8657 + tlbuild mail, 17 Jun 2011 17:10:38 + +2011-05-26 Peter Breitenlohner + + Imported icu-4.8 source tree (icu4c-4_8-src.tgz) from: + http://download.icu-project.org/files/icu4c/4.8/ + + * patch-80-Indic: Removed (not needed). + + * TL-Changes, patch-05-auxParam, patch-06-mingw, + patch-07-configure-utf16-string, patch-08-avoid-rebuild, + patch-09-generated, patch-11-CURR_FULL_DIR, patch-12-mingw, + patch-13-STATIC_PREFIX, patch-14-GENCCODE_ASSEMBLY, + patch-50-Vertical, patch-60-KernPair, patch-70-Arabic, + patch-81-Indic: Adapted. + +2011-05-11 Peter Breitenlohner + + * patch-14-GENCCODE_ASSEMBLY (new): For amd64-kfreebsd. + +2011-05-09 Peter Breitenlohner + + * patch-13-STATIC_PREFIX (new): Never use libsicuxxx.a. + +2011-02-22 Peter Breitenlohner + + * patch-81-Indic (new): IndicReordering.*: Respect array bounds. + + * patch-05-auxParam: Fix a bug introduced when importing icu-4.6. + +2010-12-07 Peter Breitenlohner + + * patch-11-CURR_FULL_DIR: Correctly handle CURR_FULL_DIR when + cross compiling. + +2010-12-02 Peter Breitenlohner + + Imported icu-4.6 source tree (icu4c-4_6-src.tgz) from: + http://download.icu-project.org/files/icu4c/4.6/ + + * patch-10-cross-TOOLEXEEXT, patch-13-remove-extra-token: + All removed, included in icu-4.6. + + * TL-Changes, patch-05-auxParam, patch-07-configure-utf16-string, + patch-08-avoid-rebuild, patch-11-CURR_FULL_DIR, patch-12-mingw, + patch-50-Vertical, patch-60-KernPair, patch-70-Arabic, + patch-80-Indic: Adapted. + + * patch-06-mingw (new): MinGW32 is Windows, not Cygwin. + * patch-09-generated (new): Regenerate configure. + +2010-04-08 Karl Berry + + * patch-07-configure-utf16-string: new patch so we can disable the + check for UTF16 string literals. See comments in our + libs/icu/configure.ac. + +2010-03-31 Peter Breitenlohner + + Imported icu-4.4 source tree (icu4c-4_4-src.tgz) from: + http://download.icu-project.org/files/icu4c/4.4/ + + * fix-case-insensitive, patch-07-cygwin, patch-09-cross, + patch-20-fix-gt_ge, patch-21-fix-not_aligned, + patch-22-fix-JK-adjust_for_marks, patch-23-fix-JK-GlyphPos: + All removed, included in icu-4.4. + + * TL-Changes, patch-05-auxParam, patch-08-avoid-rebuild, + patch-10-cross-TOOLEXEEXT, patch-11-CURR_FULL_DIR, + patch-12-mingw, patch-50-Vertical, patch-60-KernPair, + patch-70-Arabic, patch-80-Indic: Adapted. + + * patch-13-remove-extra-token (new): Avoid compiler warning. + +2010-02-22 Peter Breitenlohner + + Fixes for Linux => MinGW32 cross compilation. + * patch-10-cross-TOOLEXEEXT (new): Fix a cross compilation typo. + * patch-11-CURR_FULL_DIR (new): Fix for cross compilation on + a Unix like system. Does MinGW32 have pwd? + * patch-12-mingw (new): Changes in config/mh-mingw (libraries + named as for everyone else). + +2009-10-28 Peter Breitenlohner + + * patch-09-cross (new): Modify AC_CHECK_64BIT_LIBS in aclocal.m4 + to allow cross compilation. + +2009-10-26 Peter Breitenlohner + + * patch-08-avoid-rebuild (new): Modify data/Makefile.in such + that libsicudata.a is not rebuilt again and again. + +2009-10-25 Peter Breitenlohner + + Imported icu-4.2.1 source tree (icu4c-4_2_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/4.2.1/ + + * patch-02-syntax, patch-40-Shaping (both removed): Obsolete. + + * TL-Changes, patch-80-Indic: Adapted. + +2009-10-24 Peter Breitenlohner + + Imported icu-4.0.1 source tree (icu4c-4_0_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/4.0.1/ + + * patch-01-backport-4.0.1, patch-01-too_much-4.0.1, + patch-06-build-fix, patch-06-partial-4.0.1, + patch-10-backport-4.0.1, patch-11-partial-4.0.1, + patch-99-test (all removed): Obsolete. + + * TL-Changes, patch-40-Shaping, patch-80-Indic: Adapted. + +2009-10-23 Peter Breitenlohner + + Imported icu-3.8.1 source tree (icu4c-3_8_1-src.tgz) from: + http://download.icu-project.org/files/icu4c/3.8.1/ + + * TL-Changes (new): Description of modifications of source tree. + + * fix-case-insensitive (new): Shell script used to rename + source/layout/Features.h => ICUFeatures.h (required for Cygwin) + and modify references to that file accordingly. + + * patch-01-backport-4.0.1 (new): Replace layout/CanonData.cpp, + layout/GlyphPositionAdjustments.cpp, + layout/IndicReordering.{cpp,h}, layout/LELanguages.h, + layout/LESwaps.h, layout/OpenTypeLayoutEngine.cpp, + layout/ScriptAndLanguage.cpp, layout/ThaiLayoutEngine.{cpp,h}, + layoutex/ParagraphLayout.cpp, and test/letest/sfnt.h by their + 4.0.1 versions. + * patch-01-too_much-4.0.1 (new): Undo one change in + layoutex/ParagraphLayout.cpp. + + * patch-02-syntax (new): Fix some dubious syntax in + layoutex/ParagraphLayout.cpp. + + * patch-05-auxParam (new): Handling of extension for XeTeX in + layout/AlternateSubstSubtables.cpp, + layout/GlyphIterator.{cpp,h}, + layout/LEGlyphStorage.{cpp,h}, + and layout/OpenTypeLayoutEngine.{cpp,h}. + + * patch-06-build-fix (new): Build fix in common/ubidi.c. + * patch-06-partial-4.0.1 (new): Partial backport of common/putil.c + from 4.0.1. + * patch-07-cygwin (new): Changes in config/mh-cygwin (libraries + named as for everyone else). + + * patch-10-backport-4.0.1 (new): Replace + layout/ScriptAndLanguageTags.{cpp,h} by their 4.0.1 versions. + * patch-11-partial-4.0.1 (new): Backport of some changes in + layout/LayoutEngine.cpp from 4.0.1. + + Bug fixes originally by: Jonathan Kew + * patch-20-fix-gt_ge (new): In layout/ClassDefinitionTables.cpp. + * patch-21-fix-not_aligned (new): In layout/ExtensionSubtables.cpp. + * patch-22-fix-JK-adjust_for_marks (new): In + layout/MarkToBasePosnSubtables.cpp. + * patch-23-fix-JK-GlyphPos (new): In + layout/OpenTypeLayoutEngine.cpp. + + * patch-40-Shaping (new): Update shaping type data in + layout/ShapingTypeData.cpp to Unicode 5.1. + + * patch-50-Vertical (new): Handling vertical writing in + layout/LEFontInstance.h and layout/ValueRecords.cpp. + + * patch-60-KernPair (new): Modified handling of kerns in + layout/LEFontInstance.{cpp,h} and layout/LayoutEngine.cpp. + + * patch-70-Arabic (new): Add Draft Mongolian shaping classes + in layout/ArabicShaping.{cpp,h} and LayoutEngine.cpp. + + * patch-80-Indic (new): Backport of some changes in + layout/IndicClassTables.cpp from 4.0.1 and in + layout/IndicReordering.cpp from 4.2.1. + + * patch-99-test (new): Changes from TeX Live icu-xetex in + test/letest/PortableFontInstance.{cpp,h}, + test/letest/gendata.{cpp,xml}, test/letest/letest.{cpp,xml}. + + These modifications and patches of icu-3.8.1/ reproduce the + previous icu-xetex/ source tree (except for test data). + +2009-10-22 Peter Breitenlohner + + Slightly rearranged the icu-xetex/ source tree. + + * layout/LELanguages.h: Changed some comments, from 4.0.1. + + * layout/LEGlyphStorage.{cpp,h}, + layout/OpenTypeLayoutEngine.cpp: Renamed adoptAuxDataArrays + back to adoptAuxDataArray as it was in 3.8.1. + + * layout/LEGlyphStorage.h: The XeTeX modifications have added + an additional parameter for setAuxData, however, in most cases + the corresponding argument is NULL. Added an inline definition + of the original method. + layout/ArabicShaping.cpp, layout/HanLayoutEngine.cpp, + layout/HangulLayoutEngine.cpp, layout/IndicReordering.cpp, + layout/KhmerReordering.cpp, layout/LayoutEngine.cpp, + layout/TibetanReordering.cpp: Restored the original 3.8.1 use of + setAuxData without the additional argument NULL. + + * data/Makefile.in: Restored 3.8.1 version, Autoconf >=2.61 ensures + a posix shell making, these changes obsolete. + + * layout/ScriptAndLanguageTags.{cpp,h}: Backport from 4.0.1, + additional tags and changed comments. + + * layout/OpenTypeLayoutEngine.cpp: Removed some obsolete code, + surrounded by #if 0...#endif. diff --git a/Build/source/libs/icu/TLPATCHES/TL-Changes b/Build/source/libs/icu/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..90bded3540c --- /dev/null +++ b/Build/source/libs/icu/TLPATCHES/TL-Changes @@ -0,0 +1,56 @@ +Changes applied to the icu-57.1 tree as obtained from: + http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz + +cd /tmp # or wherever +tar xf icu4c-*-src.tgz +cd .../texlive/Build/source/libs/icu/icu-src +\cp -arf /tmp/icu/* . +rm -r as_is packaging # don't bother including these in our tree +# +# files to add: +svn status | sed -n 's/^\?//p' +svn add `!!` +svn status | sed -n 's/^\?//p' # rerun, should be empty now +# +diff -qr . /tmp/icu/ | sed -n -e 's,^Only in \./\(.*\): ,\1/,p' +svn rm `!!` +diff ... # rerun, should be empty now + +# update generic files (still in icu-src): +aux=/usr/local/src/dist/build-aux +cp $aux/config.guess $aux/config.sub $aux/install-sh source/ + +# apply ./patch-* files, as needed. +# Run svn diff after each, update patch-* file. +# Don't lose our leading comments. + +# autoreconf. +# rebuild; must rerun configure (not just config.status), +# so easiest is to just do a whole new build. +# That will also test use of the new icu version by our programs. + +# Assuming all seems ok, reduce size of source/data/in/icudt*.dat +# to decrease data segment size, e.g., for old BSD. First, check +# that we successfully built the full .dat: +srcdat=.../source/libs/icu/icu-src/source/data/in/icudt57l.dat +cd .../Work/libs/icu/icu-build/data/out/build/icudt57l +indat=../../tmp/icudt57l.dat +diff $srcdat $indat +# should be identical, amazingly enough. + +# we need to use icupkg, which may need LD_LIBRARY_PATH since it is a +# C++ binary and we didn't cxx-hack it. +icupkg="env LD_LIBRARY_PATH=$gnu/lib ../../../../bin/icupkg" + +# then remove some elements unused by the icu clients in our tree, namely +# bibtexu (in texk/bibtex-x), upmendex, and xetex (in texk/web2c/xetexdir). +outdat=icudt57l.dat +$icupkg -r 'curr/*' $indat $outdat && mv $outdat $indat +$icupkg -r 'lang/*' $indat $outdat && mv $outdat $indat +$icupkg -r 'region/*' $indat $outdat && mv $outdat $indat +$icupkg -r 'rfc*.spp' $indat $outdat && mv $outdat $indat +$icupkg -r 'zone/*' $indat $outdat && mv $outdat $indat +ls -l $indat $srcdat # indat should be much smaller +cp $indat $srcdat + +# then commit. diff --git a/Build/source/libs/icu/TLPATCHES/patch-03-gcc-atomic b/Build/source/libs/icu/TLPATCHES/patch-03-gcc-atomic new file mode 100644 index 00000000000..2b53072f732 --- /dev/null +++ b/Build/source/libs/icu/TLPATCHES/patch-03-gcc-atomic @@ -0,0 +1,13 @@ + It seems gcc-4.4 uses external calls. + +--- source/common/putilimp.h (revision 40154) ++++ source/common/putilimp.h (working copy) +@@ -191,7 +191,7 @@ + /* Use the predefined value. */ + #elif U_PLATFORM == U_PF_MINGW + #define U_HAVE_GCC_ATOMICS 0 +-#elif U_GCC_MAJOR_MINOR >= 404 || defined(__clang__) ++#elif U_GCC_MAJOR_MINOR >= 405 || defined(__clang__) + /* TODO: Intel icc and IBM xlc on AIX also support gcc atomics. (Intel originated them.) + * Add them for these compilers. + * Note: Clang sets __GNUC__ defines for version 4.2, so misses the 4.4 test here. diff --git a/Build/source/libs/icu/TLPATCHES/patch-12-mingw b/Build/source/libs/icu/TLPATCHES/patch-12-mingw new file mode 100644 index 00000000000..2b8b7b090c7 --- /dev/null +++ b/Build/source/libs/icu/TLPATCHES/patch-12-mingw @@ -0,0 +1,32 @@ + We don't want this for TeX Live cross compilation. + +--- source/config/mh-mingw (revision 40154) ++++ source/config/mh-mingw (working copy) +@@ -59,27 +59,9 @@ + ## Non-shared intermediate object suffix + STATIC_O = ao + +-ifeq ($(ENABLE_SHARED),YES) +-SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR) +-else +-SO_TARGET_VERSION_SUFFIX = +-endif +- +-# Static library prefix and file extension +-LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) +-A = a +- + ## An import library is needed for z/OS and MSVC + IMPORT_LIB_EXT = .dll.a + +-LIBPREFIX= +- +-# Change the stubnames so that poorly working FAT disks and installation programs can work. +-# This is also for backwards compatibility. +-DATA_STUBNAME = dt +-I18N_STUBNAME = in +-LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) +- + #SH### copied from Makefile.inc + #SH## for icu-config to test with + #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}" diff --git a/Build/source/libs/icu/TLPATCHES/patch-13-STATIC_PREFIX b/Build/source/libs/icu/TLPATCHES/patch-13-STATIC_PREFIX new file mode 100644 index 00000000000..e35ca62da0d --- /dev/null +++ b/Build/source/libs/icu/TLPATCHES/patch-13-STATIC_PREFIX @@ -0,0 +1,31 @@ + No `s' for STATIC_PREFIX. + +--- source/config/Makefile.inc.in (revision 40154) ++++ source/config/Makefile.inc.in (working copy) +@@ -44,7 +44,7 @@ + LIBICU = lib$(ICUPREFIX) + + # Static library prefix and file extension +-STATIC_PREFIX = s ++STATIC_PREFIX = + LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX) + A = a + +--- source/icudefs.mk.in (revision 40154) ++++ source/icudefs.mk.in (working copy) +@@ -207,13 +207,13 @@ + + ## If we can't use the shared libraries, use the static libraries + ifneq ($(ENABLE_SHARED),YES) +-STATIC_PREFIX_WHEN_USED = s ++STATIC_PREFIX_WHEN_USED = + else + STATIC_PREFIX_WHEN_USED = + endif + + # Static library prefix and file extension +-STATIC_PREFIX = s ++STATIC_PREFIX = + LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) + A = a + SOBJ = $(SO) diff --git a/Build/source/libs/icu/TLPATCHES/patch-14-xopen b/Build/source/libs/icu/TLPATCHES/patch-14-xopen new file mode 100644 index 00000000000..6ccb6564407 --- /dev/null +++ b/Build/source/libs/icu/TLPATCHES/patch-14-xopen @@ -0,0 +1,19 @@ + Do not define _XOPEN_SOURCE_EXTENDED on Solaris, + notwithstanding comments in icu source. + +--- source/common/uposixdefs.h (revision 40154) ++++ source/common/uposixdefs.h (working copy) +@@ -49,10 +49,13 @@ + * Make sure things like readlink and such functions work. + * Poorly upgraded Solaris machines can't have this defined. + * Cleanly installed Solaris can use this #define. ++ * [Experience with TeX Live is that it always causes failure. ++ * http://tug.org/pipermail/tlbuild/2013q1/002493.html ++ * http://tug.org/pipermail/tlbuild/2013q1/002536.html ] + * + * z/OS needs this definition for timeval and to get usleep. + */ +-#if !defined(_XOPEN_SOURCE_EXTENDED) ++#if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__sun) + # define _XOPEN_SOURCE_EXTENDED 1 + #endif diff --git a/Build/source/libs/icu/TLPATCHES/patch-16-putil b/Build/source/libs/icu/TLPATCHES/patch-16-putil new file mode 100644 index 00000000000..c79c526dc9c --- /dev/null +++ b/Build/source/libs/icu/TLPATCHES/patch-16-putil @@ -0,0 +1,45 @@ +--- source/common/putil.cpp (revision 40154) ++++ source/common/putil.cpp (working copy) +@@ -41,6 +41,20 @@ + // Must be before any other #includes. + #include "uposixdefs.h" + ++#if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__) ++/* tzset isn't defined in strict ANSI on Cygwin and MinGW. */ ++#undef __STRICT_ANSI__ ++#endif ++ ++/* ++ * Cygwin with GCC requires inclusion of time.h after the above disabling strict asci mode statement. ++ */ ++#include ++ ++#if !U_PLATFORM_USES_ONLY_WIN32_API ++#include ++#endif ++ + /* include ICU headers */ + #include "unicode/utypes.h" + #include "unicode/putil.h" +@@ -102,21 +116,7 @@ + # include + #endif + +-#if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__) +-/* tzset isn't defined in strict ANSI on Cygwin and MinGW. */ +-#undef __STRICT_ANSI__ +-#endif +- + /* +- * Cygwin with GCC requires inclusion of time.h after the above disabling strict asci mode statement. +- */ +-#include +- +-#if !U_PLATFORM_USES_ONLY_WIN32_API +-#include +-#endif +- +-/* + * Only include langinfo.h if we have a way to get the codeset. If we later + * depend on more feature, we can test on U_HAVE_NL_LANGINFO. + * diff --git a/Build/source/libs/icu/TLPATCHES/patch-17-cygwin-no-w32api b/Build/source/libs/icu/TLPATCHES/patch-17-cygwin-no-w32api new file mode 100644 index 00000000000..e24041a1f2b --- /dev/null +++ b/Build/source/libs/icu/TLPATCHES/patch-17-cygwin-no-w32api @@ -0,0 +1,452 @@ +--- source/common/putilimp.h (revision 40154) ++++ source/common/putilimp.h (working copy) +@@ -148,7 +148,7 @@ + + #ifdef U_HAVE_MMAP + /* Use the predefined value. */ +-#elif U_PLATFORM_HAS_WIN32_API ++#elif U_PLATFORM_USES_ONLY_WIN32_API + # define U_HAVE_MMAP 0 + #else + # define U_HAVE_MMAP 1 +@@ -171,7 +171,7 @@ + */ + #ifdef U_HAVE_DIRENT_H + /* Use the predefined value. */ +-#elif U_PLATFORM_HAS_WIN32_API ++#elif U_PLATFORM_USES_ONLY_WIN32_API + # define U_HAVE_DIRENT_H 0 + #else + # define U_HAVE_DIRENT_H 1 +--- source/common/umutex.cpp (revision 40154) ++++ source/common/umutex.cpp (working copy) +@@ -37,7 +37,7 @@ + // Build time user mutex hook: #include "U_USER_MUTEX_CPP" + #include U_MUTEX_XSTR(U_USER_MUTEX_CPP) + +-#elif U_PLATFORM_HAS_WIN32_API ++#elif U_PLATFORM_USES_ONLY_WIN32_API + + //------------------------------------------------------------------------------------------- + // +--- source/common/umutex.h (revision 40154) ++++ source/common/umutex.h (working copy) +@@ -74,7 +74,7 @@ + } + U_NAMESPACE_END + +-#elif U_PLATFORM_HAS_WIN32_API ++#elif U_PLATFORM_USES_ONLY_WIN32_API + + // MSVC compiler. Reads and writes of volatile variables have + // acquire and release memory semantics, respectively. +@@ -318,7 +318,7 @@ + // #inlcude "U_USER_MUTEX_H" + #include U_MUTEX_XSTR(U_USER_MUTEX_H) + +-#elif U_PLATFORM_HAS_WIN32_API ++#elif U_PLATFORM_USES_ONLY_WIN32_API + + /* Windows Definitions. + * Windows comes first in the platform chain. +--- source/common/wintz.c (revision 40154) ++++ source/common/wintz.c (working copy) +@@ -11,7 +11,7 @@ + + #include "unicode/utypes.h" + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + + #include "wintz.h" + #include "cmemory.h" +@@ -436,4 +436,4 @@ + return icuid; + } + +-#endif /* U_PLATFORM_HAS_WIN32_API */ ++#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ +--- source/common/wintz.h (revision 40154) ++++ source/common/wintz.h (working copy) +@@ -14,7 +14,7 @@ + + #include "unicode/utypes.h" + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + + /** + * \file +@@ -29,6 +29,6 @@ + U_CFUNC const char* U_EXPORT2 + uprv_detectWindowsTimeZone(); + +-#endif /* U_PLATFORM_HAS_WIN32_API */ ++#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ + + #endif /* __WINTZ */ +--- source/i18n/datefmt.cpp (revision 40154) ++++ source/i18n/datefmt.cpp (working copy) +@@ -496,7 +496,7 @@ + DateFormat::create(EStyle timeStyle, EStyle dateStyle, const Locale& locale) + { + UErrorCode status = U_ZERO_ERROR; +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + char buffer[8]; + int32_t count = locale.getKeywordValue("compat", buffer, sizeof(buffer), status); + +--- source/i18n/windtfmt.cpp (revision 40154) ++++ source/i18n/windtfmt.cpp (working copy) +@@ -11,7 +11,7 @@ + + #include "unicode/utypes.h" + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + + #if !UCONFIG_NO_FORMATTING + +@@ -312,5 +312,5 @@ + + #endif /* #if !UCONFIG_NO_FORMATTING */ + +-#endif // U_PLATFORM_HAS_WIN32_API ++#endif // U_PLATFORM_USES_ONLY_WIN32_API + +--- source/i18n/windtfmt.h (revision 40154) ++++ source/i18n/windtfmt.h (working copy) +@@ -14,7 +14,7 @@ + + #include "unicode/utypes.h" + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + + #if !UCONFIG_NO_FORMATTING + +@@ -131,6 +131,6 @@ + + #endif /* #if !UCONFIG_NO_FORMATTING */ + +-#endif // U_PLATFORM_HAS_WIN32_API ++#endif // U_PLATFORM_USES_ONLY_WIN32_API + + #endif // __WINDTFMT +--- source/i18n/wintzimpl.cpp (revision 40154) ++++ source/i18n/wintzimpl.cpp (working copy) +@@ -11,7 +11,7 @@ + + #include "unicode/utypes.h" + +-#if U_PLATFORM_HAS_WIN32_API && !UCONFIG_NO_FORMATTING ++#if U_PLATFORM_USES_ONLY_WIN32_API && !UCONFIG_NO_FORMATTING + + #include "wintzimpl.h" +--- source/i18n/wintzimpl.h (revision 40154) ++++ source/i18n/wintzimpl.h (working copy) +@@ -14,7 +14,7 @@ + + #include "unicode/utypes.h" + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + /** + * \file + * \brief C API: Utilities for dealing w/ Windows time zones. +@@ -32,6 +32,6 @@ + uprv_getWindowsTimeZoneInfo(TIME_ZONE_INFORMATION *zoneInfo, const UChar *icuid, int32_t length); + + +-#endif /* U_PLATFORM_HAS_WIN32_API */ ++#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ + + #endif /* __WINTZIMPL */ +Index: source/test/intltest/dtfmttst.cpp +=================================================================== +--- source/test/intltest/dtfmttst.cpp (revision 40154) ++++ source/test/intltest/dtfmttst.cpp (working copy) +@@ -23,7 +23,7 @@ + #include "caltest.h" // for fieldName + #include // for sprintf + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + #include "windttst.h" + #endif + +@@ -2372,7 +2372,7 @@ + + void DateFormatTest::TestHost(void) + { +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + Win32DateTimeTest::testLocales(this); + #endif + } +Index: source/test/intltest/uobjtest.cpp +=================================================================== +--- source/test/intltest/uobjtest.cpp (revision 40154) ++++ source/test/intltest/uobjtest.cpp (working copy) +@@ -382,13 +382,11 @@ + TESTCLASSID_FACTORY(IndianCalendar, Calendar::createInstance(Locale("@calendar=indian"), status)); + TESTCLASSID_FACTORY(ChineseCalendar, Calendar::createInstance(Locale("@calendar=chinese"), status)); + TESTCLASSID_FACTORY(TaiwanCalendar, Calendar::createInstance(Locale("@calendar=roc"), status)); +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + TESTCLASSID_FACTORY(Win32DateFormat, DateFormat::createDateInstance(DateFormat::kFull, Locale("@compat=host"))); +-#if U_PLATFORM_USES_ONLY_WIN32_API + TESTCLASSID_FACTORY(Win32NumberFormat, NumberFormat::createInstance(Locale("@compat=host"), status)); + #endif + #endif +-#endif + + #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILE_IO + /* TESTCLASSID_ABSTRACT(BreakIterator); No staticID! */ +Index: source/test/intltest/windttst.cpp +=================================================================== +--- source/test/intltest/windttst.cpp (revision 40154) ++++ source/test/intltest/windttst.cpp (working copy) +@@ -11,7 +11,7 @@ + + #include "unicode/utypes.h" + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + + #if !UCONFIG_NO_FORMATTING + +@@ -191,4 +191,4 @@ + + #endif /* #if !UCONFIG_NO_FORMATTING */ + +-#endif /* U_PLATFORM_HAS_WIN32_API */ ++#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ +Index: source/test/intltest/windttst.h +=================================================================== +--- source/test/intltest/windttst.h (revision 40154) ++++ source/test/intltest/windttst.h (working copy) +@@ -14,7 +14,7 @@ + + #include "unicode/utypes.h" + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + + #if !UCONFIG_NO_FORMATTING + +@@ -36,6 +36,6 @@ + + #endif /* #if !UCONFIG_NO_FORMATTING */ + +-#endif // U_PLATFORM_HAS_WIN32_API ++#endif // U_PLATFORM_USES_ONLY_WIN32_API + + #endif // __WINDTTST +Index: source/test/intltest/winutil.cpp +=================================================================== +--- source/test/intltest/winutil.cpp (revision 40154) ++++ source/test/intltest/winutil.cpp (working copy) +@@ -11,7 +11,7 @@ + + #include "unicode/utypes.h" + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + + #if !UCONFIG_NO_FORMATTING + +@@ -93,4 +93,4 @@ + + #endif /* #if !UCONFIG_NO_FORMATTING */ + +-#endif /* U_PLATFORM_HAS_WIN32_API */ ++#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ +Index: source/test/intltest/winutil.h +=================================================================== +--- source/test/intltest/winutil.h (revision 40154) ++++ source/test/intltest/winutil.h (working copy) +@@ -14,7 +14,7 @@ + + #include "unicode/utypes.h" + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + + #if !UCONFIG_NO_FORMATTING + +@@ -41,6 +41,6 @@ + + #endif /* #if !UCONFIG_NO_FORMATTING */ + +-#endif // U_PLATFORM_HAS_WIN32_API ++#endif // U_PLATFORM_USES_ONLY_WIN32_API + + #endif // __WINUTIL +Index: source/test/perf/collperf/collperf.cpp +=================================================================== +--- source/test/perf/collperf/collperf.cpp (revision 40154) ++++ source/test/perf/collperf/collperf.cpp (working copy) +@@ -113,7 +113,7 @@ + ucol_getSortKey(col, data[i].icu_data, data[i].icu_data_len, icu_key, MAX_KEY_LENGTH); + } + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + // pre-generated in CollPerfTest::prepareData(), need not to check error here + void win_key_null(int32_t i){ + //LCMAP_SORTsk 0x00000400 // WC sort sk (normalize) +@@ -295,7 +295,7 @@ + return strcmp((char *) da->icu_key, (char *) db->icu_key); + } + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + static int win_cmp_null(const void *a, const void *b) { + QCAST(); + //CSTR_LESS_THAN 1 +@@ -330,7 +330,7 @@ + + QFUNC(posix_strcoll_null, strcoll, posix_data) + QFUNC(posix_cmpkey, strcmp, posix_key) +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + QFUNC(win_cmpkey, strcmp, win_key) + QFUNC(win_wcscmp, wcscmp, win_data) + #endif +@@ -450,7 +450,7 @@ + return strcmp( (char *) rnd[i].icu_key, (char *) ord[j].icu_key ); + } + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + int win_cmp_null(int32_t i, int32_t j) { + int t = CompareStringW(win_langid, 0, rnd[i].win_data, -1, ord[j].win_data, -1); + if (t == 0){ +@@ -587,7 +587,7 @@ + locale = "en_US"; // set default locale + } + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + if (options[i].doesOccur) { + char *endp; + int tmp = strtol(options[i].value, &endp, 0); +@@ -687,7 +687,7 @@ + TEST_KEYGEN(TestIcu_KeyGen_null, icu_key_null); + TEST_KEYGEN(TestIcu_KeyGen_len, icu_key_len); + TEST_KEYGEN(TestPosix_KeyGen_null, posix_key_null); +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + TEST_KEYGEN(TestWin_KeyGen_null, win_key_null); + TEST_KEYGEN(TestWin_KeyGen_len, win_key_len); + #endif +@@ -713,7 +713,7 @@ + TEST_QSORT(TestIcu_qsort_usekey, icu_cmpkey); + TEST_QSORT(TestPosix_qsort_strcoll_null, posix_strcoll_null); + TEST_QSORT(TestPosix_qsort_usekey, posix_cmpkey); +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + TEST_QSORT(TestWin_qsort_CompareStringW_null, win_cmp_null); + TEST_QSORT(TestWin_qsort_CompareStringW_len, win_cmp_len); + TEST_QSORT(TestWin_qsort_usekey, win_cmpkey); +@@ -728,7 +728,7 @@ + TEST_BIN(TestIcu_BinarySearch_cmpCPO, icu_cmpcpo); + TEST_BIN(TestPosix_BinarySearch_strcoll_null, posix_strcoll_null); + TEST_BIN(TestPosix_BinarySearch_usekey, posix_cmpkey); +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + TEST_BIN(TestWin_BinarySearch_CompareStringW_null, win_cmp_null); + TEST_BIN(TestWin_BinarySearch_CompareStringW_len, win_cmp_len); + #endif +@@ -828,7 +828,7 @@ + t = strxfrm(posix_key->last(), posix_data->dataOf(i), s); + if (t != s) {status = U_INVALID_FORMAT_ERROR;return;} + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + // Win data + s = icu_data->lengthOf(i) + 1; // plus terminal NULL + win_data->append_one(s); +@@ -851,7 +851,7 @@ + rnd_index[i].posix_key = posix_key->last(); + rnd_index[i].posix_data = posix_data->dataOf(i); + rnd_index[i].posix_data_len = posix_data->lengthOf(i); +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + rnd_index[i].win_key = win_key->dataOf(i); + rnd_index[i].win_data = win_data->dataOf(i); + rnd_index[i].win_data_len = win_data->lengthOf(i); +@@ -870,7 +870,7 @@ + SORT(ord_icu_key, icu_cmpkey); + SORT(ord_posix_data, posix_strcoll_null); + SORT(ord_posix_key, posix_cmpkey); +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + SORT(ord_win_data, win_cmp_len); + SORT(ord_win_key, win_cmpkey); + SORT(ord_win_wcscmp, win_wcscmp); +Index: source/test/perf/normperf/normperf.h +=================================================================== +--- source/test/perf/normperf/normperf.h (revision 40154) ++++ source/test/perf/normperf/normperf.h (working copy) +@@ -315,7 +315,7 @@ + } + #endif + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + + int32_t WinNormNFD(const UChar* src, int32_t srcLen, UChar* dest, int32_t dstLen, int32_t options, UErrorCode* status) { + return FoldStringW(MAP_COMPOSITE,src,srcLen,dest,dstLen); +Index: source/tools/ctestfw/unicode/utimer.h +=================================================================== +--- source/tools/ctestfw/unicode/utimer.h (revision 40154) ++++ source/tools/ctestfw/unicode/utimer.h (working copy) +@@ -10,7 +10,7 @@ + + #include "unicode/utypes.h" + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + # define VC_EXTRALEAN + # define WIN32_LEAN_AND_MEAN + # include +@@ -160,7 +160,7 @@ + typedef void FuntionToBeTimed(void* param); + + +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + + struct UTimer{ + LARGE_INTEGER start; +Index: source/tools/genrb/derb.cpp +=================================================================== +--- source/tools/genrb/derb.cpp (revision 40154) ++++ source/tools/genrb/derb.cpp (working copy) +@@ -204,7 +204,7 @@ + UBool fromICUData = !uprv_strcmp(inputDir, "-"); + if (!fromICUData) { + UBool absfilename = *arg == U_FILE_SEP_CHAR; +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_HAS_WIN32_API && U_PLATFORM != U_PF_CYGWIN + if (!absfilename) { + absfilename = (uprv_strlen(arg) > 2 && isalpha(arg[0]) + && arg[1] == ':' && arg[2] == U_FILE_SEP_CHAR); +Index: source/tools/toolutil/udbgutil.cpp +=================================================================== +--- source/tools/toolutil/udbgutil.cpp (revision 40154) ++++ source/tools/toolutil/udbgutil.cpp (working copy) +@@ -348,8 +348,10 @@ + */ + U_CAPI const char *udbg_getPlatform(void) + { +-#if U_PLATFORM_HAS_WIN32_API ++#if U_PLATFORM_USES_ONLY_WIN32_API + return "Windows"; ++#elif U_PLATFORM == U_PF_CYGWIN ++ return "Cygwin"; + #elif U_PLATFORM == U_PF_UNKNOWN + return "unknown"; + #elif U_PLATFORM == U_PF_DARWIN diff --git a/Build/source/libs/icu/TLPATCHES/patch-20-private b/Build/source/libs/icu/TLPATCHES/patch-20-private new file mode 100644 index 00000000000..d20a7de0d37 --- /dev/null +++ b/Build/source/libs/icu/TLPATCHES/patch-20-private @@ -0,0 +1,73 @@ + The supplied g++-4.2 compiler on 32-bit MacOSX apparently + mishandled private enum in the implementation (since newer + compilers are ok with it). This can be removed when we drop + support for 32-bit MacOSX. + http://tug.org/pipermail/tlbuild/2016q1/003438.html + (and starting at http://tug.org/pipermail/tlbuild/2016q1/003433.html) + +Index: icu-src/source/i18n/dayperiodrules.h +=================================================================== +--- icu-src/source/i18n/dayperiodrules.h (revision 40174) ++++ icu-src/source/i18n/dayperiodrules.h (working copy) +@@ -53,7 +53,7 @@ + // Returns the center of dayPeriod. Half hours are indicated with a .5 . + double getMidPointForDayPeriod(DayPeriod dayPeriod, UErrorCode &errorCode) const; + +-private: ++/* nothing private to placate old compilers --karl/koch private: */ + DayPeriodRules(); + + // Translates "morning1" to DAYPERIOD_MORNING1, for example. +Index: icu-src/source/i18n/unicode/dtitvinf.h +=================================================================== +--- icu-src/source/i18n/unicode/dtitvinf.h (revision 40174) ++++ icu-src/source/i18n/unicode/dtitvinf.h (working copy) +@@ -150,7 +150,8 @@ + + class U_I18N_API DateIntervalInfo U_FINAL : public UObject { + public: +-#ifndef U_HIDE_INTERNAL_API ++/* nothing private to placate old compilers --karl/koch */ ++/* ifndef U_HIDE_INTERNAL_API */ + /** + * Default constructor. + * It does not initialize any interval patterns except +@@ -165,7 +166,7 @@ + * @internal ICU 4.0 + */ + DateIntervalInfo(UErrorCode& status); +-#endif /* U_HIDE_INTERNAL_API */ ++/* endif */ /* U_HIDE_INTERNAL_API */ + + + /** +@@ -328,7 +329,7 @@ + static UClassID U_EXPORT2 getStaticClassID(); + + +-private: ++/* nothing private to placate old compilers --karl/koch private: */ + /** + * DateIntervalFormat will need access to + * getBestSkeleton(), parseSkeleton(), enum IntervalPatternIndex, +@@ -359,7 +360,8 @@ + kIPI_MAX_INDEX + }; + public: +-#ifndef U_HIDE_INTERNAL_API ++/* nothing private to placate old compilers --karl/koch */ ++/* ifndef U_HIDE_INTERNAL_API */ + /** + * Max index for stored interval patterns + * @internal ICU 4.4 +@@ -367,8 +369,8 @@ + enum { + kMaxIntervalPatternIndex = kIPI_MAX_INDEX + }; +-#endif /* U_HIDE_INTERNAL_API */ +-private: ++/* endif */ /* U_HIDE_INTERNAL_API */ ++/* nothing private to placate old compilers --karl/koch private: */ + + + /** diff --git a/Build/source/libs/icu/icu-PATCHES/ChangeLog b/Build/source/libs/icu/icu-PATCHES/ChangeLog deleted file mode 100644 index 4be9800d1d8..00000000000 --- a/Build/source/libs/icu/icu-PATCHES/ChangeLog +++ /dev/null @@ -1,483 +0,0 @@ -2016-03-30 Karl Berry - - * patch-20-private: new file, per Dick Koch. - http://tug.org/pipermail/tlbuild/2016q1/003438.html - -2016-03-27 Karl Berry - - * Imported icu-57.1 from - http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz - See ./TL-Changes for procedure. - -2015-10-08 Peter Breitenlohner - - Updated icu-56.1 source tree (icu4c-56_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/56.1/ - -2015-09-27 Peter Breitenlohner - - Imported icu-56.1 source tree (icu4c-56_rc-src.tgz) from: - http://download.icu-project.org/files/icu4c/56rc/ - - * patch-03-gcc-atomic, patch-12-mingw, - patch-13-STATIC_PREFIX, patch-14-xopen, patch-16-putil, - patch-17-cygwin-no-w32api: Adapted. - -2015-04-12 Peter Breitenlohner - - Updated icu-55.1 source tree (icu4c-55_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/55.1/ - -2015-03-19 Peter Breitenlohner - - Imported icu-55.1 source tree (icu4c-55_rc-src.tgz) from: - http://download.icu-project.org/files/icu4c/55rc/ - - * patch-03-gcc-atomic, patch-12-mingw, - patch-13-STATIC_PREFIX, patch-14-xopen, patch-16-putil, - patch-17-cygwin-no-w32api: Adapted. - -2014-10-02 Peter Breitenlohner - - Updated icu-54.1 source tree (icu4c-54_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/54.1/ - -2014-09-18 Peter Breitenlohner - - Imported icu-54.1 source tree (icu4c-54_rc-src.tgz) from: - http://download.icu-project.org/files/icu4c/54rc/ - - * patch-11-cygwin64, patch-15-solaris, - patch-18-solaris-depend (removed): Included upstream. - - * patch-03-gcc-atomic, patch-12-mingw, - patch-13-STATIC_PREFIX, patch-14-xopen, patch-16-putil, - patch-17-cygwin-no-w32api: Adapted. - -2014-05-14 Peter Breitenlohner - - * patch-18-solaris-depend (new): Minor build fix for solaris, - dependencies for C files require $(CFLAGS), i.e., -std=c99. - -2014-04-03 Peter Breitenlohner - - Updated icu-53.1 source tree (icu4c-53_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/53.1/ - -2014-03-22 Peter Breitenlohner - - * patch-16-putil (new): Build fix for Cygwin/MinGW with -ansi, - * patch-17-cygwin-no-w32api (new): Use Posix instead of Win32 - API for Cygwin, - from Ken Brown . - -2014-03-20 Peter Breitenlohner - - Imported icu-53.1 source tree (icu4c-53_rc-src.tgz) from: - http://download.icu-project.org/files/icu4c/53rc/ - - * patch-04-Windows2000 (removed): Drop Windows2000 support. - * patch-08-avoid-rebuild (removed): Included upstream. - - * patch-03-gcc-atomic, patch-11-cygwin64, patch-12-mingw, - patch-13-STATIC_PREFIX, patch-14-xopen: Adapted. - - * patch-15-solaris (new): Build fix for Solaris, from - http://bugs.icu-project.org/trac/ticket/10580 - -2014-02-21 Peter Breitenlohner - - * patch-11-cygwin64 (new): Enable Cygwin64 (from Cygwin64 port). - -2013-10-10 Peter Breitenlohner - - Updated icu-52.1 source tree (icu4c-52_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/52.1/ - -2013-09-26 Peter Breitenlohner - - Imported icu-52.1 source tree (icu4c-52_rc2-src.tgz) from: - http://download.icu-project.org/files/icu4c/52rc/ - - * patch-03-gcc-atomic, patch-04-Windows2000, - patch-08-avoid-rebuild, patch-12-mingw, patch-13-STATIC_PREFIX, - patch-14-xopen: Adapted. - -2013-04-02 Karl Berry - - * patch-14-xopen: do not define _XOPEN_SOURCE_EXTENDED on Solaris, - notwithstanding comments in icu source. - From Apostolos, tlbuild 27 Mar 2013 15:52:26 (and Ettore, later). - -2013-03-21 Peter Breitenlohner - - Updated icu-51.1 source tree (icu4c-51_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/51.1/ - -2013-03-14 Peter Breitenlohner - - * patch-08-avoid-rebuild: Really avoid to run pkgdata again. - -2013-03-07 Peter Breitenlohner - - Imported icu-51.1 source tree (icu4c-51_rc-src.tgz) from: - http://download.icu-project.org/files/icu4c/51rc/ - - * patch-11-CURR_FULL_DIR, patch-14-mingw-cross, - patch-83-zonemeta-bugfix, patch-84-c++11-bugfix (removed): - Now in icu-51.1. - * patch-{40,50,60,70,82}-* (removed): Obsolete, layout not used. - * patch-02-kFreeBSD (removed): Not needed. - - * patch-03-gcc-atomic, patch-04-Windows2000, - patch-08-avoid-rebuild, patch-12-mingw, patch-13-STATIC_PREFIX: - Adapted. - -2012-11-29 Peter Breitenlohner - - * patch-04-Windows2000 (new): From Akira. - -2012-11-16 Peter Breitenlohner - - * patch-84-c++11-bugfix (new): Required for gcc-4.7. - From http://bugs.icu-project.org/trac/ticket/9728. - -2012-11-06 Peter Breitenlohner - - Updated icu-50.1 source tree (icu4c-50_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/50.1/ - - * patch-83-zonemeta-bugfix (new): Required for MinGW. - -2012-10-24 Peter Breitenlohner - - Imported icu-50.1 source tree (icu4c-50_rc-src.tgz) from: - http://download.icu-project.org/files/icu4c/50rc/ - - * patch-01-Cygwin, patch-02-FreeBSD (removed): Now in icu-50.1. - * patch-14-GENCCODE_ASSEMBLY (removed): Obsolete. - - * patch-{08,11,12,13,40,50,60,70,82}-*:Adapted. - - * patch-02-kFreeBSD (new): Use Posix conform timezone decl. - * patch-03-gcc-atomic (new): Required for gcc-4.4. - * patch-14-mingw-cross (new): Required for linux->MinGW32 cross. - -2012-06-18 Peter Breitenlohner - - * patch-82-Indic-bugfix (new): Revert ICU SVN commit 26090. - -2012-06-09 Peter Breitenlohner - - Imported icu-49.1.2 source tree (icu4c-49_1_2-src.tgz) from: - http://download.icu-project.org/files/icu4c/49.1.2/ - - * patch-07-configure-utf16-string, patch-09-generated (removed): - Obsolete. - - * patch-{01,02,08,11,12,13,14,40,50,60,70}-*: Adapted. - -2012-04-24 Peter Breitenlohner - - * patch-02-FreeBSD (new): Build fix for FreeBSD. - Reported by Nikola Lecic - -2012-04-18 Peter Breitenlohner - - Imported icu-49.1.1 source tree (icu4c-49_1_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/49.1.1/ - - * patch-05-m4-quoting: Removed, now in icu-49.1.1. - - * patch-{01,07,08,09,11,12,13,14,40,50,60,70}-*: Adapted. - -2012-03-23 Peter Breitenlohner - - * patch-01-Cygwin (new): Build fix for Cygwin. - Reported by Ken Brown . - -2012-03-22 Peter Breitenlohner - - Updated icu-49.1 source tree (icu4c-49_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/49.1/ - - * patch-{01,02,03,04}-*: Removed, now in icu-49.1. - - * patch-{05,07,08,09,11,12,13,14,40,50,60,70}-*: Adapted. - -2012-03-21 Peter Breitenlohner - - * patch-05-m4-quoting (new): Correct m4 quoting in configure.in. - -2012-03-17 Peter Breitenlohner - - * patch-04-FreeBSD (new): From ICU. - -2012-03-15 Peter Breitenlohner - - * patch-40-auxParam: Fix a typo (auxillary => auxiliary). - * patch-70-Arabic: Remove useless changes of original code. - -2012-03-12 Peter Breitenlohner - - * patch-03-U_PF_UNKNOWN (new): Bug fix for the case that - U_PLATFORM == U_PF_UNKNOWN as, e.g., for FreeBSD (why?). - Reported by Hilmar Preusse . - -2012-03-03 Peter Breitenlohner - - Imported icu-49.1 source tree (icu4c-49_rc-src.tgz) from: - http://download.icu-project.org/files/icu4c/49rc/ - - * patch-40-LESwaps, patch-81-Indic: Removed, now in icu-49.1. - - * patch-01-UVoidFunction (new): Bug fix for '--disable-dyload'. - * patch-02-AC_CHECK_TOOL (new): Bug fix for cross compilation. - - * TL-Changes, patch-07-configure-utf16-string, - patch-08-avoid-rebuild, patch-09-generated, - patch-11-CURR_FULL_DIR, patch-12-mingw, patch-13-STATIC_PREFIX, - patch-14-GENCCODE_ASSEMBLY, patch-50-Vertical, patch-60-KernPair, - patch-70-Arabic: Adapted. - * patch-05-auxParam (removed): Renamed ... - * patch-40-auxParam (new): ... to this and adapted. - -2011-08-31 Peter Breitenlohner - - * patch-40-LESwaps: See ICU Ticket #8657, comment 11. - -2011-08-09 Peter Breitenlohner - - Imported icu-4.8.1 source tree (icu4c-4_8_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/4.8.1/ - - * patch-06-mingw: Removed, included in icu-4.8.1. - - * TL-Changes, patch-05-auxParam, - patch-07-configure-utf16-string, patch-08-avoid-rebuild, - patch-09-generated, patch-11-CURR_FULL_DIR, patch-12-mingw, - patch-13-STATIC_PREFIX, patch-14-GENCCODE_ASSEMBLY, - patch-50-Vertical, patch-60-KernPair, patch-70-Arabic, - patch-81-Indic: Adapted. - - * patch-40-LESwaps: Rewritten, see ICU Ticket #8657, comment 7. - -2011-06-19 Karl Berry - - * patch-40-LESwaps: revert to ICU 4.4, as 4.6 and 4.8 code - is broken on BigEndian machines. - http://bugs.icu-project.org/trac/ticket/8657 - tlbuild mail, 17 Jun 2011 17:10:38 - -2011-05-26 Peter Breitenlohner - - Imported icu-4.8 source tree (icu4c-4_8-src.tgz) from: - http://download.icu-project.org/files/icu4c/4.8/ - - * patch-80-Indic: Removed (not needed). - - * TL-Changes, patch-05-auxParam, patch-06-mingw, - patch-07-configure-utf16-string, patch-08-avoid-rebuild, - patch-09-generated, patch-11-CURR_FULL_DIR, patch-12-mingw, - patch-13-STATIC_PREFIX, patch-14-GENCCODE_ASSEMBLY, - patch-50-Vertical, patch-60-KernPair, patch-70-Arabic, - patch-81-Indic: Adapted. - -2011-05-11 Peter Breitenlohner - - * patch-14-GENCCODE_ASSEMBLY (new): For amd64-kfreebsd. - -2011-05-09 Peter Breitenlohner - - * patch-13-STATIC_PREFIX (new): Never use libsicuxxx.a. - -2011-02-22 Peter Breitenlohner - - * patch-81-Indic (new): IndicReordering.*: Respect array bounds. - - * patch-05-auxParam: Fix a bug introduced when importing icu-4.6. - -2010-12-07 Peter Breitenlohner - - * patch-11-CURR_FULL_DIR: Correctly handle CURR_FULL_DIR when - cross compiling. - -2010-12-02 Peter Breitenlohner - - Imported icu-4.6 source tree (icu4c-4_6-src.tgz) from: - http://download.icu-project.org/files/icu4c/4.6/ - - * patch-10-cross-TOOLEXEEXT, patch-13-remove-extra-token: - All removed, included in icu-4.6. - - * TL-Changes, patch-05-auxParam, patch-07-configure-utf16-string, - patch-08-avoid-rebuild, patch-11-CURR_FULL_DIR, patch-12-mingw, - patch-50-Vertical, patch-60-KernPair, patch-70-Arabic, - patch-80-Indic: Adapted. - - * patch-06-mingw (new): MinGW32 is Windows, not Cygwin. - * patch-09-generated (new): Regenerate configure. - -2010-04-08 Karl Berry - - * patch-07-configure-utf16-string: new patch so we can disable the - check for UTF16 string literals. See comments in our - libs/icu/configure.ac. - -2010-03-31 Peter Breitenlohner - - Imported icu-4.4 source tree (icu4c-4_4-src.tgz) from: - http://download.icu-project.org/files/icu4c/4.4/ - - * fix-case-insensitive, patch-07-cygwin, patch-09-cross, - patch-20-fix-gt_ge, patch-21-fix-not_aligned, - patch-22-fix-JK-adjust_for_marks, patch-23-fix-JK-GlyphPos: - All removed, included in icu-4.4. - - * TL-Changes, patch-05-auxParam, patch-08-avoid-rebuild, - patch-10-cross-TOOLEXEEXT, patch-11-CURR_FULL_DIR, - patch-12-mingw, patch-50-Vertical, patch-60-KernPair, - patch-70-Arabic, patch-80-Indic: Adapted. - - * patch-13-remove-extra-token (new): Avoid compiler warning. - -2010-02-22 Peter Breitenlohner - - Fixes for Linux => MinGW32 cross compilation. - * patch-10-cross-TOOLEXEEXT (new): Fix a cross compilation typo. - * patch-11-CURR_FULL_DIR (new): Fix for cross compilation on - a Unix like system. Does MinGW32 have pwd? - * patch-12-mingw (new): Changes in config/mh-mingw (libraries - named as for everyone else). - -2009-10-28 Peter Breitenlohner - - * patch-09-cross (new): Modify AC_CHECK_64BIT_LIBS in aclocal.m4 - to allow cross compilation. - -2009-10-26 Peter Breitenlohner - - * patch-08-avoid-rebuild (new): Modify data/Makefile.in such - that libsicudata.a is not rebuilt again and again. - -2009-10-25 Peter Breitenlohner - - Imported icu-4.2.1 source tree (icu4c-4_2_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/4.2.1/ - - * patch-02-syntax, patch-40-Shaping (both removed): Obsolete. - - * TL-Changes, patch-80-Indic: Adapted. - -2009-10-24 Peter Breitenlohner - - Imported icu-4.0.1 source tree (icu4c-4_0_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/4.0.1/ - - * patch-01-backport-4.0.1, patch-01-too_much-4.0.1, - patch-06-build-fix, patch-06-partial-4.0.1, - patch-10-backport-4.0.1, patch-11-partial-4.0.1, - patch-99-test (all removed): Obsolete. - - * TL-Changes, patch-40-Shaping, patch-80-Indic: Adapted. - -2009-10-23 Peter Breitenlohner - - Imported icu-3.8.1 source tree (icu4c-3_8_1-src.tgz) from: - http://download.icu-project.org/files/icu4c/3.8.1/ - - * TL-Changes (new): Description of modifications of source tree. - - * fix-case-insensitive (new): Shell script used to rename - source/layout/Features.h => ICUFeatures.h (required for Cygwin) - and modify references to that file accordingly. - - * patch-01-backport-4.0.1 (new): Replace layout/CanonData.cpp, - layout/GlyphPositionAdjustments.cpp, - layout/IndicReordering.{cpp,h}, layout/LELanguages.h, - layout/LESwaps.h, layout/OpenTypeLayoutEngine.cpp, - layout/ScriptAndLanguage.cpp, layout/ThaiLayoutEngine.{cpp,h}, - layoutex/ParagraphLayout.cpp, and test/letest/sfnt.h by their - 4.0.1 versions. - * patch-01-too_much-4.0.1 (new): Undo one change in - layoutex/ParagraphLayout.cpp. - - * patch-02-syntax (new): Fix some dubious syntax in - layoutex/ParagraphLayout.cpp. - - * patch-05-auxParam (new): Handling of extension for XeTeX in - layout/AlternateSubstSubtables.cpp, - layout/GlyphIterator.{cpp,h}, - layout/LEGlyphStorage.{cpp,h}, - and layout/OpenTypeLayoutEngine.{cpp,h}. - - * patch-06-build-fix (new): Build fix in common/ubidi.c. - * patch-06-partial-4.0.1 (new): Partial backport of common/putil.c - from 4.0.1. - * patch-07-cygwin (new): Changes in config/mh-cygwin (libraries - named as for everyone else). - - * patch-10-backport-4.0.1 (new): Replace - layout/ScriptAndLanguageTags.{cpp,h} by their 4.0.1 versions. - * patch-11-partial-4.0.1 (new): Backport of some changes in - layout/LayoutEngine.cpp from 4.0.1. - - Bug fixes originally by: Jonathan Kew - * patch-20-fix-gt_ge (new): In layout/ClassDefinitionTables.cpp. - * patch-21-fix-not_aligned (new): In layout/ExtensionSubtables.cpp. - * patch-22-fix-JK-adjust_for_marks (new): In - layout/MarkToBasePosnSubtables.cpp. - * patch-23-fix-JK-GlyphPos (new): In - layout/OpenTypeLayoutEngine.cpp. - - * patch-40-Shaping (new): Update shaping type data in - layout/ShapingTypeData.cpp to Unicode 5.1. - - * patch-50-Vertical (new): Handling vertical writing in - layout/LEFontInstance.h and layout/ValueRecords.cpp. - - * patch-60-KernPair (new): Modified handling of kerns in - layout/LEFontInstance.{cpp,h} and layout/LayoutEngine.cpp. - - * patch-70-Arabic (new): Add Draft Mongolian shaping classes - in layout/ArabicShaping.{cpp,h} and LayoutEngine.cpp. - - * patch-80-Indic (new): Backport of some changes in - layout/IndicClassTables.cpp from 4.0.1 and in - layout/IndicReordering.cpp from 4.2.1. - - * patch-99-test (new): Changes from TeX Live icu-xetex in - test/letest/PortableFontInstance.{cpp,h}, - test/letest/gendata.{cpp,xml}, test/letest/letest.{cpp,xml}. - - These modifications and patches of icu-3.8.1/ reproduce the - previous icu-xetex/ source tree (except for test data). - -2009-10-22 Peter Breitenlohner - - Slightly rearranged the icu-xetex/ source tree. - - * layout/LELanguages.h: Changed some comments, from 4.0.1. - - * layout/LEGlyphStorage.{cpp,h}, - layout/OpenTypeLayoutEngine.cpp: Renamed adoptAuxDataArrays - back to adoptAuxDataArray as it was in 3.8.1. - - * layout/LEGlyphStorage.h: The XeTeX modifications have added - an additional parameter for setAuxData, however, in most cases - the corresponding argument is NULL. Added an inline definition - of the original method. - layout/ArabicShaping.cpp, layout/HanLayoutEngine.cpp, - layout/HangulLayoutEngine.cpp, layout/IndicReordering.cpp, - layout/KhmerReordering.cpp, layout/LayoutEngine.cpp, - layout/TibetanReordering.cpp: Restored the original 3.8.1 use of - setAuxData without the additional argument NULL. - - * data/Makefile.in: Restored 3.8.1 version, Autoconf >=2.61 ensures - a posix shell making, these changes obsolete. - - * layout/ScriptAndLanguageTags.{cpp,h}: Backport from 4.0.1, - additional tags and changed comments. - - * layout/OpenTypeLayoutEngine.cpp: Removed some obsolete code, - surrounded by #if 0...#endif. diff --git a/Build/source/libs/icu/icu-PATCHES/TL-Changes b/Build/source/libs/icu/icu-PATCHES/TL-Changes deleted file mode 100644 index 90bded3540c..00000000000 --- a/Build/source/libs/icu/icu-PATCHES/TL-Changes +++ /dev/null @@ -1,56 +0,0 @@ -Changes applied to the icu-57.1 tree as obtained from: - http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz - -cd /tmp # or wherever -tar xf icu4c-*-src.tgz -cd .../texlive/Build/source/libs/icu/icu-src -\cp -arf /tmp/icu/* . -rm -r as_is packaging # don't bother including these in our tree -# -# files to add: -svn status | sed -n 's/^\?//p' -svn add `!!` -svn status | sed -n 's/^\?//p' # rerun, should be empty now -# -diff -qr . /tmp/icu/ | sed -n -e 's,^Only in \./\(.*\): ,\1/,p' -svn rm `!!` -diff ... # rerun, should be empty now - -# update generic files (still in icu-src): -aux=/usr/local/src/dist/build-aux -cp $aux/config.guess $aux/config.sub $aux/install-sh source/ - -# apply ./patch-* files, as needed. -# Run svn diff after each, update patch-* file. -# Don't lose our leading comments. - -# autoreconf. -# rebuild; must rerun configure (not just config.status), -# so easiest is to just do a whole new build. -# That will also test use of the new icu version by our programs. - -# Assuming all seems ok, reduce size of source/data/in/icudt*.dat -# to decrease data segment size, e.g., for old BSD. First, check -# that we successfully built the full .dat: -srcdat=.../source/libs/icu/icu-src/source/data/in/icudt57l.dat -cd .../Work/libs/icu/icu-build/data/out/build/icudt57l -indat=../../tmp/icudt57l.dat -diff $srcdat $indat -# should be identical, amazingly enough. - -# we need to use icupkg, which may need LD_LIBRARY_PATH since it is a -# C++ binary and we didn't cxx-hack it. -icupkg="env LD_LIBRARY_PATH=$gnu/lib ../../../../bin/icupkg" - -# then remove some elements unused by the icu clients in our tree, namely -# bibtexu (in texk/bibtex-x), upmendex, and xetex (in texk/web2c/xetexdir). -outdat=icudt57l.dat -$icupkg -r 'curr/*' $indat $outdat && mv $outdat $indat -$icupkg -r 'lang/*' $indat $outdat && mv $outdat $indat -$icupkg -r 'region/*' $indat $outdat && mv $outdat $indat -$icupkg -r 'rfc*.spp' $indat $outdat && mv $outdat $indat -$icupkg -r 'zone/*' $indat $outdat && mv $outdat $indat -ls -l $indat $srcdat # indat should be much smaller -cp $indat $srcdat - -# then commit. diff --git a/Build/source/libs/icu/icu-PATCHES/patch-03-gcc-atomic b/Build/source/libs/icu/icu-PATCHES/patch-03-gcc-atomic deleted file mode 100644 index 2b53072f732..00000000000 --- a/Build/source/libs/icu/icu-PATCHES/patch-03-gcc-atomic +++ /dev/null @@ -1,13 +0,0 @@ - It seems gcc-4.4 uses external calls. - ---- source/common/putilimp.h (revision 40154) -+++ source/common/putilimp.h (working copy) -@@ -191,7 +191,7 @@ - /* Use the predefined value. */ - #elif U_PLATFORM == U_PF_MINGW - #define U_HAVE_GCC_ATOMICS 0 --#elif U_GCC_MAJOR_MINOR >= 404 || defined(__clang__) -+#elif U_GCC_MAJOR_MINOR >= 405 || defined(__clang__) - /* TODO: Intel icc and IBM xlc on AIX also support gcc atomics. (Intel originated them.) - * Add them for these compilers. - * Note: Clang sets __GNUC__ defines for version 4.2, so misses the 4.4 test here. diff --git a/Build/source/libs/icu/icu-PATCHES/patch-12-mingw b/Build/source/libs/icu/icu-PATCHES/patch-12-mingw deleted file mode 100644 index 2b8b7b090c7..00000000000 --- a/Build/source/libs/icu/icu-PATCHES/patch-12-mingw +++ /dev/null @@ -1,32 +0,0 @@ - We don't want this for TeX Live cross compilation. - ---- source/config/mh-mingw (revision 40154) -+++ source/config/mh-mingw (working copy) -@@ -59,27 +59,9 @@ - ## Non-shared intermediate object suffix - STATIC_O = ao - --ifeq ($(ENABLE_SHARED),YES) --SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR) --else --SO_TARGET_VERSION_SUFFIX = --endif -- --# Static library prefix and file extension --LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) --A = a -- - ## An import library is needed for z/OS and MSVC - IMPORT_LIB_EXT = .dll.a - --LIBPREFIX= -- --# Change the stubnames so that poorly working FAT disks and installation programs can work. --# This is also for backwards compatibility. --DATA_STUBNAME = dt --I18N_STUBNAME = in --LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) -- - #SH### copied from Makefile.inc - #SH## for icu-config to test with - #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}" diff --git a/Build/source/libs/icu/icu-PATCHES/patch-13-STATIC_PREFIX b/Build/source/libs/icu/icu-PATCHES/patch-13-STATIC_PREFIX deleted file mode 100644 index e35ca62da0d..00000000000 --- a/Build/source/libs/icu/icu-PATCHES/patch-13-STATIC_PREFIX +++ /dev/null @@ -1,31 +0,0 @@ - No `s' for STATIC_PREFIX. - ---- source/config/Makefile.inc.in (revision 40154) -+++ source/config/Makefile.inc.in (working copy) -@@ -44,7 +44,7 @@ - LIBICU = lib$(ICUPREFIX) - - # Static library prefix and file extension --STATIC_PREFIX = s -+STATIC_PREFIX = - LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX) - A = a - ---- source/icudefs.mk.in (revision 40154) -+++ source/icudefs.mk.in (working copy) -@@ -207,13 +207,13 @@ - - ## If we can't use the shared libraries, use the static libraries - ifneq ($(ENABLE_SHARED),YES) --STATIC_PREFIX_WHEN_USED = s -+STATIC_PREFIX_WHEN_USED = - else - STATIC_PREFIX_WHEN_USED = - endif - - # Static library prefix and file extension --STATIC_PREFIX = s -+STATIC_PREFIX = - LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) - A = a - SOBJ = $(SO) diff --git a/Build/source/libs/icu/icu-PATCHES/patch-14-xopen b/Build/source/libs/icu/icu-PATCHES/patch-14-xopen deleted file mode 100644 index 6ccb6564407..00000000000 --- a/Build/source/libs/icu/icu-PATCHES/patch-14-xopen +++ /dev/null @@ -1,19 +0,0 @@ - Do not define _XOPEN_SOURCE_EXTENDED on Solaris, - notwithstanding comments in icu source. - ---- source/common/uposixdefs.h (revision 40154) -+++ source/common/uposixdefs.h (working copy) -@@ -49,10 +49,13 @@ - * Make sure things like readlink and such functions work. - * Poorly upgraded Solaris machines can't have this defined. - * Cleanly installed Solaris can use this #define. -+ * [Experience with TeX Live is that it always causes failure. -+ * http://tug.org/pipermail/tlbuild/2013q1/002493.html -+ * http://tug.org/pipermail/tlbuild/2013q1/002536.html ] - * - * z/OS needs this definition for timeval and to get usleep. - */ --#if !defined(_XOPEN_SOURCE_EXTENDED) -+#if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__sun) - # define _XOPEN_SOURCE_EXTENDED 1 - #endif diff --git a/Build/source/libs/icu/icu-PATCHES/patch-16-putil b/Build/source/libs/icu/icu-PATCHES/patch-16-putil deleted file mode 100644 index c79c526dc9c..00000000000 --- a/Build/source/libs/icu/icu-PATCHES/patch-16-putil +++ /dev/null @@ -1,45 +0,0 @@ ---- source/common/putil.cpp (revision 40154) -+++ source/common/putil.cpp (working copy) -@@ -41,6 +41,20 @@ - // Must be before any other #includes. - #include "uposixdefs.h" - -+#if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__) -+/* tzset isn't defined in strict ANSI on Cygwin and MinGW. */ -+#undef __STRICT_ANSI__ -+#endif -+ -+/* -+ * Cygwin with GCC requires inclusion of time.h after the above disabling strict asci mode statement. -+ */ -+#include -+ -+#if !U_PLATFORM_USES_ONLY_WIN32_API -+#include -+#endif -+ - /* include ICU headers */ - #include "unicode/utypes.h" - #include "unicode/putil.h" -@@ -102,21 +116,7 @@ - # include - #endif - --#if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__) --/* tzset isn't defined in strict ANSI on Cygwin and MinGW. */ --#undef __STRICT_ANSI__ --#endif -- - /* -- * Cygwin with GCC requires inclusion of time.h after the above disabling strict asci mode statement. -- */ --#include -- --#if !U_PLATFORM_USES_ONLY_WIN32_API --#include --#endif -- --/* - * Only include langinfo.h if we have a way to get the codeset. If we later - * depend on more feature, we can test on U_HAVE_NL_LANGINFO. - * diff --git a/Build/source/libs/icu/icu-PATCHES/patch-17-cygwin-no-w32api b/Build/source/libs/icu/icu-PATCHES/patch-17-cygwin-no-w32api deleted file mode 100644 index e24041a1f2b..00000000000 --- a/Build/source/libs/icu/icu-PATCHES/patch-17-cygwin-no-w32api +++ /dev/null @@ -1,452 +0,0 @@ ---- source/common/putilimp.h (revision 40154) -+++ source/common/putilimp.h (working copy) -@@ -148,7 +148,7 @@ - - #ifdef U_HAVE_MMAP - /* Use the predefined value. */ --#elif U_PLATFORM_HAS_WIN32_API -+#elif U_PLATFORM_USES_ONLY_WIN32_API - # define U_HAVE_MMAP 0 - #else - # define U_HAVE_MMAP 1 -@@ -171,7 +171,7 @@ - */ - #ifdef U_HAVE_DIRENT_H - /* Use the predefined value. */ --#elif U_PLATFORM_HAS_WIN32_API -+#elif U_PLATFORM_USES_ONLY_WIN32_API - # define U_HAVE_DIRENT_H 0 - #else - # define U_HAVE_DIRENT_H 1 ---- source/common/umutex.cpp (revision 40154) -+++ source/common/umutex.cpp (working copy) -@@ -37,7 +37,7 @@ - // Build time user mutex hook: #include "U_USER_MUTEX_CPP" - #include U_MUTEX_XSTR(U_USER_MUTEX_CPP) - --#elif U_PLATFORM_HAS_WIN32_API -+#elif U_PLATFORM_USES_ONLY_WIN32_API - - //------------------------------------------------------------------------------------------- - // ---- source/common/umutex.h (revision 40154) -+++ source/common/umutex.h (working copy) -@@ -74,7 +74,7 @@ - } - U_NAMESPACE_END - --#elif U_PLATFORM_HAS_WIN32_API -+#elif U_PLATFORM_USES_ONLY_WIN32_API - - // MSVC compiler. Reads and writes of volatile variables have - // acquire and release memory semantics, respectively. -@@ -318,7 +318,7 @@ - // #inlcude "U_USER_MUTEX_H" - #include U_MUTEX_XSTR(U_USER_MUTEX_H) - --#elif U_PLATFORM_HAS_WIN32_API -+#elif U_PLATFORM_USES_ONLY_WIN32_API - - /* Windows Definitions. - * Windows comes first in the platform chain. ---- source/common/wintz.c (revision 40154) -+++ source/common/wintz.c (working copy) -@@ -11,7 +11,7 @@ - - #include "unicode/utypes.h" - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - - #include "wintz.h" - #include "cmemory.h" -@@ -436,4 +436,4 @@ - return icuid; - } - --#endif /* U_PLATFORM_HAS_WIN32_API */ -+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ ---- source/common/wintz.h (revision 40154) -+++ source/common/wintz.h (working copy) -@@ -14,7 +14,7 @@ - - #include "unicode/utypes.h" - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - - /** - * \file -@@ -29,6 +29,6 @@ - U_CFUNC const char* U_EXPORT2 - uprv_detectWindowsTimeZone(); - --#endif /* U_PLATFORM_HAS_WIN32_API */ -+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ - - #endif /* __WINTZ */ ---- source/i18n/datefmt.cpp (revision 40154) -+++ source/i18n/datefmt.cpp (working copy) -@@ -496,7 +496,7 @@ - DateFormat::create(EStyle timeStyle, EStyle dateStyle, const Locale& locale) - { - UErrorCode status = U_ZERO_ERROR; --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - char buffer[8]; - int32_t count = locale.getKeywordValue("compat", buffer, sizeof(buffer), status); - ---- source/i18n/windtfmt.cpp (revision 40154) -+++ source/i18n/windtfmt.cpp (working copy) -@@ -11,7 +11,7 @@ - - #include "unicode/utypes.h" - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - - #if !UCONFIG_NO_FORMATTING - -@@ -312,5 +312,5 @@ - - #endif /* #if !UCONFIG_NO_FORMATTING */ - --#endif // U_PLATFORM_HAS_WIN32_API -+#endif // U_PLATFORM_USES_ONLY_WIN32_API - ---- source/i18n/windtfmt.h (revision 40154) -+++ source/i18n/windtfmt.h (working copy) -@@ -14,7 +14,7 @@ - - #include "unicode/utypes.h" - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - - #if !UCONFIG_NO_FORMATTING - -@@ -131,6 +131,6 @@ - - #endif /* #if !UCONFIG_NO_FORMATTING */ - --#endif // U_PLATFORM_HAS_WIN32_API -+#endif // U_PLATFORM_USES_ONLY_WIN32_API - - #endif // __WINDTFMT ---- source/i18n/wintzimpl.cpp (revision 40154) -+++ source/i18n/wintzimpl.cpp (working copy) -@@ -11,7 +11,7 @@ - - #include "unicode/utypes.h" - --#if U_PLATFORM_HAS_WIN32_API && !UCONFIG_NO_FORMATTING -+#if U_PLATFORM_USES_ONLY_WIN32_API && !UCONFIG_NO_FORMATTING - - #include "wintzimpl.h" ---- source/i18n/wintzimpl.h (revision 40154) -+++ source/i18n/wintzimpl.h (working copy) -@@ -14,7 +14,7 @@ - - #include "unicode/utypes.h" - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - /** - * \file - * \brief C API: Utilities for dealing w/ Windows time zones. -@@ -32,6 +32,6 @@ - uprv_getWindowsTimeZoneInfo(TIME_ZONE_INFORMATION *zoneInfo, const UChar *icuid, int32_t length); - - --#endif /* U_PLATFORM_HAS_WIN32_API */ -+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ - - #endif /* __WINTZIMPL */ -Index: source/test/intltest/dtfmttst.cpp -=================================================================== ---- source/test/intltest/dtfmttst.cpp (revision 40154) -+++ source/test/intltest/dtfmttst.cpp (working copy) -@@ -23,7 +23,7 @@ - #include "caltest.h" // for fieldName - #include // for sprintf - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - #include "windttst.h" - #endif - -@@ -2372,7 +2372,7 @@ - - void DateFormatTest::TestHost(void) - { --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - Win32DateTimeTest::testLocales(this); - #endif - } -Index: source/test/intltest/uobjtest.cpp -=================================================================== ---- source/test/intltest/uobjtest.cpp (revision 40154) -+++ source/test/intltest/uobjtest.cpp (working copy) -@@ -382,13 +382,11 @@ - TESTCLASSID_FACTORY(IndianCalendar, Calendar::createInstance(Locale("@calendar=indian"), status)); - TESTCLASSID_FACTORY(ChineseCalendar, Calendar::createInstance(Locale("@calendar=chinese"), status)); - TESTCLASSID_FACTORY(TaiwanCalendar, Calendar::createInstance(Locale("@calendar=roc"), status)); --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - TESTCLASSID_FACTORY(Win32DateFormat, DateFormat::createDateInstance(DateFormat::kFull, Locale("@compat=host"))); --#if U_PLATFORM_USES_ONLY_WIN32_API - TESTCLASSID_FACTORY(Win32NumberFormat, NumberFormat::createInstance(Locale("@compat=host"), status)); - #endif - #endif --#endif - - #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILE_IO - /* TESTCLASSID_ABSTRACT(BreakIterator); No staticID! */ -Index: source/test/intltest/windttst.cpp -=================================================================== ---- source/test/intltest/windttst.cpp (revision 40154) -+++ source/test/intltest/windttst.cpp (working copy) -@@ -11,7 +11,7 @@ - - #include "unicode/utypes.h" - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - - #if !UCONFIG_NO_FORMATTING - -@@ -191,4 +191,4 @@ - - #endif /* #if !UCONFIG_NO_FORMATTING */ - --#endif /* U_PLATFORM_HAS_WIN32_API */ -+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ -Index: source/test/intltest/windttst.h -=================================================================== ---- source/test/intltest/windttst.h (revision 40154) -+++ source/test/intltest/windttst.h (working copy) -@@ -14,7 +14,7 @@ - - #include "unicode/utypes.h" - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - - #if !UCONFIG_NO_FORMATTING - -@@ -36,6 +36,6 @@ - - #endif /* #if !UCONFIG_NO_FORMATTING */ - --#endif // U_PLATFORM_HAS_WIN32_API -+#endif // U_PLATFORM_USES_ONLY_WIN32_API - - #endif // __WINDTTST -Index: source/test/intltest/winutil.cpp -=================================================================== ---- source/test/intltest/winutil.cpp (revision 40154) -+++ source/test/intltest/winutil.cpp (working copy) -@@ -11,7 +11,7 @@ - - #include "unicode/utypes.h" - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - - #if !UCONFIG_NO_FORMATTING - -@@ -93,4 +93,4 @@ - - #endif /* #if !UCONFIG_NO_FORMATTING */ - --#endif /* U_PLATFORM_HAS_WIN32_API */ -+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ -Index: source/test/intltest/winutil.h -=================================================================== ---- source/test/intltest/winutil.h (revision 40154) -+++ source/test/intltest/winutil.h (working copy) -@@ -14,7 +14,7 @@ - - #include "unicode/utypes.h" - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - - #if !UCONFIG_NO_FORMATTING - -@@ -41,6 +41,6 @@ - - #endif /* #if !UCONFIG_NO_FORMATTING */ - --#endif // U_PLATFORM_HAS_WIN32_API -+#endif // U_PLATFORM_USES_ONLY_WIN32_API - - #endif // __WINUTIL -Index: source/test/perf/collperf/collperf.cpp -=================================================================== ---- source/test/perf/collperf/collperf.cpp (revision 40154) -+++ source/test/perf/collperf/collperf.cpp (working copy) -@@ -113,7 +113,7 @@ - ucol_getSortKey(col, data[i].icu_data, data[i].icu_data_len, icu_key, MAX_KEY_LENGTH); - } - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - // pre-generated in CollPerfTest::prepareData(), need not to check error here - void win_key_null(int32_t i){ - //LCMAP_SORTsk 0x00000400 // WC sort sk (normalize) -@@ -295,7 +295,7 @@ - return strcmp((char *) da->icu_key, (char *) db->icu_key); - } - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - static int win_cmp_null(const void *a, const void *b) { - QCAST(); - //CSTR_LESS_THAN 1 -@@ -330,7 +330,7 @@ - - QFUNC(posix_strcoll_null, strcoll, posix_data) - QFUNC(posix_cmpkey, strcmp, posix_key) --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - QFUNC(win_cmpkey, strcmp, win_key) - QFUNC(win_wcscmp, wcscmp, win_data) - #endif -@@ -450,7 +450,7 @@ - return strcmp( (char *) rnd[i].icu_key, (char *) ord[j].icu_key ); - } - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - int win_cmp_null(int32_t i, int32_t j) { - int t = CompareStringW(win_langid, 0, rnd[i].win_data, -1, ord[j].win_data, -1); - if (t == 0){ -@@ -587,7 +587,7 @@ - locale = "en_US"; // set default locale - } - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - if (options[i].doesOccur) { - char *endp; - int tmp = strtol(options[i].value, &endp, 0); -@@ -687,7 +687,7 @@ - TEST_KEYGEN(TestIcu_KeyGen_null, icu_key_null); - TEST_KEYGEN(TestIcu_KeyGen_len, icu_key_len); - TEST_KEYGEN(TestPosix_KeyGen_null, posix_key_null); --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - TEST_KEYGEN(TestWin_KeyGen_null, win_key_null); - TEST_KEYGEN(TestWin_KeyGen_len, win_key_len); - #endif -@@ -713,7 +713,7 @@ - TEST_QSORT(TestIcu_qsort_usekey, icu_cmpkey); - TEST_QSORT(TestPosix_qsort_strcoll_null, posix_strcoll_null); - TEST_QSORT(TestPosix_qsort_usekey, posix_cmpkey); --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - TEST_QSORT(TestWin_qsort_CompareStringW_null, win_cmp_null); - TEST_QSORT(TestWin_qsort_CompareStringW_len, win_cmp_len); - TEST_QSORT(TestWin_qsort_usekey, win_cmpkey); -@@ -728,7 +728,7 @@ - TEST_BIN(TestIcu_BinarySearch_cmpCPO, icu_cmpcpo); - TEST_BIN(TestPosix_BinarySearch_strcoll_null, posix_strcoll_null); - TEST_BIN(TestPosix_BinarySearch_usekey, posix_cmpkey); --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - TEST_BIN(TestWin_BinarySearch_CompareStringW_null, win_cmp_null); - TEST_BIN(TestWin_BinarySearch_CompareStringW_len, win_cmp_len); - #endif -@@ -828,7 +828,7 @@ - t = strxfrm(posix_key->last(), posix_data->dataOf(i), s); - if (t != s) {status = U_INVALID_FORMAT_ERROR;return;} - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - // Win data - s = icu_data->lengthOf(i) + 1; // plus terminal NULL - win_data->append_one(s); -@@ -851,7 +851,7 @@ - rnd_index[i].posix_key = posix_key->last(); - rnd_index[i].posix_data = posix_data->dataOf(i); - rnd_index[i].posix_data_len = posix_data->lengthOf(i); --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - rnd_index[i].win_key = win_key->dataOf(i); - rnd_index[i].win_data = win_data->dataOf(i); - rnd_index[i].win_data_len = win_data->lengthOf(i); -@@ -870,7 +870,7 @@ - SORT(ord_icu_key, icu_cmpkey); - SORT(ord_posix_data, posix_strcoll_null); - SORT(ord_posix_key, posix_cmpkey); --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - SORT(ord_win_data, win_cmp_len); - SORT(ord_win_key, win_cmpkey); - SORT(ord_win_wcscmp, win_wcscmp); -Index: source/test/perf/normperf/normperf.h -=================================================================== ---- source/test/perf/normperf/normperf.h (revision 40154) -+++ source/test/perf/normperf/normperf.h (working copy) -@@ -315,7 +315,7 @@ - } - #endif - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - - int32_t WinNormNFD(const UChar* src, int32_t srcLen, UChar* dest, int32_t dstLen, int32_t options, UErrorCode* status) { - return FoldStringW(MAP_COMPOSITE,src,srcLen,dest,dstLen); -Index: source/tools/ctestfw/unicode/utimer.h -=================================================================== ---- source/tools/ctestfw/unicode/utimer.h (revision 40154) -+++ source/tools/ctestfw/unicode/utimer.h (working copy) -@@ -10,7 +10,7 @@ - - #include "unicode/utypes.h" - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - # define VC_EXTRALEAN - # define WIN32_LEAN_AND_MEAN - # include -@@ -160,7 +160,7 @@ - typedef void FuntionToBeTimed(void* param); - - --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - - struct UTimer{ - LARGE_INTEGER start; -Index: source/tools/genrb/derb.cpp -=================================================================== ---- source/tools/genrb/derb.cpp (revision 40154) -+++ source/tools/genrb/derb.cpp (working copy) -@@ -204,7 +204,7 @@ - UBool fromICUData = !uprv_strcmp(inputDir, "-"); - if (!fromICUData) { - UBool absfilename = *arg == U_FILE_SEP_CHAR; --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_HAS_WIN32_API && U_PLATFORM != U_PF_CYGWIN - if (!absfilename) { - absfilename = (uprv_strlen(arg) > 2 && isalpha(arg[0]) - && arg[1] == ':' && arg[2] == U_FILE_SEP_CHAR); -Index: source/tools/toolutil/udbgutil.cpp -=================================================================== ---- source/tools/toolutil/udbgutil.cpp (revision 40154) -+++ source/tools/toolutil/udbgutil.cpp (working copy) -@@ -348,8 +348,10 @@ - */ - U_CAPI const char *udbg_getPlatform(void) - { --#if U_PLATFORM_HAS_WIN32_API -+#if U_PLATFORM_USES_ONLY_WIN32_API - return "Windows"; -+#elif U_PLATFORM == U_PF_CYGWIN -+ return "Cygwin"; - #elif U_PLATFORM == U_PF_UNKNOWN - return "unknown"; - #elif U_PLATFORM == U_PF_DARWIN diff --git a/Build/source/libs/icu/icu-PATCHES/patch-20-private b/Build/source/libs/icu/icu-PATCHES/patch-20-private deleted file mode 100644 index d20a7de0d37..00000000000 --- a/Build/source/libs/icu/icu-PATCHES/patch-20-private +++ /dev/null @@ -1,73 +0,0 @@ - The supplied g++-4.2 compiler on 32-bit MacOSX apparently - mishandled private enum in the implementation (since newer - compilers are ok with it). This can be removed when we drop - support for 32-bit MacOSX. - http://tug.org/pipermail/tlbuild/2016q1/003438.html - (and starting at http://tug.org/pipermail/tlbuild/2016q1/003433.html) - -Index: icu-src/source/i18n/dayperiodrules.h -=================================================================== ---- icu-src/source/i18n/dayperiodrules.h (revision 40174) -+++ icu-src/source/i18n/dayperiodrules.h (working copy) -@@ -53,7 +53,7 @@ - // Returns the center of dayPeriod. Half hours are indicated with a .5 . - double getMidPointForDayPeriod(DayPeriod dayPeriod, UErrorCode &errorCode) const; - --private: -+/* nothing private to placate old compilers --karl/koch private: */ - DayPeriodRules(); - - // Translates "morning1" to DAYPERIOD_MORNING1, for example. -Index: icu-src/source/i18n/unicode/dtitvinf.h -=================================================================== ---- icu-src/source/i18n/unicode/dtitvinf.h (revision 40174) -+++ icu-src/source/i18n/unicode/dtitvinf.h (working copy) -@@ -150,7 +150,8 @@ - - class U_I18N_API DateIntervalInfo U_FINAL : public UObject { - public: --#ifndef U_HIDE_INTERNAL_API -+/* nothing private to placate old compilers --karl/koch */ -+/* ifndef U_HIDE_INTERNAL_API */ - /** - * Default constructor. - * It does not initialize any interval patterns except -@@ -165,7 +166,7 @@ - * @internal ICU 4.0 - */ - DateIntervalInfo(UErrorCode& status); --#endif /* U_HIDE_INTERNAL_API */ -+/* endif */ /* U_HIDE_INTERNAL_API */ - - - /** -@@ -328,7 +329,7 @@ - static UClassID U_EXPORT2 getStaticClassID(); - - --private: -+/* nothing private to placate old compilers --karl/koch private: */ - /** - * DateIntervalFormat will need access to - * getBestSkeleton(), parseSkeleton(), enum IntervalPatternIndex, -@@ -359,7 +360,8 @@ - kIPI_MAX_INDEX - }; - public: --#ifndef U_HIDE_INTERNAL_API -+/* nothing private to placate old compilers --karl/koch */ -+/* ifndef U_HIDE_INTERNAL_API */ - /** - * Max index for stored interval patterns - * @internal ICU 4.4 -@@ -367,8 +369,8 @@ - enum { - kMaxIntervalPatternIndex = kIPI_MAX_INDEX - }; --#endif /* U_HIDE_INTERNAL_API */ --private: -+/* endif */ /* U_HIDE_INTERNAL_API */ -+/* nothing private to placate old compilers --karl/koch private: */ - - - /** diff --git a/Build/source/libs/libpaper/TLPATCHES/ChangeLog b/Build/source/libs/libpaper/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..88935dabef6 --- /dev/null +++ b/Build/source/libs/libpaper/TLPATCHES/ChangeLog @@ -0,0 +1,16 @@ +2014-06-18 Peter Breitenlohner + + * patch-04-unsigned (new): Avoid undefined behaviour. + +2013-11-20 Peter Breitenlohner + + * patch-03-getopt (new): Adapt paperconf.1 to non-GNU getopt. + +2013-10-24 Peter Breitenlohner + + Imported libpaper-1.1.24+nmu2 source tree from: + ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper + + * patch-01-JIS (new): Add JIS paper specs. + * patch-02-TL (new): No /etc/papersize for TeX Live. + diff --git a/Build/source/libs/libpaper/TLPATCHES/TL-Changes b/Build/source/libs/libpaper/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..779b6d4ff35 --- /dev/null +++ b/Build/source/libs/libpaper/TLPATCHES/TL-Changes @@ -0,0 +1,23 @@ +Changes applied to the libpaper-1.1.24+nmu2/ tree as obtained from: + ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/ + +Removed: + COPYING + INSTALL + Makefile.in + aclocal.m4 + compile + config.guess + config.sub + configure + depcomp + install-sh + ltmain.sh + missing + mkinstalldirs + lib/Makefile.in + man/Makefile.in + src/Makefile.in + +Removed unused dirs: + debian diff --git a/Build/source/libs/libpaper/TLPATCHES/patch-01-JIS b/Build/source/libs/libpaper/TLPATCHES/patch-01-JIS new file mode 100644 index 00000000000..ce2016ad995 --- /dev/null +++ b/Build/source/libs/libpaper/TLPATCHES/patch-01-JIS @@ -0,0 +1,44 @@ +diff -ur libpaper-1.1.24+nmu2.orig/lib/paperspecs libpaper-1.1.24+nmu2/lib/paperspecs +--- libpaper-1.1.24+nmu2.orig/lib/paperspecs 2012-05-03 21:05:12.000000000 +0200 ++++ libpaper-1.1.24+nmu2/lib/paperspecs 2013-10-24 11:32:28.000000000 +0200 +@@ -40,6 +40,18 @@ + c6 114 162 mm + c7 81 114 mm + c8 57 81 mm ++jisb0 1030 1456 mm ++jisb1 728 1030 mm ++jisb2 515 728 mm ++jisb3 364 515 mm ++jisb4 257 364 mm ++jisb5 182 257 mm ++jisb6 128 182 mm ++jisb7 91 128 mm ++jisb8 64 91 mm ++jisb9 45 64 mm ++jisb10 32 45 mm ++b5var 182 230 mm + DL 110 220 mm + Comm10 297 684 + Monarch 279 540 +diff -ur libpaper-1.1.24+nmu2.orig/lib/paperspecs.h libpaper-1.1.24+nmu2/lib/paperspecs.h +--- libpaper-1.1.24+nmu2.orig/lib/paperspecs.h 2012-05-04 12:11:27.000000000 +0200 ++++ libpaper-1.1.24+nmu2/lib/paperspecs.h 2013-10-24 11:32:42.000000000 +0200 +@@ -43,6 +43,18 @@ + { "c6", 323.149606, 459.212598 }, + { "c7", 229.606299, 323.149606 }, + { "c8", 161.574803, 229.606299 }, ++ { "jisb0", 2919.685039, 4127.244094 }, ++ { "jisb1", 2063.622047, 2919.685039 }, ++ { "jisb2", 1459.842520, 2063.622047 }, ++ { "jisb3", 1031.811024, 1459.842520 }, ++ { "jisb4", 728.503937, 1031.811024 }, ++ { "jisb5", 515.905512, 728.503937 }, ++ { "jisb6", 362.834646, 515.905512 }, ++ { "jisb7", 257.952756, 362.834646 }, ++ { "jisb8", 181.417323, 257.952756 }, ++ { "jisb9", 127.559055, 181.417323 }, ++ { "jisb10", 90.708661, 127.559055 }, ++ { "b5var", 515.905512, 651.968504 }, + { "DL", 311.811024, 623.622047 }, + { "Comm10", 297.000000, 684.000000 }, + { "Monarch", 279.000000, 540.000000 }, diff --git a/Build/source/libs/libpaper/TLPATCHES/patch-02-TL b/Build/source/libs/libpaper/TLPATCHES/patch-02-TL new file mode 100644 index 00000000000..601ccb9d252 --- /dev/null +++ b/Build/source/libs/libpaper/TLPATCHES/patch-02-TL @@ -0,0 +1,171 @@ +diff -ur libpaper-1.1.24+nmu2.orig/lib/paper.c libpaper-1.1.24+nmu2/lib/paper.c +--- libpaper-1.1.24+nmu2.orig/lib/paper.c 2010-04-24 14:12:11.000000000 +0200 ++++ libpaper-1.1.24+nmu2/lib/paper.c 2013-10-24 15:45:37.955710461 +0200 +@@ -87,24 +87,11 @@ + } + + const char* defaultpapersizefile(void) { +- return PAPERCONF; ++ return NULL; + } + + const char* systempapersizefile(void) { +- const char* paperconf = getenv(PAPERCONFVAR); +-/* +-Previously PAPERCONFVAR used to contain a paper name and PAPERSIZEVAR +-contained a file path. Now they're reversed. If we don't find a '/' +-in PAPERCONFVAR, fall-back to the old behaviour. +-*/ +- +- if ((paperconf != NULL) && (strchr(paperconf, '/') == NULL)) { +- paperconf = getenv(PAPERSIZEVAR); +- if ((paperconf != NULL) && (strchr(paperconf, '/') == NULL)) +- paperconf = NULL; +- } +- +- return paperconf ? paperconf : defaultpapersizefile(); ++ return NULL; + } + + const char* defaultpapername(void) { +@@ -112,26 +99,14 @@ + } + + char* systempapername(void) { +- const char* paperconf; + char* paperstr; + char* paperenv; + const char* paperdef; +- FILE* ps; +- struct stat statbuf; + const struct paper* pp; +- int c; +- +-/* +-Previously PAPERSIZEVAR used to contain a file path and PAPERCONFVAR +-contained a paper name. Now they're reversed. If we find a '/' in +-PAPERSIZEVAR, fall-back to the old behaviour. +-*/ + + paperenv = getenv(PAPERSIZEVAR); + if ((paperenv != NULL) && (strchr(paperenv, '/') != NULL)) { +- paperenv = getenv(PAPERCONFVAR); +- if ((paperenv != NULL) && (strchr(paperenv, '/') != NULL)) +- paperenv = NULL; ++ paperenv = NULL; + } + + if (paperenv) { +@@ -145,61 +120,6 @@ + return strcpy(paperstr, paperenv); + } + +- paperconf = systempapersizefile(); +- if (paperconf && stat(paperconf, &statbuf) == -1) return 0; +- +- if (!paperconf) paperconf = defaultpapersizefile(); +- +- if ((stat(paperconf, &statbuf) != -1) && +- (ps = fopen(paperconf, "r"))) { +- +- while ((c = getc(ps)) != EOF) { +- if (c == '#') { +- while ((c = getc(ps)) != EOF && c != '\n'); +- if (c == EOF) { +- break; +- } +- } else if (!isspace(c)) { +- unsigned n = 0, m = 64; +- char* papername = malloc(m * sizeof(char)); +- +- if (!papername) { +- fclose(ps); +- return 0; +- } +- +- do { +- if (n == m-1) { +- char* newpaper = realloc(papername, +- (m *= 2) * sizeof(char)); +- if (!newpaper) { +- free(papername); +- fclose(ps); +- return 0; +- } +- papername = newpaper; +- } +- papername[n++] = c; +- } while ((c = getc(ps)) != EOF && !isspace(c)); +- +- papername[n] = 0; +- +- fclose(ps); +- +- paperstr = malloc((strlen(papername) + 1) * sizeof(char)); +- if (! paperstr) return 0; +- +- strcpy(paperstr, papername); +- free(papername); +- +- if ((pp = paperinfo(paperstr))) +- return strcpy(paperstr, pp->name); +- else +- return paperstr; +- } +- } +- } +- + paperdef = defaultpapername(); + paperstr = malloc((strlen(paperdef) + 1) * sizeof(char)); + +diff -ur libpaper-1.1.24+nmu2.orig/man/paperconf.1.in libpaper-1.1.24+nmu2/man/paperconf.1.in +--- libpaper-1.1.24+nmu2.orig/man/paperconf.1.in 2012-05-03 21:05:12.000000000 +0200 ++++ libpaper-1.1.24+nmu2/man/paperconf.1.in 2013-10-25 08:27:54.783329615 +0200 +@@ -1,4 +1,4 @@ +-.TH PAPERCONF 1 "24 April 2001" ++.TH PAPERCONF 1 "25 October 2013" + .SH NAME + .B paperconf + \- print paper configuration information +@@ -46,13 +46,10 @@ + prints the name of the system- or user-specified paper, obtained by + looking in order at the + .B @PAPERSIZEVAR@ +-environment variable, at the contents of the file specified by the +-.B @PAPERCONFVAR@ +-environment variable, at the contents of +-.B @PAPERCONF@ ++environment variable + or by using +-.B letter +-as a fall-back value if none of the other alternatives are successful. ++.B a4 ++as a fall-back value. + By default, width and height of the paper are printed in PostScript points. + .SH OPTIONS + .TP +@@ -98,21 +95,9 @@ + .SH ENVIRONMENT + .TP 20 + .B @PAPERSIZEVAR@ +-Paper size to use regardless of what the papersize file contains. +-.TP 20 +-.B @PAPERCONFVAR@ +-Full path to a file containing the paper size to use. +-.SH FILES +-.TP 20 +-.B @PAPERCONF@ +-Contains the name of the system-wide default paper size to be used +-if the +-.B @PAPERSIZEVAR@ +-and +-.B @PAPERCONFVAR@ +-variables are not set. ++Paper size to use. + .SH AUTHOR + Yves Arrouye +-.SH SEE ALSO +-.BR papersize (5) ++ ++Modified for TeX Live by Peter Breitenlohner + diff --git a/Build/source/libs/libpaper/TLPATCHES/patch-03-getopt b/Build/source/libs/libpaper/TLPATCHES/patch-03-getopt new file mode 100644 index 00000000000..cec650d1108 --- /dev/null +++ b/Build/source/libs/libpaper/TLPATCHES/patch-03-getopt @@ -0,0 +1,49 @@ +diff -ur libpaper-1.1.24+nmu2.orig/man/paperconf.1.in libpaper-1.1.24+nmu2/man/paperconf.1.in +--- libpaper-1.1.24+nmu2.orig/man/paperconf.1.in 2013-10-25 08:27:54.000000000 +0200 ++++ libpaper-1.1.24+nmu2/man/paperconf.1.in 2013-11-20 13:59:18.000000000 +0100 +@@ -3,39 +3,12 @@ + .B paperconf + \- print paper configuration information + .SH SYNOPSIS +-.B paperconf +-[ +-[ +-.B \-p +-] +-.I paper +-| +-.B \-d +-| +-.B \-a +-] +-[ +-.B \-z +-] +-[ +-.B \-n +-| +-.B \-N +-] +-[ +-.B \-s +-| +-.B \-w +-| +-.B \-h +-] +-[ +-.B \-c +-| +-.B \-m +-| +-.B \-i +-] ++\fBpaperconf\fR ++[\fB\-z\fR] ++[\fB\-n\fR|\fB\-N\fR] ++[\fB\-s\fR|\fB\-w\fR|\fB\-h\fR] ++[\fB\-c\fR|\fB\-m\fR|\fB\-i\fR] ++[[\fB\-p\fR] \fIpaper\fR|\fB\-d\fR|\fB\-a\fR] + .SH DESCRIPTION + .B paperconf + prints information about a given paper. diff --git a/Build/source/libs/libpaper/TLPATCHES/patch-04-unsigned b/Build/source/libs/libpaper/TLPATCHES/patch-04-unsigned new file mode 100644 index 00000000000..13c798bc1e5 --- /dev/null +++ b/Build/source/libs/libpaper/TLPATCHES/patch-04-unsigned @@ -0,0 +1,29 @@ +diff -ur libpaper-1.1.24+nmu2.orig/lib/dimen.c libpaper-1.1.24+nmu2/lib/dimen.c +--- libpaper-1.1.24+nmu2.orig/lib/dimen.c 2002-11-11 01:56:08.000000000 +0100 ++++ libpaper-1.1.24+nmu2/lib/dimen.c 2014-06-18 08:31:52.000000000 +0200 +@@ -53,9 +53,9 @@ + + if (*(unit = what) == '-') ++unit; + +- for (; isdigit(*unit) || (*unit == '.' && !dot++); ++unit); ++ for (; isdigit((unsigned char)*unit) || (*unit == '.' && !dot++); ++unit); + +- if (*unit && !isalpha(*unit)) { ++ if (*unit && !isalpha((unsigned char)*unit)) { + return -1; + } else { + double base = atof(what); +diff -ur libpaper-1.1.24+nmu2.orig/src/paperconf.c libpaper-1.1.24+nmu2/src/paperconf.c +--- libpaper-1.1.24+nmu2.orig/src/paperconf.c 2012-05-03 21:05:12.000000000 +0200 ++++ libpaper-1.1.24+nmu2/src/paperconf.c 2014-06-18 08:31:54.000000000 +0200 +@@ -53,8 +53,8 @@ + printf("%s", papername(paper)); + pr = 1; + } else if (options & OPT_UPPERNAME) { +- if (islower(*papername(paper))) { +- printf("%c%s", toupper(*papername(paper)), papername(paper) + 1); ++ if (islower((unsigned char)*papername(paper))) { ++ printf("%c%s", toupper((unsigned char)*papername(paper)), papername(paper) + 1); + } else { + printf("%s", papername(paper)); + } diff --git a/Build/source/libs/libpaper/libpaper-PATCHES/ChangeLog b/Build/source/libs/libpaper/libpaper-PATCHES/ChangeLog deleted file mode 100644 index 88935dabef6..00000000000 --- a/Build/source/libs/libpaper/libpaper-PATCHES/ChangeLog +++ /dev/null @@ -1,16 +0,0 @@ -2014-06-18 Peter Breitenlohner - - * patch-04-unsigned (new): Avoid undefined behaviour. - -2013-11-20 Peter Breitenlohner - - * patch-03-getopt (new): Adapt paperconf.1 to non-GNU getopt. - -2013-10-24 Peter Breitenlohner - - Imported libpaper-1.1.24+nmu2 source tree from: - ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper - - * patch-01-JIS (new): Add JIS paper specs. - * patch-02-TL (new): No /etc/papersize for TeX Live. - diff --git a/Build/source/libs/libpaper/libpaper-PATCHES/TL-Changes b/Build/source/libs/libpaper/libpaper-PATCHES/TL-Changes deleted file mode 100644 index 779b6d4ff35..00000000000 --- a/Build/source/libs/libpaper/libpaper-PATCHES/TL-Changes +++ /dev/null @@ -1,23 +0,0 @@ -Changes applied to the libpaper-1.1.24+nmu2/ tree as obtained from: - ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/ - -Removed: - COPYING - INSTALL - Makefile.in - aclocal.m4 - compile - config.guess - config.sub - configure - depcomp - install-sh - ltmain.sh - missing - mkinstalldirs - lib/Makefile.in - man/Makefile.in - src/Makefile.in - -Removed unused dirs: - debian diff --git a/Build/source/libs/libpaper/libpaper-PATCHES/patch-01-JIS b/Build/source/libs/libpaper/libpaper-PATCHES/patch-01-JIS deleted file mode 100644 index ce2016ad995..00000000000 --- a/Build/source/libs/libpaper/libpaper-PATCHES/patch-01-JIS +++ /dev/null @@ -1,44 +0,0 @@ -diff -ur libpaper-1.1.24+nmu2.orig/lib/paperspecs libpaper-1.1.24+nmu2/lib/paperspecs ---- libpaper-1.1.24+nmu2.orig/lib/paperspecs 2012-05-03 21:05:12.000000000 +0200 -+++ libpaper-1.1.24+nmu2/lib/paperspecs 2013-10-24 11:32:28.000000000 +0200 -@@ -40,6 +40,18 @@ - c6 114 162 mm - c7 81 114 mm - c8 57 81 mm -+jisb0 1030 1456 mm -+jisb1 728 1030 mm -+jisb2 515 728 mm -+jisb3 364 515 mm -+jisb4 257 364 mm -+jisb5 182 257 mm -+jisb6 128 182 mm -+jisb7 91 128 mm -+jisb8 64 91 mm -+jisb9 45 64 mm -+jisb10 32 45 mm -+b5var 182 230 mm - DL 110 220 mm - Comm10 297 684 - Monarch 279 540 -diff -ur libpaper-1.1.24+nmu2.orig/lib/paperspecs.h libpaper-1.1.24+nmu2/lib/paperspecs.h ---- libpaper-1.1.24+nmu2.orig/lib/paperspecs.h 2012-05-04 12:11:27.000000000 +0200 -+++ libpaper-1.1.24+nmu2/lib/paperspecs.h 2013-10-24 11:32:42.000000000 +0200 -@@ -43,6 +43,18 @@ - { "c6", 323.149606, 459.212598 }, - { "c7", 229.606299, 323.149606 }, - { "c8", 161.574803, 229.606299 }, -+ { "jisb0", 2919.685039, 4127.244094 }, -+ { "jisb1", 2063.622047, 2919.685039 }, -+ { "jisb2", 1459.842520, 2063.622047 }, -+ { "jisb3", 1031.811024, 1459.842520 }, -+ { "jisb4", 728.503937, 1031.811024 }, -+ { "jisb5", 515.905512, 728.503937 }, -+ { "jisb6", 362.834646, 515.905512 }, -+ { "jisb7", 257.952756, 362.834646 }, -+ { "jisb8", 181.417323, 257.952756 }, -+ { "jisb9", 127.559055, 181.417323 }, -+ { "jisb10", 90.708661, 127.559055 }, -+ { "b5var", 515.905512, 651.968504 }, - { "DL", 311.811024, 623.622047 }, - { "Comm10", 297.000000, 684.000000 }, - { "Monarch", 279.000000, 540.000000 }, diff --git a/Build/source/libs/libpaper/libpaper-PATCHES/patch-02-TL b/Build/source/libs/libpaper/libpaper-PATCHES/patch-02-TL deleted file mode 100644 index 601ccb9d252..00000000000 --- a/Build/source/libs/libpaper/libpaper-PATCHES/patch-02-TL +++ /dev/null @@ -1,171 +0,0 @@ -diff -ur libpaper-1.1.24+nmu2.orig/lib/paper.c libpaper-1.1.24+nmu2/lib/paper.c ---- libpaper-1.1.24+nmu2.orig/lib/paper.c 2010-04-24 14:12:11.000000000 +0200 -+++ libpaper-1.1.24+nmu2/lib/paper.c 2013-10-24 15:45:37.955710461 +0200 -@@ -87,24 +87,11 @@ - } - - const char* defaultpapersizefile(void) { -- return PAPERCONF; -+ return NULL; - } - - const char* systempapersizefile(void) { -- const char* paperconf = getenv(PAPERCONFVAR); --/* --Previously PAPERCONFVAR used to contain a paper name and PAPERSIZEVAR --contained a file path. Now they're reversed. If we don't find a '/' --in PAPERCONFVAR, fall-back to the old behaviour. --*/ -- -- if ((paperconf != NULL) && (strchr(paperconf, '/') == NULL)) { -- paperconf = getenv(PAPERSIZEVAR); -- if ((paperconf != NULL) && (strchr(paperconf, '/') == NULL)) -- paperconf = NULL; -- } -- -- return paperconf ? paperconf : defaultpapersizefile(); -+ return NULL; - } - - const char* defaultpapername(void) { -@@ -112,26 +99,14 @@ - } - - char* systempapername(void) { -- const char* paperconf; - char* paperstr; - char* paperenv; - const char* paperdef; -- FILE* ps; -- struct stat statbuf; - const struct paper* pp; -- int c; -- --/* --Previously PAPERSIZEVAR used to contain a file path and PAPERCONFVAR --contained a paper name. Now they're reversed. If we find a '/' in --PAPERSIZEVAR, fall-back to the old behaviour. --*/ - - paperenv = getenv(PAPERSIZEVAR); - if ((paperenv != NULL) && (strchr(paperenv, '/') != NULL)) { -- paperenv = getenv(PAPERCONFVAR); -- if ((paperenv != NULL) && (strchr(paperenv, '/') != NULL)) -- paperenv = NULL; -+ paperenv = NULL; - } - - if (paperenv) { -@@ -145,61 +120,6 @@ - return strcpy(paperstr, paperenv); - } - -- paperconf = systempapersizefile(); -- if (paperconf && stat(paperconf, &statbuf) == -1) return 0; -- -- if (!paperconf) paperconf = defaultpapersizefile(); -- -- if ((stat(paperconf, &statbuf) != -1) && -- (ps = fopen(paperconf, "r"))) { -- -- while ((c = getc(ps)) != EOF) { -- if (c == '#') { -- while ((c = getc(ps)) != EOF && c != '\n'); -- if (c == EOF) { -- break; -- } -- } else if (!isspace(c)) { -- unsigned n = 0, m = 64; -- char* papername = malloc(m * sizeof(char)); -- -- if (!papername) { -- fclose(ps); -- return 0; -- } -- -- do { -- if (n == m-1) { -- char* newpaper = realloc(papername, -- (m *= 2) * sizeof(char)); -- if (!newpaper) { -- free(papername); -- fclose(ps); -- return 0; -- } -- papername = newpaper; -- } -- papername[n++] = c; -- } while ((c = getc(ps)) != EOF && !isspace(c)); -- -- papername[n] = 0; -- -- fclose(ps); -- -- paperstr = malloc((strlen(papername) + 1) * sizeof(char)); -- if (! paperstr) return 0; -- -- strcpy(paperstr, papername); -- free(papername); -- -- if ((pp = paperinfo(paperstr))) -- return strcpy(paperstr, pp->name); -- else -- return paperstr; -- } -- } -- } -- - paperdef = defaultpapername(); - paperstr = malloc((strlen(paperdef) + 1) * sizeof(char)); - -diff -ur libpaper-1.1.24+nmu2.orig/man/paperconf.1.in libpaper-1.1.24+nmu2/man/paperconf.1.in ---- libpaper-1.1.24+nmu2.orig/man/paperconf.1.in 2012-05-03 21:05:12.000000000 +0200 -+++ libpaper-1.1.24+nmu2/man/paperconf.1.in 2013-10-25 08:27:54.783329615 +0200 -@@ -1,4 +1,4 @@ --.TH PAPERCONF 1 "24 April 2001" -+.TH PAPERCONF 1 "25 October 2013" - .SH NAME - .B paperconf - \- print paper configuration information -@@ -46,13 +46,10 @@ - prints the name of the system- or user-specified paper, obtained by - looking in order at the - .B @PAPERSIZEVAR@ --environment variable, at the contents of the file specified by the --.B @PAPERCONFVAR@ --environment variable, at the contents of --.B @PAPERCONF@ -+environment variable - or by using --.B letter --as a fall-back value if none of the other alternatives are successful. -+.B a4 -+as a fall-back value. - By default, width and height of the paper are printed in PostScript points. - .SH OPTIONS - .TP -@@ -98,21 +95,9 @@ - .SH ENVIRONMENT - .TP 20 - .B @PAPERSIZEVAR@ --Paper size to use regardless of what the papersize file contains. --.TP 20 --.B @PAPERCONFVAR@ --Full path to a file containing the paper size to use. --.SH FILES --.TP 20 --.B @PAPERCONF@ --Contains the name of the system-wide default paper size to be used --if the --.B @PAPERSIZEVAR@ --and --.B @PAPERCONFVAR@ --variables are not set. -+Paper size to use. - .SH AUTHOR - Yves Arrouye --.SH SEE ALSO --.BR papersize (5) -+ -+Modified for TeX Live by Peter Breitenlohner - diff --git a/Build/source/libs/libpaper/libpaper-PATCHES/patch-03-getopt b/Build/source/libs/libpaper/libpaper-PATCHES/patch-03-getopt deleted file mode 100644 index cec650d1108..00000000000 --- a/Build/source/libs/libpaper/libpaper-PATCHES/patch-03-getopt +++ /dev/null @@ -1,49 +0,0 @@ -diff -ur libpaper-1.1.24+nmu2.orig/man/paperconf.1.in libpaper-1.1.24+nmu2/man/paperconf.1.in ---- libpaper-1.1.24+nmu2.orig/man/paperconf.1.in 2013-10-25 08:27:54.000000000 +0200 -+++ libpaper-1.1.24+nmu2/man/paperconf.1.in 2013-11-20 13:59:18.000000000 +0100 -@@ -3,39 +3,12 @@ - .B paperconf - \- print paper configuration information - .SH SYNOPSIS --.B paperconf --[ --[ --.B \-p --] --.I paper --| --.B \-d --| --.B \-a --] --[ --.B \-z --] --[ --.B \-n --| --.B \-N --] --[ --.B \-s --| --.B \-w --| --.B \-h --] --[ --.B \-c --| --.B \-m --| --.B \-i --] -+\fBpaperconf\fR -+[\fB\-z\fR] -+[\fB\-n\fR|\fB\-N\fR] -+[\fB\-s\fR|\fB\-w\fR|\fB\-h\fR] -+[\fB\-c\fR|\fB\-m\fR|\fB\-i\fR] -+[[\fB\-p\fR] \fIpaper\fR|\fB\-d\fR|\fB\-a\fR] - .SH DESCRIPTION - .B paperconf - prints information about a given paper. diff --git a/Build/source/libs/libpaper/libpaper-PATCHES/patch-04-unsigned b/Build/source/libs/libpaper/libpaper-PATCHES/patch-04-unsigned deleted file mode 100644 index 13c798bc1e5..00000000000 --- a/Build/source/libs/libpaper/libpaper-PATCHES/patch-04-unsigned +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur libpaper-1.1.24+nmu2.orig/lib/dimen.c libpaper-1.1.24+nmu2/lib/dimen.c ---- libpaper-1.1.24+nmu2.orig/lib/dimen.c 2002-11-11 01:56:08.000000000 +0100 -+++ libpaper-1.1.24+nmu2/lib/dimen.c 2014-06-18 08:31:52.000000000 +0200 -@@ -53,9 +53,9 @@ - - if (*(unit = what) == '-') ++unit; - -- for (; isdigit(*unit) || (*unit == '.' && !dot++); ++unit); -+ for (; isdigit((unsigned char)*unit) || (*unit == '.' && !dot++); ++unit); - -- if (*unit && !isalpha(*unit)) { -+ if (*unit && !isalpha((unsigned char)*unit)) { - return -1; - } else { - double base = atof(what); -diff -ur libpaper-1.1.24+nmu2.orig/src/paperconf.c libpaper-1.1.24+nmu2/src/paperconf.c ---- libpaper-1.1.24+nmu2.orig/src/paperconf.c 2012-05-03 21:05:12.000000000 +0200 -+++ libpaper-1.1.24+nmu2/src/paperconf.c 2014-06-18 08:31:54.000000000 +0200 -@@ -53,8 +53,8 @@ - printf("%s", papername(paper)); - pr = 1; - } else if (options & OPT_UPPERNAME) { -- if (islower(*papername(paper))) { -- printf("%c%s", toupper(*papername(paper)), papername(paper) + 1); -+ if (islower((unsigned char)*papername(paper))) { -+ printf("%c%s", toupper((unsigned char)*papername(paper)), papername(paper) + 1); - } else { - printf("%s", papername(paper)); - } diff --git a/Build/source/libs/libpng/TLPATCHES/ChangeLog b/Build/source/libs/libpng/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..877539b7e40 --- /dev/null +++ b/Build/source/libs/libpng/TLPATCHES/ChangeLog @@ -0,0 +1,52 @@ +2017-01-05 Akira Kakuto + + Import libpng-1.6.28. + +2016-12-29 Akira Kakuto + + Import libpng-1.6.27. + +2016-10-20 Akira Kakuto + + Import libpng-1.6.26. + +2016-09-01 Akira Kakuto + + Import libpng-1.6.25. + +2016-08-04 Akira Kakuto + + Import libpng-1.6.24. + +2016-06-09 Akira Kakuto + + Import libpng-1.6.23. + Forgot to remove patch-02-backport-20160314-12e63e9 in 1.6.22. + Here really remove patch-02-backport-20160314-12e63e9. + +2016-05-26 Akira Kakuto + + Remove patch-02-backport-20160314-12e63e9, since it is now + in the original libpng-1.6.22. + +2016-03-28 Mojca Miklavec + + Create patch-02-backport-20160314-12e63e9: + * libpng-src/configure.ac: Force back to C89 if needed + (needed on Solaris with GCC 5 and later) + +2009-08-13 Martin Schröder + + * patch-01-static: Remove; has been integrated into libpng-1.2.39. + +2009-07-17 Peter Breitenlohner + + * patch-01-static: Adjust for libpng-1.2.38. + +2009-06-19 Peter Breitenlohner + + Create patch-01-static: + * libpng-1.2.37/png.c (png_64bit_product): declare as static to + avoid compiler warning. + +(This ChangeLog is public domain.) diff --git a/Build/source/libs/libpng/TLPATCHES/TL-Changes b/Build/source/libs/libpng/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..1dd435aecae --- /dev/null +++ b/Build/source/libs/libpng/TLPATCHES/TL-Changes @@ -0,0 +1,18 @@ +Changes applied to the libpng-1.6.28/ tree as obtained from: + http://www.libpng.org/ libpng-1.6.28.tar.xz + +Copied: + scripts/pnglibconf.h.prebuilt -> pnglibconf.h + +Removed: + Makefile.in + aclocal.m4 + compile + config.guess + config.sub + configure + depcomp + install-sh + ltmain.sh + missing + test-driver diff --git a/Build/source/libs/libpng/libpng-PATCHES/ChangeLog b/Build/source/libs/libpng/libpng-PATCHES/ChangeLog deleted file mode 100644 index 877539b7e40..00000000000 --- a/Build/source/libs/libpng/libpng-PATCHES/ChangeLog +++ /dev/null @@ -1,52 +0,0 @@ -2017-01-05 Akira Kakuto - - Import libpng-1.6.28. - -2016-12-29 Akira Kakuto - - Import libpng-1.6.27. - -2016-10-20 Akira Kakuto - - Import libpng-1.6.26. - -2016-09-01 Akira Kakuto - - Import libpng-1.6.25. - -2016-08-04 Akira Kakuto - - Import libpng-1.6.24. - -2016-06-09 Akira Kakuto - - Import libpng-1.6.23. - Forgot to remove patch-02-backport-20160314-12e63e9 in 1.6.22. - Here really remove patch-02-backport-20160314-12e63e9. - -2016-05-26 Akira Kakuto - - Remove patch-02-backport-20160314-12e63e9, since it is now - in the original libpng-1.6.22. - -2016-03-28 Mojca Miklavec - - Create patch-02-backport-20160314-12e63e9: - * libpng-src/configure.ac: Force back to C89 if needed - (needed on Solaris with GCC 5 and later) - -2009-08-13 Martin Schröder - - * patch-01-static: Remove; has been integrated into libpng-1.2.39. - -2009-07-17 Peter Breitenlohner - - * patch-01-static: Adjust for libpng-1.2.38. - -2009-06-19 Peter Breitenlohner - - Create patch-01-static: - * libpng-1.2.37/png.c (png_64bit_product): declare as static to - avoid compiler warning. - -(This ChangeLog is public domain.) diff --git a/Build/source/libs/libpng/libpng-PATCHES/TL-Changes b/Build/source/libs/libpng/libpng-PATCHES/TL-Changes deleted file mode 100644 index 1dd435aecae..00000000000 --- a/Build/source/libs/libpng/libpng-PATCHES/TL-Changes +++ /dev/null @@ -1,18 +0,0 @@ -Changes applied to the libpng-1.6.28/ tree as obtained from: - http://www.libpng.org/ libpng-1.6.28.tar.xz - -Copied: - scripts/pnglibconf.h.prebuilt -> pnglibconf.h - -Removed: - Makefile.in - aclocal.m4 - compile - config.guess - config.sub - configure - depcomp - install-sh - ltmain.sh - missing - test-driver diff --git a/Build/source/libs/lua52/TLPATCHES/ChangeLog b/Build/source/libs/lua52/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..a8f1b4d385f --- /dev/null +++ b/Build/source/libs/lua52/TLPATCHES/ChangeLog @@ -0,0 +1,36 @@ +2015-03-11 Peter Breitenlohner + + Import lua-5.2.4/ from http://www.lua.org/ftp/lua-5.2.4.tar.gz. + + * patch-01-utf-8, patch-02-FreeBSD, patch-03-export: Adapted. + +2014-10-22 Peter Breitenlohner + + * patch-03-export (new): Export symbols for LuaTeX (from Luigi). + +2014-02-13 Peter Breitenlohner + + * patch-02-FreeBSD (new): Required for FreeBSD. + From Nikola Lecic . + +2014-02-13 Peter Breitenlohner + + * patch-01-utf-8 (new): Allow utf-8 chars in identifiers. + From Luigi Scarso . + +2012-12-07 Peter Breitenlohner + + Import lua-5.2.3/ from http://www.lua.org/ftp/lua-5.2.3.tar.gz. + +2012-06-25 Peter Breitenlohner + + Import lua-5.2.2/ from http://www.lua.org/ftp/lua-5.2.2.tar.gz. + + * patch-01-const (removed): Now included upstream. + +2012-06-18 Peter Breitenlohner + + Import lua-5.2.1/ from http://www.lua.org/ftp/lua-5.2.1.tar.gz. + + * patch-01-const (new): Add const to avoid warning. + diff --git a/Build/source/libs/lua52/TLPATCHES/patch-01-utf-8 b/Build/source/libs/lua52/TLPATCHES/patch-01-utf-8 new file mode 100644 index 00000000000..9ad97494106 --- /dev/null +++ b/Build/source/libs/lua52/TLPATCHES/patch-01-utf-8 @@ -0,0 +1,26 @@ +diff -ur lua-5.2.4.orig/src/lctype.h lua-5.2.4/src/lctype.h +--- lua-5.2.4.orig/src/lctype.h 2013-04-12 20:48:47.000000000 +0200 ++++ lua-5.2.4/src/lctype.h 2014-02-13 13:17:33.000000000 +0100 +@@ -7,6 +7,8 @@ + #ifndef lctype_h + #define lctype_h + ++#include ++ + #include "lua.h" + + +@@ -53,9 +55,11 @@ + + /* + ** 'lalpha' (Lua alphabetic) and 'lalnum' (Lua alphanumeric) both include '_' ++** ++** all utf-8 chars (greater than 0x7f) are always alphabetic + */ +-#define lislalpha(c) testprop(c, MASK(ALPHABIT)) +-#define lislalnum(c) testprop(c, (MASK(ALPHABIT) | MASK(DIGITBIT))) ++#define lislalpha(c) (isalpha(c) || (c) == '_' || (c) > 0x7f) ++#define lislalnum(c) (isalnum(c) || (c) == '_' || (c) > 0x7f) + #define lisdigit(c) testprop(c, MASK(DIGITBIT)) + #define lisspace(c) testprop(c, MASK(SPACEBIT)) + #define lisprint(c) testprop(c, MASK(PRINTBIT)) diff --git a/Build/source/libs/lua52/TLPATCHES/patch-02-FreeBSD b/Build/source/libs/lua52/TLPATCHES/patch-02-FreeBSD new file mode 100644 index 00000000000..c9465de9446 --- /dev/null +++ b/Build/source/libs/lua52/TLPATCHES/patch-02-FreeBSD @@ -0,0 +1,13 @@ +diff -ur lua-5.2.4.orig/src/liolib.c lua-5.2.4/src/liolib.c +--- lua-5.2.4.orig/src/liolib.c 2013-04-12 20:48:47.000000000 +0200 ++++ lua-5.2.4/src/liolib.c 2014-03-19 15:03:49.727286832 +0100 +@@ -19,6 +19,9 @@ + #include + #include + #include ++#if defined(HAVE_UNISTD_H) ++#include ++#endif + + #define liolib_c + #define LUA_LIB diff --git a/Build/source/libs/lua52/TLPATCHES/patch-03-export b/Build/source/libs/lua52/TLPATCHES/patch-03-export new file mode 100644 index 00000000000..2c2edd01b6a --- /dev/null +++ b/Build/source/libs/lua52/TLPATCHES/patch-03-export @@ -0,0 +1,33 @@ +diff -ur lua-5.2.4.orig/src/lopcodes.h lua-5.2.4/src/lopcodes.h +--- lua-5.2.4.orig/src/lopcodes.h 2014-10-20 20:32:09.000000000 +0200 ++++ lua-5.2.4/src/lopcodes.h 2015-03-11 08:31:42.000000000 +0100 +@@ -269,7 +269,7 @@ + OpArgK /* argument is a constant or register/constant */ + }; + +-LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES]; ++LUA_API const lu_byte luaP_opmodes[NUM_OPCODES]; + + #define getOpMode(m) (cast(enum OpMode, luaP_opmodes[m] & 3)) + #define getBMode(m) (cast(enum OpArgMask, (luaP_opmodes[m] >> 4) & 3)) +@@ -278,7 +278,7 @@ + #define testTMode(m) (luaP_opmodes[m] & (1 << 7)) + + +-LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1]; /* opcode names */ ++LUA_API const char *const luaP_opnames[NUM_OPCODES+1]; /* opcode names */ + + + /* number of list items to accumulate before a SETLIST instruction */ +diff -ur lua-5.2.4.orig/src/lundump.h lua-5.2.4/src/lundump.h +--- lua-5.2.4.orig/src/lundump.h 2013-04-12 20:48:47.000000000 +0200 ++++ lua-5.2.4/src/lundump.h 2014-10-22 11:14:59.000000000 +0200 +@@ -17,7 +17,7 @@ + LUAI_FUNC void luaU_header (lu_byte* h); + + /* dump one chunk; from ldump.c */ +-LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip); ++LUA_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip); + + /* data to catch conversion errors */ + #define LUAC_TAIL "\x19\x93\r\n\x1a\n" diff --git a/Build/source/libs/lua52/lua52-PATCHES/ChangeLog b/Build/source/libs/lua52/lua52-PATCHES/ChangeLog deleted file mode 100644 index a8f1b4d385f..00000000000 --- a/Build/source/libs/lua52/lua52-PATCHES/ChangeLog +++ /dev/null @@ -1,36 +0,0 @@ -2015-03-11 Peter Breitenlohner - - Import lua-5.2.4/ from http://www.lua.org/ftp/lua-5.2.4.tar.gz. - - * patch-01-utf-8, patch-02-FreeBSD, patch-03-export: Adapted. - -2014-10-22 Peter Breitenlohner - - * patch-03-export (new): Export symbols for LuaTeX (from Luigi). - -2014-02-13 Peter Breitenlohner - - * patch-02-FreeBSD (new): Required for FreeBSD. - From Nikola Lecic . - -2014-02-13 Peter Breitenlohner - - * patch-01-utf-8 (new): Allow utf-8 chars in identifiers. - From Luigi Scarso . - -2012-12-07 Peter Breitenlohner - - Import lua-5.2.3/ from http://www.lua.org/ftp/lua-5.2.3.tar.gz. - -2012-06-25 Peter Breitenlohner - - Import lua-5.2.2/ from http://www.lua.org/ftp/lua-5.2.2.tar.gz. - - * patch-01-const (removed): Now included upstream. - -2012-06-18 Peter Breitenlohner - - Import lua-5.2.1/ from http://www.lua.org/ftp/lua-5.2.1.tar.gz. - - * patch-01-const (new): Add const to avoid warning. - diff --git a/Build/source/libs/lua52/lua52-PATCHES/patch-01-utf-8 b/Build/source/libs/lua52/lua52-PATCHES/patch-01-utf-8 deleted file mode 100644 index 9ad97494106..00000000000 --- a/Build/source/libs/lua52/lua52-PATCHES/patch-01-utf-8 +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur lua-5.2.4.orig/src/lctype.h lua-5.2.4/src/lctype.h ---- lua-5.2.4.orig/src/lctype.h 2013-04-12 20:48:47.000000000 +0200 -+++ lua-5.2.4/src/lctype.h 2014-02-13 13:17:33.000000000 +0100 -@@ -7,6 +7,8 @@ - #ifndef lctype_h - #define lctype_h - -+#include -+ - #include "lua.h" - - -@@ -53,9 +55,11 @@ - - /* - ** 'lalpha' (Lua alphabetic) and 'lalnum' (Lua alphanumeric) both include '_' -+** -+** all utf-8 chars (greater than 0x7f) are always alphabetic - */ --#define lislalpha(c) testprop(c, MASK(ALPHABIT)) --#define lislalnum(c) testprop(c, (MASK(ALPHABIT) | MASK(DIGITBIT))) -+#define lislalpha(c) (isalpha(c) || (c) == '_' || (c) > 0x7f) -+#define lislalnum(c) (isalnum(c) || (c) == '_' || (c) > 0x7f) - #define lisdigit(c) testprop(c, MASK(DIGITBIT)) - #define lisspace(c) testprop(c, MASK(SPACEBIT)) - #define lisprint(c) testprop(c, MASK(PRINTBIT)) diff --git a/Build/source/libs/lua52/lua52-PATCHES/patch-02-FreeBSD b/Build/source/libs/lua52/lua52-PATCHES/patch-02-FreeBSD deleted file mode 100644 index c9465de9446..00000000000 --- a/Build/source/libs/lua52/lua52-PATCHES/patch-02-FreeBSD +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur lua-5.2.4.orig/src/liolib.c lua-5.2.4/src/liolib.c ---- lua-5.2.4.orig/src/liolib.c 2013-04-12 20:48:47.000000000 +0200 -+++ lua-5.2.4/src/liolib.c 2014-03-19 15:03:49.727286832 +0100 -@@ -19,6 +19,9 @@ - #include - #include - #include -+#if defined(HAVE_UNISTD_H) -+#include -+#endif - - #define liolib_c - #define LUA_LIB diff --git a/Build/source/libs/lua52/lua52-PATCHES/patch-03-export b/Build/source/libs/lua52/lua52-PATCHES/patch-03-export deleted file mode 100644 index 2c2edd01b6a..00000000000 --- a/Build/source/libs/lua52/lua52-PATCHES/patch-03-export +++ /dev/null @@ -1,33 +0,0 @@ -diff -ur lua-5.2.4.orig/src/lopcodes.h lua-5.2.4/src/lopcodes.h ---- lua-5.2.4.orig/src/lopcodes.h 2014-10-20 20:32:09.000000000 +0200 -+++ lua-5.2.4/src/lopcodes.h 2015-03-11 08:31:42.000000000 +0100 -@@ -269,7 +269,7 @@ - OpArgK /* argument is a constant or register/constant */ - }; - --LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES]; -+LUA_API const lu_byte luaP_opmodes[NUM_OPCODES]; - - #define getOpMode(m) (cast(enum OpMode, luaP_opmodes[m] & 3)) - #define getBMode(m) (cast(enum OpArgMask, (luaP_opmodes[m] >> 4) & 3)) -@@ -278,7 +278,7 @@ - #define testTMode(m) (luaP_opmodes[m] & (1 << 7)) - - --LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1]; /* opcode names */ -+LUA_API const char *const luaP_opnames[NUM_OPCODES+1]; /* opcode names */ - - - /* number of list items to accumulate before a SETLIST instruction */ -diff -ur lua-5.2.4.orig/src/lundump.h lua-5.2.4/src/lundump.h ---- lua-5.2.4.orig/src/lundump.h 2013-04-12 20:48:47.000000000 +0200 -+++ lua-5.2.4/src/lundump.h 2014-10-22 11:14:59.000000000 +0200 -@@ -17,7 +17,7 @@ - LUAI_FUNC void luaU_header (lu_byte* h); - - /* dump one chunk; from ldump.c */ --LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip); -+LUA_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip); - - /* data to catch conversion errors */ - #define LUAC_TAIL "\x19\x93\r\n\x1a\n" diff --git a/Build/source/libs/luajit/LuaJIT-PATCHES/ChangeLog b/Build/source/libs/luajit/LuaJIT-PATCHES/ChangeLog deleted file mode 100644 index b74ee1d6be4..00000000000 --- a/Build/source/libs/luajit/LuaJIT-PATCHES/ChangeLog +++ /dev/null @@ -1,68 +0,0 @@ -2016-03-07 Luigi Scarso - Luajit-2.1.0-beta2 - -2016-03-04 Luigi Scarso - - * added RESERVED_load_aux_JIT needed to Luajittex loadfile - -2015-09-27 Peter Breitenlohner - - * patch-07-x86_64-cygwin (new): Backport from upstream git. - -2015-09-07 Peter Breitenlohner - - Import LuaJIT-2.1.0-beta1. - - * patch-01-LuaJITTeX: Adapted. - * patch-05-LuaJITTeX: Adapted. - * patch-06-ppc-darwin: Adapted. - -2015-06-12 Peter Breitenlohner - - Import LuaJIT-2.0.4. - - * patch-01-LuaJITTeX: Adapted. - * patch-05-LuaJITTeX: Adapted. - * patch-06-ppc-darwin: Adapted. - -2015-01-19 Peter Breitenlohner - - * patch-06-ppc-darwin (new): Build fix for PPC OS X. - From http://permalink.gmane.org/gmane.comp.lang.lua.luajit/5936. - -2014-06-01 Peter Breitenlohner - - * patch-05-LuaJITTeX (lj_str_new): Replace '6' by LUAI_HASHLIMIT - and use '#define LUAI_HASHLIMIT 5' as default as in - ../../libs/lua52/lua-5.2.3/src/lstring.c. - -2014-03-14 Peter Breitenlohner - - Import LuaJIT-2.0.3. - - * patch-01-LuaJITTeX: Adapted. - * patch-05-LuaJITTeX (new): More changes from Luigi and Taco. - - * patch-02-unwind, patch-03-OSX-build, patch-04-NetBSD64-build - (removed): Now in distribution. - -2014-02-23 Peter Breitenlohner - - * patch-04-NetBSD64-build (new): Fix NetBSD/amd64 build from - Marc Baudoin . - -2014-02-07 Peter Breitenlohner - - * patch-03-OSX-build (new): Backport from upstream git. - Fix OSX build issue by Mike Pall. - -2014-02-06 Peter Breitenlohner - - * patch-02-unwind (new): Bug fix. - -2014-02-05 Peter Breitenlohner - - Import LuaJIT-2.0.2. - - * patch-01-LuaJITTeX (new): Adapt for use in LuaJITTeX. - diff --git a/Build/source/libs/luajit/LuaJIT-PATCHES/patch-01-LuaJITTeX b/Build/source/libs/luajit/LuaJIT-PATCHES/patch-01-LuaJITTeX deleted file mode 100644 index 2e8220e0c36..00000000000 --- a/Build/source/libs/luajit/LuaJIT-PATCHES/patch-01-LuaJITTeX +++ /dev/null @@ -1,221 +0,0 @@ -diff -bur LuaJIT-src-orig/src/lauxlib.h LuaJIT-src/src/lauxlib.h ---- LuaJIT-src-orig/src/lauxlib.h 2016-03-07 09:43:42.708069718 +0100 -+++ LuaJIT-src/src/lauxlib.h 2016-03-04 16:52:23.000000000 +0100 -@@ -86,6 +86,32 @@ - int level); - - -+ -+/* -+** {====================================================== -+** File handles for IO library -+** ======================================================= -+*/ -+ -+/* -+** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and -+** initial structure 'luaL_Stream' (it may contain other fields -+** after that initial structure). -+*/ -+ -+#define LUA_FILEHANDLE "FILE*" -+ -+ -+typedef struct luaL_Stream { -+ FILE *f; /* stream (NULL for incompletely created streams) */ -+ lua_CFunction closef; /* to close stream (NULL for closed streams) */ -+} luaL_Stream; -+ -+/* }====================================================== */ -+ -+ -+ -+ - /* - ** =============================================================== - ** some useful macros -@@ -144,6 +170,8 @@ - LUALIB_API void (luaL_addvalue) (luaL_Buffer *B); - LUALIB_API void (luaL_pushresult) (luaL_Buffer *B); - -+/* Luajittex needs this one because it overloads loadfile */ -+LUALIB_API int (RESERVED_load_aux_JIT) (lua_State *L, int status, int envarg); - - /* }====================================================== */ - -diff -bur LuaJIT-src-orig/src/lib_init.c LuaJIT-src/src/lib_init.c ---- LuaJIT-src-orig/src/lib_init.c 2016-03-07 09:43:42.720069718 +0100 -+++ LuaJIT-src/src/lib_init.c 2016-03-07 11:47:15.847946480 +0100 -@@ -26,6 +26,7 @@ - { LUA_DBLIBNAME, luaopen_debug }, - { LUA_BITLIBNAME, luaopen_bit }, - { LUA_JITLIBNAME, luaopen_jit }, -+ { LUA_BITLIBNAME_32, luaopen_bit32 }, - { NULL, NULL } - }; - -diff -bur LuaJIT-src-orig/src/lib_package.c LuaJIT-src/src/lib_package.c ---- LuaJIT-src-orig/src/lib_package.c 2016-03-07 09:43:42.712069718 +0100 -+++ LuaJIT-src/src/lib_package.c 2016-03-07 11:49:15.655944489 +0100 -@@ -362,6 +362,29 @@ - return 1; /* library loaded successfully */ - } - -+#define LUA_POF "luaopen_" -+#define LUA_OFSEP "_" -+#define POF LUA_POF -+ -+static const char *mkfuncname (lua_State *L, const char *modname) { -+ const char *funcname; -+ const char *mark = strchr(modname, *LUA_IGMARK); -+ if (mark) modname = mark + 1; -+ funcname = luaL_gsub(L, modname, ".", LUA_OFSEP); -+ funcname = lua_pushfstring(L, POF"%s", funcname); -+ lua_remove(L, -2); /* remove 'gsub' result */ -+ return funcname; -+} -+ -+ -+int loader_C_luatex (lua_State *L, const char *name, const char *filename) { -+ const char *funcname; -+ funcname = mkfuncname(L, name); -+ if (ll_loadfunc(L, filename, funcname,0) != 0) -+ loaderror(L, filename); -+ return 1; /* library loaded successfully */ -+} -+ - static int lj_cf_package_loader_croot(lua_State *L) - { - const char *filename; -@@ -381,6 +404,21 @@ - return 1; - } - -+int loader_Call_luatex (lua_State *L, const char *name, const char *filename) { -+ const char *funcname; -+ int stat; -+ if (filename == NULL) return 1; /* root not found */ -+ funcname = mkfuncname(L, name); -+ if ((stat = ll_loadfunc(L, filename, funcname,0)) != 0) { -+ if (stat != PACKAGE_ERR_FUNC) loaderror(L, filename); /* real error */ -+ lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS, -+ name, filename); -+ return 1; /* function not found */ -+ } -+ return 1; /* library loaded successfully */ -+} -+ -+ - static int lj_cf_package_loader_preload(lua_State *L) - { - const char *name = luaL_checkstring(L, 1); - -diff -bur LuaJIT-src-orig/src/lj_load.c LuaJIT-src/src/lj_load.c ---- LuaJIT-src-orig/src/lj_load.c 2016-03-07 09:43:42.716069718 +0100 -+++ LuaJIT-src/src/lj_load.c 2016-03-07 12:09:10.771924621 +0100 -@@ -166,3 +166,19 @@ - return 1; - } - -+/* -- Luajittex needs this one because it overloads loadfile -- */ -+LUALIB_API int RESERVED_load_aux_JIT(lua_State *L, int status, int envarg) -+{ -+ if (status == 0) { -+ if (tvistab(L->base+envarg-1)) { -+ GCfunc *fn = funcV(L->top-1); -+ GCtab *t = tabV(L->base+envarg-1); -+ setgcref(fn->c.env, obj2gco(t)); -+ lj_gc_objbarrier(L, fn, t); -+ } -+ return 1; -+ } else { -+ setnilV(L->top-2); -+ return 2; -+ } -+} - -diff -bur LuaJIT-src-orig/src/lua.h LuaJIT-src/src/lua.h ---- LuaJIT-src-orig/src/lua.h 2016-03-07 09:43:42.716069718 +0100 -+++ LuaJIT-src/src/lua.h 2016-03-07 11:56:24.855937353 +0100 -@@ -103,6 +103,9 @@ - typedef LUA_INTEGER lua_Integer; - - -+/* communication with LuaJiTTeX */ -+LUA_API int luajittex_choose_hash_function; -+ - - /* - ** state manipulation -@@ -349,6 +352,16 @@ - const char *chunkname, const char *mode); - - -+#define LUA_OPEQ 0 -+#define LUA_OPLT 1 -+#define LUA_OPLE 2 -+#define LUA_OK 0 -+ -+/* see http://comments.gmane.org/gmane.comp.programming.swig/18673 */ -+# define lua_rawlen lua_objlen -+ -+ -+ - struct lua_Debug { - int event; - const char *name; /* (n) */ - -diff -bur LuaJIT-src-orig/src/lualib.h LuaJIT-src/src/lualib.h ---- LuaJIT-src-orig/src/lualib.h 2016-03-07 09:43:42.724069718 +0100 -+++ LuaJIT-src/src/lualib.h 2016-03-07 11:58:19.151935453 +0100 -@@ -22,6 +22,8 @@ - #define LUA_JITLIBNAME "jit" - #define LUA_FFILIBNAME "ffi" - -+#define LUA_BITLIBNAME_32 "bit32" -+ - LUALIB_API int luaopen_base(lua_State *L); - LUALIB_API int luaopen_math(lua_State *L); - LUALIB_API int luaopen_string(lua_State *L); -@@ -34,6 +36,8 @@ - LUALIB_API int luaopen_jit(lua_State *L); - LUALIB_API int luaopen_ffi(lua_State *L); - -+LUALIB_API int luaopen_bit32(lua_State *L); -+ - LUALIB_API void luaL_openlibs(lua_State *L); - - #ifndef lua_assert - -diff -bur LuaJIT-src-orig/src/Makefile LuaJIT-src/src/Makefile ---- LuaJIT-src-orig/src/Makefile 2016-03-07 09:43:42.716069718 +0100 -+++ LuaJIT-src/src/Makefile 2016-03-07 12:02:42.319931078 +0100 -@@ -99,7 +99,7 @@ - # enabled by default. Some other features that *might* break some existing - # code (e.g. __pairs or os.execute() return values) can be enabled here. - # Note: this does not provide full compatibility with Lua 5.2 at this time. --#XCFLAGS+= -DLUAJIT_ENABLE_LUA52COMPAT -+XCFLAGS+= -DLUAJIT_ENABLE_LUA52COMPAT - # - # Disable the JIT compiler, i.e. turn LuaJIT into a pure interpreter. - #XCFLAGS+= -DLUAJIT_DISABLE_JIT -@@ -471,7 +471,7 @@ - LJVM_BOUT= $(LJVM_S) - LJVM_MODE= elfasm - --LJLIB_O= lib_base.o lib_math.o lib_bit.o lib_string.o lib_table.o \ -+LJLIB_O= lib_base.o lib_math.o lbitlib.o lib_bit.o lib_string.o lib_table.o \ - lib_io.o lib_os.o lib_package.o lib_debug.o lib_jit.o lib_ffi.o - LJLIB_C= $(LJLIB_O:.o=.c) - -diff -bur LuaJIT-src-orig/src/Makefile.dep LuaJIT-src/src/Makefile.dep ---- LuaJIT-src-orig/src/Makefile.dep 2016-03-07 09:43:42.696069718 +0100 -+++ LuaJIT-src/src/Makefile.dep 2016-03-07 12:05:19.343928468 +0100 -@@ -6,6 +6,7 @@ - lj_tab.h lj_meta.h lj_state.h lj_ctype.h lj_cconv.h lj_bc.h lj_ff.h \ - lj_ffdef.h lj_dispatch.h lj_jit.h lj_ir.h lj_char.h lj_strscan.h \ - lj_strfmt.h lj_lib.h lj_libdef.h -+lbitlib.o: lbitlib.c lua.h luaconf.h lauxlib.h lualib.h - lib_bit.o: lib_bit.c lua.h luaconf.h lauxlib.h lualib.h lj_obj.h lj_def.h \ - lj_arch.h lj_err.h lj_errmsg.h lj_buf.h lj_gc.h lj_str.h lj_strscan.h \ - lj_strfmt.h lj_ctype.h lj_cdata.h lj_cconv.h lj_carith.h lj_ff.h \ diff --git a/Build/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX b/Build/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX deleted file mode 100644 index 884d3392bf7..00000000000 --- a/Build/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX +++ /dev/null @@ -1,86 +0,0 @@ -diff -bur LuaJIT-src-orig/src/lj_def.h LuaJIT-src/src/lj_def.h ---- LuaJIT-src-orig/src/lj_def.h 2016-03-07 09:43:42.728069718 +0100 -+++ LuaJIT-src/src/lj_def.h 2016-03-07 12:23:43.327910115 +0100 -@@ -66,7 +66,7 @@ - #define LJ_MAX_BCINS (1<<26) /* Max. # of bytecode instructions. */ - #define LJ_MAX_SLOTS 250 /* Max. # of slots in a Lua func. */ - #define LJ_MAX_LOCVAR 200 /* Max. # of local variables. */ --#define LJ_MAX_UPVAL 60 /* Max. # of upvalues. */ -+#define LJ_MAX_UPVAL 249 /* Max. # of upvalues. */ - - #define LJ_MAX_IDXCHAIN 100 /* __index/__newindex chain limit. */ - #define LJ_STACK_EXTRA (5+2*LJ_FR2) /* Extra stack space (metamethods). */ - -diff -bur LuaJIT-src-orig/src/lj_str.c LuaJIT-src/src/lj_str.c ---- LuaJIT-src-orig/src/lj_str.c 2016-03-07 09:43:42.696069718 +0100 -+++ LuaJIT-src/src/lj_str.c 2016-03-07 12:25:22.031908474 +0100 -@@ -118,6 +118,16 @@ - g->strhash = newhash; - } - -+/* -+** Lua will use at most ~(2^LUAI_HASHLIMIT) bytes from a string to -+** compute its hash -+*/ -+#if !defined(LUAI_HASHLIMIT) -+#define LUAI_HASHLIMIT 5 -+#endif -+ -+#define cast(t, exp) ((t)(exp)) -+int luajittex_choose_hash_function = 0 ; - /* Intern a string and return string object. */ - GCstr *lj_str_new(lua_State *L, const char *str, size_t lenx) - { -@@ -126,9 +136,22 @@ - GCobj *o; - MSize len = (MSize)lenx; - MSize a, b, h = len; -+ size_t step ; -+ size_t l1 ; - if (lenx >= LJ_MAX_STR) - lj_err_msg(L, LJ_ERR_STROV); - g = G(L); -+ -+ if (len==0) -+ return &g->strempty; -+ if (luajittex_choose_hash_function==0) { -+ /* Lua 5.1.5 hash function */ -+ /* for 5.2 max methods we also need to patch the vm eq */ -+ step = (len>>LUAI_HASHLIMIT)+1; /* if string is too long, don't hash all its chars */ -+ for (l1=len; l1>=step; l1-=step) /* compute hash */ -+ h = h ^ ((h<<5)+(h>>2)+cast(unsigned char, str[l1-1])); -+ } else { -+ /* LuaJIT 2.0.2 hash function */ - /* Compute string hash. Constants taken from lookup3 hash by Bob Jenkins. */ - if (len >= 4) { /* Caveat: unaligned access! */ - a = lj_getu32(str); -@@ -142,11 +165,15 @@ - b = *(const uint8_t *)(str+(len>>1)); - h ^= b; h -= lj_rol(b, 14); - } else { -+ /* Already done, kept for reference */ - return &g->strempty; - } - a ^= h; a -= lj_rol(h, 11); - b ^= a; b -= lj_rol(a, 25); - h ^= b; h -= lj_rol(b, 16); -+ } -+ -+ - /* Check if the string has already been interned. */ - o = gcref(g->strhash[h & g->strmask]); - if (LJ_LIKELY((((uintptr_t)str+len-1) & (LJ_PAGESIZE-1)) <= LJ_PAGESIZE-4)) { - -diff -bur LuaJIT-src-orig/src/lj_err.c LuaJIT-src/src/lj_err.c ---- LuaJIT-src-orig/src/lj_err.c 2016-03-15 12:06:56.844436191 +0100 -+++ LuaJIT-src/src/lj_err.c 2016-03-15 11:58:30.000000000 +0100 -@@ -310,7 +310,6 @@ - #define _US_FORCE_UNWIND 8 - - typedef struct _Unwind_Control_Block _Unwind_Control_Block; --typedef struct _Unwind_Context _Unwind_Context; - - struct _Unwind_Control_Block { - uint64_t exclass; - - diff --git a/Build/source/libs/luajit/LuaJIT-PATCHES/patch-06-ppc-darwin b/Build/source/libs/luajit/LuaJIT-PATCHES/patch-06-ppc-darwin deleted file mode 100644 index cc4855ea8de..00000000000 --- a/Build/source/libs/luajit/LuaJIT-PATCHES/patch-06-ppc-darwin +++ /dev/null @@ -1,25 +0,0 @@ -diff -bur LuaJIT-src-orig/src/host/buildvm.c LuaJIT-src/src/host/buildvm.c ---- LuaJIT-src-orig/src/host/buildvm.c 2016-03-07 09:43:42.728069718 +0100 -+++ LuaJIT-src/src/host/buildvm.c 2016-03-07 12:29:03.891904786 +0100 -@@ -113,7 +113,7 @@ - name[0] = '@'; - else - *p = '\0'; --#elif LJ_TARGET_PPC && !LJ_TARGET_CONSOLE -+#elif LJ_TARGET_PPC && !LJ_TARGET_OSX && !LJ_TARGET_CONSOLE - /* Keep @plt etc. */ - #else - *p = '\0'; - -diff -bur LuaJIT-src-orig/src/lj_arch.h LuaJIT-src/src/lj_arch.h ---- LuaJIT-src-orig/src/lj_arch.h 2016-03-07 09:43:42.712069718 +0100 -+++ LuaJIT-src/src/lj_arch.h 2016-03-07 12:31:33.351902301 +0100 -@@ -350,7 +350,7 @@ - #if __GNUC__ < 4 - #error "Need at least GCC 4.0 or newer" - #endif --#elif LJ_TARGET_ARM -+#elif LJ_TARGET_ARM || LJ_TARGET_PPC - #if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 2) - #error "Need at least GCC 4.2 or newer" - #endif diff --git a/Build/source/libs/luajit/LuaJIT-PATCHES/patch-07-x86_64-cygwin b/Build/source/libs/luajit/LuaJIT-PATCHES/patch-07-x86_64-cygwin deleted file mode 100644 index 4b278dd2c99..00000000000 --- a/Build/source/libs/luajit/LuaJIT-PATCHES/patch-07-x86_64-cygwin +++ /dev/null @@ -1,12 +0,0 @@ -diff -bur LuaJIT-src-orig/src/lj_arch.h LuaJIT-src/src/lj_arch.h ---- LuaJIT-src-orig/src/lj_arch.h 2016-03-07 09:43:42.712069718 +0100 -+++ LuaJIT-src/src/lj_arch.h 2016-03-07 12:31:33.351902301 +0100 -@@ -350,7 +350,7 @@ - #if __GNUC__ < 4 - #error "Need at least GCC 4.0 or newer" - #endif --#elif LJ_TARGET_ARM -+#elif LJ_TARGET_ARM || LJ_TARGET_PPC - #if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 2) - #error "Need at least GCC 4.2 or newer" - #endif diff --git a/Build/source/libs/luajit/TLPATCHES/ChangeLog b/Build/source/libs/luajit/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..b74ee1d6be4 --- /dev/null +++ b/Build/source/libs/luajit/TLPATCHES/ChangeLog @@ -0,0 +1,68 @@ +2016-03-07 Luigi Scarso + Luajit-2.1.0-beta2 + +2016-03-04 Luigi Scarso + + * added RESERVED_load_aux_JIT needed to Luajittex loadfile + +2015-09-27 Peter Breitenlohner + + * patch-07-x86_64-cygwin (new): Backport from upstream git. + +2015-09-07 Peter Breitenlohner + + Import LuaJIT-2.1.0-beta1. + + * patch-01-LuaJITTeX: Adapted. + * patch-05-LuaJITTeX: Adapted. + * patch-06-ppc-darwin: Adapted. + +2015-06-12 Peter Breitenlohner + + Import LuaJIT-2.0.4. + + * patch-01-LuaJITTeX: Adapted. + * patch-05-LuaJITTeX: Adapted. + * patch-06-ppc-darwin: Adapted. + +2015-01-19 Peter Breitenlohner + + * patch-06-ppc-darwin (new): Build fix for PPC OS X. + From http://permalink.gmane.org/gmane.comp.lang.lua.luajit/5936. + +2014-06-01 Peter Breitenlohner + + * patch-05-LuaJITTeX (lj_str_new): Replace '6' by LUAI_HASHLIMIT + and use '#define LUAI_HASHLIMIT 5' as default as in + ../../libs/lua52/lua-5.2.3/src/lstring.c. + +2014-03-14 Peter Breitenlohner + + Import LuaJIT-2.0.3. + + * patch-01-LuaJITTeX: Adapted. + * patch-05-LuaJITTeX (new): More changes from Luigi and Taco. + + * patch-02-unwind, patch-03-OSX-build, patch-04-NetBSD64-build + (removed): Now in distribution. + +2014-02-23 Peter Breitenlohner + + * patch-04-NetBSD64-build (new): Fix NetBSD/amd64 build from + Marc Baudoin . + +2014-02-07 Peter Breitenlohner + + * patch-03-OSX-build (new): Backport from upstream git. + Fix OSX build issue by Mike Pall. + +2014-02-06 Peter Breitenlohner + + * patch-02-unwind (new): Bug fix. + +2014-02-05 Peter Breitenlohner + + Import LuaJIT-2.0.2. + + * patch-01-LuaJITTeX (new): Adapt for use in LuaJITTeX. + diff --git a/Build/source/libs/luajit/TLPATCHES/patch-01-LuaJITTeX b/Build/source/libs/luajit/TLPATCHES/patch-01-LuaJITTeX new file mode 100644 index 00000000000..2e8220e0c36 --- /dev/null +++ b/Build/source/libs/luajit/TLPATCHES/patch-01-LuaJITTeX @@ -0,0 +1,221 @@ +diff -bur LuaJIT-src-orig/src/lauxlib.h LuaJIT-src/src/lauxlib.h +--- LuaJIT-src-orig/src/lauxlib.h 2016-03-07 09:43:42.708069718 +0100 ++++ LuaJIT-src/src/lauxlib.h 2016-03-04 16:52:23.000000000 +0100 +@@ -86,6 +86,32 @@ + int level); + + ++ ++/* ++** {====================================================== ++** File handles for IO library ++** ======================================================= ++*/ ++ ++/* ++** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and ++** initial structure 'luaL_Stream' (it may contain other fields ++** after that initial structure). ++*/ ++ ++#define LUA_FILEHANDLE "FILE*" ++ ++ ++typedef struct luaL_Stream { ++ FILE *f; /* stream (NULL for incompletely created streams) */ ++ lua_CFunction closef; /* to close stream (NULL for closed streams) */ ++} luaL_Stream; ++ ++/* }====================================================== */ ++ ++ ++ ++ + /* + ** =============================================================== + ** some useful macros +@@ -144,6 +170,8 @@ + LUALIB_API void (luaL_addvalue) (luaL_Buffer *B); + LUALIB_API void (luaL_pushresult) (luaL_Buffer *B); + ++/* Luajittex needs this one because it overloads loadfile */ ++LUALIB_API int (RESERVED_load_aux_JIT) (lua_State *L, int status, int envarg); + + /* }====================================================== */ + +diff -bur LuaJIT-src-orig/src/lib_init.c LuaJIT-src/src/lib_init.c +--- LuaJIT-src-orig/src/lib_init.c 2016-03-07 09:43:42.720069718 +0100 ++++ LuaJIT-src/src/lib_init.c 2016-03-07 11:47:15.847946480 +0100 +@@ -26,6 +26,7 @@ + { LUA_DBLIBNAME, luaopen_debug }, + { LUA_BITLIBNAME, luaopen_bit }, + { LUA_JITLIBNAME, luaopen_jit }, ++ { LUA_BITLIBNAME_32, luaopen_bit32 }, + { NULL, NULL } + }; + +diff -bur LuaJIT-src-orig/src/lib_package.c LuaJIT-src/src/lib_package.c +--- LuaJIT-src-orig/src/lib_package.c 2016-03-07 09:43:42.712069718 +0100 ++++ LuaJIT-src/src/lib_package.c 2016-03-07 11:49:15.655944489 +0100 +@@ -362,6 +362,29 @@ + return 1; /* library loaded successfully */ + } + ++#define LUA_POF "luaopen_" ++#define LUA_OFSEP "_" ++#define POF LUA_POF ++ ++static const char *mkfuncname (lua_State *L, const char *modname) { ++ const char *funcname; ++ const char *mark = strchr(modname, *LUA_IGMARK); ++ if (mark) modname = mark + 1; ++ funcname = luaL_gsub(L, modname, ".", LUA_OFSEP); ++ funcname = lua_pushfstring(L, POF"%s", funcname); ++ lua_remove(L, -2); /* remove 'gsub' result */ ++ return funcname; ++} ++ ++ ++int loader_C_luatex (lua_State *L, const char *name, const char *filename) { ++ const char *funcname; ++ funcname = mkfuncname(L, name); ++ if (ll_loadfunc(L, filename, funcname,0) != 0) ++ loaderror(L, filename); ++ return 1; /* library loaded successfully */ ++} ++ + static int lj_cf_package_loader_croot(lua_State *L) + { + const char *filename; +@@ -381,6 +404,21 @@ + return 1; + } + ++int loader_Call_luatex (lua_State *L, const char *name, const char *filename) { ++ const char *funcname; ++ int stat; ++ if (filename == NULL) return 1; /* root not found */ ++ funcname = mkfuncname(L, name); ++ if ((stat = ll_loadfunc(L, filename, funcname,0)) != 0) { ++ if (stat != PACKAGE_ERR_FUNC) loaderror(L, filename); /* real error */ ++ lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS, ++ name, filename); ++ return 1; /* function not found */ ++ } ++ return 1; /* library loaded successfully */ ++} ++ ++ + static int lj_cf_package_loader_preload(lua_State *L) + { + const char *name = luaL_checkstring(L, 1); + +diff -bur LuaJIT-src-orig/src/lj_load.c LuaJIT-src/src/lj_load.c +--- LuaJIT-src-orig/src/lj_load.c 2016-03-07 09:43:42.716069718 +0100 ++++ LuaJIT-src/src/lj_load.c 2016-03-07 12:09:10.771924621 +0100 +@@ -166,3 +166,19 @@ + return 1; + } + ++/* -- Luajittex needs this one because it overloads loadfile -- */ ++LUALIB_API int RESERVED_load_aux_JIT(lua_State *L, int status, int envarg) ++{ ++ if (status == 0) { ++ if (tvistab(L->base+envarg-1)) { ++ GCfunc *fn = funcV(L->top-1); ++ GCtab *t = tabV(L->base+envarg-1); ++ setgcref(fn->c.env, obj2gco(t)); ++ lj_gc_objbarrier(L, fn, t); ++ } ++ return 1; ++ } else { ++ setnilV(L->top-2); ++ return 2; ++ } ++} + +diff -bur LuaJIT-src-orig/src/lua.h LuaJIT-src/src/lua.h +--- LuaJIT-src-orig/src/lua.h 2016-03-07 09:43:42.716069718 +0100 ++++ LuaJIT-src/src/lua.h 2016-03-07 11:56:24.855937353 +0100 +@@ -103,6 +103,9 @@ + typedef LUA_INTEGER lua_Integer; + + ++/* communication with LuaJiTTeX */ ++LUA_API int luajittex_choose_hash_function; ++ + + /* + ** state manipulation +@@ -349,6 +352,16 @@ + const char *chunkname, const char *mode); + + ++#define LUA_OPEQ 0 ++#define LUA_OPLT 1 ++#define LUA_OPLE 2 ++#define LUA_OK 0 ++ ++/* see http://comments.gmane.org/gmane.comp.programming.swig/18673 */ ++# define lua_rawlen lua_objlen ++ ++ ++ + struct lua_Debug { + int event; + const char *name; /* (n) */ + +diff -bur LuaJIT-src-orig/src/lualib.h LuaJIT-src/src/lualib.h +--- LuaJIT-src-orig/src/lualib.h 2016-03-07 09:43:42.724069718 +0100 ++++ LuaJIT-src/src/lualib.h 2016-03-07 11:58:19.151935453 +0100 +@@ -22,6 +22,8 @@ + #define LUA_JITLIBNAME "jit" + #define LUA_FFILIBNAME "ffi" + ++#define LUA_BITLIBNAME_32 "bit32" ++ + LUALIB_API int luaopen_base(lua_State *L); + LUALIB_API int luaopen_math(lua_State *L); + LUALIB_API int luaopen_string(lua_State *L); +@@ -34,6 +36,8 @@ + LUALIB_API int luaopen_jit(lua_State *L); + LUALIB_API int luaopen_ffi(lua_State *L); + ++LUALIB_API int luaopen_bit32(lua_State *L); ++ + LUALIB_API void luaL_openlibs(lua_State *L); + + #ifndef lua_assert + +diff -bur LuaJIT-src-orig/src/Makefile LuaJIT-src/src/Makefile +--- LuaJIT-src-orig/src/Makefile 2016-03-07 09:43:42.716069718 +0100 ++++ LuaJIT-src/src/Makefile 2016-03-07 12:02:42.319931078 +0100 +@@ -99,7 +99,7 @@ + # enabled by default. Some other features that *might* break some existing + # code (e.g. __pairs or os.execute() return values) can be enabled here. + # Note: this does not provide full compatibility with Lua 5.2 at this time. +-#XCFLAGS+= -DLUAJIT_ENABLE_LUA52COMPAT ++XCFLAGS+= -DLUAJIT_ENABLE_LUA52COMPAT + # + # Disable the JIT compiler, i.e. turn LuaJIT into a pure interpreter. + #XCFLAGS+= -DLUAJIT_DISABLE_JIT +@@ -471,7 +471,7 @@ + LJVM_BOUT= $(LJVM_S) + LJVM_MODE= elfasm + +-LJLIB_O= lib_base.o lib_math.o lib_bit.o lib_string.o lib_table.o \ ++LJLIB_O= lib_base.o lib_math.o lbitlib.o lib_bit.o lib_string.o lib_table.o \ + lib_io.o lib_os.o lib_package.o lib_debug.o lib_jit.o lib_ffi.o + LJLIB_C= $(LJLIB_O:.o=.c) + +diff -bur LuaJIT-src-orig/src/Makefile.dep LuaJIT-src/src/Makefile.dep +--- LuaJIT-src-orig/src/Makefile.dep 2016-03-07 09:43:42.696069718 +0100 ++++ LuaJIT-src/src/Makefile.dep 2016-03-07 12:05:19.343928468 +0100 +@@ -6,6 +6,7 @@ + lj_tab.h lj_meta.h lj_state.h lj_ctype.h lj_cconv.h lj_bc.h lj_ff.h \ + lj_ffdef.h lj_dispatch.h lj_jit.h lj_ir.h lj_char.h lj_strscan.h \ + lj_strfmt.h lj_lib.h lj_libdef.h ++lbitlib.o: lbitlib.c lua.h luaconf.h lauxlib.h lualib.h + lib_bit.o: lib_bit.c lua.h luaconf.h lauxlib.h lualib.h lj_obj.h lj_def.h \ + lj_arch.h lj_err.h lj_errmsg.h lj_buf.h lj_gc.h lj_str.h lj_strscan.h \ + lj_strfmt.h lj_ctype.h lj_cdata.h lj_cconv.h lj_carith.h lj_ff.h \ diff --git a/Build/source/libs/luajit/TLPATCHES/patch-05-LuaJITTeX b/Build/source/libs/luajit/TLPATCHES/patch-05-LuaJITTeX new file mode 100644 index 00000000000..884d3392bf7 --- /dev/null +++ b/Build/source/libs/luajit/TLPATCHES/patch-05-LuaJITTeX @@ -0,0 +1,86 @@ +diff -bur LuaJIT-src-orig/src/lj_def.h LuaJIT-src/src/lj_def.h +--- LuaJIT-src-orig/src/lj_def.h 2016-03-07 09:43:42.728069718 +0100 ++++ LuaJIT-src/src/lj_def.h 2016-03-07 12:23:43.327910115 +0100 +@@ -66,7 +66,7 @@ + #define LJ_MAX_BCINS (1<<26) /* Max. # of bytecode instructions. */ + #define LJ_MAX_SLOTS 250 /* Max. # of slots in a Lua func. */ + #define LJ_MAX_LOCVAR 200 /* Max. # of local variables. */ +-#define LJ_MAX_UPVAL 60 /* Max. # of upvalues. */ ++#define LJ_MAX_UPVAL 249 /* Max. # of upvalues. */ + + #define LJ_MAX_IDXCHAIN 100 /* __index/__newindex chain limit. */ + #define LJ_STACK_EXTRA (5+2*LJ_FR2) /* Extra stack space (metamethods). */ + +diff -bur LuaJIT-src-orig/src/lj_str.c LuaJIT-src/src/lj_str.c +--- LuaJIT-src-orig/src/lj_str.c 2016-03-07 09:43:42.696069718 +0100 ++++ LuaJIT-src/src/lj_str.c 2016-03-07 12:25:22.031908474 +0100 +@@ -118,6 +118,16 @@ + g->strhash = newhash; + } + ++/* ++** Lua will use at most ~(2^LUAI_HASHLIMIT) bytes from a string to ++** compute its hash ++*/ ++#if !defined(LUAI_HASHLIMIT) ++#define LUAI_HASHLIMIT 5 ++#endif ++ ++#define cast(t, exp) ((t)(exp)) ++int luajittex_choose_hash_function = 0 ; + /* Intern a string and return string object. */ + GCstr *lj_str_new(lua_State *L, const char *str, size_t lenx) + { +@@ -126,9 +136,22 @@ + GCobj *o; + MSize len = (MSize)lenx; + MSize a, b, h = len; ++ size_t step ; ++ size_t l1 ; + if (lenx >= LJ_MAX_STR) + lj_err_msg(L, LJ_ERR_STROV); + g = G(L); ++ ++ if (len==0) ++ return &g->strempty; ++ if (luajittex_choose_hash_function==0) { ++ /* Lua 5.1.5 hash function */ ++ /* for 5.2 max methods we also need to patch the vm eq */ ++ step = (len>>LUAI_HASHLIMIT)+1; /* if string is too long, don't hash all its chars */ ++ for (l1=len; l1>=step; l1-=step) /* compute hash */ ++ h = h ^ ((h<<5)+(h>>2)+cast(unsigned char, str[l1-1])); ++ } else { ++ /* LuaJIT 2.0.2 hash function */ + /* Compute string hash. Constants taken from lookup3 hash by Bob Jenkins. */ + if (len >= 4) { /* Caveat: unaligned access! */ + a = lj_getu32(str); +@@ -142,11 +165,15 @@ + b = *(const uint8_t *)(str+(len>>1)); + h ^= b; h -= lj_rol(b, 14); + } else { ++ /* Already done, kept for reference */ + return &g->strempty; + } + a ^= h; a -= lj_rol(h, 11); + b ^= a; b -= lj_rol(a, 25); + h ^= b; h -= lj_rol(b, 16); ++ } ++ ++ + /* Check if the string has already been interned. */ + o = gcref(g->strhash[h & g->strmask]); + if (LJ_LIKELY((((uintptr_t)str+len-1) & (LJ_PAGESIZE-1)) <= LJ_PAGESIZE-4)) { + +diff -bur LuaJIT-src-orig/src/lj_err.c LuaJIT-src/src/lj_err.c +--- LuaJIT-src-orig/src/lj_err.c 2016-03-15 12:06:56.844436191 +0100 ++++ LuaJIT-src/src/lj_err.c 2016-03-15 11:58:30.000000000 +0100 +@@ -310,7 +310,6 @@ + #define _US_FORCE_UNWIND 8 + + typedef struct _Unwind_Control_Block _Unwind_Control_Block; +-typedef struct _Unwind_Context _Unwind_Context; + + struct _Unwind_Control_Block { + uint64_t exclass; + + diff --git a/Build/source/libs/luajit/TLPATCHES/patch-06-ppc-darwin b/Build/source/libs/luajit/TLPATCHES/patch-06-ppc-darwin new file mode 100644 index 00000000000..cc4855ea8de --- /dev/null +++ b/Build/source/libs/luajit/TLPATCHES/patch-06-ppc-darwin @@ -0,0 +1,25 @@ +diff -bur LuaJIT-src-orig/src/host/buildvm.c LuaJIT-src/src/host/buildvm.c +--- LuaJIT-src-orig/src/host/buildvm.c 2016-03-07 09:43:42.728069718 +0100 ++++ LuaJIT-src/src/host/buildvm.c 2016-03-07 12:29:03.891904786 +0100 +@@ -113,7 +113,7 @@ + name[0] = '@'; + else + *p = '\0'; +-#elif LJ_TARGET_PPC && !LJ_TARGET_CONSOLE ++#elif LJ_TARGET_PPC && !LJ_TARGET_OSX && !LJ_TARGET_CONSOLE + /* Keep @plt etc. */ + #else + *p = '\0'; + +diff -bur LuaJIT-src-orig/src/lj_arch.h LuaJIT-src/src/lj_arch.h +--- LuaJIT-src-orig/src/lj_arch.h 2016-03-07 09:43:42.712069718 +0100 ++++ LuaJIT-src/src/lj_arch.h 2016-03-07 12:31:33.351902301 +0100 +@@ -350,7 +350,7 @@ + #if __GNUC__ < 4 + #error "Need at least GCC 4.0 or newer" + #endif +-#elif LJ_TARGET_ARM ++#elif LJ_TARGET_ARM || LJ_TARGET_PPC + #if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 2) + #error "Need at least GCC 4.2 or newer" + #endif diff --git a/Build/source/libs/luajit/TLPATCHES/patch-07-x86_64-cygwin b/Build/source/libs/luajit/TLPATCHES/patch-07-x86_64-cygwin new file mode 100644 index 00000000000..4b278dd2c99 --- /dev/null +++ b/Build/source/libs/luajit/TLPATCHES/patch-07-x86_64-cygwin @@ -0,0 +1,12 @@ +diff -bur LuaJIT-src-orig/src/lj_arch.h LuaJIT-src/src/lj_arch.h +--- LuaJIT-src-orig/src/lj_arch.h 2016-03-07 09:43:42.712069718 +0100 ++++ LuaJIT-src/src/lj_arch.h 2016-03-07 12:31:33.351902301 +0100 +@@ -350,7 +350,7 @@ + #if __GNUC__ < 4 + #error "Need at least GCC 4.0 or newer" + #endif +-#elif LJ_TARGET_ARM ++#elif LJ_TARGET_ARM || LJ_TARGET_PPC + #if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 2) + #error "Need at least GCC 4.2 or newer" + #endif diff --git a/Build/source/libs/mpfr/TLPATCHES/ChangeLog b/Build/source/libs/mpfr/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..57a1fe35fa7 --- /dev/null +++ b/Build/source/libs/mpfr/TLPATCHES/ChangeLog @@ -0,0 +1,21 @@ +2016-09-28 Akira Kakuto + + Imported mpfr-3.1.5 source tree from: + http://ftp.gnu.org/gnu/mpfr/ + * patch-01-TL: Adapted. + +2016-03-07 Akira Kakuto + + Imported mpfr-3.1.4 source tree from: + http://ftp.gnu.org/gnu/mpfr/ + * patch-01-TL: Adapted. + +2015-06-20 Peter Breitenlohner + + Imported mpfr-3.1.3 source tree from: + http://ftp.gnu.org/gnu/mpfr/ + * patch-01-TL: Adapted. + +2014-05-23 Peter Breitenlohner + + * patch-01-TL (new): Modifications for the TeX Live build system. diff --git a/Build/source/libs/mpfr/TLPATCHES/TL-Changes b/Build/source/libs/mpfr/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..905356fe133 --- /dev/null +++ b/Build/source/libs/mpfr/TLPATCHES/TL-Changes @@ -0,0 +1,25 @@ +Changes applied to the mpfr-3.1.5/ tree as obtained from: + http://ftp.gnu.org/gnu/mpfr/ + +Removed: + COPYING + COPYING.LESSER + Makefile.in + aclocal.m4 + ar-lib + compile + config.guess + config.sub + configure + depcomp + doc/ + examples/ + install-sh + ltmain.sh + m4/ + missing + src/Makefile.in + test-driver + tests/ + tools/ + tune/ diff --git a/Build/source/libs/mpfr/TLPATCHES/patch-01-TL b/Build/source/libs/mpfr/TLPATCHES/patch-01-TL new file mode 100644 index 00000000000..e2083f9cbb1 --- /dev/null +++ b/Build/source/libs/mpfr/TLPATCHES/patch-01-TL @@ -0,0 +1,42 @@ +diff -ur mpfr-3.1.5.orig/src/mparam_h.in mpfr-3.1.5/src/mparam_h.in +--- mpfr-3.1.5.orig/src/mparam_h.in Tue Sep 27 16:58:15 2016 ++++ mpfr-3.1.5/src/mparam_h.in Wed Sep 28 16:53:41 2016 +@@ -27,7 +27,9 @@ + for example with gcc -dM -E -xc /dev/null + As of gcc 4.2, you can also use: -march=native or -mtune=native */ + +-#if defined (__tune_pentium4__) /* Threshold for Pentium 4 */ ++#if 1 /* no processor specific optimization for TeX Live */ ++#define MPFR_TUNE_CASE "default" ++#elif defined (__tune_pentium4__) /* Threshold for Pentium 4 */ + #define MPFR_TUNE_CASE "src/x86_64/pentium4/mparam.h" + #include "x86_64/pentium4/mparam.h" + +diff -ur mpfr-3.1.5.orig/src/mpfr-impl.h mpfr-3.1.5/src/mpfr-impl.h +--- mpfr-3.1.5.orig/src/mpfr-impl.h Tue Sep 27 16:58:15 2016 ++++ mpfr-3.1.5/src/mpfr-impl.h Wed Sep 28 16:55:05 2016 +@@ -23,6 +23,11 @@ + #ifndef __MPFR_IMPL_H__ + #define __MPFR_IMPL_H__ + ++/* Include MPFR 'config.h' before ANY system headers */ ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ + /* Let's include some standard headers unconditionally as they are + already needed by several source files or when some options are + enabled/disabled, and it is easy to forget them (some configure +@@ -55,12 +60,6 @@ + /****************************************************** + ****************** Include files ********************* + ******************************************************/ +- +-/* Include 'config.h' before using ANY configure macros if needed +- NOTE: It isn't MPFR 'config.h', but GMP's one! */ +-#ifdef HAVE_CONFIG_H +-# include "config.h" +-#endif + + /* For the definition of MPFR_THREAD_ATTR. GCC/ICC detection macros are + no longer used, as they sometimes gave incorrect information about diff --git a/Build/source/libs/mpfr/mpfr-PATCHES/ChangeLog b/Build/source/libs/mpfr/mpfr-PATCHES/ChangeLog deleted file mode 100644 index 57a1fe35fa7..00000000000 --- a/Build/source/libs/mpfr/mpfr-PATCHES/ChangeLog +++ /dev/null @@ -1,21 +0,0 @@ -2016-09-28 Akira Kakuto - - Imported mpfr-3.1.5 source tree from: - http://ftp.gnu.org/gnu/mpfr/ - * patch-01-TL: Adapted. - -2016-03-07 Akira Kakuto - - Imported mpfr-3.1.4 source tree from: - http://ftp.gnu.org/gnu/mpfr/ - * patch-01-TL: Adapted. - -2015-06-20 Peter Breitenlohner - - Imported mpfr-3.1.3 source tree from: - http://ftp.gnu.org/gnu/mpfr/ - * patch-01-TL: Adapted. - -2014-05-23 Peter Breitenlohner - - * patch-01-TL (new): Modifications for the TeX Live build system. diff --git a/Build/source/libs/mpfr/mpfr-PATCHES/TL-Changes b/Build/source/libs/mpfr/mpfr-PATCHES/TL-Changes deleted file mode 100644 index 905356fe133..00000000000 --- a/Build/source/libs/mpfr/mpfr-PATCHES/TL-Changes +++ /dev/null @@ -1,25 +0,0 @@ -Changes applied to the mpfr-3.1.5/ tree as obtained from: - http://ftp.gnu.org/gnu/mpfr/ - -Removed: - COPYING - COPYING.LESSER - Makefile.in - aclocal.m4 - ar-lib - compile - config.guess - config.sub - configure - depcomp - doc/ - examples/ - install-sh - ltmain.sh - m4/ - missing - src/Makefile.in - test-driver - tests/ - tools/ - tune/ diff --git a/Build/source/libs/mpfr/mpfr-PATCHES/patch-01-TL b/Build/source/libs/mpfr/mpfr-PATCHES/patch-01-TL deleted file mode 100644 index e2083f9cbb1..00000000000 --- a/Build/source/libs/mpfr/mpfr-PATCHES/patch-01-TL +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur mpfr-3.1.5.orig/src/mparam_h.in mpfr-3.1.5/src/mparam_h.in ---- mpfr-3.1.5.orig/src/mparam_h.in Tue Sep 27 16:58:15 2016 -+++ mpfr-3.1.5/src/mparam_h.in Wed Sep 28 16:53:41 2016 -@@ -27,7 +27,9 @@ - for example with gcc -dM -E -xc /dev/null - As of gcc 4.2, you can also use: -march=native or -mtune=native */ - --#if defined (__tune_pentium4__) /* Threshold for Pentium 4 */ -+#if 1 /* no processor specific optimization for TeX Live */ -+#define MPFR_TUNE_CASE "default" -+#elif defined (__tune_pentium4__) /* Threshold for Pentium 4 */ - #define MPFR_TUNE_CASE "src/x86_64/pentium4/mparam.h" - #include "x86_64/pentium4/mparam.h" - -diff -ur mpfr-3.1.5.orig/src/mpfr-impl.h mpfr-3.1.5/src/mpfr-impl.h ---- mpfr-3.1.5.orig/src/mpfr-impl.h Tue Sep 27 16:58:15 2016 -+++ mpfr-3.1.5/src/mpfr-impl.h Wed Sep 28 16:55:05 2016 -@@ -23,6 +23,11 @@ - #ifndef __MPFR_IMPL_H__ - #define __MPFR_IMPL_H__ - -+/* Include MPFR 'config.h' before ANY system headers */ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - /* Let's include some standard headers unconditionally as they are - already needed by several source files or when some options are - enabled/disabled, and it is easy to forget them (some configure -@@ -55,12 +60,6 @@ - /****************************************************** - ****************** Include files ********************* - ******************************************************/ -- --/* Include 'config.h' before using ANY configure macros if needed -- NOTE: It isn't MPFR 'config.h', but GMP's one! */ --#ifdef HAVE_CONFIG_H --# include "config.h" --#endif - - /* For the definition of MPFR_THREAD_ATTR. GCC/ICC detection macros are - no longer used, as they sometimes gave incorrect information about diff --git a/Build/source/libs/pixman/TLPATCHES/ChangeLog b/Build/source/libs/pixman/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..39dcd76ca07 --- /dev/null +++ b/Build/source/libs/pixman/TLPATCHES/ChangeLog @@ -0,0 +1,41 @@ +2016-02-04 Akira Kakuto + + Import pixman-0.34.0. + * patch-01-hide-symbols: Adapted. + +2015-09-26 Peter Breitenlohner + + Import pixman-0.32.8. + * patch-01-hide-symbols: Adapted. + +2014-12-04 Peter Breitenlohner + + * patch-01-hide-symbols (new): Allow to hide all symbols. + +2014-07-07 Peter Breitenlohner + + Import pixman-0.32.6. + +2013-11-18 Peter Breitenlohner + + Import pixman-0.32.4. + +2013-11-12 Peter Breitenlohner + + Import pixman-0.32.2. + +2013-11-11 Peter Breitenlohner + + Import pixman-0.32.0. + +2013-08-08 Peter Breitenlohner + + Import pixman-0.30.2. + +2013-05-30 Peter Breitenlohner + + Import pixman-0.30.0. + +2012-11-10 Taco Hoekwater + + Import pixman-0.28.0. diff --git a/Build/source/libs/pixman/TLPATCHES/TL-Changes b/Build/source/libs/pixman/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..7df6c0ac66a --- /dev/null +++ b/Build/source/libs/pixman/TLPATCHES/TL-Changes @@ -0,0 +1,22 @@ +Changes applied to the pixman-0.34.0/ tree as obtained from: + http://cairographics.org/releases/ + +Removed: + Makefile.in + aclocal.m4 + config.guess + config.sub + configure + compile + depcomp + install-sh + ltmain.sh + missing + pixman/Makefile.in + pixman/pixman-version.h + test-driver + +Removed unused dirs: + demos + test + diff --git a/Build/source/libs/pixman/TLPATCHES/patch-01-hide-symbols b/Build/source/libs/pixman/TLPATCHES/patch-01-hide-symbols new file mode 100644 index 00000000000..62cc5f039f7 --- /dev/null +++ b/Build/source/libs/pixman/TLPATCHES/patch-01-hide-symbols @@ -0,0 +1,12 @@ +diff -ur pixman-0.34.0.orig/pixman/pixman-compiler.h pixman-0.34.0/pixman/pixman-compiler.h +--- pixman-0.34.0.orig/pixman/pixman-compiler.h Tue Jun 30 18:48:31 2015 ++++ pixman-0.34.0/pixman/pixman-compiler.h Thu Feb 04 16:56:27 2016 +@@ -91,7 +91,7 @@ + + /* GCC visibility */ + #if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32) +-# define PIXMAN_EXPORT __attribute__ ((visibility("default"))) ++# define PIXMAN_EXPORT + /* Sun Studio 8 visibility */ + #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) + # define PIXMAN_EXPORT __global diff --git a/Build/source/libs/pixman/pixman-PATCHES/ChangeLog b/Build/source/libs/pixman/pixman-PATCHES/ChangeLog deleted file mode 100644 index 39dcd76ca07..00000000000 --- a/Build/source/libs/pixman/pixman-PATCHES/ChangeLog +++ /dev/null @@ -1,41 +0,0 @@ -2016-02-04 Akira Kakuto - - Import pixman-0.34.0. - * patch-01-hide-symbols: Adapted. - -2015-09-26 Peter Breitenlohner - - Import pixman-0.32.8. - * patch-01-hide-symbols: Adapted. - -2014-12-04 Peter Breitenlohner - - * patch-01-hide-symbols (new): Allow to hide all symbols. - -2014-07-07 Peter Breitenlohner - - Import pixman-0.32.6. - -2013-11-18 Peter Breitenlohner - - Import pixman-0.32.4. - -2013-11-12 Peter Breitenlohner - - Import pixman-0.32.2. - -2013-11-11 Peter Breitenlohner - - Import pixman-0.32.0. - -2013-08-08 Peter Breitenlohner - - Import pixman-0.30.2. - -2013-05-30 Peter Breitenlohner - - Import pixman-0.30.0. - -2012-11-10 Taco Hoekwater - - Import pixman-0.28.0. diff --git a/Build/source/libs/pixman/pixman-PATCHES/TL-Changes b/Build/source/libs/pixman/pixman-PATCHES/TL-Changes deleted file mode 100644 index 7df6c0ac66a..00000000000 --- a/Build/source/libs/pixman/pixman-PATCHES/TL-Changes +++ /dev/null @@ -1,22 +0,0 @@ -Changes applied to the pixman-0.34.0/ tree as obtained from: - http://cairographics.org/releases/ - -Removed: - Makefile.in - aclocal.m4 - config.guess - config.sub - configure - compile - depcomp - install-sh - ltmain.sh - missing - pixman/Makefile.in - pixman/pixman-version.h - test-driver - -Removed unused dirs: - demos - test - diff --git a/Build/source/libs/pixman/pixman-PATCHES/patch-01-hide-symbols b/Build/source/libs/pixman/pixman-PATCHES/patch-01-hide-symbols deleted file mode 100644 index 62cc5f039f7..00000000000 --- a/Build/source/libs/pixman/pixman-PATCHES/patch-01-hide-symbols +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur pixman-0.34.0.orig/pixman/pixman-compiler.h pixman-0.34.0/pixman/pixman-compiler.h ---- pixman-0.34.0.orig/pixman/pixman-compiler.h Tue Jun 30 18:48:31 2015 -+++ pixman-0.34.0/pixman/pixman-compiler.h Thu Feb 04 16:56:27 2016 -@@ -91,7 +91,7 @@ - - /* GCC visibility */ - #if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32) --# define PIXMAN_EXPORT __attribute__ ((visibility("default"))) -+# define PIXMAN_EXPORT - /* Sun Studio 8 visibility */ - #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) - # define PIXMAN_EXPORT __global diff --git a/Build/source/libs/poppler/TLPATCHES/ChangeLog b/Build/source/libs/poppler/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..7beafc5db27 --- /dev/null +++ b/Build/source/libs/poppler/TLPATCHES/ChangeLog @@ -0,0 +1,383 @@ +2017-01-15 Akira Kakuto + + Imported poppler-0.51.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2016-12-16 Akira Kakuto + + Imported poppler-0.50.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2016-11-15 Akira Kakuto + + Imported poppler-0.49.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2016-10-08 Akira Kakuto + + Imported poppler-0.48.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2016-08-19 Akira Kakuto + + Imported poppler-0.47.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2016-07-25 Akira Kakuto + + Imported poppler-0.46.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2016-06-18 Akira Kakuto + + Imported poppler-0.45.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2016-05-22 Akira Kakuto + + Imported poppler-0.44.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + * patch-04-ULLONG-constants: Removed. + +2016-04-29 Akira Kakuto + + Imported poppler-0.43.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-LLONG_MAX, patch-03-Object-functions, + patch-04-ULLONG-constants: Adapted. + +2016-03-29 Akira Kakuto + + * patch-04-ULLONG-constants: new patch. + +2016-03-18 Luigi Scarso + + Imported poppler-0.42.0 source tree from: + http://poppler.freedesktop.org/ + Added @POPPLER_TREE@/poppler/SignatureInfo.cc to Makefile.am + +2016-02-17 Akira Kakuto + + Imported poppler-0.41.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2016-01-14 Akira Kakuto + + Imported poppler-0.40.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2015-12-28 Akira Kakuto + + Imported poppler-0.39.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2015-10-10 Peter Breitenlohner + + Imported poppler-0.37.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2015-09-10 Peter Breitenlohner + + Imported poppler-0.36.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + +2015-09-01 Peter Breitenlohner + + * patch-03-Object-functions (new): Declare parameter of Object + member functions initCmd, isStream, and streamIs as const. + +2015-08-10 Peter Breitenlohner + + Imported poppler-0.35.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2015-07-09 Peter Breitenlohner + + Imported poppler-0.34.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2015-06-12 Peter Breitenlohner + + Imported poppler-0.33.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2015-03-08 Peter Breitenlohner + + Imported poppler-0.32.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2015-02-06 Peter Breitenlohner + + Imported poppler-0.31.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2015-01-07 Peter Breitenlohner + + Imported poppler-0.30.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2014-12-05 Peter Breitenlohner + + Imported poppler-0.29.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2014-11-04 Peter Breitenlohner + + Imported poppler-0.28.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + * patch-10-UTF-16BE (removed): Included upstream. + +2014-10-08 Peter Breitenlohner + + * patch-10-UTF-16BE (new): Backport from poppler git + (submitted by Luigi Scarso ). + +2014-09-29 Peter Breitenlohner + + Imported poppler-0.26.5 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2014-08-22 Peter Breitenlohner + + Imported poppler-0.26.4 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2014-07-21 Peter Breitenlohner + + Imported poppler-0.26.3 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2014-06-20 Peter Breitenlohner + + Imported poppler-0.26.2 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2014-05-24 Peter Breitenlohner + + Imported poppler-0.26.1 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2014-05-19 Peter Breitenlohner + + Imported poppler-0.26.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + + * patch-03-NOMINMAX (removed): Now included upstream. + +2014-03-27 Peter Breitenlohner + + Imported poppler-0.25.2 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + + * patch-03-NOMINMAX (new): Avoid to redefine NOMINMAX. + +2014-01-03 Peter Breitenlohner + + Imported poppler-0.25.1 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2013-12-12 Peter Breitenlohner + + Imported poppler-0.25.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2013-12-02 Peter Breitenlohner + + Imported poppler-0.24.4 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2013-10-28 Peter Breitenlohner + + Imported poppler-0.24.3 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2013-09-30 Peter Breitenlohner + + Imported poppler-0.24.2 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2013-09-10 Peter Breitenlohner + + Imported poppler-0.24.1 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2013-07-30 Peter Breitenlohner + + Imported poppler-0.24.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2013-07-19 Peter Breitenlohner + + Imported poppler-0.23.4 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + +2013-07-02 Peter Breitenlohner + + Imported poppler-0.23.3 source tree from: + http://poppler.freedesktop.org/ + + * patch-01-MINGW_PRINTF_FORMAT (removed): Now included upstream. + * patch-02-LLONG_MAX: Adapted. + +2013-06-18 Peter Breitenlohner + + Imported poppler-0.23.2 source tree from: + http://poppler.freedesktop.org/ + + * patch-01-disable-jpeg (removed): Now included upstream. + * patch-02-warnings (removed): Obsoleted by gcc-4.6. + + * patch-01-MINGW_PRINTF_FORMAT (new): MinGW32 may not define + __MINGW_PRINTF_FORMAT (and __USE_MINGW_ANSI_STDIO could be 0). + * patch-02-LLONG_MAX (new): If necessary define LLONG_MAX etc. + +2013-03-12 Peter Breitenlohner + + Imported poppler-0.22.2 source tree from: + http://poppler.freedesktop.org/ + * patch-02-warnings: Adapted. + + * patch-01-disable-jpeg (new): We build without libjpeg. + +2012-12-31 Peter Breitenlohner + + Imported poppler-0.22.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-warnings: Adapted. + +2012-10-15 Peter Breitenlohner + + Imported poppler-0.21.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-warnings: Adapted. + +2012-07-11 Peter Breitenlohner + + Imported poppler-0.20.2 source tree from: + http://poppler.freedesktop.org/ + * patch-02-warnings: Adapted. + +2012-05-11 Peter Breitenlohner + + Imported poppler-0.20.0 source tree from: + http://poppler.freedesktop.org/ + * patch-01-missing-param (removed): Obsolete. + * patch-02-warnings: Adapted. + +2012-05-09 Peter Breitenlohner + + Imported poppler-0.19.4 source tree from: + http://poppler.freedesktop.org/ + * patch-03-POPPLER_VERSION (removed): Obsolete. + * patch-01-missing-param (new): Bug fix, missing new func param. + * patch-02-warnings: Adapted. + +2012-02-23 Peter Breitenlohner + + Imported poppler-0.18.4 source tree from: + http://poppler.freedesktop.org/ + * patch-01-PDF_PARSER_ONLY (removed): Obsolete. + * patch-0[23]-*: Adapted. + +2011-10-18 Peter Breitenlohner + + * patch-04-mingw (removed): Instead add `-lgdi32'. + +2011-10-11 Peter Breitenlohner + + * patch-04-mingw (new): Split off ... + * patch-01-PDF_PARSER_ONLY: ... from here. + +2011-10-10 Peter Breitenlohner + + * patch-03-POPPLER_VERSION: Reorg definition of POPPLER_VERSION. + +2011-10-08 Peter Breitenlohner + + Imported poppler-0.18.0 source tree from: + http://poppler.freedesktop.org/ + * patch-0[123]-*: Adapted. + +2011-04-14 Peter Breitenlohner + + * patch-01-PDF_PARSER_ONLY: Fix PDF_PARSER_ONLY for MinGW. + + * patch-03-POPPLER_VERSION (new): #define POPPLER_VERSION. + +2011-04-12 Peter Breitenlohner + + * patch-02-warnings (new): + poppler/Movie.cc: Cast -1 to Gulong. + goo/PNGWriter.h: Add newline at end of file. + +2011-04-12 Taco Hoekwater + + Imported poppler-0.12.4 source tree from: + http://poppler.freedesktop.org/ + + * patch-01-PDF_PARSER_ONLY (new): Implement PDF_PARSER_ONLY. + diff --git a/Build/source/libs/poppler/TLPATCHES/TL-Changes b/Build/source/libs/poppler/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..0fd4201ee14 --- /dev/null +++ b/Build/source/libs/poppler/TLPATCHES/TL-Changes @@ -0,0 +1,29 @@ +Changes applied to the poppler-0.51.0 tree as obtained from: + http://poppler.freedesktop.org/ + +Removed: + Makefile.in + aclocal.m4 + compile + config.guess + config.sub + configure + depcomp + install-sh + ltmain.sh + missing + test-driver + fofi/Makefile.in + goo/Makefile.in + poppler/Makefile.in + splash/Makefile.in + +Removed unused dirs: + cmake + cpp + glib + m4 + qt4 + qt5 + test + utils diff --git a/Build/source/libs/poppler/TLPATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/TLPATCHES/patch-02-LLONG_MAX new file mode 100644 index 00000000000..1e6f0282cb0 --- /dev/null +++ b/Build/source/libs/poppler/TLPATCHES/patch-02-LLONG_MAX @@ -0,0 +1,25 @@ +diff -ur poppler-0.51.0.orig/goo/GooString.h poppler-0.51.0/goo/GooString.h +--- poppler-0.51.0.orig/goo/GooString.h Fri Dec 16 04:08:06 2016 ++++ poppler-0.51.0/goo/GooString.h Mon Jan 16 08:28:38 2017 +@@ -36,6 +36,21 @@ + #endif + + #include // for LLONG_MAX and ULLONG_MAX ++ ++/* and/or the compiler may or may not define these. */ ++/* Minimum and maximum values a `signed long long int' can hold. */ ++#ifndef LLONG_MAX ++# define LLONG_MAX 9223372036854775807LL ++#endif ++#ifndef LLONG_MIN ++# define LLONG_MIN (-LLONG_MAX - 1LL) ++#endif ++ ++/* Maximum value an `unsigned long long int' can hold. (Minimum is 0.) */ ++#ifndef ULLONG_MAX ++# define ULLONG_MAX 18446744073709551615ULL ++#endif ++ + #include + #include // for NULL + #include "gtypes.h" diff --git a/Build/source/libs/poppler/TLPATCHES/patch-03-Object-functions b/Build/source/libs/poppler/TLPATCHES/patch-03-Object-functions new file mode 100644 index 00000000000..00fae66add6 --- /dev/null +++ b/Build/source/libs/poppler/TLPATCHES/patch-03-Object-functions @@ -0,0 +1,43 @@ +diff -ur poppler-0.51.0.orig/poppler/Object.h poppler-0.51.0/poppler/Object.h +--- poppler-0.51.0.orig/poppler/Object.h Fri Dec 16 04:08:06 2016 ++++ poppler-0.51.0/poppler/Object.h Mon Jan 16 08:31:27 2017 +@@ -148,7 +148,7 @@ + Object *initStream(Stream *streamA); + Object *initRef(int numA, int genA) + { initObj(objRef); ref.num = numA; ref.gen = genA; return this; } +- Object *initCmd(char *cmdA) ++ Object *initCmd(const char *cmdA) + { initObj(objCmd); cmd = copyString(cmdA); return this; } + Object *initError() + { initObj(objError); return this; } +@@ -195,7 +195,7 @@ + GBool isName(const char *nameA) + { return type == objName && !strcmp(name, nameA); } + GBool isDict(const char *dictType); +- GBool isStream(char *dictType); ++ GBool isStream(const char *dictType); + GBool isCmd(const char *cmdA) + { return type == objCmd && !strcmp(cmd, cmdA); } + +@@ -245,7 +245,7 @@ + Object *dictGetValNF(int i, Object *obj); + + // Stream accessors. +- GBool streamIs(char *dictType); ++ GBool streamIs(const char *dictType); + void streamReset(); + void streamClose(); + int streamGetChar(); +@@ -352,10 +352,10 @@ + + #include "Stream.h" + +-inline GBool Object::streamIs(char *dictType) ++inline GBool Object::streamIs(const char *dictType) + { OBJECT_TYPE_CHECK(objStream); return stream->getDict()->is(dictType); } + +-inline GBool Object::isStream(char *dictType) ++inline GBool Object::isStream(const char *dictType) + { return type == objStream && streamIs(dictType); } + + inline void Object::streamReset() diff --git a/Build/source/libs/poppler/poppler-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-PATCHES/ChangeLog deleted file mode 100644 index 7beafc5db27..00000000000 --- a/Build/source/libs/poppler/poppler-PATCHES/ChangeLog +++ /dev/null @@ -1,383 +0,0 @@ -2017-01-15 Akira Kakuto - - Imported poppler-0.51.0 source tree from: - http://poppler.freedesktop.org/ - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2016-12-16 Akira Kakuto - - Imported poppler-0.50.0 source tree from: - http://poppler.freedesktop.org/ - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2016-11-15 Akira Kakuto - - Imported poppler-0.49.0 source tree from: - http://poppler.freedesktop.org/ - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2016-10-08 Akira Kakuto - - Imported poppler-0.48.0 source tree from: - http://poppler.freedesktop.org/ - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2016-08-19 Akira Kakuto - - Imported poppler-0.47.0 source tree from: - http://poppler.freedesktop.org/ - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2016-07-25 Akira Kakuto - - Imported poppler-0.46.0 source tree from: - http://poppler.freedesktop.org/ - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2016-06-18 Akira Kakuto - - Imported poppler-0.45.0 source tree from: - http://poppler.freedesktop.org/ - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2016-05-22 Akira Kakuto - - Imported poppler-0.44.0 source tree from: - http://poppler.freedesktop.org/ - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - * patch-04-ULLONG-constants: Removed. - -2016-04-29 Akira Kakuto - - Imported poppler-0.43.0 source tree from: - http://poppler.freedesktop.org/ - * patch-02-LLONG_MAX, patch-03-Object-functions, - patch-04-ULLONG-constants: Adapted. - -2016-03-29 Akira Kakuto - - * patch-04-ULLONG-constants: new patch. - -2016-03-18 Luigi Scarso - - Imported poppler-0.42.0 source tree from: - http://poppler.freedesktop.org/ - Added @POPPLER_TREE@/poppler/SignatureInfo.cc to Makefile.am - -2016-02-17 Akira Kakuto - - Imported poppler-0.41.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2016-01-14 Akira Kakuto - - Imported poppler-0.40.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2015-12-28 Akira Kakuto - - Imported poppler-0.39.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2015-10-10 Peter Breitenlohner - - Imported poppler-0.37.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2015-09-10 Peter Breitenlohner - - Imported poppler-0.36.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. - -2015-09-01 Peter Breitenlohner - - * patch-03-Object-functions (new): Declare parameter of Object - member functions initCmd, isStream, and streamIs as const. - -2015-08-10 Peter Breitenlohner - - Imported poppler-0.35.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2015-07-09 Peter Breitenlohner - - Imported poppler-0.34.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2015-06-12 Peter Breitenlohner - - Imported poppler-0.33.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2015-03-08 Peter Breitenlohner - - Imported poppler-0.32.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2015-02-06 Peter Breitenlohner - - Imported poppler-0.31.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2015-01-07 Peter Breitenlohner - - Imported poppler-0.30.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2014-12-05 Peter Breitenlohner - - Imported poppler-0.29.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2014-11-04 Peter Breitenlohner - - Imported poppler-0.28.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - * patch-10-UTF-16BE (removed): Included upstream. - -2014-10-08 Peter Breitenlohner - - * patch-10-UTF-16BE (new): Backport from poppler git - (submitted by Luigi Scarso ). - -2014-09-29 Peter Breitenlohner - - Imported poppler-0.26.5 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2014-08-22 Peter Breitenlohner - - Imported poppler-0.26.4 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2014-07-21 Peter Breitenlohner - - Imported poppler-0.26.3 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2014-06-20 Peter Breitenlohner - - Imported poppler-0.26.2 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2014-05-24 Peter Breitenlohner - - Imported poppler-0.26.1 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2014-05-19 Peter Breitenlohner - - Imported poppler-0.26.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - - * patch-03-NOMINMAX (removed): Now included upstream. - -2014-03-27 Peter Breitenlohner - - Imported poppler-0.25.2 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - - * patch-03-NOMINMAX (new): Avoid to redefine NOMINMAX. - -2014-01-03 Peter Breitenlohner - - Imported poppler-0.25.1 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2013-12-12 Peter Breitenlohner - - Imported poppler-0.25.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2013-12-02 Peter Breitenlohner - - Imported poppler-0.24.4 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2013-10-28 Peter Breitenlohner - - Imported poppler-0.24.3 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2013-09-30 Peter Breitenlohner - - Imported poppler-0.24.2 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2013-09-10 Peter Breitenlohner - - Imported poppler-0.24.1 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2013-07-30 Peter Breitenlohner - - Imported poppler-0.24.0 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2013-07-19 Peter Breitenlohner - - Imported poppler-0.23.4 source tree from: - http://poppler.freedesktop.org/ - - * patch-02-LLONG_MAX: Adapted. - -2013-07-02 Peter Breitenlohner - - Imported poppler-0.23.3 source tree from: - http://poppler.freedesktop.org/ - - * patch-01-MINGW_PRINTF_FORMAT (removed): Now included upstream. - * patch-02-LLONG_MAX: Adapted. - -2013-06-18 Peter Breitenlohner - - Imported poppler-0.23.2 source tree from: - http://poppler.freedesktop.org/ - - * patch-01-disable-jpeg (removed): Now included upstream. - * patch-02-warnings (removed): Obsoleted by gcc-4.6. - - * patch-01-MINGW_PRINTF_FORMAT (new): MinGW32 may not define - __MINGW_PRINTF_FORMAT (and __USE_MINGW_ANSI_STDIO could be 0). - * patch-02-LLONG_MAX (new): If necessary define LLONG_MAX etc. - -2013-03-12 Peter Breitenlohner - - Imported poppler-0.22.2 source tree from: - http://poppler.freedesktop.org/ - * patch-02-warnings: Adapted. - - * patch-01-disable-jpeg (new): We build without libjpeg. - -2012-12-31 Peter Breitenlohner - - Imported poppler-0.22.0 source tree from: - http://poppler.freedesktop.org/ - * patch-02-warnings: Adapted. - -2012-10-15 Peter Breitenlohner - - Imported poppler-0.21.0 source tree from: - http://poppler.freedesktop.org/ - * patch-02-warnings: Adapted. - -2012-07-11 Peter Breitenlohner - - Imported poppler-0.20.2 source tree from: - http://poppler.freedesktop.org/ - * patch-02-warnings: Adapted. - -2012-05-11 Peter Breitenlohner - - Imported poppler-0.20.0 source tree from: - http://poppler.freedesktop.org/ - * patch-01-missing-param (removed): Obsolete. - * patch-02-warnings: Adapted. - -2012-05-09 Peter Breitenlohner - - Imported poppler-0.19.4 source tree from: - http://poppler.freedesktop.org/ - * patch-03-POPPLER_VERSION (removed): Obsolete. - * patch-01-missing-param (new): Bug fix, missing new func param. - * patch-02-warnings: Adapted. - -2012-02-23 Peter Breitenlohner - - Imported poppler-0.18.4 source tree from: - http://poppler.freedesktop.org/ - * patch-01-PDF_PARSER_ONLY (removed): Obsolete. - * patch-0[23]-*: Adapted. - -2011-10-18 Peter Breitenlohner - - * patch-04-mingw (removed): Instead add `-lgdi32'. - -2011-10-11 Peter Breitenlohner - - * patch-04-mingw (new): Split off ... - * patch-01-PDF_PARSER_ONLY: ... from here. - -2011-10-10 Peter Breitenlohner - - * patch-03-POPPLER_VERSION: Reorg definition of POPPLER_VERSION. - -2011-10-08 Peter Breitenlohner - - Imported poppler-0.18.0 source tree from: - http://poppler.freedesktop.org/ - * patch-0[123]-*: Adapted. - -2011-04-14 Peter Breitenlohner - - * patch-01-PDF_PARSER_ONLY: Fix PDF_PARSER_ONLY for MinGW. - - * patch-03-POPPLER_VERSION (new): #define POPPLER_VERSION. - -2011-04-12 Peter Breitenlohner - - * patch-02-warnings (new): - poppler/Movie.cc: Cast -1 to Gulong. - goo/PNGWriter.h: Add newline at end of file. - -2011-04-12 Taco Hoekwater - - Imported poppler-0.12.4 source tree from: - http://poppler.freedesktop.org/ - - * patch-01-PDF_PARSER_ONLY (new): Implement PDF_PARSER_ONLY. - diff --git a/Build/source/libs/poppler/poppler-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-PATCHES/TL-Changes deleted file mode 100644 index 0fd4201ee14..00000000000 --- a/Build/source/libs/poppler/poppler-PATCHES/TL-Changes +++ /dev/null @@ -1,29 +0,0 @@ -Changes applied to the poppler-0.51.0 tree as obtained from: - http://poppler.freedesktop.org/ - -Removed: - Makefile.in - aclocal.m4 - compile - config.guess - config.sub - configure - depcomp - install-sh - ltmain.sh - missing - test-driver - fofi/Makefile.in - goo/Makefile.in - poppler/Makefile.in - splash/Makefile.in - -Removed unused dirs: - cmake - cpp - glib - m4 - qt4 - qt5 - test - utils diff --git a/Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX deleted file mode 100644 index 1e6f0282cb0..00000000000 --- a/Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX +++ /dev/null @@ -1,25 +0,0 @@ -diff -ur poppler-0.51.0.orig/goo/GooString.h poppler-0.51.0/goo/GooString.h ---- poppler-0.51.0.orig/goo/GooString.h Fri Dec 16 04:08:06 2016 -+++ poppler-0.51.0/goo/GooString.h Mon Jan 16 08:28:38 2017 -@@ -36,6 +36,21 @@ - #endif - - #include // for LLONG_MAX and ULLONG_MAX -+ -+/* and/or the compiler may or may not define these. */ -+/* Minimum and maximum values a `signed long long int' can hold. */ -+#ifndef LLONG_MAX -+# define LLONG_MAX 9223372036854775807LL -+#endif -+#ifndef LLONG_MIN -+# define LLONG_MIN (-LLONG_MAX - 1LL) -+#endif -+ -+/* Maximum value an `unsigned long long int' can hold. (Minimum is 0.) */ -+#ifndef ULLONG_MAX -+# define ULLONG_MAX 18446744073709551615ULL -+#endif -+ - #include - #include // for NULL - #include "gtypes.h" diff --git a/Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions b/Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions deleted file mode 100644 index 00fae66add6..00000000000 --- a/Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions +++ /dev/null @@ -1,43 +0,0 @@ -diff -ur poppler-0.51.0.orig/poppler/Object.h poppler-0.51.0/poppler/Object.h ---- poppler-0.51.0.orig/poppler/Object.h Fri Dec 16 04:08:06 2016 -+++ poppler-0.51.0/poppler/Object.h Mon Jan 16 08:31:27 2017 -@@ -148,7 +148,7 @@ - Object *initStream(Stream *streamA); - Object *initRef(int numA, int genA) - { initObj(objRef); ref.num = numA; ref.gen = genA; return this; } -- Object *initCmd(char *cmdA) -+ Object *initCmd(const char *cmdA) - { initObj(objCmd); cmd = copyString(cmdA); return this; } - Object *initError() - { initObj(objError); return this; } -@@ -195,7 +195,7 @@ - GBool isName(const char *nameA) - { return type == objName && !strcmp(name, nameA); } - GBool isDict(const char *dictType); -- GBool isStream(char *dictType); -+ GBool isStream(const char *dictType); - GBool isCmd(const char *cmdA) - { return type == objCmd && !strcmp(cmd, cmdA); } - -@@ -245,7 +245,7 @@ - Object *dictGetValNF(int i, Object *obj); - - // Stream accessors. -- GBool streamIs(char *dictType); -+ GBool streamIs(const char *dictType); - void streamReset(); - void streamClose(); - int streamGetChar(); -@@ -352,10 +352,10 @@ - - #include "Stream.h" - --inline GBool Object::streamIs(char *dictType) -+inline GBool Object::streamIs(const char *dictType) - { OBJECT_TYPE_CHECK(objStream); return stream->getDict()->is(dictType); } - --inline GBool Object::isStream(char *dictType) -+inline GBool Object::isStream(const char *dictType) - { return type == objStream && streamIs(dictType); } - - inline void Object::streamReset() diff --git a/Build/source/libs/potrace/TLPATCHES/ChangeLog b/Build/source/libs/potrace/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..b006f21b545 --- /dev/null +++ b/Build/source/libs/potrace/TLPATCHES/ChangeLog @@ -0,0 +1,14 @@ +2015-12-28 Akira Kakuto + + Import potrace-1.13 source tree from: + http://potrace.sourceforge.net + +2015-03-27 Peter Breitenlohner + + Import potrace-1.12 source tree from: + http://potrace.sourceforge.net + +2012-02-11 Peter Breitenlohner + + Import potrace-1.11 source tree from: + http://potrace.sourceforge.net diff --git a/Build/source/libs/potrace/TLPATCHES/TL-Changes b/Build/source/libs/potrace/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..5eeb6e10376 --- /dev/null +++ b/Build/source/libs/potrace/TLPATCHES/TL-Changes @@ -0,0 +1,22 @@ +Changes applied to the potrace-1.13/ tree as obtained from: + http://potrace.sourceforge.net + +Removed: + COPYING + INSTALL + Makefile.in + aclocal.m4 + check/ + compile + config.guess + config.sub + configure + depcomp + doc/ + install-sh + ltmain.sh + m4/ + missing + mkinstalldirs + src/Makefile.in + test-driver diff --git a/Build/source/libs/potrace/potrace-PATCHES/ChangeLog b/Build/source/libs/potrace/potrace-PATCHES/ChangeLog deleted file mode 100644 index b006f21b545..00000000000 --- a/Build/source/libs/potrace/potrace-PATCHES/ChangeLog +++ /dev/null @@ -1,14 +0,0 @@ -2015-12-28 Akira Kakuto - - Import potrace-1.13 source tree from: - http://potrace.sourceforge.net - -2015-03-27 Peter Breitenlohner - - Import potrace-1.12 source tree from: - http://potrace.sourceforge.net - -2012-02-11 Peter Breitenlohner - - Import potrace-1.11 source tree from: - http://potrace.sourceforge.net diff --git a/Build/source/libs/potrace/potrace-PATCHES/TL-Changes b/Build/source/libs/potrace/potrace-PATCHES/TL-Changes deleted file mode 100644 index 5eeb6e10376..00000000000 --- a/Build/source/libs/potrace/potrace-PATCHES/TL-Changes +++ /dev/null @@ -1,22 +0,0 @@ -Changes applied to the potrace-1.13/ tree as obtained from: - http://potrace.sourceforge.net - -Removed: - COPYING - INSTALL - Makefile.in - aclocal.m4 - check/ - compile - config.guess - config.sub - configure - depcomp - doc/ - install-sh - ltmain.sh - m4/ - missing - mkinstalldirs - src/Makefile.in - test-driver diff --git a/Build/source/libs/teckit/TECkit-PATCHES/ChangeLog b/Build/source/libs/teckit/TECkit-PATCHES/ChangeLog deleted file mode 100644 index 4ae1093d856..00000000000 --- a/Build/source/libs/teckit/TECkit-PATCHES/ChangeLog +++ /dev/null @@ -1,79 +0,0 @@ -2017-01-11 Norbert Preining - - Remove SFconv directory, contains non-free ConvertUTF.{c,h} - Add patch patch-06-dont-build-sfconv to not build sfconv. - -2016-12-30 Akira Kakuto - - Imported TECkit-2.5.6 source tree (teckit) from - https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz. - patch-02-warning, patch-03-warnings, patch-04-pragmas, and - patch-05-static: Adapted. - -2014-07-18 Peter Breitenlohner - - Imported TECkit-2.5.4 source tree (teckit) from - http://scripts.sil.org/svn-public/teckit/TRUNK - (svn r139 2014-07-09 14:47:39 UTC). - - * patch-06-backport-r119 (removed): Now in source tree. - * patch-02-warning, patch-03-warnings, patch-04-pragmas, - patch-05-static: Adapted. - -2014-06-28 Peter Breitenlohner - - * patch-06-static_cast (removed): Replaced by ... - * patch-06-backport-r119 (new): ... Backport upstream changes: - svn r117: Update test runner for compatibility with newer - versions of perl - svn r118: Update Normalization test data for 6.0.0 - svn r119: Fix data-narrowing bug - -2014-06-23 Peter Breitenlohner - - * patch-06-static_cast (new): Add static_cast required by C++11. - -2012-10-13 Peter Breitenlohner - - Avoid TL vs W32TeX diffs (from Akira). - * patch-04-pragmas (new): Remove '#pragma's. - * patch-05-static (new): Build a static library and not a Dll. - -2012-03-17 Peter Breitenlohner - - Imported TECkit-2.5.3 source tree (teckit) from - http://scripts.sil.org/svn-public/teckit/TRUNK - (svn r116 2011-05-12 18:24:47 UTC). - - * patch-01-debian-505693, patch-04-case-sensitive (removed): - Now in source tree. - * patch-02-warning, patch-03-warnings: Adapted. - -2010-02-19 Peter Breitenlohner - - * patch-04-case-sensitive (new): #include instead - of for, e.g., Linux => MinGW32 cross compilation. - -2009-10-18 Peter Breitenlohner - - Reconstruct TL TECkit sources from distributed tarball. - * TL-changes (new): Modifications applied to the distribution. - * patch-[0-9][0-9]-*: Patches applied to the distribution. - -2009-10-01 Peter Breitenlohner - - * patch-03-warnings (new): Avoid maximal compiler warnings. - source/Sample-tools/TECkit_Compile.cpp, source/Engine.{cpp,h}, - source/Public-headers/TECkit_Compiler.h, source/Compiler.cpp: - Constify. - -2009-06-25 Peter Breitenlohner - - * patch-02-warning (new): Avoid compiler warning. - source/Compiler.h: change type of Compiler::Pass.passType - long -> UInt32. - -2008-11-17 Jonathan Kew - - * patch-01-debian-505693 (new): Bug fix. - diff --git a/Build/source/libs/teckit/TECkit-PATCHES/TL-Changes b/Build/source/libs/teckit/TECkit-PATCHES/TL-Changes deleted file mode 100644 index fd47be354c5..00000000000 --- a/Build/source/libs/teckit/TECkit-PATCHES/TL-Changes +++ /dev/null @@ -1,34 +0,0 @@ -Changes applied to the TECkit-2.5.6/ tree obtained from: - https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz. - -Removed execute permissions from: - installed-top.pc.in - teckit.pc.in - uninstalled-top.pc.in - -Removed: - .gitignore - SFconv/ - TECkit.mcp - build-mac-binaries.sh - build-linux-package.sh - build-windows-binaries.sh - debian-src/ - mac-installer/ - perl_binaries/ - source/teckitjni/ - zlib-1.2.3/ - -Converted Dos/Win line ends to native: - source/Perl/TECkit.xs - source/Perl/lib/Encode/TECkit.pm - source/Perl/test.pl - source/Perl/typemap - test/GNT-map.xml - test/ISO-8859-1.map - test/Mrk-GNT.sf - test/mrk.sf.legacy.txt.orig - -Added newline at end of file: - source/Carbon.r - diff --git a/Build/source/libs/teckit/TECkit-PATCHES/patch-02-warning b/Build/source/libs/teckit/TECkit-PATCHES/patch-02-warning deleted file mode 100644 index 35f6c621c84..00000000000 --- a/Build/source/libs/teckit/TECkit-PATCHES/patch-02-warning +++ /dev/null @@ -1,14 +0,0 @@ - Avoid compiler warning. - -diff -ur teckit-2.5.6.orig/source/Compiler.h teckit-2.5.6/source/Compiler.h ---- teckit-2.5.6.orig/source/Compiler.h Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Compiler.h Fri Dec 30 18:01:51 2016 -@@ -230,7 +230,7 @@ - vector byteClassLines; - vector uniClassLines; - -- long passType; -+ UInt32 passType; - UInt32 uniDefault; - UInt8 byteDefault; - bool supplementaryChars; diff --git a/Build/source/libs/teckit/TECkit-PATCHES/patch-03-warnings b/Build/source/libs/teckit/TECkit-PATCHES/patch-03-warnings deleted file mode 100644 index d88f8282eb1..00000000000 --- a/Build/source/libs/teckit/TECkit-PATCHES/patch-03-warnings +++ /dev/null @@ -1,104 +0,0 @@ - Avoid more compiler warnings. - -diff -ur teckit-2.5.6.orig/source/Compiler.cpp teckit-2.5.6/source/Compiler.cpp ---- teckit-2.5.6.orig/source/Compiler.cpp Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Compiler.cpp Fri Dec 30 18:04:55 2016 -@@ -189,14 +189,14 @@ - free(table); - } - --char* -+const char* - WINAPI - TECkit_GetUnicodeName(UInt32 usv) - { - const CharName *c = &gUnicodeNames[0]; - while (c->name != 0) - if (c->usv == usv) -- return (char*)c->name; -+ return c->name; - else - ++c; - return NULL; -@@ -2133,7 +2133,7 @@ - cout << " at line " << line << endl; - } - else -- (*errorFunction)(errFuncUserData, (char*)msg, (char*)s, line); -+ (*errorFunction)(errFuncUserData, msg, s, line); - errorState = true; - ++errorCount; - } -diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp ---- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 -@@ -1093,7 +1075,7 @@ - if (matchElems == 0 && allowInsertion == false) - continue; - patternLength = matchElems + READ(rule->postLength); -- pattern = (MatchElem*)(rule + 1); // point past the defined struct for the rule header -+ pattern = (const MatchElem*)(rule + 1); // point past the defined struct for the rule header - direction = 1; - infoLimit = matchElems; - -@@ -2194,7 +2168,7 @@ - status = kStatus_BadMappingVersion; - else { - const Byte* namePtr; -- if (getNamePtrFromTable((Byte*)fh, nameID, namePtr, *nameLength)) { -+ if (getNamePtrFromTable((const Byte*)fh, nameID, namePtr, *nameLength)) { - UInt16 copyBytes = *nameLength < bufferSize ? *nameLength : bufferSize; - if (copyBytes > 0) - memcpy(nameBuffer, namePtr, copyBytes); -diff -ur teckit-2.5.6.orig/source/Engine.h teckit-2.5.6/source/Engine.h ---- teckit-2.5.6.orig/source/Engine.h Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Engine.h Fri Dec 30 18:09:51 2016 -@@ -117,7 +117,7 @@ - - UInt32 match(int index, int repeats, int textLoc); - // returns 0 for no match, 1 for match, or kNeedMoreInput/kInvalidChar -- MatchElem* pattern; -+ const MatchElem* pattern; - int patternLength; - int direction; - MatchInfo info[256]; -diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h teckit-2.5.6/source/Public-headers/TECkit_Compiler.h ---- teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Public-headers/TECkit_Compiler.h Fri Dec 30 18:21:02 2016 -@@ -56,7 +59,7 @@ - #define kCompilerOpts_Compress 0x00000010 /* generate compressed mapping table */ - #define kCompilerOpts_XML 0x00000020 /* instead of a compiled binary table, generate an XML representation of the mapping */ - --typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, char* msg, char* param, UInt32 line); -+typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, const char* msg, const char* param, UInt32 line); - - TECkit_Status - WINAPI EXPORTED -@@ -75,7 +78,7 @@ - TECkit_GetCompilerVersion(); - - /* new APIs for looking up Unicode names (as NUL-terminated C strings) */ --char* -+const char* - WINAPI EXPORTED - TECkit_GetUnicodeName(UInt32 usv); - /* returns the Unicode name of usv, if available, else NULL */ -diff -ur teckit-2.5.6.orig/source/Sample-tools/TECkit_Compile.cpp teckit-2.5.6/source/Sample-tools/TECkit_Compile.cpp ---- teckit-2.5.6.orig/source/Sample-tools/TECkit_Compile.cpp Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Sample-tools/TECkit_Compile.cpp Fri Dec 30 18:14:53 2016 -@@ -24,13 +24,13 @@ - #endif - - extern "C" { -- static void CALLBACK errFunc(void* userData, char* msg, char* param, UInt32 line); -+ static void CALLBACK errFunc(void* userData, const char* msg, const char* param, UInt32 line); - }; - - static - void - CALLBACK --errFunc(void* /*userData*/, char* msg, char* param, UInt32 line) -+errFunc(void* /*userData*/, const char* msg, const char* param, UInt32 line) - { - fprintf(stderr, "%s", msg); - if (param != 0) diff --git a/Build/source/libs/teckit/TECkit-PATCHES/patch-04-pragmas b/Build/source/libs/teckit/TECkit-PATCHES/patch-04-pragmas deleted file mode 100644 index 171a2aec59f..00000000000 --- a/Build/source/libs/teckit/TECkit-PATCHES/patch-04-pragmas +++ /dev/null @@ -1,61 +0,0 @@ - Remove the '#pragma's, they seem to cause problems for MSVC - and are certainly not needed otherwise. - -diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp ---- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 -@@ -102,10 +96,6 @@ - #endif - } - --#ifndef __GNUC__ --#pragma mark --- class Stage --- --#endif -- - Stage::Stage() - : oBuffer(0) - , oBufSize(0) -@@ -127,10 +117,6 @@ - return 0; - } - --#ifndef __GNUC__ --#pragma mark --- class Normalizer --- --#endif -- - #include "NormalizationData.c" - - Normalizer::Normalizer(bool compose) -@@ -400,10 +386,6 @@ - return c; - } - --#ifndef __GNUC__ --#pragma mark --- class Pass --- --#endif -- - Pass::Pass(const TableHeader* inTable, Converter* cnv) - : converter(cnv) - , tableHeader(inTable) -@@ -1288,10 +1270,6 @@ - return 0; - } - --#ifndef __GNUC__ --#pragma mark --- class Converter --- --#endif -- - Converter::Converter(const Byte* inTable, UInt32 inTableSize, bool inForward, - UInt16 inForm, UInt16 outForm) - : table(0) -@@ -1942,10 +1920,6 @@ - return true; - } - --#ifndef __GNUC__ --#pragma mark --- Public "C" API functions --- --#endif -- - TECkit_Status - WINAPI - TECkit_CreateConverter( diff --git a/Build/source/libs/teckit/TECkit-PATCHES/patch-05-static b/Build/source/libs/teckit/TECkit-PATCHES/patch-05-static deleted file mode 100644 index 00d0d2eccc2..00000000000 --- a/Build/source/libs/teckit/TECkit-PATCHES/patch-05-static +++ /dev/null @@ -1,44 +0,0 @@ - For TeX Live we build a static library and not a Dll. - -diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp ---- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 -@@ -51,12 +51,6 @@ - # define NOSERVICE - # define NOMCX - # include -- -- BOOL WINAPI -- DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/) -- { -- return true; -- } - #endif - - #include "Engine.h" -diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h teckit-2.5.6/source/Public-headers/TECkit_Compiler.h ---- teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Public-headers/TECkit_Compiler.h Fri Dec 30 18:21:02 2016 -@@ -30,6 +30,9 @@ - #ifdef _WIN32 - /* MS compiler has predefined _WIN32, so assume Windows target */ - #include // apparently just using windef.h fails on VC++6 -+#undef WINAPI -+#define WINAPI -+#define EXPORTED - #else - /* not the MS compiler, so try Metrowerks' platform macros */ - #ifndef __APPLE__ -diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Engine.h teckit-2.5.6/source/Public-headers/TECkit_Engine.h ---- teckit-2.5.6.orig/source/Public-headers/TECkit_Engine.h Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Public-headers/TECkit_Engine.h Fri Dec 30 18:22:04 2016 -@@ -80,6 +80,9 @@ - #ifdef _WIN32 - /* MS compiler has predefined _WIN32, so assume Windows target */ - #include -+#undef WINAPI -+#define WINAPI -+#define EXPORTED - #else - /* not the MS compiler, so try Metrowerks' platform macros */ - #ifndef __APPLE__ diff --git a/Build/source/libs/teckit/TECkit-PATCHES/patch-06-dont-build-sfconv b/Build/source/libs/teckit/TECkit-PATCHES/patch-06-dont-build-sfconv deleted file mode 100644 index 77324d5145a..00000000000 --- a/Build/source/libs/teckit/TECkit-PATCHES/patch-06-dont-build-sfconv +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Build/source/libs/teckit/TECkit-src/bin/Makefile.am b/Build/source/libs/teckit/TECkit-src/bin/Makefile.am -index 2337f1d851d..1edc61627bd 100644 ---- TECkit-src/bin/Makefile.am -+++ TECkit-src/bin/Makefile.am -@@ -1,6 +1,6 @@ - AUTOMAKE_OPTIONS = -Wno-portability - --bin_PROGRAMS = teckit_compile txtconv sfconv -+bin_PROGRAMS = teckit_compile txtconv - - AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers - diff --git a/Build/source/libs/teckit/TLPATCHES/ChangeLog b/Build/source/libs/teckit/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..4ae1093d856 --- /dev/null +++ b/Build/source/libs/teckit/TLPATCHES/ChangeLog @@ -0,0 +1,79 @@ +2017-01-11 Norbert Preining + + Remove SFconv directory, contains non-free ConvertUTF.{c,h} + Add patch patch-06-dont-build-sfconv to not build sfconv. + +2016-12-30 Akira Kakuto + + Imported TECkit-2.5.6 source tree (teckit) from + https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz. + patch-02-warning, patch-03-warnings, patch-04-pragmas, and + patch-05-static: Adapted. + +2014-07-18 Peter Breitenlohner + + Imported TECkit-2.5.4 source tree (teckit) from + http://scripts.sil.org/svn-public/teckit/TRUNK + (svn r139 2014-07-09 14:47:39 UTC). + + * patch-06-backport-r119 (removed): Now in source tree. + * patch-02-warning, patch-03-warnings, patch-04-pragmas, + patch-05-static: Adapted. + +2014-06-28 Peter Breitenlohner + + * patch-06-static_cast (removed): Replaced by ... + * patch-06-backport-r119 (new): ... Backport upstream changes: + svn r117: Update test runner for compatibility with newer + versions of perl + svn r118: Update Normalization test data for 6.0.0 + svn r119: Fix data-narrowing bug + +2014-06-23 Peter Breitenlohner + + * patch-06-static_cast (new): Add static_cast required by C++11. + +2012-10-13 Peter Breitenlohner + + Avoid TL vs W32TeX diffs (from Akira). + * patch-04-pragmas (new): Remove '#pragma's. + * patch-05-static (new): Build a static library and not a Dll. + +2012-03-17 Peter Breitenlohner + + Imported TECkit-2.5.3 source tree (teckit) from + http://scripts.sil.org/svn-public/teckit/TRUNK + (svn r116 2011-05-12 18:24:47 UTC). + + * patch-01-debian-505693, patch-04-case-sensitive (removed): + Now in source tree. + * patch-02-warning, patch-03-warnings: Adapted. + +2010-02-19 Peter Breitenlohner + + * patch-04-case-sensitive (new): #include instead + of for, e.g., Linux => MinGW32 cross compilation. + +2009-10-18 Peter Breitenlohner + + Reconstruct TL TECkit sources from distributed tarball. + * TL-changes (new): Modifications applied to the distribution. + * patch-[0-9][0-9]-*: Patches applied to the distribution. + +2009-10-01 Peter Breitenlohner + + * patch-03-warnings (new): Avoid maximal compiler warnings. + source/Sample-tools/TECkit_Compile.cpp, source/Engine.{cpp,h}, + source/Public-headers/TECkit_Compiler.h, source/Compiler.cpp: + Constify. + +2009-06-25 Peter Breitenlohner + + * patch-02-warning (new): Avoid compiler warning. + source/Compiler.h: change type of Compiler::Pass.passType + long -> UInt32. + +2008-11-17 Jonathan Kew + + * patch-01-debian-505693 (new): Bug fix. + diff --git a/Build/source/libs/teckit/TLPATCHES/TL-Changes b/Build/source/libs/teckit/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..fd47be354c5 --- /dev/null +++ b/Build/source/libs/teckit/TLPATCHES/TL-Changes @@ -0,0 +1,34 @@ +Changes applied to the TECkit-2.5.6/ tree obtained from: + https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz. + +Removed execute permissions from: + installed-top.pc.in + teckit.pc.in + uninstalled-top.pc.in + +Removed: + .gitignore + SFconv/ + TECkit.mcp + build-mac-binaries.sh + build-linux-package.sh + build-windows-binaries.sh + debian-src/ + mac-installer/ + perl_binaries/ + source/teckitjni/ + zlib-1.2.3/ + +Converted Dos/Win line ends to native: + source/Perl/TECkit.xs + source/Perl/lib/Encode/TECkit.pm + source/Perl/test.pl + source/Perl/typemap + test/GNT-map.xml + test/ISO-8859-1.map + test/Mrk-GNT.sf + test/mrk.sf.legacy.txt.orig + +Added newline at end of file: + source/Carbon.r + diff --git a/Build/source/libs/teckit/TLPATCHES/patch-02-warning b/Build/source/libs/teckit/TLPATCHES/patch-02-warning new file mode 100644 index 00000000000..35f6c621c84 --- /dev/null +++ b/Build/source/libs/teckit/TLPATCHES/patch-02-warning @@ -0,0 +1,14 @@ + Avoid compiler warning. + +diff -ur teckit-2.5.6.orig/source/Compiler.h teckit-2.5.6/source/Compiler.h +--- teckit-2.5.6.orig/source/Compiler.h Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Compiler.h Fri Dec 30 18:01:51 2016 +@@ -230,7 +230,7 @@ + vector byteClassLines; + vector uniClassLines; + +- long passType; ++ UInt32 passType; + UInt32 uniDefault; + UInt8 byteDefault; + bool supplementaryChars; diff --git a/Build/source/libs/teckit/TLPATCHES/patch-03-warnings b/Build/source/libs/teckit/TLPATCHES/patch-03-warnings new file mode 100644 index 00000000000..d88f8282eb1 --- /dev/null +++ b/Build/source/libs/teckit/TLPATCHES/patch-03-warnings @@ -0,0 +1,104 @@ + Avoid more compiler warnings. + +diff -ur teckit-2.5.6.orig/source/Compiler.cpp teckit-2.5.6/source/Compiler.cpp +--- teckit-2.5.6.orig/source/Compiler.cpp Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Compiler.cpp Fri Dec 30 18:04:55 2016 +@@ -189,14 +189,14 @@ + free(table); + } + +-char* ++const char* + WINAPI + TECkit_GetUnicodeName(UInt32 usv) + { + const CharName *c = &gUnicodeNames[0]; + while (c->name != 0) + if (c->usv == usv) +- return (char*)c->name; ++ return c->name; + else + ++c; + return NULL; +@@ -2133,7 +2133,7 @@ + cout << " at line " << line << endl; + } + else +- (*errorFunction)(errFuncUserData, (char*)msg, (char*)s, line); ++ (*errorFunction)(errFuncUserData, msg, s, line); + errorState = true; + ++errorCount; + } +diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp +--- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 +@@ -1093,7 +1075,7 @@ + if (matchElems == 0 && allowInsertion == false) + continue; + patternLength = matchElems + READ(rule->postLength); +- pattern = (MatchElem*)(rule + 1); // point past the defined struct for the rule header ++ pattern = (const MatchElem*)(rule + 1); // point past the defined struct for the rule header + direction = 1; + infoLimit = matchElems; + +@@ -2194,7 +2168,7 @@ + status = kStatus_BadMappingVersion; + else { + const Byte* namePtr; +- if (getNamePtrFromTable((Byte*)fh, nameID, namePtr, *nameLength)) { ++ if (getNamePtrFromTable((const Byte*)fh, nameID, namePtr, *nameLength)) { + UInt16 copyBytes = *nameLength < bufferSize ? *nameLength : bufferSize; + if (copyBytes > 0) + memcpy(nameBuffer, namePtr, copyBytes); +diff -ur teckit-2.5.6.orig/source/Engine.h teckit-2.5.6/source/Engine.h +--- teckit-2.5.6.orig/source/Engine.h Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Engine.h Fri Dec 30 18:09:51 2016 +@@ -117,7 +117,7 @@ + + UInt32 match(int index, int repeats, int textLoc); + // returns 0 for no match, 1 for match, or kNeedMoreInput/kInvalidChar +- MatchElem* pattern; ++ const MatchElem* pattern; + int patternLength; + int direction; + MatchInfo info[256]; +diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h teckit-2.5.6/source/Public-headers/TECkit_Compiler.h +--- teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Public-headers/TECkit_Compiler.h Fri Dec 30 18:21:02 2016 +@@ -56,7 +59,7 @@ + #define kCompilerOpts_Compress 0x00000010 /* generate compressed mapping table */ + #define kCompilerOpts_XML 0x00000020 /* instead of a compiled binary table, generate an XML representation of the mapping */ + +-typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, char* msg, char* param, UInt32 line); ++typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, const char* msg, const char* param, UInt32 line); + + TECkit_Status + WINAPI EXPORTED +@@ -75,7 +78,7 @@ + TECkit_GetCompilerVersion(); + + /* new APIs for looking up Unicode names (as NUL-terminated C strings) */ +-char* ++const char* + WINAPI EXPORTED + TECkit_GetUnicodeName(UInt32 usv); + /* returns the Unicode name of usv, if available, else NULL */ +diff -ur teckit-2.5.6.orig/source/Sample-tools/TECkit_Compile.cpp teckit-2.5.6/source/Sample-tools/TECkit_Compile.cpp +--- teckit-2.5.6.orig/source/Sample-tools/TECkit_Compile.cpp Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Sample-tools/TECkit_Compile.cpp Fri Dec 30 18:14:53 2016 +@@ -24,13 +24,13 @@ + #endif + + extern "C" { +- static void CALLBACK errFunc(void* userData, char* msg, char* param, UInt32 line); ++ static void CALLBACK errFunc(void* userData, const char* msg, const char* param, UInt32 line); + }; + + static + void + CALLBACK +-errFunc(void* /*userData*/, char* msg, char* param, UInt32 line) ++errFunc(void* /*userData*/, const char* msg, const char* param, UInt32 line) + { + fprintf(stderr, "%s", msg); + if (param != 0) diff --git a/Build/source/libs/teckit/TLPATCHES/patch-04-pragmas b/Build/source/libs/teckit/TLPATCHES/patch-04-pragmas new file mode 100644 index 00000000000..171a2aec59f --- /dev/null +++ b/Build/source/libs/teckit/TLPATCHES/patch-04-pragmas @@ -0,0 +1,61 @@ + Remove the '#pragma's, they seem to cause problems for MSVC + and are certainly not needed otherwise. + +diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp +--- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 +@@ -102,10 +96,6 @@ + #endif + } + +-#ifndef __GNUC__ +-#pragma mark --- class Stage --- +-#endif +- + Stage::Stage() + : oBuffer(0) + , oBufSize(0) +@@ -127,10 +117,6 @@ + return 0; + } + +-#ifndef __GNUC__ +-#pragma mark --- class Normalizer --- +-#endif +- + #include "NormalizationData.c" + + Normalizer::Normalizer(bool compose) +@@ -400,10 +386,6 @@ + return c; + } + +-#ifndef __GNUC__ +-#pragma mark --- class Pass --- +-#endif +- + Pass::Pass(const TableHeader* inTable, Converter* cnv) + : converter(cnv) + , tableHeader(inTable) +@@ -1288,10 +1270,6 @@ + return 0; + } + +-#ifndef __GNUC__ +-#pragma mark --- class Converter --- +-#endif +- + Converter::Converter(const Byte* inTable, UInt32 inTableSize, bool inForward, + UInt16 inForm, UInt16 outForm) + : table(0) +@@ -1942,10 +1920,6 @@ + return true; + } + +-#ifndef __GNUC__ +-#pragma mark --- Public "C" API functions --- +-#endif +- + TECkit_Status + WINAPI + TECkit_CreateConverter( diff --git a/Build/source/libs/teckit/TLPATCHES/patch-05-static b/Build/source/libs/teckit/TLPATCHES/patch-05-static new file mode 100644 index 00000000000..00d0d2eccc2 --- /dev/null +++ b/Build/source/libs/teckit/TLPATCHES/patch-05-static @@ -0,0 +1,44 @@ + For TeX Live we build a static library and not a Dll. + +diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp +--- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 +@@ -51,12 +51,6 @@ + # define NOSERVICE + # define NOMCX + # include +- +- BOOL WINAPI +- DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/) +- { +- return true; +- } + #endif + + #include "Engine.h" +diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h teckit-2.5.6/source/Public-headers/TECkit_Compiler.h +--- teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Public-headers/TECkit_Compiler.h Fri Dec 30 18:21:02 2016 +@@ -30,6 +30,9 @@ + #ifdef _WIN32 + /* MS compiler has predefined _WIN32, so assume Windows target */ + #include // apparently just using windef.h fails on VC++6 ++#undef WINAPI ++#define WINAPI ++#define EXPORTED + #else + /* not the MS compiler, so try Metrowerks' platform macros */ + #ifndef __APPLE__ +diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Engine.h teckit-2.5.6/source/Public-headers/TECkit_Engine.h +--- teckit-2.5.6.orig/source/Public-headers/TECkit_Engine.h Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Public-headers/TECkit_Engine.h Fri Dec 30 18:22:04 2016 +@@ -80,6 +80,9 @@ + #ifdef _WIN32 + /* MS compiler has predefined _WIN32, so assume Windows target */ + #include ++#undef WINAPI ++#define WINAPI ++#define EXPORTED + #else + /* not the MS compiler, so try Metrowerks' platform macros */ + #ifndef __APPLE__ diff --git a/Build/source/libs/teckit/TLPATCHES/patch-06-dont-build-sfconv b/Build/source/libs/teckit/TLPATCHES/patch-06-dont-build-sfconv new file mode 100644 index 00000000000..77324d5145a --- /dev/null +++ b/Build/source/libs/teckit/TLPATCHES/patch-06-dont-build-sfconv @@ -0,0 +1,12 @@ +diff --git a/Build/source/libs/teckit/TECkit-src/bin/Makefile.am b/Build/source/libs/teckit/TECkit-src/bin/Makefile.am +index 2337f1d851d..1edc61627bd 100644 +--- TECkit-src/bin/Makefile.am ++++ TECkit-src/bin/Makefile.am +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = -Wno-portability + +-bin_PROGRAMS = teckit_compile txtconv sfconv ++bin_PROGRAMS = teckit_compile txtconv + + AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers + diff --git a/Build/source/libs/xpdf/TLPATCHES/ChangeLog b/Build/source/libs/xpdf/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..f00ad4df94c --- /dev/null +++ b/Build/source/libs/xpdf/TLPATCHES/ChangeLog @@ -0,0 +1,157 @@ +2015-05-09 Peter Breitenlohner + + * patch-41-W32TeX: On Windows use USERPROFILE instead of HOME. + +2015-05-07 Peter Breitenlohner + + * patch-41-W32TeX (new): More changes from Akira. + +2014-05-30 Peter Breitenlohner + + Imported xpdf-3.04 source tree: + ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz + + * patch-10-exclude-body-of-Page_getDefaultCTM, + patch-20-skip-reading-config-file, + patch-22-exclude-openTempFile, patch-30-include-strings_h, + patch-40-W32TeX: Adapted. + +2012-10-19 Peter Breitenlohner + + * patch-12-mingw32 (removed): The library now needs '-lgdi32'. + * patch-20-skip-reading-config-file: Less intrusive solution. + * patch-30-include-strings_h: Adapted. + + * patch-40-W32TeX (new): Remove TL vs W32TeX diffs (from Akira). + +2012-05-16 Vladimir Volovich + + * patch-30-include-strings_h (new): Bug fix for AIX 4.3 and xlc. + The Posix manpage says strcasecmp() is declared in . + +2011-08-22 Peter Breitenlohner + + * patch-40-objectStream-support-for-pdftosrc: Removed, no longer + required with new logic for Object Streams in pdftosrc.cc. + +2011-08-22 Peter Breitenlohner + + Imported xpdf-3.03 source tree: + ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz + + * patch-0?-pl?, patch-11-time_h, patch-15-fix-pow-arg, + patch-60-bug-fix: Removed, now in distribution. + * patch-10-exclude-body-of-Page_getDefaultCTM, patch-12-mingw32, + patch-20-skip-reading-config-file, + patch-22-exclude-openTempFile, + patch-40-objectStream-support-for-pdftosrc: Adapted. + +2010-12-02 Karl Berry + + * patch-60-bug-fix: update with Thanh's comments. + +2010-12-01 Peter Breitenlohner + + * patch-60-bug-fix (new): Bug fix for 4-digit bfrange values in + ToUnicode CMap; backport from poppler-0.14.5. + Mail from Thanh Han The, Wed, 1 Dec 2010 08:57:29, ref: + http://sarovar.org/tracker/index.php?func=detail&aid=4321&group_id=106&atid=493 + +2010-10-25 Peter Breitenlohner + + * patch-05-pl5 (new): Official 3.02pl5 patch plus change of + xpdfVersion "3.02pl4" -> "3.02pl5" + +2010-04-13 Peter Breitenlohner + + * patch-45-getmetadatanf (removed): unnecessary. + +2010-04-06 Hartmut Henkel + + * patch-45-getmetadatanf (new): needed by luaTeX's pdftoepdf.cc. + +2009-09-15 Peter Breitenlohner + + * patch-04-pl4 (new): Official 3.02pl4 patch plus change of + xpdfVersion "3.02pl3" -> "3.02pl4" + * patch-40-*: Adapted to presence of patch-04-pl4. + +2009-05-12 Peter Breitenlohner + + * patch-16-size-of-struct (removed): unnecessary. + * patch-17-strCrypt (removed): was never useful. + * patch-23-exclude-keyBindings (removed): has removed lots of + unused code, but may be problematic with future foolabs updates. + +2009-05-11 Peter Breitenlohner + + * patch-10-exclude-body-of-Page::getDefaultCTM (removed), + * patch-10-exclude-body-of-Page_getDefaultCTM (new): renamed + this file to avoid problems with rsync and windows. + +2009-05-10 Peter Breitenlohner + + Reorganize and simplify pdftex patches. + + * patch-10-PDF_PARSER_ONLY (removed): replaced by ... + * patch-10-exclude-body-of-Page::getDefaultCTM (new): ... this. + + from Derek B. Noonburg + + * patch-20-pdftex (removed): split into several pieces. + * patch-20-skip-reading-config-file (new): simplified version + of previous code. + * patch-22-exclude-openTempFile: new file. + * patch-23-exclude-keyBindings: new file. + * patch-40-objectStream-support-for-pdftosrc: new file. + + from Han The Thanh + +2009-05-05 Peter Breitenlohner + + * patch-15-fix-pow-arg (new): Three ... + * patch-16-size-of-struct (new): ... small patches ... + * patch-17-strCrypt (new): ... split of from ... + * patch-20-pdftex: ... this one. + +2009-04-30 Peter Breitenlohner + + * patch-03-pl3 (new): Official 3.02pl3 patch plus change of + xpdfVersion "3.02pl2" -> "3.02pl3" + * patch-[12]?-*: adapted to presence of patch-03-pl3. + +2009-04-02 Peter Breitenlohner + + * patch-12-mingw32 (new): Buld fix for mingw32. + + from Derek B. Noonburg + +2009-03-05 Peter Breitenlohner + + * patch-11-time_h (new): Buld fix for djgpp. + + from Derek B. Noonburg + +2009-02-08 Peter Breitenlohner + + * patch-10-PDF_PARSER_ONLY (new): required build with + PDF_PARSER_ONLY defined. + + * patch-20-pdftex (new): To restore former tree for pdfTeX. + +2007-11-12 Peter Breitenlohner + + * patch-02-pl2 (new): Official 3.02pl2 patch plus change of + xpdfVersion "3.02pl1" -> "3.02pl2" + +2007-08-01 Peter Breitenlohner + + * patch-01-pl1 (new): Official 3.02pl1 patch plus change of + xpdfVersion "3.02" -> "3.02pl1" in ../xpdf/config.h. + +2007-02-29 Peter Breitenlohner + + Imported xpdf-3.02 source tree: + ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz + http://www.foolabs.com/xpdf/xpdf-3.02.tar.gz + diff --git a/Build/source/libs/xpdf/TLPATCHES/TL-Changes b/Build/source/libs/xpdf/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..16c6b27b495 --- /dev/null +++ b/Build/source/libs/xpdf/TLPATCHES/TL-Changes @@ -0,0 +1,6 @@ +Changes applied to the xpdf-3.04/ tree as obtained from: + ftp://ftp.foolabs.com/pub/xpdf/ + +Removed: + install-sh + diff --git a/Build/source/libs/xpdf/TLPATCHES/patch-10-exclude-body-of-Page_getDefaultCTM b/Build/source/libs/xpdf/TLPATCHES/patch-10-exclude-body-of-Page_getDefaultCTM new file mode 100644 index 00000000000..da4d8519c31 --- /dev/null +++ b/Build/source/libs/xpdf/TLPATCHES/patch-10-exclude-body-of-Page_getDefaultCTM @@ -0,0 +1,23 @@ + Enable compilation with -DPDF_PARSER_ONLY + +diff -ur -N xpdf-3.04.orig/xpdf/Page.cc xpdf-3.04/xpdf/Page.cc +--- xpdf-3.04.orig/xpdf/Page.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/Page.cc 2014-05-30 19:57:46.000000000 +0200 +@@ -468,9 +468,9 @@ + delete links; + } + +-#ifndef PDF_PARSER_ONLY + void Page::getDefaultCTM(double *ctm, double hDPI, double vDPI, + int rotate, GBool useMediaBox, GBool upsideDown) { ++#ifndef PDF_PARSER_ONLY + GfxState *state; + int i; + +@@ -487,5 +487,5 @@ + ctm[i] = state->getCTM()[i]; + } + delete state; +-} + #endif ++} diff --git a/Build/source/libs/xpdf/TLPATCHES/patch-20-skip-reading-config-file b/Build/source/libs/xpdf/TLPATCHES/patch-20-skip-reading-config-file new file mode 100644 index 00000000000..5c20dccdd72 --- /dev/null +++ b/Build/source/libs/xpdf/TLPATCHES/patch-20-skip-reading-config-file @@ -0,0 +1,60 @@ + Patches for pdfTeX / luaTeX / XeTeX + + Declare GlobalParams constructor with a default config file argument + and skip reading a config file. + + from: + Han The Thanh + Peter Breitenlohner + +diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc +--- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:29:23.000000000 +0200 +@@ -5,6 +5,9 @@ + // Copyright 2001-2003 Glyph & Cog, LLC + // + //======================================================================== ++// Modified for TeX Live by Peter Breitenlohner ++// See top-level ChangeLog for a list of all modifications ++//======================================================================== + + #include + +@@ -812,6 +815,7 @@ + f = NULL; + fileName = NULL; + if (cfgFileName && cfgFileName[0]) { ++#ifndef PDF_PARSER_ONLY + fileName = new GString(cfgFileName); + if (!(f = fopen(fileName->getCString(), "r"))) { + delete fileName; +@@ -844,6 +848,7 @@ + parseFile(fileName, f); + delete fileName; + fclose(f); ++#endif /* !PDF_PARSER_ONLY */ + } + } + +diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.h xpdf-3.04/xpdf/GlobalParams.h +--- xpdf-3.04.orig/xpdf/GlobalParams.h 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/GlobalParams.h 2014-05-30 19:29:23.000000000 +0200 +@@ -5,6 +5,9 @@ + // Copyright 2001-2003 Glyph & Cog, LLC + // + //======================================================================== ++// Modified for TeX Live by Peter Breitenlohner ++// See top-level ChangeLog for a list of all modifications ++//======================================================================== + + #ifndef GLOBALPARAMS_H + #define GLOBALPARAMS_H +@@ -173,7 +176,7 @@ + + // Initialize the global parameters by attempting to read a config + // file. +- GlobalParams(const char *cfgFileName); ++ GlobalParams(const char *cfgFileName = NULL); + + ~GlobalParams(); + diff --git a/Build/source/libs/xpdf/TLPATCHES/patch-22-exclude-openTempFile b/Build/source/libs/xpdf/TLPATCHES/patch-22-exclude-openTempFile new file mode 100644 index 00000000000..be04bd4042d --- /dev/null +++ b/Build/source/libs/xpdf/TLPATCHES/patch-22-exclude-openTempFile @@ -0,0 +1,34 @@ + Patches for pdfTeX / luaTeX / XeTeX + + from: + Han The Thanh + +diff -ur -N xpdf-3.04.orig/goo/gfile.cc xpdf-3.04/goo/gfile.cc +--- xpdf-3.04.orig/goo/gfile.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/goo/gfile.cc 2014-05-30 19:42:41.000000000 +0200 +@@ -7,6 +7,9 @@ + // Copyright 1996-2003 Glyph & Cog, LLC + // + //======================================================================== ++// Modified for TeX Live by Peter Breitenlohner ++// See top-level ChangeLog for a list of all modifications ++//======================================================================== + + #include + +@@ -441,6 +444,7 @@ + #endif + } + ++#ifndef PDF_PARSER_ONLY + GBool openTempFile(GString **name, FILE **f, + const char *mode, const char *ext) { + #if defined(_WIN32) +@@ -551,6 +555,7 @@ + return gTrue; + #endif + } ++#endif + + GBool createDir(char *path, int mode) { + #ifdef _WIN32 diff --git a/Build/source/libs/xpdf/TLPATCHES/patch-30-include-strings_h b/Build/source/libs/xpdf/TLPATCHES/patch-30-include-strings_h new file mode 100644 index 00000000000..f9b694650b1 --- /dev/null +++ b/Build/source/libs/xpdf/TLPATCHES/patch-30-include-strings_h @@ -0,0 +1,15 @@ + The Posix manpage says strcasecmp() is declared in + and this indeed required for AIX 4.3 and xlc. + +diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc +--- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-30 19:29:23.000000000 +0200 ++++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:47:44.000000000 +0200 +@@ -54,6 +54,8 @@ + #ifdef _WIN32 + # define strcasecmp stricmp + # define strncasecmp strnicmp ++#else ++# include + #endif + + #if MULTITHREADED diff --git a/Build/source/libs/xpdf/TLPATCHES/patch-40-W32TeX b/Build/source/libs/xpdf/TLPATCHES/patch-40-W32TeX new file mode 100644 index 00000000000..53a431f334a --- /dev/null +++ b/Build/source/libs/xpdf/TLPATCHES/patch-40-W32TeX @@ -0,0 +1,29 @@ + WIN32TeX uses MSVC 5.0 with the kpathsea headers and library. + +diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc +--- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-30 19:47:44.000000000 +0200 ++++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:52:04.000000000 +0200 +@@ -52,6 +52,8 @@ + #include "GlobalParams.h" + + #ifdef _WIN32 ++# undef strcasecmp ++# undef strncasecmp + # define strcasecmp stricmp + # define strncasecmp strnicmp + #else +diff -ur -N xpdf-3.04.orig/xpdf/config.h xpdf-3.04/xpdf/config.h +--- xpdf-3.04.orig/xpdf/config.h 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/config.h 2014-05-30 19:52:04.000000000 +0200 +@@ -78,11 +78,6 @@ + // popen + //------------------------------------------------------------------------ + +-#if defined(_MSC_VER) || defined(__BORLANDC__) +-#define popen _popen +-#define pclose _pclose +-#endif +- + #if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS) + #define POPEN_READ_MODE "rb" + #else diff --git a/Build/source/libs/xpdf/TLPATCHES/patch-41-W32TeX b/Build/source/libs/xpdf/TLPATCHES/patch-41-W32TeX new file mode 100644 index 00000000000..28efb4219f3 --- /dev/null +++ b/Build/source/libs/xpdf/TLPATCHES/patch-41-W32TeX @@ -0,0 +1,177 @@ +diff -ur -N xpdf-3.04.orig/goo/gfile.cc xpdf-3.04/goo/gfile.cc +--- xpdf-3.04.orig/goo/gfile.cc 2014-05-30 19:42:41.000000000 +0200 ++++ xpdf-3.04/goo/gfile.cc 2015-05-09 15:49:36.000000000 +0200 +@@ -55,7 +55,11 @@ + char *s; + GString *ret; + ++#ifdef _WIN32 ++ if ((s = getenv("USERPROFILE"))) ++#else + if ((s = getenv("HOME"))) ++#endif + ret = new GString(s); + else + ret = new GString("."); +@@ -559,7 +563,7 @@ + + GBool createDir(char *path, int mode) { + #ifdef _WIN32 +- return !mkdir(path); ++ return !_mkdir(path); + #else + return !mkdir(path, mode); + #endif +diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc +--- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-30 19:52:04.000000000 +0200 ++++ xpdf-3.04/xpdf/GlobalParams.cc 2015-05-07 08:43:30.000000000 +0200 +@@ -16,7 +16,9 @@ + #endif + + #ifdef _WIN32 ++# ifndef _WIN32_WINNT + # define _WIN32_WINNT 0x0500 // for GetSystemWindowsDirectory ++# endif + # include + #endif + #include +@@ -54,8 +56,8 @@ + #ifdef _WIN32 + # undef strcasecmp + # undef strncasecmp +-# define strcasecmp stricmp +-# define strncasecmp strnicmp ++# define strcasecmp _stricmp ++# define strncasecmp _strnicmp + #else + # include + #endif +@@ -2138,8 +2140,11 @@ + base14->fontNum, + displayFontTab[i].obliqueFactor)); + } else { ++// Do not display unnecessary looking message on W32 ++#ifndef _WIN32 + error(errConfig, -1, "No display font for '{0:s}'", + displayFontTab[i].name); ++#endif + } + } + } +diff -ur -N xpdf-3.04.orig/xpdf/pdfdetach.cc xpdf-3.04/xpdf/pdfdetach.cc +--- xpdf-3.04.orig/xpdf/pdfdetach.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/pdfdetach.cc 2015-05-07 08:43:30.000000000 +0200 +@@ -74,6 +74,9 @@ + + exitCode = 99; + ++#ifdef _MSC_VER ++ (void)kpse_set_program_name(argv[0], NULL); ++#endif + // parse args + ok = parseArgs(argDesc, &argc, argv); + if ((doList ? 1 : 0) + +diff -ur -N xpdf-3.04.orig/xpdf/pdffonts.cc xpdf-3.04/xpdf/pdffonts.cc +--- xpdf-3.04.orig/xpdf/pdffonts.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/pdffonts.cc 2015-05-07 08:43:30.000000000 +0200 +@@ -107,6 +107,9 @@ + + exitCode = 99; + ++#ifdef _MSC_VER ++ (void)kpse_set_program_name(argv[0], NULL); ++#endif + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (!ok || argc != 2 || printVersion || printHelp) { +diff -ur -N xpdf-3.04.orig/xpdf/pdfimages.cc xpdf-3.04/xpdf/pdfimages.cc +--- xpdf-3.04.orig/xpdf/pdfimages.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/pdfimages.cc 2015-05-07 08:43:30.000000000 +0200 +@@ -76,6 +76,9 @@ + + exitCode = 99; + ++#ifdef _MSC_VER ++ (void)kpse_set_program_name(argv[0], NULL); ++#endif + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (!ok || argc != 3 || printVersion || printHelp) { +diff -ur -N xpdf-3.04.orig/xpdf/pdfinfo.cc xpdf-3.04/xpdf/pdfinfo.cc +--- xpdf-3.04.orig/xpdf/pdfinfo.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/pdfinfo.cc 2015-05-07 08:43:30.000000000 +0200 +@@ -100,6 +100,9 @@ + + exitCode = 99; + ++#ifdef _MSC_VER ++ (void)kpse_set_program_name(argv[0], NULL); ++#endif + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (!ok || argc != 2 || printVersion || printHelp) { +diff -ur -N xpdf-3.04.orig/xpdf/pdftohtml.cc xpdf-3.04/xpdf/pdftohtml.cc +--- xpdf-3.04.orig/xpdf/pdftohtml.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/pdftohtml.cc 2015-05-07 08:43:30.000000000 +0200 +@@ -86,6 +86,9 @@ + + exitCode = 99; + ++#ifdef _MSC_VER ++ (void)kpse_set_program_name(argv[0], NULL); ++#endif + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (!ok || argc != 3 || printVersion || printHelp) { +diff -ur -N xpdf-3.04.orig/xpdf/pdftopng.cc xpdf-3.04/xpdf/pdftopng.cc +--- xpdf-3.04.orig/xpdf/pdftopng.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/pdftopng.cc 2015-05-07 08:43:30.000000000 +0200 +@@ -99,6 +99,9 @@ + + exitCode = 99; + ++#ifdef _MSC_VER ++ (void)kpse_set_program_name(argv[0], NULL); ++#endif + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (mono && gray) { +diff -ur -N xpdf-3.04.orig/xpdf/pdftoppm.cc xpdf-3.04/xpdf/pdftoppm.cc +--- xpdf-3.04.orig/xpdf/pdftoppm.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/pdftoppm.cc 2015-05-07 08:43:30.000000000 +0200 +@@ -111,6 +111,9 @@ + + exitCode = 99; + ++#ifdef _MSC_VER ++ (void)kpse_set_program_name(argv[0], NULL); ++#endif + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (mono && gray) { +diff -ur -N xpdf-3.04.orig/xpdf/pdftops.cc xpdf-3.04/xpdf/pdftops.cc +--- xpdf-3.04.orig/xpdf/pdftops.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/pdftops.cc 2015-05-07 08:43:30.000000000 +0200 +@@ -168,6 +168,9 @@ + + exitCode = 99; + ++#ifdef _MSC_VER ++ (void)kpse_set_program_name(argv[0], NULL); ++#endif + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) { +diff -ur -N xpdf-3.04.orig/xpdf/pdftotext.cc xpdf-3.04/xpdf/pdftotext.cc +--- xpdf-3.04.orig/xpdf/pdftotext.cc 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/xpdf/pdftotext.cc 2015-05-07 08:43:30.000000000 +0200 +@@ -129,6 +129,9 @@ + + exitCode = 99; + ++#ifdef _MSC_VER ++ (void)kpse_set_program_name(argv[0], NULL); ++#endif + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) { diff --git a/Build/source/libs/xpdf/xpdf-PATCHES/ChangeLog b/Build/source/libs/xpdf/xpdf-PATCHES/ChangeLog deleted file mode 100644 index f00ad4df94c..00000000000 --- a/Build/source/libs/xpdf/xpdf-PATCHES/ChangeLog +++ /dev/null @@ -1,157 +0,0 @@ -2015-05-09 Peter Breitenlohner - - * patch-41-W32TeX: On Windows use USERPROFILE instead of HOME. - -2015-05-07 Peter Breitenlohner - - * patch-41-W32TeX (new): More changes from Akira. - -2014-05-30 Peter Breitenlohner - - Imported xpdf-3.04 source tree: - ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz - - * patch-10-exclude-body-of-Page_getDefaultCTM, - patch-20-skip-reading-config-file, - patch-22-exclude-openTempFile, patch-30-include-strings_h, - patch-40-W32TeX: Adapted. - -2012-10-19 Peter Breitenlohner - - * patch-12-mingw32 (removed): The library now needs '-lgdi32'. - * patch-20-skip-reading-config-file: Less intrusive solution. - * patch-30-include-strings_h: Adapted. - - * patch-40-W32TeX (new): Remove TL vs W32TeX diffs (from Akira). - -2012-05-16 Vladimir Volovich - - * patch-30-include-strings_h (new): Bug fix for AIX 4.3 and xlc. - The Posix manpage says strcasecmp() is declared in . - -2011-08-22 Peter Breitenlohner - - * patch-40-objectStream-support-for-pdftosrc: Removed, no longer - required with new logic for Object Streams in pdftosrc.cc. - -2011-08-22 Peter Breitenlohner - - Imported xpdf-3.03 source tree: - ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz - - * patch-0?-pl?, patch-11-time_h, patch-15-fix-pow-arg, - patch-60-bug-fix: Removed, now in distribution. - * patch-10-exclude-body-of-Page_getDefaultCTM, patch-12-mingw32, - patch-20-skip-reading-config-file, - patch-22-exclude-openTempFile, - patch-40-objectStream-support-for-pdftosrc: Adapted. - -2010-12-02 Karl Berry - - * patch-60-bug-fix: update with Thanh's comments. - -2010-12-01 Peter Breitenlohner - - * patch-60-bug-fix (new): Bug fix for 4-digit bfrange values in - ToUnicode CMap; backport from poppler-0.14.5. - Mail from Thanh Han The, Wed, 1 Dec 2010 08:57:29, ref: - http://sarovar.org/tracker/index.php?func=detail&aid=4321&group_id=106&atid=493 - -2010-10-25 Peter Breitenlohner - - * patch-05-pl5 (new): Official 3.02pl5 patch plus change of - xpdfVersion "3.02pl4" -> "3.02pl5" - -2010-04-13 Peter Breitenlohner - - * patch-45-getmetadatanf (removed): unnecessary. - -2010-04-06 Hartmut Henkel - - * patch-45-getmetadatanf (new): needed by luaTeX's pdftoepdf.cc. - -2009-09-15 Peter Breitenlohner - - * patch-04-pl4 (new): Official 3.02pl4 patch plus change of - xpdfVersion "3.02pl3" -> "3.02pl4" - * patch-40-*: Adapted to presence of patch-04-pl4. - -2009-05-12 Peter Breitenlohner - - * patch-16-size-of-struct (removed): unnecessary. - * patch-17-strCrypt (removed): was never useful. - * patch-23-exclude-keyBindings (removed): has removed lots of - unused code, but may be problematic with future foolabs updates. - -2009-05-11 Peter Breitenlohner - - * patch-10-exclude-body-of-Page::getDefaultCTM (removed), - * patch-10-exclude-body-of-Page_getDefaultCTM (new): renamed - this file to avoid problems with rsync and windows. - -2009-05-10 Peter Breitenlohner - - Reorganize and simplify pdftex patches. - - * patch-10-PDF_PARSER_ONLY (removed): replaced by ... - * patch-10-exclude-body-of-Page::getDefaultCTM (new): ... this. - - from Derek B. Noonburg - - * patch-20-pdftex (removed): split into several pieces. - * patch-20-skip-reading-config-file (new): simplified version - of previous code. - * patch-22-exclude-openTempFile: new file. - * patch-23-exclude-keyBindings: new file. - * patch-40-objectStream-support-for-pdftosrc: new file. - - from Han The Thanh - -2009-05-05 Peter Breitenlohner - - * patch-15-fix-pow-arg (new): Three ... - * patch-16-size-of-struct (new): ... small patches ... - * patch-17-strCrypt (new): ... split of from ... - * patch-20-pdftex: ... this one. - -2009-04-30 Peter Breitenlohner - - * patch-03-pl3 (new): Official 3.02pl3 patch plus change of - xpdfVersion "3.02pl2" -> "3.02pl3" - * patch-[12]?-*: adapted to presence of patch-03-pl3. - -2009-04-02 Peter Breitenlohner - - * patch-12-mingw32 (new): Buld fix for mingw32. - - from Derek B. Noonburg - -2009-03-05 Peter Breitenlohner - - * patch-11-time_h (new): Buld fix for djgpp. - - from Derek B. Noonburg - -2009-02-08 Peter Breitenlohner - - * patch-10-PDF_PARSER_ONLY (new): required build with - PDF_PARSER_ONLY defined. - - * patch-20-pdftex (new): To restore former tree for pdfTeX. - -2007-11-12 Peter Breitenlohner - - * patch-02-pl2 (new): Official 3.02pl2 patch plus change of - xpdfVersion "3.02pl1" -> "3.02pl2" - -2007-08-01 Peter Breitenlohner - - * patch-01-pl1 (new): Official 3.02pl1 patch plus change of - xpdfVersion "3.02" -> "3.02pl1" in ../xpdf/config.h. - -2007-02-29 Peter Breitenlohner - - Imported xpdf-3.02 source tree: - ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz - http://www.foolabs.com/xpdf/xpdf-3.02.tar.gz - diff --git a/Build/source/libs/xpdf/xpdf-PATCHES/TL-Changes b/Build/source/libs/xpdf/xpdf-PATCHES/TL-Changes deleted file mode 100644 index 16c6b27b495..00000000000 --- a/Build/source/libs/xpdf/xpdf-PATCHES/TL-Changes +++ /dev/null @@ -1,6 +0,0 @@ -Changes applied to the xpdf-3.04/ tree as obtained from: - ftp://ftp.foolabs.com/pub/xpdf/ - -Removed: - install-sh - diff --git a/Build/source/libs/xpdf/xpdf-PATCHES/patch-10-exclude-body-of-Page_getDefaultCTM b/Build/source/libs/xpdf/xpdf-PATCHES/patch-10-exclude-body-of-Page_getDefaultCTM deleted file mode 100644 index da4d8519c31..00000000000 --- a/Build/source/libs/xpdf/xpdf-PATCHES/patch-10-exclude-body-of-Page_getDefaultCTM +++ /dev/null @@ -1,23 +0,0 @@ - Enable compilation with -DPDF_PARSER_ONLY - -diff -ur -N xpdf-3.04.orig/xpdf/Page.cc xpdf-3.04/xpdf/Page.cc ---- xpdf-3.04.orig/xpdf/Page.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/Page.cc 2014-05-30 19:57:46.000000000 +0200 -@@ -468,9 +468,9 @@ - delete links; - } - --#ifndef PDF_PARSER_ONLY - void Page::getDefaultCTM(double *ctm, double hDPI, double vDPI, - int rotate, GBool useMediaBox, GBool upsideDown) { -+#ifndef PDF_PARSER_ONLY - GfxState *state; - int i; - -@@ -487,5 +487,5 @@ - ctm[i] = state->getCTM()[i]; - } - delete state; --} - #endif -+} diff --git a/Build/source/libs/xpdf/xpdf-PATCHES/patch-20-skip-reading-config-file b/Build/source/libs/xpdf/xpdf-PATCHES/patch-20-skip-reading-config-file deleted file mode 100644 index 5c20dccdd72..00000000000 --- a/Build/source/libs/xpdf/xpdf-PATCHES/patch-20-skip-reading-config-file +++ /dev/null @@ -1,60 +0,0 @@ - Patches for pdfTeX / luaTeX / XeTeX - - Declare GlobalParams constructor with a default config file argument - and skip reading a config file. - - from: - Han The Thanh - Peter Breitenlohner - -diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc ---- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:29:23.000000000 +0200 -@@ -5,6 +5,9 @@ - // Copyright 2001-2003 Glyph & Cog, LLC - // - //======================================================================== -+// Modified for TeX Live by Peter Breitenlohner -+// See top-level ChangeLog for a list of all modifications -+//======================================================================== - - #include - -@@ -812,6 +815,7 @@ - f = NULL; - fileName = NULL; - if (cfgFileName && cfgFileName[0]) { -+#ifndef PDF_PARSER_ONLY - fileName = new GString(cfgFileName); - if (!(f = fopen(fileName->getCString(), "r"))) { - delete fileName; -@@ -844,6 +848,7 @@ - parseFile(fileName, f); - delete fileName; - fclose(f); -+#endif /* !PDF_PARSER_ONLY */ - } - } - -diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.h xpdf-3.04/xpdf/GlobalParams.h ---- xpdf-3.04.orig/xpdf/GlobalParams.h 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/GlobalParams.h 2014-05-30 19:29:23.000000000 +0200 -@@ -5,6 +5,9 @@ - // Copyright 2001-2003 Glyph & Cog, LLC - // - //======================================================================== -+// Modified for TeX Live by Peter Breitenlohner -+// See top-level ChangeLog for a list of all modifications -+//======================================================================== - - #ifndef GLOBALPARAMS_H - #define GLOBALPARAMS_H -@@ -173,7 +176,7 @@ - - // Initialize the global parameters by attempting to read a config - // file. -- GlobalParams(const char *cfgFileName); -+ GlobalParams(const char *cfgFileName = NULL); - - ~GlobalParams(); - diff --git a/Build/source/libs/xpdf/xpdf-PATCHES/patch-22-exclude-openTempFile b/Build/source/libs/xpdf/xpdf-PATCHES/patch-22-exclude-openTempFile deleted file mode 100644 index be04bd4042d..00000000000 --- a/Build/source/libs/xpdf/xpdf-PATCHES/patch-22-exclude-openTempFile +++ /dev/null @@ -1,34 +0,0 @@ - Patches for pdfTeX / luaTeX / XeTeX - - from: - Han The Thanh - -diff -ur -N xpdf-3.04.orig/goo/gfile.cc xpdf-3.04/goo/gfile.cc ---- xpdf-3.04.orig/goo/gfile.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/goo/gfile.cc 2014-05-30 19:42:41.000000000 +0200 -@@ -7,6 +7,9 @@ - // Copyright 1996-2003 Glyph & Cog, LLC - // - //======================================================================== -+// Modified for TeX Live by Peter Breitenlohner -+// See top-level ChangeLog for a list of all modifications -+//======================================================================== - - #include - -@@ -441,6 +444,7 @@ - #endif - } - -+#ifndef PDF_PARSER_ONLY - GBool openTempFile(GString **name, FILE **f, - const char *mode, const char *ext) { - #if defined(_WIN32) -@@ -551,6 +555,7 @@ - return gTrue; - #endif - } -+#endif - - GBool createDir(char *path, int mode) { - #ifdef _WIN32 diff --git a/Build/source/libs/xpdf/xpdf-PATCHES/patch-30-include-strings_h b/Build/source/libs/xpdf/xpdf-PATCHES/patch-30-include-strings_h deleted file mode 100644 index f9b694650b1..00000000000 --- a/Build/source/libs/xpdf/xpdf-PATCHES/patch-30-include-strings_h +++ /dev/null @@ -1,15 +0,0 @@ - The Posix manpage says strcasecmp() is declared in - and this indeed required for AIX 4.3 and xlc. - -diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc ---- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-30 19:29:23.000000000 +0200 -+++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:47:44.000000000 +0200 -@@ -54,6 +54,8 @@ - #ifdef _WIN32 - # define strcasecmp stricmp - # define strncasecmp strnicmp -+#else -+# include - #endif - - #if MULTITHREADED diff --git a/Build/source/libs/xpdf/xpdf-PATCHES/patch-40-W32TeX b/Build/source/libs/xpdf/xpdf-PATCHES/patch-40-W32TeX deleted file mode 100644 index 53a431f334a..00000000000 --- a/Build/source/libs/xpdf/xpdf-PATCHES/patch-40-W32TeX +++ /dev/null @@ -1,29 +0,0 @@ - WIN32TeX uses MSVC 5.0 with the kpathsea headers and library. - -diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc ---- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-30 19:47:44.000000000 +0200 -+++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:52:04.000000000 +0200 -@@ -52,6 +52,8 @@ - #include "GlobalParams.h" - - #ifdef _WIN32 -+# undef strcasecmp -+# undef strncasecmp - # define strcasecmp stricmp - # define strncasecmp strnicmp - #else -diff -ur -N xpdf-3.04.orig/xpdf/config.h xpdf-3.04/xpdf/config.h ---- xpdf-3.04.orig/xpdf/config.h 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/config.h 2014-05-30 19:52:04.000000000 +0200 -@@ -78,11 +78,6 @@ - // popen - //------------------------------------------------------------------------ - --#if defined(_MSC_VER) || defined(__BORLANDC__) --#define popen _popen --#define pclose _pclose --#endif -- - #if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS) - #define POPEN_READ_MODE "rb" - #else diff --git a/Build/source/libs/xpdf/xpdf-PATCHES/patch-41-W32TeX b/Build/source/libs/xpdf/xpdf-PATCHES/patch-41-W32TeX deleted file mode 100644 index 28efb4219f3..00000000000 --- a/Build/source/libs/xpdf/xpdf-PATCHES/patch-41-W32TeX +++ /dev/null @@ -1,177 +0,0 @@ -diff -ur -N xpdf-3.04.orig/goo/gfile.cc xpdf-3.04/goo/gfile.cc ---- xpdf-3.04.orig/goo/gfile.cc 2014-05-30 19:42:41.000000000 +0200 -+++ xpdf-3.04/goo/gfile.cc 2015-05-09 15:49:36.000000000 +0200 -@@ -55,7 +55,11 @@ - char *s; - GString *ret; - -+#ifdef _WIN32 -+ if ((s = getenv("USERPROFILE"))) -+#else - if ((s = getenv("HOME"))) -+#endif - ret = new GString(s); - else - ret = new GString("."); -@@ -559,7 +563,7 @@ - - GBool createDir(char *path, int mode) { - #ifdef _WIN32 -- return !mkdir(path); -+ return !_mkdir(path); - #else - return !mkdir(path, mode); - #endif -diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc ---- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-30 19:52:04.000000000 +0200 -+++ xpdf-3.04/xpdf/GlobalParams.cc 2015-05-07 08:43:30.000000000 +0200 -@@ -16,7 +16,9 @@ - #endif - - #ifdef _WIN32 -+# ifndef _WIN32_WINNT - # define _WIN32_WINNT 0x0500 // for GetSystemWindowsDirectory -+# endif - # include - #endif - #include -@@ -54,8 +56,8 @@ - #ifdef _WIN32 - # undef strcasecmp - # undef strncasecmp --# define strcasecmp stricmp --# define strncasecmp strnicmp -+# define strcasecmp _stricmp -+# define strncasecmp _strnicmp - #else - # include - #endif -@@ -2138,8 +2140,11 @@ - base14->fontNum, - displayFontTab[i].obliqueFactor)); - } else { -+// Do not display unnecessary looking message on W32 -+#ifndef _WIN32 - error(errConfig, -1, "No display font for '{0:s}'", - displayFontTab[i].name); -+#endif - } - } - } -diff -ur -N xpdf-3.04.orig/xpdf/pdfdetach.cc xpdf-3.04/xpdf/pdfdetach.cc ---- xpdf-3.04.orig/xpdf/pdfdetach.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/pdfdetach.cc 2015-05-07 08:43:30.000000000 +0200 -@@ -74,6 +74,9 @@ - - exitCode = 99; - -+#ifdef _MSC_VER -+ (void)kpse_set_program_name(argv[0], NULL); -+#endif - // parse args - ok = parseArgs(argDesc, &argc, argv); - if ((doList ? 1 : 0) + -diff -ur -N xpdf-3.04.orig/xpdf/pdffonts.cc xpdf-3.04/xpdf/pdffonts.cc ---- xpdf-3.04.orig/xpdf/pdffonts.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/pdffonts.cc 2015-05-07 08:43:30.000000000 +0200 -@@ -107,6 +107,9 @@ - - exitCode = 99; - -+#ifdef _MSC_VER -+ (void)kpse_set_program_name(argv[0], NULL); -+#endif - // parse args - ok = parseArgs(argDesc, &argc, argv); - if (!ok || argc != 2 || printVersion || printHelp) { -diff -ur -N xpdf-3.04.orig/xpdf/pdfimages.cc xpdf-3.04/xpdf/pdfimages.cc ---- xpdf-3.04.orig/xpdf/pdfimages.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/pdfimages.cc 2015-05-07 08:43:30.000000000 +0200 -@@ -76,6 +76,9 @@ - - exitCode = 99; - -+#ifdef _MSC_VER -+ (void)kpse_set_program_name(argv[0], NULL); -+#endif - // parse args - ok = parseArgs(argDesc, &argc, argv); - if (!ok || argc != 3 || printVersion || printHelp) { -diff -ur -N xpdf-3.04.orig/xpdf/pdfinfo.cc xpdf-3.04/xpdf/pdfinfo.cc ---- xpdf-3.04.orig/xpdf/pdfinfo.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/pdfinfo.cc 2015-05-07 08:43:30.000000000 +0200 -@@ -100,6 +100,9 @@ - - exitCode = 99; - -+#ifdef _MSC_VER -+ (void)kpse_set_program_name(argv[0], NULL); -+#endif - // parse args - ok = parseArgs(argDesc, &argc, argv); - if (!ok || argc != 2 || printVersion || printHelp) { -diff -ur -N xpdf-3.04.orig/xpdf/pdftohtml.cc xpdf-3.04/xpdf/pdftohtml.cc ---- xpdf-3.04.orig/xpdf/pdftohtml.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/pdftohtml.cc 2015-05-07 08:43:30.000000000 +0200 -@@ -86,6 +86,9 @@ - - exitCode = 99; - -+#ifdef _MSC_VER -+ (void)kpse_set_program_name(argv[0], NULL); -+#endif - // parse args - ok = parseArgs(argDesc, &argc, argv); - if (!ok || argc != 3 || printVersion || printHelp) { -diff -ur -N xpdf-3.04.orig/xpdf/pdftopng.cc xpdf-3.04/xpdf/pdftopng.cc ---- xpdf-3.04.orig/xpdf/pdftopng.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/pdftopng.cc 2015-05-07 08:43:30.000000000 +0200 -@@ -99,6 +99,9 @@ - - exitCode = 99; - -+#ifdef _MSC_VER -+ (void)kpse_set_program_name(argv[0], NULL); -+#endif - // parse args - ok = parseArgs(argDesc, &argc, argv); - if (mono && gray) { -diff -ur -N xpdf-3.04.orig/xpdf/pdftoppm.cc xpdf-3.04/xpdf/pdftoppm.cc ---- xpdf-3.04.orig/xpdf/pdftoppm.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/pdftoppm.cc 2015-05-07 08:43:30.000000000 +0200 -@@ -111,6 +111,9 @@ - - exitCode = 99; - -+#ifdef _MSC_VER -+ (void)kpse_set_program_name(argv[0], NULL); -+#endif - // parse args - ok = parseArgs(argDesc, &argc, argv); - if (mono && gray) { -diff -ur -N xpdf-3.04.orig/xpdf/pdftops.cc xpdf-3.04/xpdf/pdftops.cc ---- xpdf-3.04.orig/xpdf/pdftops.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/pdftops.cc 2015-05-07 08:43:30.000000000 +0200 -@@ -168,6 +168,9 @@ - - exitCode = 99; - -+#ifdef _MSC_VER -+ (void)kpse_set_program_name(argv[0], NULL); -+#endif - // parse args - ok = parseArgs(argDesc, &argc, argv); - if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) { -diff -ur -N xpdf-3.04.orig/xpdf/pdftotext.cc xpdf-3.04/xpdf/pdftotext.cc ---- xpdf-3.04.orig/xpdf/pdftotext.cc 2014-05-28 20:50:50.000000000 +0200 -+++ xpdf-3.04/xpdf/pdftotext.cc 2015-05-07 08:43:30.000000000 +0200 -@@ -129,6 +129,9 @@ - - exitCode = 99; - -+#ifdef _MSC_VER -+ (void)kpse_set_program_name(argv[0], NULL); -+#endif - // parse args - ok = parseArgs(argDesc, &argc, argv); - if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) { diff --git a/Build/source/libs/zlib/TLPATCHES/ChangeLog b/Build/source/libs/zlib/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..15dd50372f0 --- /dev/null +++ b/Build/source/libs/zlib/TLPATCHES/ChangeLog @@ -0,0 +1,21 @@ +2017-01-15 Akira Kakuto + + Import zlib-1.2.11. + * Add patch-01-not-define-WIDECHAR-for-cygwin: Adapted. + +2017-01-03 Akira Kakuto + + Import zlib-1.2.10. + +2012-02-11 Peter Breitenlohner + + Import zlib-1.2.6. + * patch-01-LARGEFILE64_SOURCE: Removed. + +2010-09-27 Peter Breitenlohner + + Create patch-01-LARGEFILE64_SOURCE: + * zlib-1.2.5/zlib.h: Use #ifndef _LARGEFILE64_SOURCE instead + of #ifdef _LARGEFILE64_SOURCE, to allow compilation with + _LARGEFILE64_SOURCE. + diff --git a/Build/source/libs/zlib/TLPATCHES/TL-Changes b/Build/source/libs/zlib/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..f31d2bbedde --- /dev/null +++ b/Build/source/libs/zlib/TLPATCHES/TL-Changes @@ -0,0 +1,75 @@ +Changes applied to the zlib-1.2.11/ tree as obtained from: + http://zlib.net/zlib-1.2.11.tar.xz + +Removed: + Makefile + zconf.h + doc/rfc* + +Converted Dos/Win line ends to native: + contrib/dotzlib/DotZLib/AssemblyInfo.cs + contrib/dotzlib/DotZLib/ChecksumImpl.cs + contrib/dotzlib/DotZLib/CircularBuffer.cs + contrib/dotzlib/DotZLib/CodecBase.cs + contrib/dotzlib/DotZLib/Deflater.cs + contrib/dotzlib/DotZLib/DotZLib.cs + contrib/dotzlib/DotZLib/DotZLib.csproj + contrib/dotzlib/DotZLib/GZipStream.cs + contrib/dotzlib/DotZLib/Inflater.cs + contrib/dotzlib/DotZLib/UnitTests.cs + contrib/dotzlib/DotZLib.build + contrib/dotzlib/DotZLib.sln + contrib/dotzlib/LICENSE_1_0.txt + contrib/dotzlib/readme.txt + contrib/gcc_gvmat64/gvmat64.S + contrib/masmx64/bld_ml64.bat + contrib/masmx64/gvmat64.asm + contrib/masmx64/inffas8664.c + contrib/masmx64/inffasx64.asm + contrib/masmx64/readme.txt + contrib/masmx86/bld_ml32.bat + contrib/masmx86/inffas32.asm + contrib/masmx86/match686.asm + contrib/masmx86/readme.txt + contrib/testzlib/testzlib.c + contrib/testzlib/testzlib.txt + contrib/vstudio/readme.txt + contrib/vstudio/vc10/miniunz.vcxproj + contrib/vstudio/vc10/miniunz.vcxproj.filters + contrib/vstudio/vc10/minizip.vcxproj + contrib/vstudio/vc10/minizip.vcxproj.filters + contrib/vstudio/vc10/testzlib.vcxproj + contrib/vstudio/vc10/testzlib.vcxproj.filters + contrib/vstudio/vc10/testzlibdll.vcxproj + contrib/vstudio/vc10/testzlibdll.vcxproj.filters + contrib/vstudio/vc10/zlib.rc + contrib/vstudio/vc10/zlibstat.vcxproj + contrib/vstudio/vc10/zlibstat.vcxproj.filters + contrib/vstudio/vc10/zlibvc.def + contrib/vstudio/vc10/zlibvc.sln + contrib/vstudio/vc10/zlibvc.vcxproj + contrib/vstudio/vc10/zlibvc.vcxproj.filters + contrib/vstudio/vc11/miniunz.vcxproj + contrib/vstudio/vc11/minizip.vcxproj + contrib/vstudio/vc11/testzlib.vcxproj + contrib/vstudio/vc11/testzlibdll.vcxproj + contrib/vstudio/vc11/zlib.rc + contrib/vstudio/vc11/zlibstat.vcxproj + contrib/vstudio/vc11/zlibvc.def + contrib/vstudio/vc11/zlibvc.sln + contrib/vstudio/vc11/zlibvc.vcxproj + contrib/vstudio/vc9/miniunz.vcproj + contrib/vstudio/vc9/minizip.vcproj + contrib/vstudio/vc9/testzlib.vcproj + contrib/vstudio/vc9/testzlibdll.vcproj + contrib/vstudio/vc9/zlib.rc + contrib/vstudio/vc9/zlibstat.vcproj + contrib/vstudio/vc9/zlibvc.def + contrib/vstudio/vc9/zlibvc.sln + contrib/vstudio/vc9/zlibvc.vcproj + +Added newline at end of file: + contrib/dotzlib/DotZLib/ChecksumImpl.cs + contrib/dotzlib/LICENSE_1_0.txt + contrib/testzlib/testzlib.txt + diff --git a/Build/source/libs/zlib/TLPATCHES/patch-01-not-define-WIDECHAR-for-cygwin b/Build/source/libs/zlib/TLPATCHES/patch-01-not-define-WIDECHAR-for-cygwin new file mode 100644 index 00000000000..87e08bcd382 --- /dev/null +++ b/Build/source/libs/zlib/TLPATCHES/patch-01-not-define-WIDECHAR-for-cygwin @@ -0,0 +1,12 @@ +diff -ur zlib-1.2.11.orig/gzguts.h zlib-1.2.11/gzguts.h +--- zlib-1.2.11.orig/gzguts.h Sun Jan 01 16:37:10 2017 ++++ zlib-1.2.11/gzguts.h Mon Jan 16 07:53:25 2017 +@@ -39,7 +39,7 @@ + # include + #endif + +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + # define WIDECHAR + #endif + diff --git a/Build/source/libs/zlib/zlib-PATCHES/ChangeLog b/Build/source/libs/zlib/zlib-PATCHES/ChangeLog deleted file mode 100644 index 15dd50372f0..00000000000 --- a/Build/source/libs/zlib/zlib-PATCHES/ChangeLog +++ /dev/null @@ -1,21 +0,0 @@ -2017-01-15 Akira Kakuto - - Import zlib-1.2.11. - * Add patch-01-not-define-WIDECHAR-for-cygwin: Adapted. - -2017-01-03 Akira Kakuto - - Import zlib-1.2.10. - -2012-02-11 Peter Breitenlohner - - Import zlib-1.2.6. - * patch-01-LARGEFILE64_SOURCE: Removed. - -2010-09-27 Peter Breitenlohner - - Create patch-01-LARGEFILE64_SOURCE: - * zlib-1.2.5/zlib.h: Use #ifndef _LARGEFILE64_SOURCE instead - of #ifdef _LARGEFILE64_SOURCE, to allow compilation with - _LARGEFILE64_SOURCE. - diff --git a/Build/source/libs/zlib/zlib-PATCHES/TL-Changes b/Build/source/libs/zlib/zlib-PATCHES/TL-Changes deleted file mode 100644 index f31d2bbedde..00000000000 --- a/Build/source/libs/zlib/zlib-PATCHES/TL-Changes +++ /dev/null @@ -1,75 +0,0 @@ -Changes applied to the zlib-1.2.11/ tree as obtained from: - http://zlib.net/zlib-1.2.11.tar.xz - -Removed: - Makefile - zconf.h - doc/rfc* - -Converted Dos/Win line ends to native: - contrib/dotzlib/DotZLib/AssemblyInfo.cs - contrib/dotzlib/DotZLib/ChecksumImpl.cs - contrib/dotzlib/DotZLib/CircularBuffer.cs - contrib/dotzlib/DotZLib/CodecBase.cs - contrib/dotzlib/DotZLib/Deflater.cs - contrib/dotzlib/DotZLib/DotZLib.cs - contrib/dotzlib/DotZLib/DotZLib.csproj - contrib/dotzlib/DotZLib/GZipStream.cs - contrib/dotzlib/DotZLib/Inflater.cs - contrib/dotzlib/DotZLib/UnitTests.cs - contrib/dotzlib/DotZLib.build - contrib/dotzlib/DotZLib.sln - contrib/dotzlib/LICENSE_1_0.txt - contrib/dotzlib/readme.txt - contrib/gcc_gvmat64/gvmat64.S - contrib/masmx64/bld_ml64.bat - contrib/masmx64/gvmat64.asm - contrib/masmx64/inffas8664.c - contrib/masmx64/inffasx64.asm - contrib/masmx64/readme.txt - contrib/masmx86/bld_ml32.bat - contrib/masmx86/inffas32.asm - contrib/masmx86/match686.asm - contrib/masmx86/readme.txt - contrib/testzlib/testzlib.c - contrib/testzlib/testzlib.txt - contrib/vstudio/readme.txt - contrib/vstudio/vc10/miniunz.vcxproj - contrib/vstudio/vc10/miniunz.vcxproj.filters - contrib/vstudio/vc10/minizip.vcxproj - contrib/vstudio/vc10/minizip.vcxproj.filters - contrib/vstudio/vc10/testzlib.vcxproj - contrib/vstudio/vc10/testzlib.vcxproj.filters - contrib/vstudio/vc10/testzlibdll.vcxproj - contrib/vstudio/vc10/testzlibdll.vcxproj.filters - contrib/vstudio/vc10/zlib.rc - contrib/vstudio/vc10/zlibstat.vcxproj - contrib/vstudio/vc10/zlibstat.vcxproj.filters - contrib/vstudio/vc10/zlibvc.def - contrib/vstudio/vc10/zlibvc.sln - contrib/vstudio/vc10/zlibvc.vcxproj - contrib/vstudio/vc10/zlibvc.vcxproj.filters - contrib/vstudio/vc11/miniunz.vcxproj - contrib/vstudio/vc11/minizip.vcxproj - contrib/vstudio/vc11/testzlib.vcxproj - contrib/vstudio/vc11/testzlibdll.vcxproj - contrib/vstudio/vc11/zlib.rc - contrib/vstudio/vc11/zlibstat.vcxproj - contrib/vstudio/vc11/zlibvc.def - contrib/vstudio/vc11/zlibvc.sln - contrib/vstudio/vc11/zlibvc.vcxproj - contrib/vstudio/vc9/miniunz.vcproj - contrib/vstudio/vc9/minizip.vcproj - contrib/vstudio/vc9/testzlib.vcproj - contrib/vstudio/vc9/testzlibdll.vcproj - contrib/vstudio/vc9/zlib.rc - contrib/vstudio/vc9/zlibstat.vcproj - contrib/vstudio/vc9/zlibvc.def - contrib/vstudio/vc9/zlibvc.sln - contrib/vstudio/vc9/zlibvc.vcproj - -Added newline at end of file: - contrib/dotzlib/DotZLib/ChecksumImpl.cs - contrib/dotzlib/LICENSE_1_0.txt - contrib/testzlib/testzlib.txt - diff --git a/Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin b/Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin deleted file mode 100644 index 87e08bcd382..00000000000 --- a/Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur zlib-1.2.11.orig/gzguts.h zlib-1.2.11/gzguts.h ---- zlib-1.2.11.orig/gzguts.h Sun Jan 01 16:37:10 2017 -+++ zlib-1.2.11/gzguts.h Mon Jan 16 07:53:25 2017 -@@ -39,7 +39,7 @@ - # include - #endif - --#if defined(_WIN32) || defined(__CYGWIN__) -+#if defined(_WIN32) - # define WIDECHAR - #endif - diff --git a/Build/source/libs/zziplib/TLPATCHES/ChangeLog b/Build/source/libs/zziplib/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..98ecda061fc --- /dev/null +++ b/Build/source/libs/zziplib/TLPATCHES/ChangeLog @@ -0,0 +1,48 @@ +2015-03-29 Peter Breitenlohner + + * patch-02-bugfix: More fix mmap for WIN32/WIN64, from Akira. + +2014-07-15 Peter Breitenlohner + + * patch-03-w64-ptr: Avoid WIN64 warning due to different size. + +2014-07-14 Peter Breitenlohner + + * patch-02-bugfix (new): Fix mmap for WIN32/WIN64, from Akira. + +2014-07-11 Peter Breitenlohner + + * patch-01-binary (new): Do not convert NL => CRLF (required + under Windows for our test case), from Akira. + +2012-03-12 Peter Breitenlohner + + Import zziplib-0.13.62. + +2011-01-07 Peter Breitenlohner + + Adapted to zziplib-0.13.60. + * patch-02-aix-strcasecmp, patch-03-inline (removed): + Now in source tree. + +2010-10-04 Peter Breitenlohner + + Adapted to zziplib-0.13.59. + * patch-01-old-style-parameter (removed): now in source tree. + * patch-03-inline: Add static instead of dropping inline. + +2010-07-05 Peter Breitenlohner + + * patch-03-inline (new): Can't use non-static inline for Sun + Studio C, mail from Vladimir Volovich, Wed, 16 Jun 2010 20:18:17. + +2010-06-04 Peter Breitenlohner + + * patch-02-aix-strcasecmp (new): Need to #include + under _AIX for declaration of strcasecmp(). + From Taco. + +2010-01-30 Peter Breitenlohner + + * patch-01-old-style-parameter (new): Avoid compiler warning. + diff --git a/Build/source/libs/zziplib/TLPATCHES/TL-Changes b/Build/source/libs/zziplib/TLPATCHES/TL-Changes new file mode 100644 index 00000000000..72c4023aac6 --- /dev/null +++ b/Build/source/libs/zziplib/TLPATCHES/TL-Changes @@ -0,0 +1,26 @@ +Changes applied to the zziplib-0.13.62/ tree as obtained from: + http://zziplib.sourceforge.net/ + +Copied: + m4/ax_prefix_config_h.m4 -> ../m4/ (without AC_BEFORE) + m4/ac_sys_largefile_sensitive.m4 -> ../m4/ + +Removed: + aclocal.m4 + uses/ + zzip/_config.h + zzip/_msvc.h + +Converted Dos/Win line ends to native: + docs/README.MSVC6 + docs/sdocbook.css + msvc6/*.dsp + msvc6/*.dsw + msvc7/*.sln + msvc7/*.vcproj + msvc8/*.sln + msvc8/*.vcproj + zzip/file.h + zzip/stdint.h + zzip/zziplib.wpj + diff --git a/Build/source/libs/zziplib/TLPATCHES/patch-01-binary b/Build/source/libs/zziplib/TLPATCHES/patch-01-binary new file mode 100644 index 00000000000..4d528511791 --- /dev/null +++ b/Build/source/libs/zziplib/TLPATCHES/patch-01-binary @@ -0,0 +1,15 @@ +diff -ur zziplib-0.13.62.orig/bins/unzzip.c zziplib-0.13.62/bins/unzzip.c +--- zziplib-0.13.62.orig/bins/unzzip.c 2009-08-23 13:38:22.000000000 +0200 ++++ zziplib-0.13.62/bins/unzzip.c 2014-07-11 09:50:50.000000000 +0200 +@@ -72,7 +72,11 @@ + continue; + } + ++#ifdef _WIN32 ++ output = _open (d.d_name, _O_CREAT | _O_BINARY | _O_RDWR); ++#else + output = creat (d.d_name, 0664); ++#endif + if (output == -1) + { + fprintf (stderr, "|output file %s: \n", d.d_name); diff --git a/Build/source/libs/zziplib/TLPATCHES/patch-02-bugfix b/Build/source/libs/zziplib/TLPATCHES/patch-02-bugfix new file mode 100644 index 00000000000..3cdb42a64c4 --- /dev/null +++ b/Build/source/libs/zziplib/TLPATCHES/patch-02-bugfix @@ -0,0 +1,111 @@ +diff -ur zziplib-0.13.62.orig/zzip/__mmap.h zziplib-0.13.62/zzip/__mmap.h +--- zziplib-0.13.62.orig/zzip/__mmap.h 2009-08-23 13:38:22.000000000 +0200 ++++ zziplib-0.13.62/zzip/__mmap.h 2015-03-29 12:44:43.000000000 +0200 +@@ -50,43 +50,60 @@ + #define MAP_FAILED 0 + #endif + /* we (ab)use the "*user" variable to store the FileMapping handle */ +- /* which assumes (sizeof(long) == sizeof(HANDLE)) */ ++ /* and make sure (sizeof(*user) == sizeof(HANDLE)) */ + + static size_t win32_getpagesize (void) + { + SYSTEM_INFO si; GetSystemInfo (&si); + return si.dwAllocationGranularity; + } ++#ifdef _WIN64 ++static void* win32_mmap (__int64* user, int fd, zzip_off_t offs, size_t len) ++#else + static void* win32_mmap (long* user, int fd, zzip_off_t offs, size_t len) ++#endif + { + if (! user || *user != 1) /* || offs % getpagesize() */ + return 0; + { + HANDLE hFile = (HANDLE)_get_osfhandle(fd); + if (hFile) +- *user = (int) CreateFileMapping (hFile, 0, PAGE_READONLY, 0, 0, NULL); ++#ifdef _WIN64 ++ *user = (__int64) CreateFileMapping (hFile, 0, PAGE_READONLY, 0, 0, NULL); ++#else ++ *user = (long) CreateFileMapping (hFile, 0, PAGE_READONLY, 0, 0, NULL); ++#endif + if (*user) + { + char* p = 0; + p = MapViewOfFile(*(HANDLE*)user, FILE_MAP_READ, 0, offs, len); +- if (p) return p + offs; ++ if (p) return p; + CloseHandle (*(HANDLE*)user); *user = 1; + } + return MAP_FAILED; + } + } ++#ifdef _WIN64 ++static void win32_munmap (__int64* user, char* fd_map, size_t len) ++#else + static void win32_munmap (long* user, char* fd_map, size_t len) ++#endif + { + UnmapViewOfFile (fd_map); + CloseHandle (*(HANDLE*)user); *user = 1; + } +- ++#ifdef _WIN64 ++#define _zzip_mmap(user, fd, offs, len) \ ++ win32_mmap ((__int64*) &(user), fd, offs, len) ++#define _zzip_munmap(user, ptr, len) \ ++ win32_munmap ((__int64*) &(user), ptr, len) ++#else + #define _zzip_mmap(user, fd, offs, len) \ + win32_mmap ((long*) &(user), fd, offs, len) + #define _zzip_munmap(user, ptr, len) \ + win32_munmap ((long*) &(user), ptr, len) ++#endif + #define _zzip_getpagesize(user) win32_getpagesize() +- + #else /* disable */ + #define USE_MMAP 0 + /* USE_MAP is intentional: we expect the compiler to do some "code removal" +diff -ur zziplib-0.13.62.orig/zzip/mmapped.h zziplib-0.13.62/zzip/mmapped.h +--- zziplib-0.13.62.orig/zzip/mmapped.h 2009-08-23 13:38:22.000000000 +0200 ++++ zziplib-0.13.62/zzip/mmapped.h 2014-07-14 11:25:47.000000000 +0200 +@@ -42,7 +42,11 @@ + void* reserved; /* - for later extensions (might be renamed) */ + void* user; /* - free for applications (use this!) */ + long flags; /* bit 0: findfile searches case-insensitive */ ++#ifdef _WIN64 ++ __int64 mapped; ++#else + long mapped; /* used for mmap() wrappers of zzip/__mmap.h */ ++#endif + long unused; /* - for later extensions (might be renamed) */ + long code; /* - free for applications (use this!) */ + }; +diff -ur zziplib-0.13.62.orig/zzip/plugin.c zziplib-0.13.62/zzip/plugin.c +--- zziplib-0.13.62.orig/zzip/plugin.c 2010-12-27 02:14:27.000000000 +0100 ++++ zziplib-0.13.62/zzip/plugin.c 2014-07-14 11:23:23.000000000 +0200 +@@ -43,7 +43,7 @@ + return st.st_size; + } + +-static const struct zzip_plugin_io default_io = { ++static struct zzip_plugin_io default_io = { + &open, + &close, + &_zzip_read, +diff -ur zziplib-0.13.62.orig/zzip/plugin.h zziplib-0.13.62/zzip/plugin.h +--- zziplib-0.13.62.orig/zzip/plugin.h 2010-12-27 02:12:54.000000000 +0100 ++++ zziplib-0.13.62/zzip/plugin.h 2014-07-14 11:23:23.000000000 +0200 +@@ -47,7 +47,11 @@ + zzip_ssize_t (*read)(int fd, void* buf, zzip_size_t len); + zzip_off_t (*seeks)(int fd, zzip_off_t offset, int whence); + zzip_off_t (*filesize)(int fd); ++#ifdef _WIN64 ++ __int64 sys; ++#else + long sys; ++#endif + long type; + zzip_ssize_t (*write)(int fd, _zzip_const void* buf, zzip_size_t len); + }; diff --git a/Build/source/libs/zziplib/TLPATCHES/patch-03-w64-ptr b/Build/source/libs/zziplib/TLPATCHES/patch-03-w64-ptr new file mode 100644 index 00000000000..f11ec7e4819 --- /dev/null +++ b/Build/source/libs/zziplib/TLPATCHES/patch-03-w64-ptr @@ -0,0 +1,27 @@ +diff -ur zziplib-0.13.62.orig/zzip/zip.c zziplib-0.13.62/zzip/zip.c +--- zziplib-0.13.62.orig/zzip/zip.c 2010-12-29 17:22:29.000000000 +0100 ++++ zziplib-0.13.62/zzip/zip.c 2014-07-14 17:05:48.000000000 +0200 +@@ -374,15 +374,19 @@ + * making pointer alignments to values that can be handled as structures + * is tricky. We assume here that an align(4) is sufficient even for + * 64 bit machines. Note that binary operations are not usually allowed +- * to pointer types but we do need only the lower bits in this implementation, +- * so we can just cast the value to a long value. ++ * to pointer types but we can cast the value to a suitably sized integer. + */ + _zzip_inline static char * + __zzip_aligned4(char *p) + { + #define aligned4 __zzip_aligned4 +- p += ((long) p) & 1; /* warnings about truncation of a "pointer" */ +- p += ((long) p) & 2; /* to a "long int" may be safely ignored :) */ ++#ifdef _WIN64 ++ p += ((__int64) p) & 1; ++ p += ((__int64) p) & 2; ++#else ++ p += ((long) p) & 1; ++ p += ((long) p) & 2; ++#endif + return p; + } + diff --git a/Build/source/libs/zziplib/zziplib-PATCHES/ChangeLog b/Build/source/libs/zziplib/zziplib-PATCHES/ChangeLog deleted file mode 100644 index 98ecda061fc..00000000000 --- a/Build/source/libs/zziplib/zziplib-PATCHES/ChangeLog +++ /dev/null @@ -1,48 +0,0 @@ -2015-03-29 Peter Breitenlohner - - * patch-02-bugfix: More fix mmap for WIN32/WIN64, from Akira. - -2014-07-15 Peter Breitenlohner - - * patch-03-w64-ptr: Avoid WIN64 warning due to different size. - -2014-07-14 Peter Breitenlohner - - * patch-02-bugfix (new): Fix mmap for WIN32/WIN64, from Akira. - -2014-07-11 Peter Breitenlohner - - * patch-01-binary (new): Do not convert NL => CRLF (required - under Windows for our test case), from Akira. - -2012-03-12 Peter Breitenlohner - - Import zziplib-0.13.62. - -2011-01-07 Peter Breitenlohner - - Adapted to zziplib-0.13.60. - * patch-02-aix-strcasecmp, patch-03-inline (removed): - Now in source tree. - -2010-10-04 Peter Breitenlohner - - Adapted to zziplib-0.13.59. - * patch-01-old-style-parameter (removed): now in source tree. - * patch-03-inline: Add static instead of dropping inline. - -2010-07-05 Peter Breitenlohner - - * patch-03-inline (new): Can't use non-static inline for Sun - Studio C, mail from Vladimir Volovich, Wed, 16 Jun 2010 20:18:17. - -2010-06-04 Peter Breitenlohner - - * patch-02-aix-strcasecmp (new): Need to #include - under _AIX for declaration of strcasecmp(). - From Taco. - -2010-01-30 Peter Breitenlohner - - * patch-01-old-style-parameter (new): Avoid compiler warning. - diff --git a/Build/source/libs/zziplib/zziplib-PATCHES/TL-Changes b/Build/source/libs/zziplib/zziplib-PATCHES/TL-Changes deleted file mode 100644 index 72c4023aac6..00000000000 --- a/Build/source/libs/zziplib/zziplib-PATCHES/TL-Changes +++ /dev/null @@ -1,26 +0,0 @@ -Changes applied to the zziplib-0.13.62/ tree as obtained from: - http://zziplib.sourceforge.net/ - -Copied: - m4/ax_prefix_config_h.m4 -> ../m4/ (without AC_BEFORE) - m4/ac_sys_largefile_sensitive.m4 -> ../m4/ - -Removed: - aclocal.m4 - uses/ - zzip/_config.h - zzip/_msvc.h - -Converted Dos/Win line ends to native: - docs/README.MSVC6 - docs/sdocbook.css - msvc6/*.dsp - msvc6/*.dsw - msvc7/*.sln - msvc7/*.vcproj - msvc8/*.sln - msvc8/*.vcproj - zzip/file.h - zzip/stdint.h - zzip/zziplib.wpj - diff --git a/Build/source/libs/zziplib/zziplib-PATCHES/patch-01-binary b/Build/source/libs/zziplib/zziplib-PATCHES/patch-01-binary deleted file mode 100644 index 4d528511791..00000000000 --- a/Build/source/libs/zziplib/zziplib-PATCHES/patch-01-binary +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur zziplib-0.13.62.orig/bins/unzzip.c zziplib-0.13.62/bins/unzzip.c ---- zziplib-0.13.62.orig/bins/unzzip.c 2009-08-23 13:38:22.000000000 +0200 -+++ zziplib-0.13.62/bins/unzzip.c 2014-07-11 09:50:50.000000000 +0200 -@@ -72,7 +72,11 @@ - continue; - } - -+#ifdef _WIN32 -+ output = _open (d.d_name, _O_CREAT | _O_BINARY | _O_RDWR); -+#else - output = creat (d.d_name, 0664); -+#endif - if (output == -1) - { - fprintf (stderr, "|output file %s: \n", d.d_name); diff --git a/Build/source/libs/zziplib/zziplib-PATCHES/patch-02-bugfix b/Build/source/libs/zziplib/zziplib-PATCHES/patch-02-bugfix deleted file mode 100644 index 3cdb42a64c4..00000000000 --- a/Build/source/libs/zziplib/zziplib-PATCHES/patch-02-bugfix +++ /dev/null @@ -1,111 +0,0 @@ -diff -ur zziplib-0.13.62.orig/zzip/__mmap.h zziplib-0.13.62/zzip/__mmap.h ---- zziplib-0.13.62.orig/zzip/__mmap.h 2009-08-23 13:38:22.000000000 +0200 -+++ zziplib-0.13.62/zzip/__mmap.h 2015-03-29 12:44:43.000000000 +0200 -@@ -50,43 +50,60 @@ - #define MAP_FAILED 0 - #endif - /* we (ab)use the "*user" variable to store the FileMapping handle */ -- /* which assumes (sizeof(long) == sizeof(HANDLE)) */ -+ /* and make sure (sizeof(*user) == sizeof(HANDLE)) */ - - static size_t win32_getpagesize (void) - { - SYSTEM_INFO si; GetSystemInfo (&si); - return si.dwAllocationGranularity; - } -+#ifdef _WIN64 -+static void* win32_mmap (__int64* user, int fd, zzip_off_t offs, size_t len) -+#else - static void* win32_mmap (long* user, int fd, zzip_off_t offs, size_t len) -+#endif - { - if (! user || *user != 1) /* || offs % getpagesize() */ - return 0; - { - HANDLE hFile = (HANDLE)_get_osfhandle(fd); - if (hFile) -- *user = (int) CreateFileMapping (hFile, 0, PAGE_READONLY, 0, 0, NULL); -+#ifdef _WIN64 -+ *user = (__int64) CreateFileMapping (hFile, 0, PAGE_READONLY, 0, 0, NULL); -+#else -+ *user = (long) CreateFileMapping (hFile, 0, PAGE_READONLY, 0, 0, NULL); -+#endif - if (*user) - { - char* p = 0; - p = MapViewOfFile(*(HANDLE*)user, FILE_MAP_READ, 0, offs, len); -- if (p) return p + offs; -+ if (p) return p; - CloseHandle (*(HANDLE*)user); *user = 1; - } - return MAP_FAILED; - } - } -+#ifdef _WIN64 -+static void win32_munmap (__int64* user, char* fd_map, size_t len) -+#else - static void win32_munmap (long* user, char* fd_map, size_t len) -+#endif - { - UnmapViewOfFile (fd_map); - CloseHandle (*(HANDLE*)user); *user = 1; - } -- -+#ifdef _WIN64 -+#define _zzip_mmap(user, fd, offs, len) \ -+ win32_mmap ((__int64*) &(user), fd, offs, len) -+#define _zzip_munmap(user, ptr, len) \ -+ win32_munmap ((__int64*) &(user), ptr, len) -+#else - #define _zzip_mmap(user, fd, offs, len) \ - win32_mmap ((long*) &(user), fd, offs, len) - #define _zzip_munmap(user, ptr, len) \ - win32_munmap ((long*) &(user), ptr, len) -+#endif - #define _zzip_getpagesize(user) win32_getpagesize() -- - #else /* disable */ - #define USE_MMAP 0 - /* USE_MAP is intentional: we expect the compiler to do some "code removal" -diff -ur zziplib-0.13.62.orig/zzip/mmapped.h zziplib-0.13.62/zzip/mmapped.h ---- zziplib-0.13.62.orig/zzip/mmapped.h 2009-08-23 13:38:22.000000000 +0200 -+++ zziplib-0.13.62/zzip/mmapped.h 2014-07-14 11:25:47.000000000 +0200 -@@ -42,7 +42,11 @@ - void* reserved; /* - for later extensions (might be renamed) */ - void* user; /* - free for applications (use this!) */ - long flags; /* bit 0: findfile searches case-insensitive */ -+#ifdef _WIN64 -+ __int64 mapped; -+#else - long mapped; /* used for mmap() wrappers of zzip/__mmap.h */ -+#endif - long unused; /* - for later extensions (might be renamed) */ - long code; /* - free for applications (use this!) */ - }; -diff -ur zziplib-0.13.62.orig/zzip/plugin.c zziplib-0.13.62/zzip/plugin.c ---- zziplib-0.13.62.orig/zzip/plugin.c 2010-12-27 02:14:27.000000000 +0100 -+++ zziplib-0.13.62/zzip/plugin.c 2014-07-14 11:23:23.000000000 +0200 -@@ -43,7 +43,7 @@ - return st.st_size; - } - --static const struct zzip_plugin_io default_io = { -+static struct zzip_plugin_io default_io = { - &open, - &close, - &_zzip_read, -diff -ur zziplib-0.13.62.orig/zzip/plugin.h zziplib-0.13.62/zzip/plugin.h ---- zziplib-0.13.62.orig/zzip/plugin.h 2010-12-27 02:12:54.000000000 +0100 -+++ zziplib-0.13.62/zzip/plugin.h 2014-07-14 11:23:23.000000000 +0200 -@@ -47,7 +47,11 @@ - zzip_ssize_t (*read)(int fd, void* buf, zzip_size_t len); - zzip_off_t (*seeks)(int fd, zzip_off_t offset, int whence); - zzip_off_t (*filesize)(int fd); -+#ifdef _WIN64 -+ __int64 sys; -+#else - long sys; -+#endif - long type; - zzip_ssize_t (*write)(int fd, _zzip_const void* buf, zzip_size_t len); - }; diff --git a/Build/source/libs/zziplib/zziplib-PATCHES/patch-03-w64-ptr b/Build/source/libs/zziplib/zziplib-PATCHES/patch-03-w64-ptr deleted file mode 100644 index f11ec7e4819..00000000000 --- a/Build/source/libs/zziplib/zziplib-PATCHES/patch-03-w64-ptr +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur zziplib-0.13.62.orig/zzip/zip.c zziplib-0.13.62/zzip/zip.c ---- zziplib-0.13.62.orig/zzip/zip.c 2010-12-29 17:22:29.000000000 +0100 -+++ zziplib-0.13.62/zzip/zip.c 2014-07-14 17:05:48.000000000 +0200 -@@ -374,15 +374,19 @@ - * making pointer alignments to values that can be handled as structures - * is tricky. We assume here that an align(4) is sufficient even for - * 64 bit machines. Note that binary operations are not usually allowed -- * to pointer types but we do need only the lower bits in this implementation, -- * so we can just cast the value to a long value. -+ * to pointer types but we can cast the value to a suitably sized integer. - */ - _zzip_inline static char * - __zzip_aligned4(char *p) - { - #define aligned4 __zzip_aligned4 -- p += ((long) p) & 1; /* warnings about truncation of a "pointer" */ -- p += ((long) p) & 2; /* to a "long int" may be safely ignored :) */ -+#ifdef _WIN64 -+ p += ((__int64) p) & 1; -+ p += ((__int64) p) & 2; -+#else -+ p += ((long) p) & 1; -+ p += ((long) p) & 2; -+#endif - return p; - } - -- cgit v1.2.3