Mercurial > mxe-octave
comparison src/msvc-gtk3-1.patch @ 3176:0fc090129214
[MSVC] add GTK+ 3.x module (and MSVC-specific patch)
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Thu, 25 Jul 2013 15:44:17 -0400 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
3175:f283b410a60f | 3176:0fc090129214 |
---|---|
1 diff -ur gtk+-3.8.2-orig/gdk/Makefile.in gtk+-3.8.2/gdk/Makefile.in | |
2 --- gtk+-3.8.2-orig/gdk/Makefile.in 2013-05-13 06:26:30 -0400 | |
3 +++ gtk+-3.8.2/gdk/Makefile.in 2013-07-25 13:13:07 -0400 | |
4 @@ -67,7 +67,7 @@ | |
5 @USE_WIN32_FALSE@ $(am__append_1) $(am__append_2) \ | |
6 @USE_WIN32_FALSE@ $(am__append_4) $(am__append_6) \ | |
7 @USE_WIN32_FALSE@ $(am__append_7) | |
8 -@USE_WIN32_TRUE@am__append_5 = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def | |
9 +@USE_WIN32_TRUE@am__append_5 = -Wl,win32/rc/gdk-win32-res.o -export-symbols-regex "xXx" -Wl,$(srcdir)/gdk.def | |
10 @USE_BROADWAY_TRUE@am__append_6 = broadway/libgdk-broadway.la | |
11 @USE_WAYLAND_TRUE@am__append_7 = wayland/libgdk-wayland.la | |
12 @HAVE_INTROSPECTION_TRUE@am__append_8 = Gdk-3.0.gir | |
13 @@ -942,7 +942,7 @@ | |
14 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS) | |
15 @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0 | |
16 @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) | |
17 -@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib | |
18 +@MS_LIB_AVAILABLE_FALSE@noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib | |
19 TESTS_ENVIRONMENT = srcdir="$(srcdir)" | |
20 @OS_LINUX_TRUE@TESTS = abicheck.sh | |
21 lib_LTLIBRARIES = libgdk-3.la | |
22 @@ -1717,17 +1717,17 @@ | |
23 @OS_WIN32_FALSE@install-def-file: | |
24 @OS_WIN32_FALSE@uninstall-def-file: | |
25 | |
26 -@MS_LIB_AVAILABLE_TRUE@gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def | |
27 -@MS_LIB_AVAILABLE_TRUE@ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@ | |
28 +@MS_LIB_AVAILABLE_FALSE@gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def | |
29 +@MS_LIB_AVAILABLE_FALSE@ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@ | |
30 | |
31 -@MS_LIB_AVAILABLE_TRUE@install-ms-lib: | |
32 -@MS_LIB_AVAILABLE_TRUE@ mkdir -p $(DESTDIR)$(libdir) | |
33 -@MS_LIB_AVAILABLE_TRUE@ $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) | |
34 - | |
35 -@MS_LIB_AVAILABLE_TRUE@uninstall-ms-lib: | |
36 -@MS_LIB_AVAILABLE_TRUE@ -rm $(DESTDIR)$(libdir)/gdk-win32-$(GTK_API_VERSION).lib | |
37 @MS_LIB_AVAILABLE_FALSE@install-ms-lib: | |
38 +@MS_LIB_AVAILABLE_FALSE@ mkdir -p $(DESTDIR)$(libdir) | |
39 +@MS_LIB_AVAILABLE_FALSE@ $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) | |
40 + | |
41 @MS_LIB_AVAILABLE_FALSE@uninstall-ms-lib: | |
42 +@MS_LIB_AVAILABLE_FALSE@ -rm $(DESTDIR)$(libdir)/gdk-win32-$(GTK_API_VERSION).lib | |
43 +@MS_LIB_AVAILABLE_TRUE@install-ms-lib: | |
44 +@MS_LIB_AVAILABLE_TRUE@uninstall-ms-lib: | |
45 | |
46 # This places the generated .def file in srcdir, since it is expected to be there. | |
47 # (The one from a tarball is) | |
48 diff -ur gtk+-3.8.2-orig/gtk/Makefile.in gtk+-3.8.2/gtk/Makefile.in | |
49 --- gtk+-3.8.2-orig/gtk/Makefile.in 2013-05-13 06:26:32 -0400 | |
50 +++ gtk+-3.8.2/gtk/Makefile.in 2013-07-25 13:14:52 -0400 | |
51 @@ -1146,7 +1146,7 @@ | |
52 --includedir=. \ | |
53 --includedir=../gdk | |
54 | |
55 -@USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f" | |
56 +@USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %%s %%f" | |
57 @USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "open -a /Applications/Preview.app %f" | |
58 SUBDIRS = a11y native . tests | |
59 @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE@GTK_PRINT_BACKENDS = file,lpr | |
60 @@ -1178,10 +1178,10 @@ | |
61 | |
62 @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined | |
63 @OS_WIN32_TRUE@gtk_def = gtk.def | |
64 -@OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def | |
65 +@OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols-regex "xXx" -Wl,$(srcdir)/gtk.def | |
66 @OS_WIN32_TRUE@gtk_win32_res = gtk-win32-res.o | |
67 @OS_WIN32_TRUE@gtk_win32_res_ldflag = -Wl,gtk-win32-res.o | |
68 -@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib | |
69 +@MS_LIB_AVAILABLE_FALSE@noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib | |
70 TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)" | |
71 @OS_LINUX_TRUE@TESTS = abicheck.sh | |
72 libgtkincludedir = $(includedir)/gtk-3.0/gtk | |
73 @@ -6037,16 +6037,16 @@ | |
74 @OS_WIN32_FALSE@install-def-file: | |
75 @OS_WIN32_FALSE@uninstall-def-file: | |
76 | |
77 -@MS_LIB_AVAILABLE_TRUE@gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def | |
78 -@MS_LIB_AVAILABLE_TRUE@ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@ | |
79 +@MS_LIB_AVAILABLE_FALSE@gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def | |
80 +@MS_LIB_AVAILABLE_FALSE@ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@ | |
81 | |
82 -@MS_LIB_AVAILABLE_TRUE@install-ms-lib: | |
83 -@MS_LIB_AVAILABLE_TRUE@ $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) | |
84 - | |
85 -@MS_LIB_AVAILABLE_TRUE@uninstall-ms-lib: | |
86 -@MS_LIB_AVAILABLE_TRUE@ -rm $(DESTDIR)$(libdir)/gtk-win32-$(GTK_API_VERSION).lib | |
87 @MS_LIB_AVAILABLE_FALSE@install-ms-lib: | |
88 +@MS_LIB_AVAILABLE_FALSE@ $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) | |
89 + | |
90 @MS_LIB_AVAILABLE_FALSE@uninstall-ms-lib: | |
91 +@MS_LIB_AVAILABLE_FALSE@ -rm $(DESTDIR)$(libdir)/gtk-win32-$(GTK_API_VERSION).lib | |
92 +@MS_LIB_AVAILABLE_TRUE@install-ms-lib: | |
93 +@MS_LIB_AVAILABLE_TRUE@uninstall-ms-lib: | |
94 | |
95 # This places the generated .def file in srcdir, since it is expected to be there. | |
96 # (The one from a tarball is) | |
97 diff -ur gtk+-3.8.2-orig/gtk/gtk-launch.c gtk+-3.8.2/gtk/gtk-launch.c | |
98 --- gtk+-3.8.2-orig/gtk/gtk-launch.c 2013-03-09 15:03:18 -0500 | |
99 +++ gtk+-3.8.2/gtk/gtk-launch.c 2013-07-25 13:14:26 -0400 | |
100 @@ -117,7 +117,9 @@ | |
101 info = G_APP_INFO (g_desktop_app_info_new (desktop_file_name)); | |
102 g_free (desktop_file_name); | |
103 #else | |
104 +#ifndef _MSC_VER | |
105 #warning Please add support for creating AppInfo from id for your OS | |
106 +#endif | |
107 g_printerr (_("Creating AppInfo from id not supported on non unix operating systems")); | |
108 #endif | |
109 args++; | |
110 diff -ur gtk+-3.8.2-orig/gtk/tests/testing.c gtk+-3.8.2/gtk/tests/testing.c | |
111 --- gtk+-3.8.2-orig/gtk/tests/testing.c 2013-03-09 15:03:21 -0500 | |
112 +++ gtk+-3.8.2/gtk/tests/testing.c 2013-07-25 13:38:15 -0400 | |
113 @@ -138,7 +138,11 @@ | |
114 static void | |
115 test_text_access (void) | |
116 { | |
117 +#ifdef _MSC_VER | |
118 +# define N_WIDGETS 3 | |
119 +#else | |
120 const int N_WIDGETS = 3; | |
121 +#endif | |
122 GtkWidget *widgets[N_WIDGETS]; | |
123 int i = 0; | |
124 widgets[i++] = gtk_test_create_widget (GTK_TYPE_LABEL, NULL); | |
125 diff -ur gtk+-3.8.2-orig/libgail-util/Makefile.in gtk+-3.8.2/libgail-util/Makefile.in | |
126 --- gtk+-3.8.2-orig/libgail-util/Makefile.in 2013-05-13 06:26:32 -0400 | |
127 +++ gtk+-3.8.2/libgail-util/Makefile.in 2013-07-25 13:19:45 -0400 | |
128 @@ -473,8 +473,8 @@ | |
129 && DISPLAY=:$$XID && export DISPLAY | |
130 | |
131 @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined | |
132 -@OS_WIN32_TRUE@export_symbols = -export-symbols $(srcdir)/gailutil.def | |
133 -@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gailutil.lib | |
134 +@OS_WIN32_TRUE@export_symbols = -export-symbols-regex "xXx" -Wl,$(srcdir)/gailutil.def | |
135 +@MS_LIB_AVAILABLE_FALSE@noinst_DATA = gailutil.lib | |
136 lib_LTLIBRARIES = libgailutil-3.la | |
137 util_c_sources = \ | |
138 gailmisc.c \ | |
139 @@ -936,13 +936,13 @@ | |
140 @OS_WIN32_FALSE@install-def-file: | |
141 @OS_WIN32_FALSE@uninstall-def-file: | |
142 | |
143 -@MS_LIB_AVAILABLE_TRUE@install-ms-lib: | |
144 -@MS_LIB_AVAILABLE_TRUE@ $(INSTALL) gailutil.lib $(DESTDIR)$(libdir) | |
145 - | |
146 -@MS_LIB_AVAILABLE_TRUE@uninstall-ms-lib: | |
147 -@MS_LIB_AVAILABLE_TRUE@ -rm $(DESTDIR)$(libdir)/gailutil.lib | |
148 @MS_LIB_AVAILABLE_FALSE@install-ms-lib: | |
149 +@MS_LIB_AVAILABLE_FALSE@ $(INSTALL) gailutil.lib $(DESTDIR)$(libdir) | |
150 + | |
151 @MS_LIB_AVAILABLE_FALSE@uninstall-ms-lib: | |
152 +@MS_LIB_AVAILABLE_FALSE@ -rm $(DESTDIR)$(libdir)/gailutil.lib | |
153 +@MS_LIB_AVAILABLE_TRUE@install-ms-lib: | |
154 +@MS_LIB_AVAILABLE_TRUE@uninstall-ms-lib: | |
155 | |
156 gailutil.lib: libgailutil-3.la gailutil.def | |
157 lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-3.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@ |