1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
|
This file is part of mingw-cross-env.
See doc/index.html for further information.
Contains ad hoc patches for cross building.
From 4693f62d3f01f7b7d26607e6eed843202cbf90f7 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 23 Sep 2010 21:36:04 +0200
Subject: [PATCH 1/7] no gtk doc check
diff --git a/configure.ac b/configure.ac
index a821267..2e541d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2741,8 +2741,6 @@ dnl **************************
dnl *** Checks for gtk-doc ***
dnl **************************
-GTK_DOC_CHECK([1.15])
-
AC_ARG_ENABLE(man,
[AC_HELP_STRING([--enable-man],
[regenerate man pages from Docbook [default=no]])],enable_man=yes,
--
1.7.1
From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 23 Sep 2010 21:41:51 +0200
Subject: [PATCH 2/7] optional gettext
diff --git a/configure.ac b/configure.ac
index 2e541d2..18c2dea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -464,8 +464,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
GLIB_GNU_GETTEXT
if test "$gt_cv_have_gettext" != "yes" ; then
- AC_MSG_ERROR([
-*** You must have either have gettext support in your C library, or use the
+ AC_MSG_WARN([
+*** You should have either have gettext support in your C library, or use the
*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
])
fi
diff --git a/glib/gi18n.h b/glib/gi18n.h
index c710046..269bfdf 100644
--- a/glib/gi18n.h
+++ b/glib/gi18n.h
@@ -22,7 +22,12 @@
#include <glib.h>
+#ifdef ENABLE_NLS
#include <libintl.h>
+#else
+#define gettext(String) (String)
+#endif
+
#include <string.h>
#define _(String) gettext (String)
--
1.7.1
From 3473b5183b2e59d247cd1db053efc6c9ecaf2aab Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 23 Sep 2010 21:42:46 +0200
Subject: [PATCH 3/7] fix tool paths
diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
index 3d1ac12..58e1ecf 100644
--- a/glib-2.0.pc.in
+++ b/glib-2.0.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-glib_genmarshal=glib-genmarshal
-gobject_query=gobject-query
-glib_mkenums=glib-mkenums
+glib_genmarshal=@bindir@/glib-genmarshal
+gobject_query=@bindir@/gobject-query
+glib_mkenums=@bindir@/glib-mkenums
Name: GLib
Description: C Utility Library
--
1.7.1
From 0e57514812500d5d4dee03e1be8059a25876dd99 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 23 Sep 2010 21:45:50 +0200
Subject: [PATCH 4/7] fix dependency libs
diff --git a/configure.ac b/configure.ac
index 18c2dea..e472768 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2698,7 +2698,7 @@ case $host in
G_LIBS_EXTRA="-luser32 -lkernel32"
;;
*-*-mingw*)
- G_LIBS_EXTRA="-lws2_32 -lole32"
+ G_LIBS_EXTRA="-lws2_32 -lole32 -lshlwapi"
;;
*)
G_LIBS_EXTRA=""
diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
index 58e1ecf..17b2133 100644
--- a/glib-2.0.pc.in
+++ b/glib-2.0.pc.in
@@ -11,5 +11,5 @@ Name: GLib
Description: C Utility Library
Version: @VERSION@
Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
-Libs.private: @ICONV_LIBS@
+Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
--
1.7.1
From 87931c81f6401fb0c25064ec0ba2edca9ec53924 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Sat, 25 Sep 2010 00:07:33 +0200
Subject: [PATCH 5/7] add -ldnsapi to gio-2.0.pc
diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
index 92cda85..7a4e224 100644
--- a/gio-2.0.pc.in
+++ b/gio-2.0.pc.in
@@ -10,6 +10,6 @@ Name: GIO
Description: glib I/O library
Version: @VERSION@
Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
-Libs: -L${libdir} -lgio-2.0
+Libs: -L${libdir} -lgio-2.0 -ldnsapi
Libs.private: @ZLIB_LIBS@ @LIBASYNCNS_LIBADD@
Cflags:
--
1.7.1
From 58d20f08e876298e795f7282ddc6cfccbe6f05fe Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Sun, 3 Oct 2010 20:24:46 +0200
Subject: [PATCH 6/7] darwin config libiconv
diff --git a/configure.ac b/configure.ac
index e472768..a681285 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,6 +374,12 @@ dnl ***********************
dnl
dnl We do this before the gettext checks, to avoid distortion
+case $host in
+ *-*-darwin*)
+ with_libiconv=native
+ ;;
+esac
+
dnl On Windows we use a native implementation
if test x"$glib_native_win32" = xyes; then
--
1.7.1
From a340fa1dfbf9a8ac58cd1b026bd26de30d7fc581 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Sun, 3 Oct 2010 20:25:32 +0200
Subject: [PATCH 7/7] apple iconv
This patch has been taken from:
http://mail.gnome.org/archives/gtk-list/2009-August/msg00146.html
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 52a3dd8..d8b4f89 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -61,7 +61,7 @@
#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
#error GNU libiconv in use but included iconv.h not from libiconv
#endif
-#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
+#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined(__APPLE__)
#error GNU libiconv not in use but included iconv.h is from libiconv
#endif
--
1.7.1
|
