Mercurial > mxe-octave
comparison src/glib-1-fixes.patch @ 1190:821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Fri, 24 Sep 2010 16:33:16 +0200 |
parents | |
children | 1f5a3eb3bacf |
comparison
equal
deleted
inserted
replaced
1189:07a641411170 | 1190:821fabe85a36 |
---|---|
1 This file is part of mingw-cross-env. | |
2 See doc/index.html for further information. | |
3 | |
4 Contains ad hoc patches for cross building. | |
5 | |
6 commit 637620b33c175676972419ae674806825a390734 | |
7 Author: Mark Brand <mabrand@mabrand.nl> | |
8 Date: Thu Sep 23 21:36:04 2010 +0200 | |
9 | |
10 no gtk doc check | |
11 | |
12 diff --git a/configure.ac b/configure.ac | |
13 index a821267..2e541d2 100644 | |
14 --- a/configure.ac | |
15 +++ b/configure.ac | |
16 @@ -2741,8 +2741,6 @@ dnl ************************** | |
17 dnl *** Checks for gtk-doc *** | |
18 dnl ************************** | |
19 | |
20 -GTK_DOC_CHECK([1.15]) | |
21 - | |
22 AC_ARG_ENABLE(man, | |
23 [AC_HELP_STRING([--enable-man], | |
24 [regenerate man pages from Docbook [default=no]])],enable_man=yes, | |
25 | |
26 commit 8f4fde8f0ab605720ef0baf7ef8080479b34af63 | |
27 Author: Mark Brand <mabrand@mabrand.nl> | |
28 Date: Thu Sep 23 21:41:51 2010 +0200 | |
29 | |
30 optional gettext | |
31 | |
32 diff --git a/configure.ac b/configure.ac | |
33 index 2e541d2..18c2dea 100644 | |
34 --- a/configure.ac | |
35 +++ b/configure.ac | |
36 @@ -464,8 +464,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS']) | |
37 GLIB_GNU_GETTEXT | |
38 | |
39 if test "$gt_cv_have_gettext" != "yes" ; then | |
40 - AC_MSG_ERROR([ | |
41 -*** You must have either have gettext support in your C library, or use the | |
42 + AC_MSG_WARN([ | |
43 +*** You should have either have gettext support in your C library, or use the | |
44 *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html | |
45 ]) | |
46 fi | |
47 diff --git a/glib/gi18n.h b/glib/gi18n.h | |
48 index c710046..269bfdf 100644 | |
49 --- a/glib/gi18n.h | |
50 +++ b/glib/gi18n.h | |
51 @@ -22,7 +22,12 @@ | |
52 | |
53 #include <glib.h> | |
54 | |
55 +#ifdef ENABLE_NLS | |
56 #include <libintl.h> | |
57 +#else | |
58 +#define gettext(String) (String) | |
59 +#endif | |
60 + | |
61 #include <string.h> | |
62 | |
63 #define _(String) gettext (String) | |
64 | |
65 commit 0a998b24fdb3ae5397ff5ad498260165300a4393 | |
66 Author: Mark Brand <mabrand@mabrand.nl> | |
67 Date: Thu Sep 23 21:42:46 2010 +0200 | |
68 | |
69 fix tool paths | |
70 | |
71 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in | |
72 index 3d1ac12..58e1ecf 100644 | |
73 --- a/glib-2.0.pc.in | |
74 +++ b/glib-2.0.pc.in | |
75 @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ | |
76 libdir=@libdir@ | |
77 includedir=@includedir@ | |
78 | |
79 -glib_genmarshal=glib-genmarshal | |
80 -gobject_query=gobject-query | |
81 -glib_mkenums=glib-mkenums | |
82 +glib_genmarshal=@bindir@/glib-genmarshal | |
83 +gobject_query=@bindir@/gobject-query | |
84 +glib_mkenums=@bindir@/glib-mkenums | |
85 | |
86 Name: GLib | |
87 Description: C Utility Library | |
88 | |
89 commit 7ddbe18ccce7aede0cef972c6035058151c3ce10 | |
90 Author: Mark Brand <mabrand@mabrand.nl> | |
91 Date: Thu Sep 23 21:45:50 2010 +0200 | |
92 | |
93 fix dependency libs | |
94 | |
95 diff --git a/configure.ac b/configure.ac | |
96 index 18c2dea..e472768 100644 | |
97 --- a/configure.ac | |
98 +++ b/configure.ac | |
99 @@ -2698,7 +2698,7 @@ case $host in | |
100 G_LIBS_EXTRA="-luser32 -lkernel32" | |
101 ;; | |
102 *-*-mingw*) | |
103 - G_LIBS_EXTRA="-lws2_32 -lole32" | |
104 + G_LIBS_EXTRA="-lws2_32 -lole32 -lshlwapi" | |
105 ;; | |
106 *) | |
107 G_LIBS_EXTRA="" | |
108 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in | |
109 index 58e1ecf..17b2133 100644 | |
110 --- a/glib-2.0.pc.in | |
111 +++ b/glib-2.0.pc.in | |
112 @@ -11,5 +11,5 @@ Name: GLib | |
113 Description: C Utility Library | |
114 Version: @VERSION@ | |
115 Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ | |
116 -Libs.private: @ICONV_LIBS@ | |
117 +Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ | |
118 Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ |