Mercurial > mxe-octave

comparison src/glib-1-fixes.patch @ 1219:ffb6a86b8f9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved patch layout Use "git format-patch" instead of "git log -p --reverse" to generate patches which can be imported with with "git am". Also set author/from to "mingw-cross-env" since attribution is done in the mingw-cross-env repository.
author Mark Brand <mabrand@mabrand.nl>
date Wed, 29 Sep 2010 19:42:33 +0200
parents 1f5a3eb3bacf
children 190d15e709cf
comparison
equal deleted inserted replaced
1218:e8e0dd3ce3e7 1219:ffb6a86b8f9a
1 This file is part of mingw-cross-env. 1 This file is part of mingw-cross-env.
2 See doc/index.html for further information. 2 See doc/index.html for further information.
3 3
4 Contains ad hoc patches for cross building. 4 Contains ad hoc patches for cross building.
5 5
6 commit 637620b33c175676972419ae674806825a390734 6 From 637620b33c175676972419ae674806825a390734 Mon Sep 17 00:00:00 2001
7 Author: Mark Brand <mabrand@mabrand.nl> 7 From: mingw-cross-env
8 Date: Thu Sep 23 21:36:04 2010 +0200 8 Date: Thu, 23 Sep 2010 21:36:04 +0200
9 Subject: [PATCH 1/5] no gtk doc check
9 10
10 no gtk doc check
11 11
12 diff --git a/configure.ac b/configure.ac 12 diff --git a/configure.ac b/configure.ac
13 index a821267..2e541d2 100644 13 index a821267..2e541d2 100644
14 --- a/configure.ac 14 --- a/configure.ac
15 +++ b/configure.ac 15 +++ b/configure.ac
20 -GTK_DOC_CHECK([1.15]) 20 -GTK_DOC_CHECK([1.15])
21 - 21 -
22 AC_ARG_ENABLE(man, 22 AC_ARG_ENABLE(man,
23 [AC_HELP_STRING([--enable-man], 23 [AC_HELP_STRING([--enable-man],
24 [regenerate man pages from Docbook [default=no]])],enable_man=yes, 24 [regenerate man pages from Docbook [default=no]])],enable_man=yes,
25 --
26 1.7.1
25 27
26 commit 8f4fde8f0ab605720ef0baf7ef8080479b34af63
27 Author: Mark Brand <mabrand@mabrand.nl>
28 Date: Thu Sep 23 21:41:51 2010 +0200
29 28
30 optional gettext 29 From 8f4fde8f0ab605720ef0baf7ef8080479b34af63 Mon Sep 17 00:00:00 2001
30 From: mingw-cross-env
31 Date: Thu, 23 Sep 2010 21:41:51 +0200
32 Subject: [PATCH 2/5] optional gettext
33
31 34
32 diff --git a/configure.ac b/configure.ac 35 diff --git a/configure.ac b/configure.ac
33 index 2e541d2..18c2dea 100644 36 index 2e541d2..18c2dea 100644
34 --- a/configure.ac 37 --- a/configure.ac
35 +++ b/configure.ac 38 +++ b/configure.ac
59 +#endif 62 +#endif
60 + 63 +
61 #include <string.h> 64 #include <string.h>
62 65
63 #define _(String) gettext (String) 66 #define _(String) gettext (String)
67 --
68 1.7.1
64 69
65 commit 0a998b24fdb3ae5397ff5ad498260165300a4393
66 Author: Mark Brand <mabrand@mabrand.nl>
67 Date: Thu Sep 23 21:42:46 2010 +0200
68 70
69 fix tool paths 71 From 0a998b24fdb3ae5397ff5ad498260165300a4393 Mon Sep 17 00:00:00 2001
72 From: mingw-cross-env
73 Date: Thu, 23 Sep 2010 21:42:46 +0200
74 Subject: [PATCH 3/5] fix tool paths
75
70 76
71 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in 77 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
72 index 3d1ac12..58e1ecf 100644 78 index 3d1ac12..58e1ecf 100644
73 --- a/glib-2.0.pc.in 79 --- a/glib-2.0.pc.in
74 +++ b/glib-2.0.pc.in 80 +++ b/glib-2.0.pc.in
83 +gobject_query=@bindir@/gobject-query 89 +gobject_query=@bindir@/gobject-query
84 +glib_mkenums=@bindir@/glib-mkenums 90 +glib_mkenums=@bindir@/glib-mkenums
85 91
86 Name: GLib 92 Name: GLib
87 Description: C Utility Library 93 Description: C Utility Library
94 --
95 1.7.1
88 96
89 commit 7ddbe18ccce7aede0cef972c6035058151c3ce10
90 Author: Mark Brand <mabrand@mabrand.nl>
91 Date: Thu Sep 23 21:45:50 2010 +0200
92 97
93 fix dependency libs 98 From 7ddbe18ccce7aede0cef972c6035058151c3ce10 Mon Sep 17 00:00:00 2001
99 From: mingw-cross-env
100 Date: Thu, 23 Sep 2010 21:45:50 +0200
101 Subject: [PATCH 4/5] fix dependency libs
102
94 103
95 diff --git a/configure.ac b/configure.ac 104 diff --git a/configure.ac b/configure.ac
96 index 18c2dea..e472768 100644 105 index 18c2dea..e472768 100644
97 --- a/configure.ac 106 --- a/configure.ac
98 +++ b/configure.ac 107 +++ b/configure.ac
114 Version: @VERSION@ 123 Version: @VERSION@
115 Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ 124 Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
116 -Libs.private: @ICONV_LIBS@ 125 -Libs.private: @ICONV_LIBS@
117 +Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ 126 +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@ 127 Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
128 --
129 1.7.1
119 130
120 commit 83ef7aba98793b7502370971c6de0b115c55e49c
121 Author: Mark Brand <mabrand@mabrand.nl>
122 Date: Sat Sep 25 00:07:33 2010 +0200
123 131
124 add -ldnsapi to gio-2.0.pc 132 From 83ef7aba98793b7502370971c6de0b115c55e49c Mon Sep 17 00:00:00 2001
133 From: mingw-cross-env
134 Date: Sat, 25 Sep 2010 00:07:33 +0200
135 Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc
136
125 137
126 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in 138 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
127 index 92cda85..7a4e224 100644 139 index 92cda85..7a4e224 100644
128 --- a/gio-2.0.pc.in 140 --- a/gio-2.0.pc.in
129 +++ b/gio-2.0.pc.in 141 +++ b/gio-2.0.pc.in
133 Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0 145 Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
134 -Libs: -L${libdir} -lgio-2.0 146 -Libs: -L${libdir} -lgio-2.0
135 +Libs: -L${libdir} -lgio-2.0 -ldnsapi 147 +Libs: -L${libdir} -lgio-2.0 -ldnsapi
136 Libs.private: @ZLIB_LIBS@ @LIBASYNCNS_LIBADD@ 148 Libs.private: @ZLIB_LIBS@ @LIBASYNCNS_LIBADD@
137 Cflags: 149 Cflags:
150 --
151 1.7.1
152