GNOME.org
 

[gnumeric] win32: more gtk+ work.

commit bb4ef512c2d0965af6c78536abedbe77c2c83575
Author: Morten Welinder <terra gnome org>
Date:   Thu Aug 1 20:05:37 2013 -0400

    win32: more gtk+ work.

 tools/win32/ChangeLog                              |    2 +-
 tools/win32/jhbuildrc.py                           |    2 +-
 tools/win32/moduleset.in                           |    6 +-
 tools/win32/patches/gtk-disable-demo.patch         |    8 +-
 tools/win32/patches/gtk-release-flux.patch         |  164 ++++++++++++++++++++
 .../patches/gtk-use-wine-to-cross-compile.patch    |   68 --------
 6 files changed, 173 insertions(+), 77 deletions(-)
---
diff --git a/tools/win32/ChangeLog b/tools/win32/ChangeLog
index 8af61a9..f8b62c8 100644
--- a/tools/win32/ChangeLog
+++ b/tools/win32/ChangeLog
@@ -1,6 +1,6 @@
 2013-08-01  Morten Welinder  <terra gnome org>
 
-       * moduleset.in: libgsf to 1.14.28.
+       * moduleset.in: libgsf to 1.14.28.  gtk+ to 3.9.10.
 
 2013-07-27  Morten Welinder  <terra gnome org>
 
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index ea6b52e..71f0d7f 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -44,7 +44,7 @@ else:
     sys.exit (1)
 
 mingw_tools = {'ADDR2LINE': 'addr2line',
-       'AS': 'as', 'CC': 'gcc', 'CPP': 'cpp',
+       'AS': 'as', 'CC': 'gcc', 'CC_FOR_BUILD': 'gcc', 'CPP': 'cpp',
        'CPPFILT': 'c++filt', 'CXX': 'g++',
        'DLLTOOL': 'dlltool', 'DLLWRAP': 'dllwrap',
        'GCOV': 'gcov', 'LD': 'ld', 'NM': 'nm',
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index c81f1dc..95c5e28 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -214,11 +214,11 @@
     </autotools>
 
     <autotools id="gtk+">
-       <branch repo="gnome.org" module="sources/gtk+/3.9/gtk+-3.9.8.tar.xz"
-               version="3.9.8">
+       <branch repo="gnome.org" module="sources/gtk+/3.9/gtk+-3.9.10.tar.xz"
+               version="3.9.10">
            <patch file="&patch_dir;gtk-disable-demo.patch"/>
            <patch file="&patch_dir;gtk-use-wine-to-cross-compile.patch"/>
-           <patch file="&patch_dir;gtk-warp-prototype.patch" strip="1"/>
+           <patch file="&patch_dir;gtk-release-flux.patch" strip="1"/>
        </branch>
        <dependencies>
            <dep package="glib"/>
diff --git a/tools/win32/patches/gtk-disable-demo.patch b/tools/win32/patches/gtk-disable-demo.patch
index 0bad55c..f64a38b 100644
--- a/tools/win32/patches/gtk-disable-demo.patch
+++ b/tools/win32/patches/gtk-disable-demo.patch
@@ -5,15 +5,15 @@
   ## Makefile.am for GTK+
   include $(top_srcdir)/Makefile.decl
   
-! SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+! SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
+  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
   
   # require automake 1.4
 --- 1,7 ----
   ## Makefile.am for GTK+
   include $(top_srcdir)/Makefile.decl
   
-! SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
-  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+! SRC_SUBDIRS = gdk gtk libgail-util modules
+  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
   
   # require automake 1.4
diff --git a/tools/win32/patches/gtk-release-flux.patch b/tools/win32/patches/gtk-release-flux.patch
new file mode 100644
index 0000000..6fa2566
--- /dev/null
+++ b/tools/win32/patches/gtk-release-flux.patch
@@ -0,0 +1,164 @@
+From 1f4e6cc1a3fe62d05036cfae181f10e07da3764a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
+ =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986 gmail com>
+Date: Fri, 10 May 2013 09:23:17 +0400
+Subject: [PATCH 4/5] BURN THE .DEF
+
+---
+ gdk/Makefile.am  | 23 ++++++-----------------
+ gdk/makefile.msc | 14 ++++----------
+ gtk/Makefile.am  | 22 ++++++----------------
+ 3 files changed, 16 insertions(+), 43 deletions(-)
+
+diff --git a/gdk/Makefile.am b/gdk/Makefile.am
+index af0ac94..a0233f9 100644
+--- a/gdk/Makefile.am
++++ b/gdk/Makefile.am
+@@ -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
+ endif # USE_WIN32
+ 
+ if USE_BROADWAY
+@@ -269,22 +269,11 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
+ 
+ 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)- LT_CURRENT_MINUS_AGE@.dll 
-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)- LT_CURRENT_MINUS_AGE@.dll 
-out:$@
+ 
+ install-ms-lib:
+       mkdir -p $(DESTDIR)$(libdir)
+@@ -381,9 +370,9 @@ dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../buil
+ 
+ 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
+diff --git a/gdk/makefile.msc b/gdk/makefile.msc
+index 0d88d1e..f956606 100644
+--- a/gdk/makefile.msc
++++ b/gdk/makefile.msc
+@@ -139,25 +139,19 @@ gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template
+ gdkconfig.h : gdkconfig.h.win32
+       copy gdkconfig.h.win32 gdkconfig.h
+ 
+-gdk.def: gdk.symbols
+-      echo EXPORTS > gdk.def
+-      cl /EP -DG_OS_WIN32 -DGDK_WINDOWING_WIN32 \
+-              -DG_GNUC_CONST= \
+-              gdk.symbols >> gdk.def
+-
+ # /force /verbose:lib 
+-libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
++libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) win32\gdk-win32.lib
+       $(CC) $(CFLAGS) -LD -Fe$@ $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) \
+       gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res \
+-      $(LDFLAGS) /implib:gdk-win32-$(GTK_VER).lib /def:gdk.def
++      $(LDFLAGS) /implib:gdk-win32-$(GTK_VER).lib
+ 
+ gdk-win32-$(GTK_VER)s.lib : $(gdk_OBJECTS)
+       lib /out:gdk-win32-$(GTK_VER)s.lib $(gdk_OBJECTS) win32\gdk-win32.lib
+ 
+-gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def x11\gdk-x11.lib
++gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) x11\gdk-x11.lib
+       $(CC) $(CFLAGS) -LD -Fegdk-x11-$(GTK_VER).dll $(gdk_OBJECTS) \
+       $(PANGO)\pango\pangox-$(PANGO_VER).lib \
+-      x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS) /def:gdk.def
++      x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS)
+ 
+ testgdk.exe : libgdk-win32-$(GTK_VER)-0.dll testgdk.obj
+       $(CC) -Fetestgdk.exe testgdk.obj gdk-win32-$(GTK_VER).lib $(EXTRALIBS) $(LDFLAGS)
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 60fbc31..5da0b35 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -61,29 +61,19 @@ no_undefined = -no-undefined
+ 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
+ 
+ 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)- LT_CURRENT_MINUS_AGE@.dll 
-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)- LT_CURRENT_MINUS_AGE@.dll 
-out:$@
+ 
+ install-ms-lib:
+       $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
+@@ -1226,8 +1216,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)
+ endif
+ 
+ install-exec-hook:
+@@ -1279,13 +1269,13 @@ dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../buil
+       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
+-- 
+1.8.0.3
+
diff --git a/tools/win32/patches/gtk-use-wine-to-cross-compile.patch 
b/tools/win32/patches/gtk-use-wine-to-cross-compile.patch
index d68f58c..f8164e6 100644
--- a/tools/win32/patches/gtk-use-wine-to-cross-compile.patch
+++ b/tools/win32/patches/gtk-use-wine-to-cross-compile.patch
@@ -1,49 +1,4 @@
  gdk-pixbuf/Makefile.in        2010-03-22 23:32:58.000000000 -0400
