Mercurial > mxe-octave

comparison src/pstoedit-1-fixes.patch @ 5258:57dd959b3713

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pstoedit: update to v3.75 * src/pstoedit-1-fixes.patch, src/pstoedit-2-gs.patch: update patch * src/pstoedit.mk: update version, checksum
author John Donoghue
date Mon, 06 Jan 2020 13:02:08 -0500
parents 3c5634c6a422
children 6ae1a7973a7e
comparison
equal deleted inserted replaced
5257:1927e90b6f63 5258:57dd959b3713
1 diff -ur pstoedit-3.74.orig/othersrc/gsdllinc/wgsver.c pstoedit-3.74/othersrc/gsdllinc/wgsver.c 1 diff -ur pstoedit-3.75.orig/othersrc/gsdllinc/wgsver.c pstoedit-3.75/othersrc/gsdllinc/wgsver.c
2 --- pstoedit-3.74.orig/othersrc/gsdllinc/wgsver.c 2019-08-12 16:51:30.466523053 -0400 2 --- pstoedit-3.75.orig/othersrc/gsdllinc/wgsver.c 2020-01-06 12:45:59.927286515 -0500
3 +++ pstoedit-3.74/othersrc/gsdllinc/wgsver.c 2019-08-12 16:57:43.384024846 -0400 3 +++ pstoedit-3.75/othersrc/gsdllinc/wgsver.c 2020-01-06 12:46:54.580699984 -0500
4 @@ -40,6 +40,10 @@ 4 @@ -40,6 +40,9 @@
5 #include "wgsver.h" 5 #include "wgsver.h"
6 #include "cppcomp.h" 6 #include "cppcomp.h"
7 7
8 +#ifndef KEY_WOW64_64KEY 8 +#ifndef KEY_WOW64_64KEY
9 +#define KEY_WOW64_64KEY 0x0100 9 +#define KEY_WOW64_64KEY 0x0100
10 +#endif 10 +#endif
11 +
12 /* Ghostscript may be known in the Windows Registry by 11 /* Ghostscript may be known in the Windows Registry by
13 * the following names. 12 * the following names.
14 */ 13 */
15 Only in pstoedit-3.74/othersrc/gsdllinc: wgsver.c.orig 14 diff -ur pstoedit-3.75.orig/src/cbstream.cpp pstoedit-3.75/src/cbstream.cpp
16 diff -ur pstoedit-3.74.orig/src/cbstream.cpp pstoedit-3.74/src/cbstream.cpp 15 --- pstoedit-3.75.orig/src/cbstream.cpp 2020-01-06 12:45:59.927286515 -0500
17 --- pstoedit-3.74.orig/src/cbstream.cpp 2019-08-12 16:51:30.466523053 -0400 16 +++ pstoedit-3.75/src/cbstream.cpp 2020-01-06 12:49:33.424788938 -0500
18 +++ pstoedit-3.74/src/cbstream.cpp 2019-08-12 16:57:43.388024951 -0400
19 @@ -33,6 +33,8 @@ 17 @@ -33,6 +33,8 @@
20 // this code is only needed under WIN32 18 // this code is only needed under WIN32
21 // ...and under OS/2 19 // ...and under OS/2
22 20
23 +#include <cstdio> 21 +#include <cstdio>
24 + 22 +
25 #include "cppcomp.h" 23 #include "cppcomp.h"
26 24
27 #include "cbstream.h" 25 #include "cbstream.h"
28 diff -ur pstoedit-3.74.orig/src/dynload.cpp pstoedit-3.74/src/dynload.cpp 26 diff -ur pstoedit-3.75.orig/src/Makefile.am pstoedit-3.75/src/Makefile.am
29 --- pstoedit-3.74.orig/src/dynload.cpp 2019-08-12 16:51:30.470523154 -0400 27 --- pstoedit-3.75.orig/src/Makefile.am 2020-01-06 12:45:59.931286619 -0500
30 +++ pstoedit-3.74/src/dynload.cpp 2019-08-12 16:57:43.388024951 -0400 28 +++ pstoedit-3.75/src/Makefile.am 2020-01-06 12:52:56.149975594 -0500
31 @@ -240,7 +240,7 @@
32 #elif defined(OS_WIN32_WCE)
33 DynLoader::fptr rfptr = ptr_to_fptr(GetProcAddress((HINSTANCE) handle, LPSTRtoLPWSTR(name).c_str())); //lint !e611 //: Suspicious cast
34 #elif defined(_WIN32)
35 - DynLoader::fptr rfptr = ptr_to_fptr(GetProcAddress((HINSTANCE) handle, name)); //lint !e611 //: Suspicious cast
36 + DynLoader::fptr rfptr = ptr_to_fptr((void*)GetProcAddress((HINSTANCE) handle, name)); //lint !e611 //: Suspicious cast
37 #else
38 #error "system unsupported so far"
39 #endif
40 Only in pstoedit-3.74/src: dynload.cpp.orig
41 diff -ur pstoedit-3.74.orig/src/Makefile.am pstoedit-3.74/src/Makefile.am
42 --- pstoedit-3.74.orig/src/Makefile.am 2019-08-12 16:51:30.470523154 -0400
43 +++ pstoedit-3.74/src/Makefile.am 2019-08-12 16:57:43.388024951 -0400
44 @@ -143,7 +143,8 @@ 29 @@ -143,7 +143,8 @@
45 psfront.h \ 30 psfront.h \
46 genericints.h 31 genericints.h
47 32
48 -libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm 33 -libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm