From 1c6b7e6b002c63f606ce606cbf6d8d474af4a7ae Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sun, 25 Jul 2021 01:37:03 +0000 Subject: libpaper: apply patch of W32TeX (Windows only) git-svn-id: svn://tug.org/texlive/trunk@60051 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/libpaper/ChangeLog | 5 ++++ Build/source/libs/libpaper/TLpatches/ChangeLog | 5 ++++ .../libs/libpaper/TLpatches/patch-05-windows | 29 ++++++++++++++++++++++ .../libs/libpaper/libpaper-src/src/paperconf.c | 9 +++++++ 4 files changed, 48 insertions(+) create mode 100644 Build/source/libs/libpaper/TLpatches/patch-05-windows (limited to 'Build/source/libs') diff --git a/Build/source/libs/libpaper/ChangeLog b/Build/source/libs/libpaper/ChangeLog index 419aa5e945b..f1fdffc950a 100644 --- a/Build/source/libs/libpaper/ChangeLog +++ b/Build/source/libs/libpaper/ChangeLog @@ -1,3 +1,8 @@ +2021-07-25 TANAKA Takuji + + * src/paperconf.c: Apply patch of W32TeX for Windows + Visual C by Kakuto-san. + 2021-06-27 Karl Berry * configure.ac (AC_USE_SYSTEM_EXTENSIONS): use before KPSE_BASIC, diff --git a/Build/source/libs/libpaper/TLpatches/ChangeLog b/Build/source/libs/libpaper/TLpatches/ChangeLog index 88935dabef6..63bf66a9362 100644 --- a/Build/source/libs/libpaper/TLpatches/ChangeLog +++ b/Build/source/libs/libpaper/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2021-07-25 TANAKA Takuji + + * patch-05-windows (new): Patch of W32TeX for Windows + Visual C by Kakuto-san. + 2014-06-18 Peter Breitenlohner * patch-04-unsigned (new): Avoid undefined behaviour. diff --git a/Build/source/libs/libpaper/TLpatches/patch-05-windows b/Build/source/libs/libpaper/TLpatches/patch-05-windows new file mode 100644 index 00000000000..e5efe39dd85 --- /dev/null +++ b/Build/source/libs/libpaper/TLpatches/patch-05-windows @@ -0,0 +1,29 @@ +diff -urN libpaper-src.orig/src/paperconf.c libpaper-src/src/paperconf.c +--- libpaper-src.orig/src/paperconf.c 2018-06-04 21:21:52.425895682 +0900 ++++ libpaper-src/src/paperconf.c 2021-07-25 10:23:30.460565370 +0900 +@@ -3,9 +3,14 @@ + #include "config.h" + #endif + ++#ifdef HAVE_SYS_PARAM_H + #include ++#endif + + #include ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + #include +@@ -100,6 +105,10 @@ + const char* progname; + + progname = strrchr(*argv, '/'); ++#ifdef WIN32 ++ if(!progname) ++ progname = strrchr(*argv, '\\'); ++#endif + if (progname) { + ++progname; + } else { diff --git a/Build/source/libs/libpaper/libpaper-src/src/paperconf.c b/Build/source/libs/libpaper/libpaper-src/src/paperconf.c index bbd43802512..96314533b26 100644 --- a/Build/source/libs/libpaper/libpaper-src/src/paperconf.c +++ b/Build/source/libs/libpaper/libpaper-src/src/paperconf.c @@ -3,9 +3,14 @@ #include "config.h" #endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #include +#ifdef _MSC_VER +#include +#endif #include #include #include @@ -100,6 +105,10 @@ int main(int argc, char** argv) const char* progname; progname = strrchr(*argv, '/'); +#ifdef WIN32 + if(!progname) + progname = strrchr(*argv, '\\'); +#endif if (progname) { ++progname; } else { -- cgit v1.2.3