Mercurial > mxe-octave

annotate src/pstoedit-1-fixes.patch @ 5534:372ea4c0afb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move of-ocs PKG_XXXX to inst dir and add break patch * src/of-ocs-3-break-fixes.patch, src/of-ocs-4-pkgadd-fixes.patch: new files * dist-files.mk: add ref to files
author John Donoghue <john.donoghue@ieee.org>
date Sun, 13 Sep 2020 08:15:14 -0400
parents 6ae1a7973a7e
children 8d61de83cf90
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5258
57dd959b3713 pstoedit: update to v3.75
John Donoghue
parents: 5149
diff changeset
1 diff -ur pstoedit-3.75.orig/othersrc/gsdllinc/wgsver.c pstoedit-3.75/othersrc/gsdllinc/wgsver.c
57dd959b3713 pstoedit: update to v3.75
John Donoghue
parents: 5149
diff changeset
2 --- pstoedit-3.75.orig/othersrc/gsdllinc/wgsver.c 2020-01-06 12:45:59.927286515 -0500
57dd959b3713 pstoedit: update to v3.75
John Donoghue
parents: 5149
diff changeset
3 +++ pstoedit-3.75/othersrc/gsdllinc/wgsver.c 2020-01-06 12:46:54.580699984 -0500
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 */
5258
57dd959b3713 pstoedit: update to v3.75
John Donoghue
parents: 5149
diff changeset
14 diff -ur pstoedit-3.75.orig/src/cbstream.cpp pstoedit-3.75/src/cbstream.cpp
57dd959b3713 pstoedit: update to v3.75
John Donoghue
parents: 5149
diff changeset
15 --- pstoedit-3.75.orig/src/cbstream.cpp 2020-01-06 12:45:59.927286515 -0500
57dd959b3713 pstoedit: update to v3.75
John Donoghue
parents: 5149
diff changeset
16 +++ pstoedit-3.75/src/cbstream.cpp 2020-01-06 12:49:33.424788938 -0500
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"
5258
57dd959b3713 pstoedit: update to v3.75
John Donoghue
parents: 5149
diff changeset
26 diff -ur pstoedit-3.75.orig/src/Makefile.am pstoedit-3.75/src/Makefile.am
57dd959b3713 pstoedit: update to v3.75
John Donoghue
parents: 5149
diff changeset
27 --- pstoedit-3.75.orig/src/Makefile.am 2020-01-06 12:45:59.931286619 -0500
57dd959b3713 pstoedit: update to v3.75
John Donoghue
parents: 5149
diff changeset
28 +++ pstoedit-3.75/src/Makefile.am 2020-01-06 12:52:56.149975594 -0500
5149
3c5634c6a422 pstoedit: update to v3.74
John Donoghue
parents: 3813
diff changeset
29 @@ -143,7 +143,8 @@
3c5634c6a422 pstoedit: update to v3.74
John Donoghue
parents: 3813
diff changeset
30 psfront.h \
3c5634c6a422 pstoedit: update to v3.74
John Donoghue
parents: 3813
diff changeset
31 genericints.h
2952
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 -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
34 +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
35 +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
36 libpstoedit_la_LDFLAGS = -no-undefined
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37
09a58eb274f4 Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 pstoedit_SOURCES = cmdmain.cpp
5264
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
39 diff -ur pstoedit-3.75.orig/src/dynload.cpp pstoedit-3.75/src/dynload.cpp
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
40 --- pstoedit-3.75.orig/src/dynload.cpp 2020-01-09 13:50:03.610222335 -0500
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
41 +++ pstoedit-3.75/src/dynload.cpp 2020-01-09 13:51:10.084019302 -0500
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
42 @@ -239,8 +239,10 @@
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
43 DynLoader::fptr rfptr = ptr_to_fptr(dlsym(handle, name)); //lint !e611 //: Suspicious cast
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
44 #elif defined(OS_WIN32_WCE)
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
45 DynLoader::fptr rfptr = ptr_to_fptr(GetProcAddress((HINSTANCE) handle, LPSTRtoLPWSTR(name).c_str())); //lint !e611 //: Suspicious cast
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
46 -#elif defined(_WIN32)
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
47 +#elif defined(_WIN64)
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
48 DynLoader::fptr rfptr = /* ptr_to_fptr */(GetProcAddress((HINSTANCE) handle, name)); //lint !e611 //: Suspicious cast
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
49 +#elif defined(_WIN32)
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
50 + DynLoader::fptr rfptr = ptr_to_fptr((void*)GetProcAddress((HINSTANCE) handle, name)); //lint !e611 //: Suspicious cast
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
51 #else
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
52 #error "system unsupported so far"
6ae1a7973a7e * src/pstoedit-1-fixes.patch: fix patch for win32 build
John Donoghue
parents: 5258
diff changeset
53 #endif