mirror of https://git.wownero.com/dsc/mxe.git
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.
This commit is contained in:
Mark Brand
parent
430b5736b0
commit
e661d6126f
|
|
@ -2,11 +2,12 @@ This file is part of mingw-cross-env.
|
|||
See doc/index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
commit d5e7a81cbe6339e1d0dbf97f8814c28e2c806d80
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 23:31:24 2010 +0200
|
||||
|
||||
s,DllMain,static _disabled_DllMain,
|
||||
From d5e7a81cbe6339e1d0dbf97f8814c28e2c806d80 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 23:31:24 +0200
|
||||
Subject: [PATCH] s,DllMain,static _disabled_DllMain,
|
||||
|
||||
|
||||
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
index aa4964f..c925934 100644
|
||||
|
|
@ -27,3 +28,6 @@ index aa4964f..c925934 100644
|
|||
DWORD fdwReason,
|
||||
LPVOID lpvReserved)
|
||||
{
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ See doc/index.html for further information.
|
|||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
commit 637620b33c175676972419ae674806825a390734
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu Sep 23 21:36:04 2010 +0200
|
||||
From 637620b33c175676972419ae674806825a390734 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Thu, 23 Sep 2010 21:36:04 +0200
|
||||
Subject: [PATCH 1/5] no gtk doc check
|
||||
|
||||
no gtk doc check
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a821267..2e541d2 100644
|
||||
|
|
@ -22,12 +22,15 @@ index a821267..2e541d2 100644
|
|||
AC_ARG_ENABLE(man,
|
||||
[AC_HELP_STRING([--enable-man],
|
||||
[regenerate man pages from Docbook [default=no]])],enable_man=yes,
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 8f4fde8f0ab605720ef0baf7ef8080479b34af63
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu Sep 23 21:41:51 2010 +0200
|
||||
|
||||
optional gettext
|
||||
From 8f4fde8f0ab605720ef0baf7ef8080479b34af63 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Thu, 23 Sep 2010 21:41:51 +0200
|
||||
Subject: [PATCH 2/5] optional gettext
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 2e541d2..18c2dea 100644
|
||||
|
|
@ -61,12 +64,15 @@ index c710046..269bfdf 100644
|
|||
#include <string.h>
|
||||
|
||||
#define _(String) gettext (String)
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 0a998b24fdb3ae5397ff5ad498260165300a4393
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu Sep 23 21:42:46 2010 +0200
|
||||
|
||||
fix tool paths
|
||||
From 0a998b24fdb3ae5397ff5ad498260165300a4393 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Thu, 23 Sep 2010 21:42:46 +0200
|
||||
Subject: [PATCH 3/5] fix tool paths
|
||||
|
||||
|
||||
diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
|
||||
index 3d1ac12..58e1ecf 100644
|
||||
|
|
@ -85,12 +91,15 @@ index 3d1ac12..58e1ecf 100644
|
|||
|
||||
Name: GLib
|
||||
Description: C Utility Library
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 7ddbe18ccce7aede0cef972c6035058151c3ce10
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu Sep 23 21:45:50 2010 +0200
|
||||
|
||||
fix dependency libs
|
||||
From 7ddbe18ccce7aede0cef972c6035058151c3ce10 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Thu, 23 Sep 2010 21:45:50 +0200
|
||||
Subject: [PATCH 4/5] fix dependency libs
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 18c2dea..e472768 100644
|
||||
|
|
@ -116,12 +125,15 @@ index 58e1ecf..17b2133 100644
|
|||
-Libs.private: @ICONV_LIBS@
|
||||
+Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
|
||||
Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 83ef7aba98793b7502370971c6de0b115c55e49c
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sat Sep 25 00:07:33 2010 +0200
|
||||
|
||||
add -ldnsapi to gio-2.0.pc
|
||||
From 83ef7aba98793b7502370971c6de0b115c55e49c Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Sat, 25 Sep 2010 00:07:33 +0200
|
||||
Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc
|
||||
|
||||
|
||||
diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
|
||||
index 92cda85..7a4e224 100644
|
||||
|
|
@ -135,3 +147,6 @@ index 92cda85..7a4e224 100644
|
|||
+Libs: -L${libdir} -lgio-2.0 -ldnsapi
|
||||
Libs.private: @ZLIB_LIBS@ @LIBASYNCNS_LIBADD@
|
||||
Cflags:
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ See doc/index.html for further information.
|
|||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
commit 1acd5465c0b9f2f612c5904ea7e652475fb3bee6
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 14:43:43 2010 +0200
|
||||
From 1acd5465c0b9f2f612c5904ea7e652475fb3bee6 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 14:43:43 +0200
|
||||
Subject: [PATCH 01/11] s,DllMain,static _disabled_DllMain,
|
||||
|
||||
s,DllMain,static _disabled_DllMain,
|
||||
|
||||
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
|
||||
index 94b7ac7..2c01be6 100644
|
||||
|
|
@ -35,12 +35,15 @@ index fdf4730..428fd96 100644
|
|||
DWORD fdwReason,
|
||||
LPVOID lpvReserved)
|
||||
{
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit bc446ce0785954ccf28825554c3074a15b4f4071
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 14:46:20 2010 +0200
|
||||
|
||||
s,__declspec(dllimport),,
|
||||
From bc446ce0785954ccf28825554c3074a15b4f4071 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 14:46:20 +0200
|
||||
Subject: [PATCH 02/11] s,__declspec(dllimport),,
|
||||
|
||||
|
||||
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
|
||||
index 506f35d..f40de41 100644
|
||||
|
|
@ -94,12 +97,15 @@ index c624aea..b792ea5 100644
|
|||
#endif
|
||||
#else
|
||||
#define VARIABLE extern
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 078f0c210e1706b4028907bf55cc55672d5dc7d3
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 15:03:28 2010 +0200
|
||||
|
||||
s,__declspec(dllexport),,
|
||||
From 078f0c210e1706b4028907bf55cc55672d5dc7d3 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 15:03:28 +0200
|
||||
Subject: [PATCH 03/11] s,__declspec(dllexport),,
|
||||
|
||||
|
||||
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
|
||||
index f40de41..07cfb4e 100644
|
||||
|
|
@ -153,12 +159,15 @@ index b792ea5..f382a64 100644
|
|||
#else
|
||||
#define VARIABLE extern
|
||||
#endif
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 69568bc7c8627d117521548192730665a9623b80
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 14:17:22 2010 +0200
|
||||
|
||||
fix gtk+-2.0.pc.in
|
||||
From 69568bc7c8627d117521548192730665a9623b80 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 14:17:22 +0200
|
||||
Subject: [PATCH 04/11] fix gtk+-2.0.pc.in
|
||||
|
||||
|
||||
diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in
|
||||
index 46853e1..7f3eb22 100644
|
||||
|
|
@ -171,12 +180,15 @@ index 46853e1..7f3eb22 100644
|
|||
-Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@
|
||||
+Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_DEP_LIBS@ -lwinspool -lcomctl32 -lcomdlg32
|
||||
Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 1f60f6943b5c67a199660618e546de5f0faafeef
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 14:48:31 2010 +0200
|
||||
|
||||
disable gtkbuiltincache
|
||||
From 1f60f6943b5c67a199660618e546de5f0faafeef Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 14:48:31 +0200
|
||||
Subject: [PATCH 05/11] disable gtkbuiltincache
|
||||
|
||||
|
||||
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
|
||||
index 39a35c2..89bae23 100644
|
||||
|
|
@ -191,12 +203,15 @@ index 39a35c2..89bae23 100644
|
|||
$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
|
||||
$(gtk_update_icon_cache_program) --force --ignore-theme-index \
|
||||
--source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit e24f3fb7d18d0690dddd1fdb1a629a06d49b4c11
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 14:49:50 2010 +0200
|
||||
|
||||
disable test-inline-pixbufs.h
|
||||
From e24f3fb7d18d0690dddd1fdb1a629a06d49b4c11 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 14:49:50 +0200
|
||||
Subject: [PATCH 06/11] disable test-inline-pixbufs.h
|
||||
|
||||
|
||||
diff --git a/demos/Makefile.in b/demos/Makefile.in
|
||||
index 6bffbb8..c866923 100644
|
||||
|
|
@ -211,12 +226,15 @@ index 6bffbb8..c866923 100644
|
|||
testpixbuf_DEPENDENCIES = $(DEPS)
|
||||
testpixbuf_drawable_DEPENDENCIES = $(DEPS)
|
||||
testpixbuf_save_DEPENDENCIES = $(DEPS)
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit b34df7c9461a798e9a8202eec886ac5e173da3ea
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 14:51:04 2010 +0200
|
||||
|
||||
permit static building
|
||||
From b34df7c9461a798e9a8202eec886ac5e173da3ea Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 14:51:04 +0200
|
||||
Subject: [PATCH 07/11] permit static building
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index f203b13..51e6619 100755
|
||||
|
|
@ -309,12 +327,15 @@ index f203b13..51e6619 100755
|
|||
fi
|
||||
;;
|
||||
esac
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 831f94ccf7a26662bfc9e8d22b9ae9eaea740bbb
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 14:53:18 2010 +0200
|
||||
|
||||
no -Wl
|
||||
From 831f94ccf7a26662bfc9e8d22b9ae9eaea740bbb Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 14:53:18 +0200
|
||||
Subject: [PATCH 08/11] no -Wl
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 51e6619..8c04264 100755
|
||||
|
|
@ -329,12 +350,15 @@ index 51e6619..8c04264 100755
|
|||
if true; then
|
||||
USE_WIN32_TRUE=
|
||||
USE_WIN32_FALSE='#'
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 2ec5f9d9ea8d7d80758c5272ff2e94fd0e7856e8
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 14:54:15 2010 +0200
|
||||
|
||||
gio not gio-unix
|
||||
From 2ec5f9d9ea8d7d80758c5272ff2e94fd0e7856e8 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 14:54:15 +0200
|
||||
Subject: [PATCH 09/11] gio not gio-unix
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 8c04264..d3e5e21 100755
|
||||
|
|
@ -352,12 +376,15 @@ index 8c04264..d3e5e21 100755
|
|||
else
|
||||
GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
|
||||
fi
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 3e9c211536912bf78c44172b7f6ecd8860887166
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 14:55:33 2010 +0200
|
||||
|
||||
set cross_compiling explicitly to avoid Wine interference
|
||||
From 3e9c211536912bf78c44172b7f6ecd8860887166 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 14:55:33 +0200
|
||||
Subject: [PATCH 10/11] set cross_compiling explicitly to avoid Wine interference
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index d3e5e21..7ae7a5d 100755
|
||||
|
|
@ -381,12 +408,15 @@ index d3e5e21..7ae7a5d 100755
|
|||
else
|
||||
if test "$cross_compiling" = maybe; then
|
||||
cross_compiling=yes
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 01cc2d128be8a19c1434b912e378deae3b1bfcf9
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 15:30:49 2010 +0200
|
||||
|
||||
removed duplicate _gtk_marshal_OBJECT__VOID()
|
||||
From 01cc2d128be8a19c1434b912e378deae3b1bfcf9 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 15:30:49 +0200
|
||||
Subject: [PATCH 11/11] removed duplicate _gtk_marshal_OBJECT__VOID()
|
||||
|
||||
|
||||
diff --git a/perf/marshalers.c b/perf/marshalers.c
|
||||
index f533ab0..0a37ba4 100644
|
||||
|
|
@ -436,3 +466,6 @@ index f533ab0..0a37ba4 100644
|
|||
/* VOID:ENUM,OBJECT,DOUBLE (./marshalers.list:2) */
|
||||
void
|
||||
_gtk_marshal_VOID__ENUM_OBJECT_DOUBLE (GClosure *closure,
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,12 @@ This file is part of mingw-cross-env.
|
|||
See doc/index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
commit 908f4325d4977e67dc1d1840ce3e67bb9492de71
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri Sep 24 23:34:26 2010 +0200
|
||||
|
||||
s,DllMain,static _disabled_DllMain,
|
||||
From 908f4325d4977e67dc1d1840ce3e67bb9492de71 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 24 Sep 2010 23:34:26 +0200
|
||||
Subject: [PATCH] s,DllMain,static _disabled_DllMain,
|
||||
|
||||
|
||||
diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
|
||||
index 4e54b09..b8261e5 100644
|
||||
|
|
@ -24,3 +25,6 @@ index 4e54b09..b8261e5 100644
|
|||
{
|
||||
if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL;
|
||||
return TRUE;
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
This file is part of mingw-cross-env.
|
||||
See doc/index.html for further information.
|
||||
|
||||
commit 1ff5a73bee660f1d61f9cdd7c8d7aff29e959c4c
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Mon Sep 27 12:00:52 2010 +0200
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 1ff5a73bee660f1d61f9cdd7c8d7aff29e959c4c Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Mon, 27 Sep 2010 12:00:52 +0200
|
||||
Subject: [PATCH 1/2] fix .pc requirements
|
||||
|
||||
fix .pc requirements
|
||||
|
||||
diff --git a/librsvg.pc.in b/librsvg.pc.in
|
||||
index 372f199..b6ee7a9 100644
|
||||
|
|
@ -20,14 +22,16 @@ index 372f199..b6ee7a9 100644
|
|||
Requires.private:
|
||||
Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
|
||||
Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@
|
||||
--
|
||||
1.7.1
|
||||
|
||||
commit 9a7e7ebee9aab83659b9aced51fb53de5427138d
|
||||
Author: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Mon Sep 27 12:02:45 2010 +0200
|
||||
|
||||
fix stray comma
|
||||
|
||||
Taken from https://bugzilla.gnome.org/show_bug.cgi?id=630714
|
||||
From 9a7e7ebee9aab83659b9aced51fb53de5427138d Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Mon, 27 Sep 2010 12:02:45 +0200
|
||||
Subject: [PATCH 2/2] fix stray comma
|
||||
|
||||
Taken from https://bugzilla.gnome.org/show_bug.cgi?id=630714
|
||||
|
||||
diff --git a/rsvg.h b/rsvg.h
|
||||
index 37e7930..41c4127 100644
|
||||
|
|
@ -42,3 +46,6 @@ index 37e7930..41c4127 100644
|
|||
} RsvgHandleFlags;
|
||||
|
||||
void rsvg_handle_set_base_gfile (RsvgHandle *handle,
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
no pango-querymodules
|
||||
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
|
||||
|
||||
|
||||
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
|
||||
|
||||
wine workaround s,^install-data-local:.*,install-data-local:,
|
||||
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:,
|
||||
|
||||
|
||||
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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue