Merge pull request #20 from mgehre/master

Rename DllMain to package_DllMain

7 files changed, 93 insertions, 5 deletions

diff --git a/src/atk-1-DllMain.patch b/src/atk-1-DllMain.patch
new file mode 100644
index 0000000..f1c1f68
--- /dev/null
+++ b/src/atk-1-DllMain.patch
@@ -0,0 +1,12 @@
+diff -uNr atk-2.2.0-orig/atk/atkobject.c atk-2.2.0/atk/atkobject.c
+--- atk-2.2.0-orig/atk/atkobject.c	2011-09-19 19:06:54.000000000 +0200
++++ atk-2.2.0/atk/atkobject.c	2012-04-14 20:26:12.763814596 +0200
+@@ -366,7 +366,7 @@
+ static HMODULE atk_dll;
+ 
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++atk_DllMain (HINSTANCE hinstDLL,
+ 	 DWORD     fdwReason,
+ 	 LPVOID    lpvReserved)
+ {
diff --git a/src/atk.mk b/src/atk.mk
index 412cf5a..4237480 100644
--- a/src/atk.mk
+++ b/src/atk.mk
@@ -18,7 +18,6 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/atk/atkobject.c'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
diff --git a/src/cairo-1-DllMain.patch b/src/cairo-1-DllMain.patch
new file mode 100644
index 0000000..cb87fde
--- /dev/null
+++ b/src/cairo-1-DllMain.patch
@@ -0,0 +1,18 @@
+diff -uNr cairo-1.10.2-orig/src/cairo-system.c cairo-1.10.2/src/cairo-system.c
+--- cairo-1.10.2-orig/src/cairo-system.c	2010-06-18 13:47:14.000000000 +0200
++++ cairo-1.10.2/src/cairo-system.c	2012-04-14 22:01:27.848928137 +0200
+@@ -70,12 +70,12 @@
+ 
+ /* declare to avoid "no previous prototype for 'DllMain'" warning */
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++cairo_DllMain (HINSTANCE hinstDLL,
+          DWORD     fdwReason,
+          LPVOID    lpvReserved);
+ 
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++cairo_DllMain (HINSTANCE hinstDLL,
+          DWORD     fdwReason,
+          LPVOID    lpvReserved)
+ {
diff --git a/src/gdk-pixbuf-1-fixes.patch b/src/gdk-pixbuf-1-fixes.patch
index 6f18015..b186a04 100644
--- a/src/gdk-pixbuf-1-fixes.patch
+++ b/src/gdk-pixbuf-1-fixes.patch
@@ -27,7 +27,7 @@ index 6a5dbce..e5e1c2d 100644
  
  BOOL WINAPI
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++gdkpixbuf_DllMain (HINSTANCE hinstDLL,
           DWORD     fdwReason,
           LPVOID    lpvReserved)
  {
diff --git a/src/glib-2-DllMain.patch b/src/glib-2-DllMain.patch
new file mode 100644
index 0000000..4ed2ac5
--- /dev/null
+++ b/src/glib-2-DllMain.patch
@@ -0,0 +1,59 @@
+diff -uNr glib-2.28.8-orig/gio/giomodule.c glib/gio/giomodule.c
+--- glib-2.28.8-orig/gio/giomodule.c	2011-01-05 22:44:06.000000000 +0100
++++ glib/gio/giomodule.c	2011-11-23 21:04:43.867004895 +0100
+@@ -489,10 +489,8 @@
+ 
+ static HMODULE gio_dll = NULL;
+ 
+-#ifdef DLL_EXPORT
+-
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++gio_DllMain (HINSTANCE hinstDLL,
+ 	 DWORD     fdwReason,
+ 	 LPVOID    lpvReserved)
+ {
+@@ -502,8 +500,6 @@
+   return TRUE;
+ }
+ 
+-#endif
+-
+ #undef GIO_MODULE_DIR
+ 
+ /* GIO_MODULE_DIR is used only in code called just once,
+diff -uNr glib-2.28.8-orig/glib/gutils.c glib/glib/gutils.c
+--- glib-2.28.8-orig/glib/gutils.c	2011-06-06 01:18:49.000000000 +0200
++++ glib/glib/gutils.c	2011-11-23 21:05:07.822988144 +0100
+@@ -144,10 +144,8 @@
+ 
+ static HMODULE glib_dll = NULL;
+ 
+-#ifdef DLL_EXPORT
+-
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++glib_DllMain (HINSTANCE hinstDLL,
+ 	 DWORD     fdwReason,
+ 	 LPVOID    lpvReserved)
+ {
+@@ -157,8 +155,6 @@
+   return TRUE;
+ }
+ 
+-#endif
+-
+ gchar *
+ _glib_get_dll_directory (void)
+ {
+@@ -166,10 +162,8 @@
+   gchar *p;
+   wchar_t wc_fn[MAX_PATH];
+ 
+-#ifdef DLL_EXPORT
+   if (glib_dll == NULL)
+     return NULL;
+-#endif
+ 
+   /* This code is different from that in
+    * g_win32_get_package_installation_directory_of_module() in that
diff --git a/src/gtk2-1-fixes.patch b/src/gtk2-1-fixes.patch
index cd26a7b..a413637 100644
--- a/src/gtk2-1-fixes.patch
+++ b/src/gtk2-1-fixes.patch
@@ -18,7 +18,7 @@ index dc139be..be2a7ee 100644
  
  int __stdcall
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++gdk_DllMain (HINSTANCE hinstDLL,
  	 DWORD     dwReason,
  	 LPVOID    reserved)
  {
@@ -31,7 +31,7 @@ index d081f70..aa2973d 100644
  
  BOOL WINAPI
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++gtk_DllMain (HINSTANCE hinstDLL,
  	 DWORD     fdwReason,
  	 LPVOID    lpvReserved)
  {
diff --git a/src/pango-1-fixes.patch b/src/pango-1-fixes.patch
index da4e9a0..7090070 100644
--- a/src/pango-1-fixes.patch
+++ b/src/pango-1-fixes.patch
@@ -24,7 +24,7 @@ index 44ec353..72e13f1 100644
  
  BOOL WINAPI
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++pango_DllMain (HINSTANCE hinstDLL,
  	 DWORD     fdwReason,
  	 LPVOID    lpvReserved)
  {