GNOME.org
 

[gnumeric] win32: use newer versions of libraries.

commit f8cd8d018681f82e833e130b900fcef3996d1c09
Author: Morten Welinder <terra gnome org>
Date:   Tue Apr 6 19:40:27 2010 -0400

    win32: use newer versions of libraries.

 tools/win32/moduleset.in                           |   10 +++---
 tools/win32/patches/fontconfig-CC.patch            |   21 -------------
 tools/win32/patches/gtk-gdk-expose-order.patch     |    9 -----
 .../patches/gtk-use-wine-to-cross-compile.patch    |   32 +++++++++----------
 tools/win32/patches/pango-no-introspection.patch   |   18 +++++------
 tools/win32/patches/zlib.patch                     |    3 +-
 6 files changed, 30 insertions(+), 63 deletions(-)
---
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index f115c98..550ab37 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -66,7 +66,7 @@
     </autotools>
 
     <autotools id="glib">
-	<branch repo="gnome.org" module="sources/glib/2.22/glib-2.22.3.tar.bz2" version="2.22.3">
+	<branch repo="gnome.org" module="sources/glib/2.24/glib-2.24.0.tar.bz2" version="2.22.3">
 	    <patch file="&patch_dir;glib-win32-cachefile.patch.gz"/>
 	    <patch file="&patch_dir;glib-goption-disable-localization.patch"/>
 	    <patch file="&patch_dir;glib-disable-python.patch" strip="1"/>
@@ -164,7 +164,7 @@
 
     <autotools id="fontconfig"
 	autogen-sh="autoreconf"  skip-autogen="never">
-	<branch repo="fontconfig" module="fontconfig-2.7.0.tar.gz" version="2.7.0">
+	<branch repo="fontconfig" module="fontconfig-2.8.0.tar.gz" version="2.8.0">
 	    <patch file="&patch_dir;fontconfig-CC.patch"/>
 	</branch>
 	<dependencies>
@@ -174,7 +174,7 @@
     </autotools>
 
     <autotools id="pango">
-	<branch repo="gnome.org" module="sources/pango/1.26/pango-1.26.2.tar.bz2" version="1.26.2">
+	<branch repo="gnome.org" module="sources/pango/1.28/pango-1.28.0.tar.bz2" version="1.28.0">
 	  <patch file="&patch_dir;pango-no-introspection.patch"/>
 	</branch>
 	<dependencies>
@@ -187,14 +187,14 @@
     </autotools>
 
     <autotools id="atk">
-	<branch repo="gnome.org" module="sources/atk/1.28/atk-1.28.0.tar.bz2" version="1.28.0"/>
+	<branch repo="gnome.org" module="sources/atk/1.30/atk-1.30.0.tar.bz2" version="1.30.0"/>
 	<dependencies>
 	    <dep package="glib"/>
 	</dependencies>
     </autotools>
 
     <autotools id="gtk+">
-	<branch repo="gnome.org" module="sources/gtk+/2.18/gtk+-2.18.5.tar.bz2"
+	<branch repo="gnome.org" module="sources/gtk+/2.20/gtk+-2.20.0.tar.bz2"
 		version="2.18.5">
 	    <patch file="&patch_dir;gtk-disable-demo.patch"/>
 	    <patch file="&patch_dir;gtk-use-wine-to-cross-compile.patch"/>
diff --git a/tools/win32/patches/fontconfig-CC.patch b/tools/win32/patches/fontconfig-CC.patch
index 71299dc..8370281 100644
--- a/tools/win32/patches/fontconfig-CC.patch
+++ b/tools/win32/patches/fontconfig-CC.patch
@@ -14,24 +14,3 @@ Index: configure.in
  AC_MSG_RESULT([$CC_FOR_BUILD])
  AC_SUBST(CC_FOR_BUILD)
  
-Index: src/fcint.h
-===================================================================
-*** src/fcint.h	Wed Jun 24 13:52:13 2009
---- src/fcint.h	Sun Jun 28 16:25:38 2009
-***************
-*** 538,544 ****
-  
-  #ifdef _WIN32
-  FcPrivate int
-! FcStat (const char *file, struct stat *statb)
-  #else
-  #define FcStat stat
-  #endif
---- 538,544 ----
-  
-  #ifdef _WIN32
-  FcPrivate int
-! FcStat (const char *file, struct stat *statb);
-  #else
-  #define FcStat stat
-  #endif
diff --git a/tools/win32/patches/gtk-gdk-expose-order.patch b/tools/win32/patches/gtk-gdk-expose-order.patch
index 4494cfe..798fd6c 100644
--- a/tools/win32/patches/gtk-gdk-expose-order.patch
+++ b/tools/win32/patches/gtk-gdk-expose-order.patch
@@ -1,15 +1,6 @@
 diff -ur gtk+-2.18.5/gdk/gdkwindow.c gtk+-2.18.5.new/gdk/gdkwindow.c
 --- gtk+-2.18.5/gdk/gdkwindow.c	2009-12-08 10:13:05.000000000 -0500
 +++ gtk+-2.18.5.new/gdk/gdkwindow.c	2010-04-05 18:38:41.000000000 -0400
-@@ -4569,7 +4569,7 @@
-   region = gdk_region_rectangle (&rect);
-   gdk_window_clear_region_internal (window,
- 				    region,
--				    FALSE);
-+				    send_expose);
-   gdk_region_destroy (region);
- 
- }
 @@ -5008,7 +5008,7 @@
        /*  if "window" has an ancestor in the list and tmp is one of
         *  "window's" children, insert "window" before tmp
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 2c2f8f5..d68f58c 100644
--- a/tools/win32/patches/gtk-use-wine-to-cross-compile.patch
+++ b/tools/win32/patches/gtk-use-wine-to-cross-compile.patch
@@ -1,17 +1,16 @@
---- gdk-pixbuf/Makefile.in	2009-11-30 23:08:44.000000000 -0500
-+++ gdk-pixbuf/Makefile.in	2009-12-06 15:38:25.000000000 -0500
-@@ -1392,8 +1392,8 @@
- 	gdk-pixbuf-enum-types.c gdk-pixbuf-marshal.h \
- 	gdk-pixbuf-marshal.c gdk-pixbuf.loaders s-enum-types-h \
- 	stamp-gdk-pixbuf-marshal.h
+ 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
  
-@@ -2047,7 +2047,7 @@
+@@ -2158,7 +2157,7 @@
  	$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
  check: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) check-recursive
@@ -20,7 +19,7 @@
  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \
  		all-local
  install-binPROGRAMS: install-libLTLIBRARIES
-@@ -2332,7 +2332,7 @@
+@@ -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 ; \
@@ -29,7 +28,7 @@
  	else \
  	  echo "***" ; \
  	  echo "*** Warning: gdk-pixbuf.loaders not built" ; \
-@@ -2345,13 +2345,13 @@
+@@ -2463,13 +2462,13 @@
  uninstall-local: uninstall-ms-lib uninstall-def-file
  	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
  
@@ -45,10 +44,9 @@
  @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; \
-diff -ur modules/input/Makefile.in modules/input/Makefile.in
---- modules/input/Makefile.in	2009-10-05 16:46:10.000000000 -0400
-+++ modules/input/Makefile.in	2009-10-11 08:15:33.000000000 -0400
-@@ -702,8 +702,8 @@
+--- 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 @@
  @INCLUDE_IM_MULTIPRESS_FALSE MULTIPRESS_MODULE = im-multipress.la
  imconffiledir = $(sysconfdir)/gtk-2.0
  dist_imconffile_DATA = im-multipress.conf
@@ -59,7 +57,7 @@ diff -ur modules/input/Makefile.in modules/input/Makefile.in
  @BUILD_DYNAMIC_MODULES_TRUE module_LTLIBRARIES = \
  @BUILD_DYNAMIC_MODULES_TRUE@	$(AM_ET_MODULE)			\
  @BUILD_DYNAMIC_MODULES_TRUE@	$(CEDILLA_MODULE)		\
-@@ -1049,7 +1049,7 @@
+@@ -1065,7 +1065,7 @@
  check-am: all-am
  	$(MAKE) $(AM_MAKEFLAGS) check-local
  check: check-am
@@ -68,7 +66,7 @@ diff -ur modules/input/Makefile.in modules/input/Makefile.in
  all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
  installdirs:
  	for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(imconffiledir)"; do \
-@@ -1237,8 +1237,8 @@
+@@ -1253,8 +1253,8 @@
  	@if $(RUN_QUERY_IMMODULES_TEST) ; then \
  	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
  	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
@@ -79,7 +77,7 @@ diff -ur modules/input/Makefile.in modules/input/Makefile.in
  	else \
  	  echo "***" ; \
  	  echo "*** Warning: gtk.immodules not built" ; \
-@@ -1254,9 +1254,9 @@
+@@ -1270,9 +1270,9 @@
  included-modules: $(noinst_LTLIBRARIES)
  
  gtk.immodules: Makefile.am $(module_LTLIBRARIES)
diff --git a/tools/win32/patches/pango-no-introspection.patch b/tools/win32/patches/pango-no-introspection.patch
index 6bb8412..778ff5e 100644
--- a/tools/win32/patches/pango-no-introspection.patch
+++ b/tools/win32/patches/pango-no-introspection.patch
@@ -1,13 +1,11 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 2583)
-+++ configure.in	(working copy)
-@@ -484,7 +484,7 @@
+--- configure.in~	2010-03-30 15:12:04.000000000 -0400
++++ configure.in	2010-04-06 18:56:59.000000000 -0400
+@@ -468,7 +468,7 @@
  # Checks for GObject Introspection
  #
- have_introspection=false
--PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0 >= 0.6.4, have_introspection=true, have_introspection=false)
-+#PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0 >= 0.6.4, have_introspection=true, have_introspection=false)
- AM_CONDITIONAL(HAVE_INTROSPECTION, $have_introspection)
  
- G_IR_SCANNER=
+-GOBJECT_INTROSPECTION_CHECK([0.6.7])
++AM_CONDITIONAL(HAVE_INTROSPECTION, false)
+ 
+ #
+ # Modules to build
diff --git a/tools/win32/patches/zlib.patch b/tools/win32/patches/zlib.patch
index 970eb24..e8f8c3d 100644
--- a/tools/win32/patches/zlib.patch
+++ b/tools/win32/patches/zlib.patch
@@ -64,7 +64,7 @@
  
  example.exe: example.o $(STATICLIB)
  	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
-@@ -106,11 +105,9 @@
+@@ -106,11 +105,10 @@
  .PHONY: install uninstall clean
  
  install: zlib.h zconf.h $(LIB)
@@ -74,6 +74,7 @@
  	-$(INSTALL) zconf.h $(INCLUDE_PATH)
 -	-$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
 +	-$(INSTALL) $(STATICLIB) $(exec_prefix)
++	-$(INSTALL) $(SHAREDLIB) $(exec_prefix)
  	-$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)
  
  uninstall:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]