Hi
First two hunks (g[dt]k/Makefile.am) fixes regressions due to commits:
https://git.gnome.org/browse/gtk+/commit/gdk/Makefile.am?id=d08d7f2c5a4c4c28a774119f8e1dd88e5fca1681
https://git.gnome.org/browse/gtk+/commit/gtk/Makefile.am?id=d08d7f2c5a4c4c28a774119f8e1dd88e5fca1681
(as well as the commits in the commit message).
Basically we need the .def or should remove the logic totally, but then the
MS_LIB_AVAILABLE logic should be checked as well.
(Last I checked it did not work with GTK+3, although it still does with 2, but
cannot currently verify.)
The third hunk (testsuite/gtk/Makefile.am) fix a regression from commit:
https://git.gnome.org/browse/gtk+/commit/testsuite/gtk/Makefile.am?id=c5e241147b6f710fcefde5d54582ea3936f48807
("defaultvalue" does not build on win32).
The last hunk (modules/input/gtkimcontextime.c) fixes undefined values from
"gdkkeysyms-compat.h".
I assume the duplicate added include of "gdkkeysyms.h" from commit:
https://git.gnome.org/browse/gtk+/commit/modules/input/gtkimcontextime.c?id=493ca20912a9a84b3b13f44c1e99b97eb75dd943
should have been to include "gdkkeysyms-compat.h".
Let me know if I should split it up rather or file bugs.
Regards,
Martin
Vrywaringsklousule / Disclaimer:
http://www.nwu.ac.za/it/gov-man/disclaimer.html
--- a/gdk/Makefile.am 2013-07-30 14:25:46 +0200
+++ b/gdk/Makefile.am 2013-07-30 15:46:41 +0200
@@ -178,8 +178,8 @@ endif # USE_QUARTZ
if USE_WIN32
libgdk_3_la_SOURCES += gdkkeynames.c
libgdk_3_la_LIBADD += win32/libgdk-win32.la
-libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
gdk.def
-libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols
$(srcdir)/gdk.def
+libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
+libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
-Wl,--output-def,$(srcdir)/gdk.def
endif # USE_WIN32
if USE_BROADWAY
@@ -270,6 +270,10 @@ CLEANFILES += $(gir_DATA) $(typelibs_DAT
endif # HAVE_INTROSPECTION
if OS_WIN32
+noinst_DATA = gdk.def
+
+gdk.def: libgdk-3.la
+
install-def-file: gdk.def
mkdir -p $(DESTDIR)$(libdir)
$(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
--- a/gtk/Makefile.am 2013-07-30 14:49:30 +0200
+++ b/gtk/Makefile.am 2013-07-30 15:46:54 +0200
@@ -61,12 +61,15 @@ no_undefined = -no-undefined
endif
if OS_WIN32
-gtk_def = gtk.def
-gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
+noinst_DATA = gtk.def
+
+gtk_gen_def = -Wl,--output-def,$(srcdir)/gtk.def
gtk_win32_res = gtk-win32-res.o
gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
+gtk.def: libgtk-3.la
+
gtk-win32-res.o : gtk-win32.rc
$(WINDRES) gtk-win32.rc $@
@@ -1236,8 +1239,8 @@ libgtk_3_la_DEPENDENCIES = $(deps)
if USE_WIN32
libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
libgtk_3_la_LDFLAGS += -Wl,-luuid
-libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
-libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
+libgtk_3_la_DEPENDENCIES += $(gtk_win32_res) $(deps)
+libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_gen_def)
endif
install-exec-hook:
--- a/testsuite/gtk/Makefile.am 2013-07-30 15:14:07 +0200
+++ b/testsuite/gtk/Makefile.am 2013-07-30 15:14:19 +0200
@@ -32,7 +32,6 @@ TEST_PROGS += \
bitmask \
builder \
cellarea \
- defaultvalue \
entry \
expander \
floating \
@@ -58,7 +57,7 @@ TEST_PROGS += \
$(NULL)
if OS_UNIX
-#TEST_PROGS += defaultvalue
+TEST_PROGS += defaultvalue
endif
#TEST_PROGS += testing
--- a/modules/input/gtkimcontextime.c 2013-07-30 14:47:39 +0200
+++ b/modules/input/gtkimcontextime.c 2013-07-30 14:48:38 +0200
@@ -31,7 +31,7 @@
#include "imm-extra.h"
-#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkkeysyms-compat.h>
#include "gdk/win32/gdkwin32.h"
#include "gdk/gdkkeysyms.h"
_______________________________________________
gtk-devel-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/gtk-devel-list
