d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mxe/src/gtk3-1-fixes.patch

97 lines
3.1 KiB
Diff
Raw Normal View History

Copyright headers: point to LICENSE.md and shorten The following script was applied: sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE') sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \ $(git grep -l 'part of MXE.*See index.html') before='This file is part of MXE. See index.html for further information.' after='This file is part of MXE. See LICENSE.md for licensing information.' sed "s/$before/$after/" -i $(git grep -l 'part of MXE') Then git grep 'index.html for further information' revealed two other files. One of them was patched manually (patch.mk). Makefile has text "See index.html for further information" unrelated to licensing. See https://github.com/mxe/mxe/issues/1500#issuecomment-241340792
2016-08-22 20:52:34 +01:00
This file is part of MXE. See LICENSE.md for licensing information.
add packages gtk3 and gtkmm3 Pango has been updated to 1.37.4 in 24cf97dbdd62ece0ea0b39cf33694a8804352bd1 Side effects: * mute function g_win32_run_session_bus of glib (see the thread) * add new external dependency: gdk-pixbuf Original thread: https://lists.nongnu.org/archive/html/mingw-cross-env-list/2015-08/msg00009.html
2015-08-16 12:18:24 +01:00
Contains ad hoc patches for cross building.
gtk3: unify patch
2017-01-29 20:54:25 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 29 Jan 2017 21:47:39 +0100
Subject: [PATCH] These were adapted from the gtk2 patchset.
add packages gtk3 and gtkmm3 Pango has been updated to 1.37.4 in 24cf97dbdd62ece0ea0b39cf33694a8804352bd1 Side effects: * mute function g_win32_run_session_bus of glib (see the thread) * add new external dependency: gdk-pixbuf Original thread: https://lists.nongnu.org/archive/html/mingw-cross-env-list/2015-08/msg00009.html
2015-08-16 12:18:24 +01:00
gtk3: unify patch
2017-01-29 20:54:25 +00:00
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[] = {
add packages gtk3 and gtkmm3 Pango has been updated to 1.37.4 in 24cf97dbdd62ece0ea0b39cf33694a8804352bd1 Side effects: * mute function g_win32_run_session_bus of glib (see the thread) * add new external dependency: gdk-pixbuf Original thread: https://lists.nongnu.org/archive/html/mingw-cross-env-list/2015-08/msg00009.html
2015-08-16 12:18:24 +01:00
};
BOOL WINAPI
-DllMain (HINSTANCE hinstDLL,
+gdk_DllMain (HINSTANCE hinstDLL,
DWORD dwReason,
LPVOID reserved)
{
gtk3: unify patch
2017-01-29 20:54:25 +00:00
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
add packages gtk3 and gtkmm3 Pango has been updated to 1.37.4 in 24cf97dbdd62ece0ea0b39cf33694a8804352bd1 Side effects: * mute function g_win32_run_session_bus of glib (see the thread) * add new external dependency: gdk-pixbuf Original thread: https://lists.nongnu.org/archive/html/mingw-cross-env-list/2015-08/msg00009.html
2015-08-16 12:18:24 +01:00
@@ -42,7 +42,7 @@
static HMODULE gtk_dll;
BOOL WINAPI
-DllMain (HINSTANCE hinstDLL,
+gtk_DllMain (HINSTANCE hinstDLL,
DWORD fdwReason,
LPVOID lpvReserved)
{
gtk3: unify patch
2017-01-29 20:54:25 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
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
update gtk3 to 3.22.7 fix https://github.com/mxe/mxe/issues/1647 gtk3 now depends on libepoxy.
2017-01-31 01:15:31 +00:00
@@ -992,5 +992,5 @@ _gtk_accessibility_init (void)
add packages gtk3 and gtkmm3 Pango has been updated to 1.37.4 in 24cf97dbdd62ece0ea0b39cf33694a8804352bd1 Side effects: * mute function g_win32_run_session_bus of glib (see the thread) * add new external dependency: gdk-pixbuf Original thread: https://lists.nongnu.org/archive/html/mingw-cross-env-list/2015-08/msg00009.html
2015-08-16 12:18:24 +01:00
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); */
}
update gtk3 to 3.22.7 fix https://github.com/mxe/mxe/issues/1647 gtk3 now depends on libepoxy.
2017-01-31 01:15:31 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
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)