Mercurial > mxe-octave

annotate src/msvc-libgsf-1.patch @ 7207:9ed6500e56d3 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 17 May 2024 20:16:41 +0200
parents 8147e6f8659a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3135
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur libgsf-1.14.27-orig/configure libgsf-1.14.27/configure
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- libgsf-1.14.27-orig/configure 2013-06-23 12:50:43 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ libgsf-1.14.27/configure 2013-07-12 23:44:33 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -14191,7 +14191,11 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 for try in 1 2; do
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 /* end confdefs.h. */
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 +#ifdef _MSC_VER
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 +#include <winsock2.h>
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 +#else
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 #include <sys/time.h>
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 +#endif
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 int
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 main ()
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 {
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 diff -ur libgsf-1.14.27-orig/dumpdef.pl libgsf-1.14.27/dumpdef.pl
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 --- libgsf-1.14.27-orig/dumpdef.pl 2009-05-18 21:55:48 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 +++ libgsf-1.14.27/dumpdef.pl 2013-07-13 00:13:39 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 @@ -43,7 +43,7 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 while ($lines =~ /^\s*extern\s+ #function type
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 [A-Za-z_]\w*(?:[\s\*]+[A-Za-z_]\w*)*[\s\*]+([A-Za-z_]\w*) #[first arg
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 \s*(?:\[\s*\]\s*)?;/gxm) {
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 - push @symbols, "$1 DATA";
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 + push @symbols, $1;
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 }
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 @symbols;
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 }
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 diff -ur libgsf-1.14.27-orig/gsf/Makefile.in libgsf-1.14.27/gsf/Makefile.in
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 --- libgsf-1.14.27-orig/gsf/Makefile.in 2013-06-23 12:50:44 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 +++ libgsf-1.14.27/gsf/Makefile.in 2013-07-13 00:12:49 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 @@ -350,7 +350,8 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 top_srcdir = @top_srcdir@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) \
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 $(Z_CPPFLAGS) \
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 - -DGSFLOCALEDIR=\"$(datadir)/locale\"
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 + -DGSFLOCALEDIR=\"$(datadir)/locale\" \
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 + -DBUILDING_LIBGSF
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 lib_LTLIBRARIES = libgsf-1.la
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 CLEANFILES = $(am__append_1) $(am__append_3) $(am__append_5)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 @@ -482,8 +483,8 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 CPP_CFLAGS = -DGLIB_CHECK_VERSION\(x,y,z\)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 LIB_PUBLIC_HDRS = $(libgsf_1_include_HEADERS)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45 -@HAVE_LIBEXE_TRUE@gsf_mslibdir = $(DESTDIR)$(libdir)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 -@HAVE_LIBEXE_TRUE@gsf_mslib_DATA = gsf-1.lib
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 +@HAVE_LIBEXE_TRUE@#gsf_mslibdir = $(DESTDIR)$(libdir)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 +@HAVE_LIBEXE_TRUE@#gsf_mslib_DATA = gsf-1.lib
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49 @HAVE_INTROSPECTION_TRUE@Gsf_1_gir_INCLUDES = GObject-2.0 Gio-2.0 libxml2-2.0
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 @HAVE_INTROSPECTION_TRUE@Gsf_1_gir_CFLAGS = $(AM_CPPFLAGS)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 @HAVE_INTROSPECTION_TRUE@Gsf_1_gir_LIBS = libgsf-1.la
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 diff -ur libgsf-1.14.27-orig/gsf/gsf-fwd.h libgsf-1.14.27/gsf/gsf-fwd.h
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 --- libgsf-1.14.27-orig/gsf/gsf-fwd.h 2013-02-23 14:06:49 -0500
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 +++ libgsf-1.14.27/gsf/gsf-fwd.h 2013-07-13 00:09:36 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 @@ -25,6 +25,12 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 #include <glib.h>
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57 #include <glib-object.h>
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 +#if defined(_MSC_VER) && !defined(BUILDING_LIBGSF)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 +# define LIBGSF_EXTERN extern __declspec(dllimport)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61 +#else
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 +# define LIBGSF_EXTERN extern
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63 +#endif
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 +
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 G_BEGIN_DECLS
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 /**
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68 diff -ur libgsf-1.14.27-orig/gsf/gsf-input-memory.c libgsf-1.14.27/gsf/gsf-input-memory.c
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69 --- libgsf-1.14.27-orig/gsf/gsf-input-memory.c 2013-03-08 21:46:57 -0500
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70 +++ libgsf-1.14.27/gsf/gsf-input-memory.c 2013-07-13 00:18:03 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 @@ -36,6 +36,10 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 #include <io.h>
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73 #include <fcntl.h>
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 +#ifndef S_ISREG
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 +# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
77 +#endif
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78 +
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79 #define MAP_FAILED NULL
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80 #endif
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 diff -ur libgsf-1.14.27-orig/gsf/gsf-input-stdio.c libgsf-1.14.27/gsf/gsf-input-stdio.c
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
83 --- libgsf-1.14.27-orig/gsf/gsf-input-stdio.c 2013-03-08 21:46:57 -0500
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84 +++ libgsf-1.14.27/gsf/gsf-input-stdio.c 2013-07-13 00:17:57 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
85 @@ -32,6 +32,10 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
86 #include <sys/types.h>
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
87 #include <sys/stat.h>
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
88
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
89 +#ifndef S_ISREG
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
90 +# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
91 +#endif
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92 +
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 static GObjectClass *parent_class;
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95 struct _GsfInputStdio {
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96 diff -ur libgsf-1.14.27-orig/gsf/gsf-opendoc-utils.h libgsf-1.14.27/gsf/gsf-opendoc-utils.h
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 --- libgsf-1.14.27-orig/gsf/gsf-opendoc-utils.h 2013-02-23 16:27:40 -0500
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
98 +++ libgsf-1.14.27/gsf/gsf-opendoc-utils.h 2013-07-13 00:03:47 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
99 @@ -138,7 +138,7 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
100
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
101 /* For 1.15.x s/opendoc/odf/ and s/ooo/odf/ */
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
102 #ifndef GSF_DISABLE_DEPRECATED
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
103 -extern GsfXMLInNS gsf_ooo_ns[]; /* use get_gsf_ooo_ns instead */
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
104 +LIBGSF_EXTERN GsfXMLInNS gsf_ooo_ns[]; /* use get_gsf_ooo_ns instead */
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
105 GSF_DEPRECATED_FOR (gsf_odf_get_ns)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
106 GsfXMLInNS *get_gsf_ooo_ns (void);
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
107 GSF_DEPRECATED_FOR (gsf_odf_get_version_string)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
108 diff -ur libgsf-1.14.27-orig/gsf/gsf-output-stdio.c libgsf-1.14.27/gsf/gsf-output-stdio.c
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
109 --- libgsf-1.14.27-orig/gsf/gsf-output-stdio.c 2013-03-08 21:46:57 -0500
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
110 +++ libgsf-1.14.27/gsf/gsf-output-stdio.c 2013-07-13 00:17:52 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
111 @@ -52,6 +52,9 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
112 #ifdef HAVE_IO_H
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
113 #include <io.h>
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
114 #endif
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
115 +#ifndef S_ISREG
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
116 +# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
117 +#endif
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
118 #endif /* G_OS_WIN32 */
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
119
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
120 #ifndef W_OK
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
121 diff -ur libgsf-1.14.27-orig/gsf/gsf-utils.h libgsf-1.14.27/gsf/gsf-utils.h
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
122 --- libgsf-1.14.27-orig/gsf/gsf-utils.h 2013-03-07 17:56:29 -0500
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
123 +++ libgsf-1.14.27/gsf/gsf-utils.h 2013-07-13 00:03:06 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
124 @@ -280,21 +280,21 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
125 *
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
126 * Major version number of libgsf, indicating the ABI version.
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
127 */
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
128 -extern int libgsf_major_version;
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
129 +LIBGSF_EXTERN int libgsf_major_version;
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
130
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
131 /**
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
132 * libgsf_minor_version:
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
133 *
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
134 * Minor (secondary) version number of libgsf, indicating the API version.
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
135 */
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
136 -extern int libgsf_minor_version;
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
137 +LIBGSF_EXTERN int libgsf_minor_version;
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
138
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
139 /**
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
140 * libgsf_micro_version:
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
141 *
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
142 * Micro (tertiary) version number of libgsf, indicating bug fixes.
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
143 */
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
144 -extern int libgsf_micro_version;
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
145 +LIBGSF_EXTERN int libgsf_micro_version;
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
146
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
147 char const *gsf_extension_pointer (char const * path);
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
148 void gsf_iconv_close (GIConv handle);
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
149 diff -ur libgsf-1.14.27-orig/gsf-win32/Makefile.in libgsf-1.14.27/gsf-win32/Makefile.in
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
150 --- libgsf-1.14.27-orig/gsf-win32/Makefile.in 2013-06-23 12:50:44 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
151 +++ libgsf-1.14.27/gsf-win32/Makefile.in 2013-07-13 00:20:12 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
152 @@ -355,8 +355,8 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
153 CLEANFILES = $(am__append_1) $(am__append_2)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
154 @WITH_WIN32_TRUE@noinst_DATA = lib.def
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
155 LIB_PUBLIC_HDRS = $(libgsf_win32_1_include_HEADERS)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
156 -@HAVE_LIBEXE_TRUE@gsf_win32_mslibdir = $(DESTDIR)$(libdir)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
157 -@HAVE_LIBEXE_TRUE@gsf_win32_mslib_DATA = gsf-win32-1.lib
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
158 +@HAVE_LIBEXE_TRUE@#gsf_win32_mslibdir = $(DESTDIR)$(libdir)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
159 +@HAVE_LIBEXE_TRUE@#gsf_win32_mslib_DATA = gsf-win32-1.lib
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
160 all: all-am
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
161
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
162 .SUFFIXES:
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
163 diff -ur libgsf-1.14.27-orig/tools/gsf.c libgsf-1.14.27/tools/gsf.c
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
164 --- libgsf-1.14.27-orig/tools/gsf.c 2013-03-07 17:56:29 -0500
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
165 +++ libgsf-1.14.27/tools/gsf.c 2013-07-13 00:21:19 -0400
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
166 @@ -8,6 +8,13 @@
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
167 #include <string.h>
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
168 #include <errno.h>
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
169
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
170 +#ifndef S_ISREG
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
171 +# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
172 +#endif
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
173 +#ifndef S_ISDIR
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
174 +# define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
175 +#endif
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
176 +
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
177 static gboolean show_version;
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
178
8147e6f8659a [MSVC] enable libgsf compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
179 static GOptionEntry const gsf_options [] = {