Mercurial > mxe-octave

annotate src/glib-1-fixes.patch @ 1190:821fabe85a36

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