[gtk-builder-win] gtk3: add patch to remove the def definitions so we manage to build gtk3



commit 71862b77f9190aa392ea33e294daa5f5b30f43df
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Jul 15 10:06:14 2014 +0200

    gtk3: add patch to remove the def definitions so we manage to build gtk3

 win32/libs/51_gtk3.bat              |    3 +
 win32/libs/51_gtk3/remove-def.patch |   72 +++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 0 deletions(-)
---
diff --git a/win32/libs/51_gtk3.bat b/win32/libs/51_gtk3.bat
index 82aa534..d78a22b 100644
--- a/win32/libs/51_gtk3.bat
+++ b/win32/libs/51_gtk3.bat
@@ -10,6 +10,9 @@ xz -d -k -f gtk+-$MODVER.tar.xz
 tar -xf gtk+-$MODVER.tar
 cd gtk+-$MODVER
 
+echo remove useless def
+patch -p1 < ../remove-def.patch
+
 echo Save current CFLAGS var, we will restore it later...
 
 export CFLAGS_SAVE="$CFLAGS"
diff --git a/win32/libs/51_gtk3/remove-def.patch b/win32/libs/51_gtk3/remove-def.patch
new file mode 100644
index 0000000..4c18cb8
--- /dev/null
+++ b/win32/libs/51_gtk3/remove-def.patch
@@ -0,0 +1,72 @@
+--- gtk+-3.12.2/gtk/Makefile.in.orig   2014-07-15 09:59:43 +0200
++++ gtk+-3.12.2/gtk/Makefile.in        2014-07-15 10:01:09 +0200
+@@ -1071,8 +1071,8 @@
+       $(INCLUDED_IMMODULE_DEFINE)
+ 
+ @PLATFORM_WIN32_TRUE no_undefined = -no-undefined
+- OS_WIN32_TRUE@gtk_def = gtk.def
+- OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
++ OS_WIN32_TRUE@gtk_def = 
++ OS_WIN32_TRUE@gtk_win32_symbols =
+ @OS_WIN32_TRUE gtk_win32_res = gtk-win32-res.o
+ @OS_WIN32_TRUE gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
+ @MS_LIB_AVAILABLE_TRUE noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
+@@ -5969,15 +5969,13 @@
+ @OS_WIN32_TRUE gtk-win32-res o : gtk-win32.rc
+ @OS_WIN32_TRUE@       $(WINDRES) gtk-win32.rc $@
+ 
+- OS_WIN32_TRUE@install-def-file: gtk.def
+- OS_WIN32_TRUE@       $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def
++ OS_WIN32_TRUE@install-def-file:
+ @OS_WIN32_TRUE uninstall-def-file:
+- OS_WIN32_TRUE@       -rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def
+ @OS_WIN32_FALSE install-def-file:
+ @OS_WIN32_FALSE uninstall-def-file:
+ 
+- MS_LIB_AVAILABLE_TRUE@gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def
+- 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:$@
++ MS_LIB_AVAILABLE_TRUE@gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la 
++ MS_LIB_AVAILABLE_TRUE@       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)- 
LT_CURRENT_MINUS_AGE@.dll -out:$@
+ 
+ @MS_LIB_AVAILABLE_TRUE install-ms-lib:
+ @MS_LIB_AVAILABLE_TRUE@       $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
+--- gtk+-3.12.2/gdk/Makefile.in.orig   2014-07-15 09:57:14 +0200
++++ gtk+-3.12.2/gdk/Makefile.in        2014-07-15 09:59:26 +0200
+@@ -94,7 +94,7 @@
+ @USE_WIN32_FALSE@     $(am__append_1) $(am__append_3) \
+ @USE_WIN32_FALSE@     $(am__append_5) $(am__append_7) \
+ @USE_WIN32_FALSE@     $(am__append_8)
+- USE_WIN32_TRUE@am__append_6 = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
++ USE_WIN32_TRUE@am__append_6 = -Wl,win32/rc/gdk-win32-res.o
+ @USE_BROADWAY_TRUE am__append_7 = broadway/libgdk-broadway.la
+ @USE_WAYLAND_TRUE am__append_8 = wayland/libgdk-wayland.la
+ @HAVE_INTROSPECTION_TRUE am__append_9 = Gdk-3.0.gir
+@@ -747,7 +747,7 @@
+ libgdk_3_la_LIBADD = $(GDK_DEP_LIBS) $(am__append_1) $(am__append_3) \
+       $(am__append_5) $(am__append_7) $(am__append_8)
+ libgdk_3_la_LDFLAGS = $(LDADD) $(am__append_6)
+- USE_WIN32_TRUE@libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
++ USE_WIN32_TRUE@libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
+ @HAVE_INTROSPECTION_TRUE introspection_files = \
+ @HAVE_INTROSPECTION_TRUE@     $(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources))      \
+ @HAVE_INTROSPECTION_TRUE@     $(gdk_c_sources)        \
+@@ -1690,16 +1690,13 @@
+ 
+ @HAVE_INTROSPECTION_TRUE@@OS_WIN32_TRUE GdkWin32-3 0 gir: libgdk-3.la Gdk-3.0.gir Makefile
+ 
+- OS_WIN32_TRUE@install-def-file: gdk.def
+- OS_WIN32_TRUE@       mkdir -p $(DESTDIR)$(libdir)
+- OS_WIN32_TRUE@       $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
++ OS_WIN32_TRUE@install-def-file:
+ @OS_WIN32_TRUE uninstall-def-file:
+- OS_WIN32_TRUE@       -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+ @OS_WIN32_FALSE install-def-file:
+ @OS_WIN32_FALSE uninstall-def-file:
+ 
+- MS_LIB_AVAILABLE_TRUE@gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
+- 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:$@
++ MS_LIB_AVAILABLE_TRUE@gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la 
++ MS_LIB_AVAILABLE_TRUE@       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)- 
LT_CURRENT_MINUS_AGE@.dll -out:$@
+ 
+ @MS_LIB_AVAILABLE_TRUE install-ms-lib:
+ @MS_LIB_AVAILABLE_TRUE@       mkdir -p $(DESTDIR)$(libdir)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]