1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
|
Description: Autogenerated patch header for a single-debian-patch file.
The delta against upstream is either kept as a single patch, or maintained
in some VCS, and exported as a single patch instead of more manageable
atomic patches.
Forwarded: not-needed
---
--- termrec-0.19.orig/Makefile.am
+++ termrec-0.19/Makefile.am
@@ -6,7 +6,6 @@ endif
EXTRA_DIST= BUGS autogen.sh gettext.h export.h win32/termrec.iss \
VERSION get_version
-DISTCLEANFILES = _stdint.h
ACLOCAL_AMFLAGS = -I m4
CLEANFILES =
--- termrec-0.19.orig/acinclude.m4
+++ termrec-0.19/acinclude.m4
@@ -1,4 +1,3 @@
-m4_include([m4/ax_create_stdint_h.m4])
m4_include([m4/ac_ptyranges.m4])
m4_include([m4/ac_check_win32.m4])
m4_include([m4/ac_shipped_lib.m4])
--- termrec-0.19.orig/configure.ac
+++ termrec-0.19/configure.ac
@@ -1,12 +1,12 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
-AC_INIT(termrec, m4_esyscmd([./get_version -n]), [kilobyte@angband.pl])
+AC_PREREQ([2.71])
+AC_INIT([termrec],[m4_esyscmd(./get_version -n)],[kilobyte@angband.pl])
AM_INIT_AUTOMAKE([-Wall dist-xz no-dist-gzip foreign subdir-objects])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([libtty/tty.h])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES(Makefile
win32/icons/Makefile
)
@@ -31,10 +31,8 @@ AX_CHECK_COMPILE_FLAG(-std=gnu11, [CFLAG
AC_SCO
# Checks for header files.
-AC_HEADER_STDC
#AC_HEADER_TIOCGWINSZ
-AX_CREATE_STDINT_H
-AC_HEADER_TIME
+AC_CHECK_HEADERS_ONCE([sys/time.h])
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h strings.h sys/ioctl.h termios.h \
unistd.h bzlib.h zlib.h sys/time.h sys/select.h langinfo.h \
netinet/in.h lzma.h pty.h libutil.h zstd.h])
--- termrec-0.19.orig/libtty/asciicast.c
+++ termrec-0.19/libtty/asciicast.c
@@ -1,5 +1,5 @@
#include "config.h"
-#include "_stdint.h"
+#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
@@ -487,7 +487,7 @@ void record_asciicast(FILE *f, void* sta
fprintf(f, "{\"version\":%d, \"width\":%d, \"height\":%d",
as->version, vt->sx, vt->sy);
if (as->ts.tv_sec)
- fprintf(f, ", \"timestamp\":%ld", as->ts.tv_sec);
+ fprintf(f, ", \"timestamp\":%lld", (long long int)as->ts.tv_sec);
if (as->version == 1)
fprintf(f, ", \"stdout\":[\n");
else
--- termrec-0.19.orig/libtty/dosrecorder.c
+++ termrec-0.19/libtty/dosrecorder.c
@@ -9,7 +9,7 @@
#include <string.h>
#include <stdio.h>
#include <unistd.h>
-#include "_stdint.h"
+#include <stdint.h>
#include "gettext.h"
#include "export.h"
#include "formats.h"
--- termrec-0.19.orig/libtty/formats.c
+++ termrec-0.19/libtty/formats.c
@@ -73,7 +73,7 @@ Will be called when the recording ends.
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
-#include "_stdint.h"
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
--- termrec-0.19.orig/libtty/formats.h
+++ termrec-0.19/libtty/formats.h
@@ -1,13 +1,7 @@
#include <stdio.h>
-#if TIME_WITH_SYS_TIME
+#include <time.h>
+#if HAVE_SYS_TIME_H
# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
typedef void play_func(FILE *f,
--- termrec-0.19.orig/play/termplay.c
+++ termrec-0.19/play/termplay.c
@@ -10,7 +10,7 @@
# include <termios.h>
# include <unistd.h>
#endif
-#include "_stdint.h"
+#include <stdint.h>
#include "gettext.h"
#include "common.h"
#include "sys/threads.h"
--- termrec-0.19.orig/tests/vt.c
+++ termrec-0.19/tests/vt.c
@@ -4,6 +4,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdbool.h>
+#include <inttypes.h>
#include "tty.h"
#include "wcwidth.h"
@@ -50,7 +51,7 @@ static const char* describe_attr(uint64_
b+=sprintf(b, " bg="), b+=describe_color(b, attr>>32);
#define INVALID_ATTRS 0x7000000080000000
if (attr & INVALID_ATTRS)
- b+=sprintf(b, "bad_attr:%lx", attr & INVALID_ATTRS);
+ b+=sprintf(b, "bad_attr:%"PRIx64, attr & INVALID_ATTRS);
return *buf? buf+1 : buf;
}
--- termrec-0.19.orig/tests/vtmir.c
+++ termrec-0.19/tests/vtmir.c
@@ -4,7 +4,7 @@
#include "sys/compat.h"
#include "sys/threads.h"
#include "sys/error.h"
-#include "_stdint.h"
+#include <stdint.h>
#include <unistd.h>
--- termrec-0.19.orig/win32/term.c
+++ termrec-0.19/win32/term.c
@@ -8,7 +8,7 @@
#include <fcntl.h>
#include <errno.h>
#include "config.h"
-#include "_stdint.h"
+#include <stdint.h>
#include "sys/utils.h"
#include "tty.h"
#include "draw.h"
|
