Mercurial > mxe-octave

comparison src/pango-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 02fccefe7136
children 58ea60dca393
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 ed3371ed8a13f169cfd1920ecc794b30bb69cc0b 6 From ed3371ed8a13f169cfd1920ecc794b30bb69cc0b Mon Sep 17 00:00:00 2001
7 Author: Mark Brand <mabrand@mabrand.nl> 7 From: mingw-cross-env
8 Date: Wed Sep 29 00:52:59 2010 +0200 8 Date: Wed, 29 Sep 2010 00:52:59 +0200
9 9 Subject: [PATCH 1/5] s,DllMain,static _disabled_DllMain,
10 s,DllMain,static _disabled_DllMain, 10
11 11
12 diff --git a/pango/pango-utils.c b/pango/pango-utils.c 12 diff --git a/pango/pango-utils.c b/pango/pango-utils.c
13 index 100dbc7..f60be42 100644 13 index 100dbc7..f60be42 100644
14 --- a/pango/pango-utils.c 14 --- a/pango/pango-utils.c
15 +++ b/pango/pango-utils.c 15 +++ b/pango/pango-utils.c
26 -DllMain (HINSTANCE hinstDLL, 26 -DllMain (HINSTANCE hinstDLL,
27 +static _disabled_DllMain (HINSTANCE hinstDLL, 27 +static _disabled_DllMain (HINSTANCE hinstDLL,
28 DWORD fdwReason, 28 DWORD fdwReason,
29 LPVOID lpvReserved) 29 LPVOID lpvReserved)
30 { 30 {
31 31 --
32 commit b33f70af495cdaddab9ddccd79aef777e005bb85 32 1.7.1
33 Author: Mark Brand <mabrand@mabrand.nl> 33
34 Date: Wed Sep 29 00:55:07 2010 +0200 34
35 35 From b33f70af495cdaddab9ddccd79aef777e005bb85 Mon Sep 17 00:00:00 2001
36 static, not shared 36 From: mingw-cross-env
37 Date: Wed, 29 Sep 2010 00:55:07 +0200
38 Subject: [PATCH 2/5] static, not shared
39
37 40
38 diff --git a/configure b/configure 41 diff --git a/configure b/configure
39 index 352c9c4..a78ace5 100755 42 index 352c9c4..a78ace5 100755
40 --- a/configure 43 --- a/configure
41 +++ b/configure 44 +++ b/configure
124 - test "$enable_shared" = yes && enable_static=no 127 - test "$enable_shared" = yes && enable_static=no
125 + test "$enable_shared" = yes && enable_static=yes 128 + test "$enable_shared" = yes && enable_static=yes
126 fi 129 fi
127 ;; 130 ;;
128 esac 131 esac
129 132 --
130 commit 4601f723ef49c010656ef800ce705cd8677833d4 133 1.7.1
131 Author: Mark Brand <mabrand@mabrand.nl> 134
132 Date: Wed Sep 29 00:57:12 2010 +0200 135
133 136 From 4601f723ef49c010656ef800ce705cd8677833d4 Mon Sep 17 00:00:00 2001
134 no pango-querymodules 137 From: mingw-cross-env
138 Date: Wed, 29 Sep 2010 00:57:12 +0200
139 Subject: [PATCH 3/5] no pango-querymodules
140
135 141
136 diff --git a/modules/Makefile.in b/modules/Makefile.in 142 diff --git a/modules/Makefile.in b/modules/Makefile.in
137 index 0d48e08..df71e02 100644 143 index 0d48e08..df71e02 100644
138 --- a/modules/Makefile.in 144 --- a/modules/Makefile.in
139 +++ b/modules/Makefile.in 145 +++ b/modules/Makefile.in
144 -install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT) 150 -install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
145 +install-data-local: 151 +install-data-local:
146 @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \ 152 @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
147 echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ 153 echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
148 $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ 154 $(top_builddir)/pango/pango-querymodules$(EXEEXT) \
149 155 --
150 commit 53bd7d3d3a83e40eb7d02568b560840ceadd7c0a 156 1.7.1
151 Author: Mark Brand <mabrand@mabrand.nl> 157
152 Date: Wed Sep 29 00:58:13 2010 +0200 158
153 159 From 53bd7d3d3a83e40eb7d02568b560840ceadd7c0a Mon Sep 17 00:00:00 2001
154 wine workaround s,^install-data-local:.*,install-data-local:, 160 From: mingw-cross-env
161 Date: Wed, 29 Sep 2010 00:58:13 +0200
162 Subject: [PATCH 4/5] wine workaround s,^install-data-local:.*,install-data-local:,
163
155 164
156 diff --git a/configure b/configure 165 diff --git a/configure b/configure
157 index a78ace5..92b1334 100755 166 index a78ace5..92b1334 100755
158 --- a/configure 167 --- a/configure
159 +++ b/configure 168 +++ b/configure
173 - cross_compiling=no 182 - cross_compiling=no
174 + cross_compiling=yes 183 + cross_compiling=yes
175 else 184 else
176 if test "$cross_compiling" = maybe; then 185 if test "$cross_compiling" = maybe; then
177 cross_compiling=yes 186 cross_compiling=yes
178 187 --
179 commit ccd472e0aee0109932e261eb1f7d9d24bbf1870c 188 1.7.1
180 Author: Mark Brand <mabrand@mabrand.nl> 189
181 Date: Wed Sep 29 00:50:08 2010 +0200 190
182 191 From ccd472e0aee0109932e261eb1f7d9d24bbf1870c Mon Sep 17 00:00:00 2001
183 add missing lib to pango.pc for static linking 192 From: mingw-cross-env
193 Date: Wed, 29 Sep 2010 00:50:08 +0200
194 Subject: [PATCH 5/5] add missing lib to pango.pc for static linking
195
184 196
185 diff --git a/pango.pc.in b/pango.pc.in 197 diff --git a/pango.pc.in b/pango.pc.in
186 index 5cc3ef8..745b8f0 100644 198 index 5cc3ef8..745b8f0 100644
187 --- a/pango.pc.in 199 --- a/pango.pc.in
188 +++ b/pango.pc.in 200 +++ b/pango.pc.in
191 Version: @VERSION@ 203 Version: @VERSION@
192 Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0 204 Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
193 -Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ 205 -Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@
194 +Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10 206 +Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10
195 Cflags: -I${includedir}/pango-1.0 207 Cflags: -I${includedir}/pango-1.0
208 --
209 1.7.1
210