Created
June 22, 2014 16:47
-
-
Save Cilyan/26fcb3e5e97d8bdab03b to your computer and use it in GitHub Desktop.
This is a patch against Gtk+-3.10.9 that removes references to the yet obsolete gdk.def and gtk.def files for Win32 build/cross build
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- gdk/Makefile.am 2014-06-22 18:37:26.077172331 +0200 | |
+++ gdk/Makefile.am 2014-06-22 18:38:34.244019623 +0200 | |
@@ -179,8 +179,8 @@ | |
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 | |
endif # USE_WIN32 | |
if USE_BROADWAY | |
@@ -270,22 +270,11 @@ | |
endif # HAVE_INTROSPECTION | |
-if OS_WIN32 | |
-install-def-file: gdk.def | |
- mkdir -p $(DESTDIR)$(libdir) | |
- $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def | |
-uninstall-def-file: | |
- -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def | |
-else | |
-install-def-file: | |
-uninstall-def-file: | |
-endif | |
- | |
if MS_LIB_AVAILABLE | |
noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib | |
-gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def | |
- lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@[email protected] -def:gdk.def -out:$@ | |
+gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la | |
+ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@[email protected] -out:$@ | |
install-ms-lib: | |
mkdir -p $(DESTDIR)$(libdir) | |
@@ -382,9 +371,9 @@ | |
DISTCLEANFILES = gdkconfig.h stamp-gc-h | |
-install-data-local: install-ms-lib install-def-file | |
+install-data-local: install-ms-lib | |
-uninstall-local: uninstall-ms-lib uninstall-def-file | |
+uninstall-local: uninstall-ms-lib | |
rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h | |
# if srcdir!=builddir, clean out maintainer-clean files from builddir | |
--- gtk/Makefile.am 2014-06-22 18:31:31.846238341 +0200 | |
+++ gtk/Makefile.am 2014-06-22 18:32:11.406342238 +0200 | |
@@ -61,8 +61,6 @@ | |
endif | |
if OS_WIN32 | |
-gtk_def = gtk.def | |
-gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def | |
gtk_win32_res = gtk-win32-res.o | |
gtk_win32_res_ldflag = -Wl,gtk-win32-res.o | |
@@ -70,20 +68,13 @@ | |
gtk-win32-res.o : gtk-win32.rc | |
$(WINDRES) gtk-win32.rc $@ | |
-install-def-file: gtk.def | |
- $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def | |
-uninstall-def-file: | |
- -rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def | |
-else | |
-install-def-file: | |
-uninstall-def-file: | |
endif | |
if MS_LIB_AVAILABLE | |
noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib | |
-gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def | |
- lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@[email protected] -def:gtk.def -out:$@ | |
+gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la | |
+ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@[email protected] -out:$@ | |
install-ms-lib: | |
$(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) | |
@@ -1233,8 +1224,8 @@ | |
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) | |
endif | |
install-exec-hook: | |
@@ -1286,13 +1277,13 @@ | |
rm libgtk.vs10.sourcefiles.filters | |
# Install a RC file for the default GTK+ theme, and key themes | |
-install-data-local: install-ms-lib install-def-file install-mac-key-theme | |
+install-data-local: install-ms-lib install-mac-key-theme | |
$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0 | |
$(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css | |
$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0 | |
$(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css | |
-uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme | |
+uninstall-local: uninstall-ms-lib uninstall-mac-key-theme | |
rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css | |
rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css | |
rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment