annotate src/msvc-gtk3-1.patch @ 5947:09d3533acacf

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