-+++ gdk-pixbuf/Makefile.in     2010-04-06 18:18:13.000000000 -0400
-@@ -1458,8 +1458,7 @@
- @HAVE_INTROSPECTION_TRUE dist_gir_DATA = $(INTROSPECTION_GIRS)
- @HAVE_INTROSPECTION_TRUE typelibsdir = $(libdir)/girepository-1.0
- @HAVE_INTROSPECTION_TRUE typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-- CROSS_COMPILING_FALSE@RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)"
-- CROSS_COMPILING_TRUE@RUN_QUERY_LOADER_TEST = false
-+RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)"
- all: $(BUILT_SOURCES)
-       $(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
-@@ -2158,7 +2157,7 @@
-       $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
- check: $(BUILT_SOURCES)
-       $(MAKE) $(AM_MAKEFLAGS) check-recursive
-- CROSS_COMPILING_TRUE@all-local:
-+all-local:
- all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \
-               all-local
- install-binPROGRAMS: install-libLTLIBRARIES
-@@ -2450,7 +2449,7 @@
- install-data-hook: install-ms-lib install-def-file
-       @if $(RUN_QUERY_LOADER_TEST) ; then \
-         $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
--        $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > 
$(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
-+        $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders$(EXEEXT) > 
$(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
-       else \
-         echo "***" ; \
-         echo "*** Warning: gdk-pixbuf.loaders not built" ; \
-@@ -2463,13 +2462,13 @@
- uninstall-local: uninstall-ms-lib uninstall-def-file
-       rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
- 
-- CROSS_COMPILING_FALSE@all-local: gdk-pixbuf.loaders
-+all-local: gdk-pixbuf.loaders
- 
- @BUILD_DYNAMIC_MODULES_TRUE gdk-pixbuf loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT)
- @BUILD_DYNAMIC_MODULES_TRUE@  LOADERS=`echo libpixbufloader-*.la` ; \
- @BUILD_DYNAMIC_MODULES_TRUE@  if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
- @BUILD_DYNAMIC_MODULES_TRUE@          echo "Writing a gdk-pixbuf.loader file to use when running examples 
before installing gdk-pixbuf."; \
-- BUILD_DYNAMIC_MODULES_TRUE@    $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > 
./gdk-pixbuf.loaders ;\
-+ BUILD_DYNAMIC_MODULES_TRUE@    $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders$(EXEEXT) $$LOADERS > 
./gdk-pixbuf.loaders ;\
- @BUILD_DYNAMIC_MODULES_TRUE@  else \
- @BUILD_DYNAMIC_MODULES_TRUE@          echo "No dynamic modules found; will use only static modules for 
uninstalled example programs."; \
- @BUILD_DYNAMIC_MODULES_TRUE@    touch gdk-pixbuf.loaders; \
 --- modules/input/Makefile.in  2010-03-22 23:33:00.000000000 -0400
 +++ modules/input/Makefile.in  2010-04-06 18:15:37.000000000 -0400
 @@ -718,8 +718,8 @@
@@ -66,26 +21,3 @@
  all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
  installdirs:
        for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(imconffiledir)"; do \
-@@ -1253,8 +1253,8 @@
-       @if $(RUN_QUERY_IMMODULES_TEST) ; then \
-         echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-         $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
--        echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" 
; \
--        $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
-+        echo "$(top_builddir)/gtk/gtk-query-immodules-2.0$(EXEEXT) > 
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
-+        $(top_builddir)/gtk/gtk-query-immodules-2.0$(EXEEXT) > 
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
-       else \
-         echo "***" ; \
-         echo "*** Warning: gtk.immodules not built" ; \
-@@ -1270,9 +1270,9 @@
- included-modules: $(noinst_LTLIBRARIES)
- 
- gtk.immodules: Makefile.am $(module_LTLIBRARIES)
--      $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
-+      $(top_builddir)/gtk/gtk-query-immodules-2.0$(EXEEXT) $(module_LTLIBRARIES) > gtk.immodules
- 
-- CROSS_COMPILING_FALSE@all-local: gtk.immodules
-+all-local: gtk.immodules
- 
- -include $(top_srcdir)/git.mk
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]