texlive[60051] Build/source/libs/libpaper: libpaper: apply patch of

[commits+takuji at tug.org]

Revision: 60051
          http://tug.org/svn/texlive?view=revision&revision=60051
Author:   takuji
Date:     2021-07-25 03:37:03 +0200 (Sun, 25 Jul 2021)
Log Message:
-----------
libpaper: apply patch of W32TeX (Windows only)

Modified Paths:
--------------
    trunk/Build/source/libs/libpaper/ChangeLog
    trunk/Build/source/libs/libpaper/TLpatches/ChangeLog
    trunk/Build/source/libs/libpaper/libpaper-src/src/paperconf.c

Added Paths:
-----------
    trunk/Build/source/libs/libpaper/TLpatches/patch-05-windows

Modified: trunk/Build/source/libs/libpaper/ChangeLog
===================================================================
--- trunk/Build/source/libs/libpaper/ChangeLog	2021-07-25 00:11:58 UTC (rev 60050)
+++ trunk/Build/source/libs/libpaper/ChangeLog	2021-07-25 01:37:03 UTC (rev 60051)
@@ -1,3 +1,8 @@
+2021-07-25  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* src/paperconf.c: Apply patch of W32TeX for Windows
+	Visual C by Kakuto-san.
+
 2021-06-27  Karl Berry  <karl at freefriends.org>
 
 	* configure.ac (AC_USE_SYSTEM_EXTENSIONS): use before KPSE_BASIC,

Modified: trunk/Build/source/libs/libpaper/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/libs/libpaper/TLpatches/ChangeLog	2021-07-25 00:11:58 UTC (rev 60050)
+++ trunk/Build/source/libs/libpaper/TLpatches/ChangeLog	2021-07-25 01:37:03 UTC (rev 60051)
@@ -1,3 +1,8 @@
+2021-07-25  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* patch-05-windows (new): Patch of W32TeX for Windows
+	Visual C by Kakuto-san.
+
 2014-06-18  Peter Breitenlohner  <peb at mppmu.mpg.de>
 
 	* patch-04-unsigned (new): Avoid undefined behaviour.

Added: trunk/Build/source/libs/libpaper/TLpatches/patch-05-windows
===================================================================
--- trunk/Build/source/libs/libpaper/TLpatches/patch-05-windows	                        (rev 0)
+++ trunk/Build/source/libs/libpaper/TLpatches/patch-05-windows	2021-07-25 01:37:03 UTC (rev 60051)
@@ -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 <sys/param.h>
++#endif
+ 
+ #include <ctype.h>
++#ifdef _MSC_VER
++#include <getopt.h>
++#endif
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -100,6 +105,10 @@
+     const char* progname;
+ 
+     progname = strrchr(*argv, '/');
++#ifdef WIN32
++    if(!progname)
++        progname = strrchr(*argv, '\\');
++#endif
+     if (progname) {
+ 	++progname;
+     } else {

Modified: trunk/Build/source/libs/libpaper/libpaper-src/src/paperconf.c
===================================================================
--- trunk/Build/source/libs/libpaper/libpaper-src/src/paperconf.c	2021-07-25 00:11:58 UTC (rev 60050)
+++ trunk/Build/source/libs/libpaper/libpaper-src/src/paperconf.c	2021-07-25 01:37:03 UTC (rev 60051)
@@ -3,9 +3,14 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
 
 #include <ctype.h>
+#ifdef _MSC_VER
+#include <getopt.h>
+#endif
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -100,6 +105,10 @@
     const char* progname;
 
     progname = strrchr(*argv, '/');
+#ifdef WIN32
+    if(!progname)
+        progname = strrchr(*argv, '\\');
+#endif
     if (progname) {
 	++progname;
     } else {