Mercurial > mxe-octave

annotate src/pstoedit-1-fixes.patch @ 5893:53a6c7df43f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents 8d61de83cf90
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5889
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
1 diff -ur pstoedit-3.77.orig/othersrc/gsdllinc/wgsver.c pstoedit-3.77/othersrc/gsdllinc/wgsver.c
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
2 --- pstoedit-3.77.orig/othersrc/gsdllinc/wgsver.c 2021-09-08 15:38:09.812856463 -0400
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
3 +++ pstoedit-3.77/othersrc/gsdllinc/wgsver.c 2021-09-08 15:39:08.695322622 -0400
5258
57dd959b3713 pstoedit: update to v3.75
John Donoghue
parents: 5149
diff changeset
4 @@ -40,6 +40,9 @@
2952
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 #include "wgsver.h"
5149
3c5634c6a422 pstoedit: update to v3.74
John Donoghue
parents: 3813
diff changeset
6 #include "cppcomp.h"
2952
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 +#ifndef KEY_WOW64_64KEY
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 +#define KEY_WOW64_64KEY 0x0100
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 +#endif
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 /* Ghostscript may be known in the Windows Registry by
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 * the following names.
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 */
5889
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
14 diff -ur pstoedit-3.77.orig/src/cbstream.cpp pstoedit-3.77/src/cbstream.cpp
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
15 --- pstoedit-3.77.orig/src/cbstream.cpp 2021-09-08 15:38:09.813856522 -0400
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
16 +++ pstoedit-3.77/src/cbstream.cpp 2021-09-08 15:39:08.696322681 -0400
2952
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 @@ -33,6 +33,8 @@
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 // this code is only needed under WIN32
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 // ...and under OS/2
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 +#include <cstdio>
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 +
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 #include "cppcomp.h"
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 #include "cbstream.h"
5889
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
26 diff -ur pstoedit-3.77.orig/src/dynload.cpp pstoedit-3.77/src/dynload.cpp
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
27 --- pstoedit-3.77.orig/src/dynload.cpp 2021-09-08 15:38:09.817856757 -0400
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
28 +++ pstoedit-3.77/src/dynload.cpp 2021-09-08 15:42:20.225597212 -0400
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
29 @@ -241,7 +241,7 @@
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
30 #ifdef _WIN64
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
31 DynLoader::fptr rfptr = /* ptr_to_fptr */(GetProcAddress((HINSTANCE) handle, name)); //lint !e611 //: Suspicious cast
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
32 #else
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
33 - DynLoader::fptr rfptr = ptr_to_fptr(GetProcAddress((HINSTANCE)handle, name));
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
34 + DynLoader::fptr rfptr = ptr_to_fptr((void*)GetProcAddress((HINSTANCE)handle, name));
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
35 #endif
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
36
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
37 #else
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
38 diff -ur pstoedit-3.77.orig/src/Makefile.am pstoedit-3.77/src/Makefile.am
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
39 --- pstoedit-3.77.orig/src/Makefile.am 2021-09-08 15:38:09.817856757 -0400
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
40 +++ pstoedit-3.77/src/Makefile.am 2021-09-08 15:39:08.696322681 -0400
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
41 @@ -144,7 +144,8 @@
5149
3c5634c6a422 pstoedit: update to v3.74
John Donoghue
parents: 3813
diff changeset
42 psfront.h \
3c5634c6a422 pstoedit: update to v3.74
John Donoghue
parents: 3813
diff changeset
43 genericints.h
2952
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 -libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 +libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -lm
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47 +libpstoedit_la_CPPFLAGS = -I$(top_srcdir)/othersrc/gsdllinc
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 libpstoedit_la_LDFLAGS = -no-undefined
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 pstoedit_SOURCES = cmdmain.cpp
5889
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
51 @@ -171,7 +172,7 @@
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
52 pstoedit.cpp : pstoedit.ph
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
53
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
54 pstoedit.ph : pstoedit.pro
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
55 - awk -f ps_pro_to_ph.awk < pstoedit.pro > pstoedit.ph
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
56 + awk -f $(srcdir)/ps_pro_to_ph.awk < $(srcdir)/pstoedit.pro > pstoedit.ph
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
57
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
58 cppcheck:
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 5264
diff changeset
59 cppcheck --inconclusive --enable=all `sh ./get_D_and_I_options.sh ${AM_CPPFLAGS}` ${SOURCES}