mxe/src/libgsf-1-fixes.patch

This file is part of MXE.
See index.html for further information.

Contains ad hoc patches for cross building.

From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 24 Sep 2010 23:34:26 +0200
Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain,


diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
index d7a7247..cc52d99 100644
--- a/gsf/gsf-utils.c
+++ b/gsf/gsf-utils.c
@@ -115,9 +115,9 @@ static GTypeModule *static_type_module = NULL;
 #include <windows.h>
 static HMODULE gsf_dll_hmodule;
 BOOL WINAPI
-DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
+static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
 BOOL WINAPI
-DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
+static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
 {
 	if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL;
 	return TRUE;
-- 
1.7.1
Rebrand to new project name MXE 2012-03-28 14:46:58 +01:00			`This file is part of MXE.`
Move doc/index.html -> index.html 2012-03-29 11:14:15 +01:00			`See index.html for further information.`
remove stray DllMain from packages libgsf and gdk-pixbuf These caused a problem linking librsvg. 2010-09-24 22:54:15 +01:00
			`Contains ad hoc patches for cross building.`

combined patch files 2010-09-29 19:19:18 +01:00			`From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001`
Rebrand to new project name MXE 2012-03-28 14:46:58 +01:00			`From: MXE`
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. 2010-09-29 18:42:33 +01:00			`Date: Fri, 24 Sep 2010 23:34:26 +0200`
package libgsf: gettext/intltool configure patch no longer required 2011-06-19 09:22:17 +01:00			`Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain,`
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. 2010-09-29 18:42:33 +01:00
remove stray DllMain from packages libgsf and gdk-pixbuf These caused a problem linking librsvg. 2010-09-24 22:54:15 +01:00
			`diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c`
combined patch files 2010-09-29 19:19:18 +01:00			`index d7a7247..cc52d99 100644`
remove stray DllMain from packages libgsf and gdk-pixbuf These caused a problem linking librsvg. 2010-09-24 22:54:15 +01:00			`--- a/gsf/gsf-utils.c`
			`+++ b/gsf/gsf-utils.c`
update packages libgsf libxml2 2012-06-16 16:43:45 +01:00			`@@ -115,9 +115,9 @@ static GTypeModule *static_type_module = NULL;`
remove stray DllMain from packages libgsf and gdk-pixbuf These caused a problem linking librsvg. 2010-09-24 22:54:15 +01:00			`#include <windows.h>`
			`static HMODULE gsf_dll_hmodule;`
			`BOOL WINAPI`
			`-DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);`
			`+static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);`
			`BOOL WINAPI`
			`-DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)`
			`+static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)`
			`{`
			`if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL;`
			`return TRUE;`
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. 2010-09-29 18:42:33 +01:00			`--`
			`1.7.1`