This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 Jan 2017 21:47:39 +0100 Subject: [PATCH] These were adapted from the gtk2 patchset. diff --git a/configure b/configure index 1111111..2222222 100755 --- a/configure +++ b/configure @@ -9378,15 +9378,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling static library build, must build as DLL on Windows." >&5 -$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} - enable_static=no + { $as_echo "(disabled warning)" >&5 +$as_echo "(disabled warning)" >&2;} + enable_static=yes fi if test x$enable_shared = xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 -$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} + { $as_echo "(disabled warning)" >&5 +$as_echo "(disabled warning)" >&2;} fi - enable_shared=yes + enable_shared=no fi diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index 1111111..2222222 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -64,7 +64,7 @@ const GOptionEntry _gdk_windowing_args[] = { }; BOOL WINAPI -DllMain (HINSTANCE hinstDLL, +gdk_DllMain (HINSTANCE hinstDLL, DWORD dwReason, LPVOID reserved) { diff --git a/gtk+-3.0.pc.in b/gtk+-3.0.pc.in index 1111111..2222222 100644 --- a/gtk+-3.0.pc.in +++ b/gtk+-3.0.pc.in @@ -12,5 +12,5 @@ Description: GTK+ Graphical UI Library Version: @VERSION@ Requires: gdk-@GTK_API_VERSION@ @GTK_PACKAGES@ Requires.private: @GTK_PRIVATE_PACKAGES@ -Libs: -L${libdir} -lgtk-3 @GTK_EXTRA_LIBS@ +Libs: -L${libdir} -lgtk-3 @GTK_DEP_LIBS@ -lwinspool -lcomctl32 -lcomdlg32 Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ diff --git a/gtk/gtkwin32.c b/gtk/gtkwin32.c index 1111111..2222222 100644 --- a/gtk/gtkwin32.c +++ b/gtk/gtkwin32.c @@ -42,7 +42,7 @@ static HMODULE gtk_dll; BOOL WINAPI -DllMain (HINSTANCE hinstDLL, +gtk_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 Jan 2017 21:50:48 +0100 Subject: [PATCH] Not sure what happens when this line is commented out diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c index 1111111..2222222 100644 --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c @@ -992,5 +992,5 @@ _gtk_accessibility_init (void) atk_bridge_adaptor_init (NULL, NULL); #endif - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); + /* atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); */ } From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 Jan 2017 22:50:45 +0100 Subject: [PATCH] disable gtk-update-icon-cache The error: https://gist.github.com/b3030a43a325ee7646a2bda2864465b5 diff --git a/demos/gtk-demo/Makefile.in b/demos/gtk-demo/Makefile.in index 1111111..2222222 100644 --- a/demos/gtk-demo/Makefile.in +++ b/demos/gtk-demo/Makefile.in @@ -1422,7 +1422,6 @@ uninstall-hook: uninstall-update-icon-cache install-update-icon-cache: $(AM_V_at)$(POST_INSTALL) - test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)" uninstall-update-icon-cache: $(AM_V_at)$(POST_UNINSTALL) diff --git a/demos/widget-factory/Makefile.in b/demos/widget-factory/Makefile.in index 1111111..2222222 100644 --- a/demos/widget-factory/Makefile.in +++ b/demos/widget-factory/Makefile.in @@ -1161,7 +1161,6 @@ uninstall-hook: uninstall-update-icon-cache install-update-icon-cache: $(AM_V_at)$(POST_INSTALL) - test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)" uninstall-update-icon-cache: $(AM_V_at)$(POST_UNINSTALL)