diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-09-29 17:42:33 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2010-09-29 17:42:33 (GMT) |
| commit | e661d6126faea76a1448b03bea5221ff0238ddf6 (patch) | |
| tree | ad559c284332f2005629e6289f3988e5d14d9fca /src/pango-1-fixes.patch | |
| parent | 430b5736b07263cd2134235cb175b845ad6a5fde (diff) | |
| download | mxe-e661d6126faea76a1448b03bea5221ff0238ddf6.zip mxe-e661d6126faea76a1448b03bea5221ff0238ddf6.tar.gz mxe-e661d6126faea76a1448b03bea5221ff0238ddf6.tar.bz2 | |
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.
Diffstat (limited to 'src/pango-1-fixes.patch')
| -rw-r--r-- | src/pango-1-fixes.patch | 55 |
1 files changed, 35 insertions, 20 deletions
diff --git a/src/pango-1-fixes.patch b/src/pango-1-fixes.patch index c1cadd7..3024040 100644 --- a/src/pango-1-fixes.patch +++ b/src/pango-1-fixes.patch @@ -3,11 +3,11 @@ See doc/index.html for further information. Contains ad hoc patches for cross building. -commit ed3371ed8a13f169cfd1920ecc794b30bb69cc0b -Author: Mark Brand <mabrand@mabrand.nl> -Date: Wed Sep 29 00:52:59 2010 +0200 +From ed3371ed8a13f169cfd1920ecc794b30bb69cc0b Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Wed, 29 Sep 2010 00:52:59 +0200 +Subject: [PATCH 1/5] s,DllMain,static _disabled_DllMain, - s,DllMain,static _disabled_DllMain, diff --git a/pango/pango-utils.c b/pango/pango-utils.c index 100dbc7..f60be42 100644 @@ -28,12 +28,15 @@ index 100dbc7..f60be42 100644 DWORD fdwReason, LPVOID lpvReserved) { +-- +1.7.1 -commit b33f70af495cdaddab9ddccd79aef777e005bb85 -Author: Mark Brand <mabrand@mabrand.nl> -Date: Wed Sep 29 00:55:07 2010 +0200 - static, not shared +From b33f70af495cdaddab9ddccd79aef777e005bb85 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Wed, 29 Sep 2010 00:55:07 +0200 +Subject: [PATCH 2/5] static, not shared + diff --git a/configure b/configure index 352c9c4..a78ace5 100755 @@ -126,12 +129,15 @@ index 352c9c4..a78ace5 100755 fi ;; esac +-- +1.7.1 + -commit 4601f723ef49c010656ef800ce705cd8677833d4 -Author: Mark Brand <mabrand@mabrand.nl> -Date: Wed Sep 29 00:57:12 2010 +0200 +From 4601f723ef49c010656ef800ce705cd8677833d4 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Wed, 29 Sep 2010 00:57:12 +0200 +Subject: [PATCH 3/5] no pango-querymodules - no pango-querymodules diff --git a/modules/Makefile.in b/modules/Makefile.in index 0d48e08..df71e02 100644 @@ -146,12 +152,15 @@ index 0d48e08..df71e02 100644 @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ +-- +1.7.1 + -commit 53bd7d3d3a83e40eb7d02568b560840ceadd7c0a -Author: Mark Brand <mabrand@mabrand.nl> -Date: Wed Sep 29 00:58:13 2010 +0200 +From 53bd7d3d3a83e40eb7d02568b560840ceadd7c0a Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Wed, 29 Sep 2010 00:58:13 +0200 +Subject: [PATCH 4/5] wine workaround s,^install-data-local:.*,install-data-local:, - wine workaround s,^install-data-local:.*,install-data-local:, diff --git a/configure b/configure index a78ace5..92b1334 100755 @@ -175,12 +184,15 @@ index a78ace5..92b1334 100755 else if test "$cross_compiling" = maybe; then cross_compiling=yes +-- +1.7.1 -commit ccd472e0aee0109932e261eb1f7d9d24bbf1870c -Author: Mark Brand <mabrand@mabrand.nl> -Date: Wed Sep 29 00:50:08 2010 +0200 - add missing lib to pango.pc for static linking +From ccd472e0aee0109932e261eb1f7d9d24bbf1870c Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Wed, 29 Sep 2010 00:50:08 +0200 +Subject: [PATCH 5/5] add missing lib to pango.pc for static linking + diff --git a/pango.pc.in b/pango.pc.in index 5cc3ef8..745b8f0 100644 @@ -193,3 +205,6 @@ index 5cc3ef8..745b8f0 100644 -Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ +Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10 Cflags: -I${includedir}/pango-1.0 +-- +1.7.1 + |