Mercurial > mxe-octave
annotate src/pstoedit-1-fixes.patch @ 4039:1c72016826aa
of-fl-core: update patch for --enable-64
* src/of-fl-core-1-fixes.patch: update patch
author | John Donoghue |
---|---|
date | Wed, 30 Sep 2015 14:11:45 -0400 |
parents | ea3cab4018c5 |
children | 3c5634c6a422 |
rev | line source |
---|---|
2952
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1 diff -uNr e/othersrc/gsdllinc/wgsver.c f/othersrc/gsdllinc/wgsver.c |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2 --- e/othersrc/gsdllinc/wgsver.c 2010-12-27 10:09:35.000000000 -0500 |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
3 +++ f/othersrc/gsdllinc/wgsver.c 2013-01-08 22:23:09.775545031 -0500 |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
4 @@ -39,6 +39,10 @@ |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
5 #include <stdlib.h> |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
6 #include "wgsver.h" |
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 + |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
12 /* 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
|
13 * the following names. |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
14 */ |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
15 diff -uNr e/src/cbstream.cpp f/src/cbstream.cpp |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
16 --- e/src/cbstream.cpp 2012-08-28 09:52:28.000000000 -0400 |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 +++ f/src/cbstream.cpp 2013-01-08 22:15:04.575971765 -0500 |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
18 @@ -33,6 +33,8 @@ |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 // this code is only needed under WIN32 |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
20 // ...and under OS/2 |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
21 |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
22 +#include <cstdio> |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 + |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
24 #include "cppcomp.h" |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 #include "cbstream.h" |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 diff -uNr e/src/Makefile.am f/src/Makefile.am |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 --- e/src/Makefile.am 2010-08-22 09:54:28.000000000 -0400 |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 +++ f/src/Makefile.am 2013-01-08 22:28:40.596345408 -0500 |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
30 @@ -133,7 +133,8 @@ |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
31 genericints.h \ |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 version.h |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
33 |
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} -ldl -lm |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
35 +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
|
36 +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
|
37 libpstoedit_la_LDFLAGS = -no-undefined |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
38 |
09a58eb274f4
Include pstoedit as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 pstoedit_SOURCES = cmdmain.cpp |
3813 | 40 diff -ur pstoedit-3.70.orig/src/dynload.cpp pstoedit-3.70/src/dynload.cpp |
41 --- pstoedit-3.70.orig/src/dynload.cpp 2015-02-27 11:26:42.674665283 -0500 | |
42 +++ pstoedit-3.70/src/dynload.cpp 2015-02-27 11:28:12.270406665 -0500 | |
43 @@ -229,7 +229,7 @@ | |
44 #if defined(__linux) || defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__hpux) || defined(__sparc) || defined(__OS2__) || defined(_AIX) || (defined (HAVE_DLFCN_H) && (HAVE_DLFCN_H==1 ) ) | |
45 DynLoader::fptr rfptr = ptr_to_fptr(dlsym(handle, name)); //lint !e611 //: Suspicious cast | |
46 #elif defined(_WIN32) | |
47 - DynLoader::fptr rfptr = ptr_to_fptr(GetProcAddress((HINSTANCE) handle, name)); //lint !e611 //: Suspicious cast | |
48 + DynLoader::fptr rfptr = ptr_to_fptr((void*)GetProcAddress((HINSTANCE) handle, name)); //lint !e611 //: Suspicious cast | |
49 #else | |
50 #error "system unsupported so far" | |
51 #endif | |
52 diff -ur pstoedit-3.70.orig/src/pstoedit.cpp pstoedit-3.70/src/pstoedit.cpp | |
53 --- pstoedit-3.70.orig/src/pstoedit.cpp 2015-02-27 13:34:44.955166896 -0500 | |
54 +++ pstoedit-3.70/src/pstoedit.cpp 2015-02-27 13:36:47.962690034 -0500 | |
55 @@ -269,10 +269,12 @@ | |
56 char *p = 0; | |
57 if (r && (p = strrchr(szExePath, directoryDelimiter)) != 0) { | |
58 *p = '\0'; | |
59 +/* disabled load in exe dir -- | |
60 if (!strequal(szExePath, plugindir.c_str())) { | |
61 loadPlugInDrivers(szExePath, errstream,verbose); | |
62 pluginsloaded = true; | |
63 } | |
64 +*/ | |
65 } | |
66 // now try also $exepath/../lib/pstoedit | |
67 strcat_s(szExePath,1000,"/../lib/pstoedit"); |