1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
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 <bnagaev@gmail.com>
Date: Sun, 29 Jan 2017 21:47:39 +0100
Subject: [PATCH] These were adapted from the gtk2 patchset.
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 <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
@@ -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 <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)
|
