GNOME.org
 

gnumeric r16780 - in trunk: . tools/win32 tools/win32/patches

Author: jody
Date: Mon Sep  8 09:48:34 2008
New Revision: 16780
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16780&view=rev

Log:
update for the 2008-09-08 packages

Modified:
   trunk/BUGS
   trunk/tools/win32/jhbuildrc
   trunk/tools/win32/moduleset
   trunk/tools/win32/patches/glib-goption-disable-localization.patch
   trunk/tools/win32/patches/libgda.patch
   trunk/tools/win32/patches/pygobject.patch

Modified: trunk/BUGS
==============================================================================
--- trunk/BUGS	(original)
+++ trunk/BUGS	Mon Sep  8 09:48:34 2008
@@ -769,13 +769,14 @@
 	 names correctly.
 
 41) win32
-    41.1) Fix preview
-    41.2) hhmap
-	41.2.1) how to generate
-	41.2.2) include in the installer
-    41.3) optionally add quicklaunch & desktop links
-    41.4) Check 'long name' issue
-    41.5) Check crash on russian home dir.
+    41.1) Fix preview [#533795]
+    41.2) python installation [#549387]
+    41.3) libbz2 not found for libgsf
+    41.4) hhmap
+	41.4.1) how to generate
+	41.4.2) include in the installer
+    41.5) optionally add quicklaunch & desktop links
+    41.6) long pause between license and screen ?
 
 autoformat
 ----------

Modified: trunk/tools/win32/jhbuildrc
==============================================================================
--- trunk/tools/win32/jhbuildrc	(original)
+++ trunk/tools/win32/jhbuildrc	Mon Sep  8 09:48:34 2008
@@ -101,13 +101,12 @@
 module_autogenargs['pixman']	= autogenargs + """ --enable-explicit-deps=no \
                                                   --enable-xlib=no \
                                                   --enable-xlib-xrender=no \
-                                                  --enable-win32-font=yes \
-						  --enable-freetype"""
+                                                  --enable-win32-font=yes"""
 module_autogenargs['cairo']	= autogenargs + """ --enable-explicit-deps=no \
                                                   --enable-xlib=no \
                                                   --enable-xlib-xrender=no \
                                                   --enable-win32-font=yes \
-						  --enable-freetype=no \
+						  --enable-ft=no \
 						  --disable-static \
 						  --enable-shared"""
 

Modified: trunk/tools/win32/moduleset
==============================================================================
--- trunk/tools/win32/moduleset	(original)
+++ trunk/tools/win32/moduleset	Mon Sep  8 09:48:34 2008
@@ -7,28 +7,19 @@
     <repository type="svn" name="svn.gnome.org" default="yes"
 		href="http://svn.gnome.org/svn/"/>
     <repository type="tarball" name="gnome.org"
-		href="http://download.gnome.org/sources"/>
+		href="http://download.gnome.org"/>
     <repository type="tarball" name="zlib.net"
 		href="http://www.zlib.net"/>
     <repository type="git" name="freedesktop.org"
 		href="git://cgit.freedesktop.org/git"/>
 
-<!--
-    <tarball id="iconv" version="1.12">
-	<source href="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz";
-	    md5sum="c2be282595751535a618ae0edeb8f648"/>
-    </tarball>
-    -->
- 
     <tarball id="gettext" version="0.17">
 	<source href="ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz";
 	    md5sum="58a2bc6d39c0ba57823034d55d65d606"/>
 	<patches>
 	    <patch file="http://www.gnome.org/~aruiz/gtk+/patches/gettext_0_17_crossbuild_override_tools_fix.patch"/>
 	</patches>
-	<dependencies>
-<!--	    <dep package="iconv"/> -->
-	</dependencies>
+	<dependencies/>
     </tarball>
 
     <tarball id="pcre" version="7.2">
@@ -43,10 +34,12 @@
 	<dependencies>
 	</dependencies>
     </autotools>
+
+<!--
+		- APPLY MANUALLY -
     <autotools id="glib">
 	<branch>
 	    <patches>
-		<!-- APPLY MANUALLY -->
 		<patch file="http://www.gnome.org/~aruiz/gtk+/patches/glib_win32_cachefile.patch.gz"/>
 		<patch file="&patch_dir;glib-goption-disable-localization.patch"/>
 	    </patches>
@@ -54,24 +47,21 @@
 	<dependencies>
 	    <dep package="gettext"/>
 	    <dep package="gtk-doc"/>
-<!--	    <dep package="iconv"/> -->
+	    <dep package="iconv"/>
 	</dependencies>
     </autotools>
-
-    <!--
-    <tarball id="glib" version="2.14.6">
-	<source href="http://download.gnome.org/sources/glib/2.14/glib-2.14.6.tar.bz2";
-		md5sum="3b340946d6916ee9cbf2c348e7c099f1"/>
+-->
+    <tarball id="glib" version="2.18.0">
+	<source href="http://download.gnome.org/sources/glib/2.18/glib-2.18.0.tar.bz2"; />
 	<patches>
 		<patch file="http://www.gnome.org/~aruiz/gtk+/patches/glib_win32_cachefile.patch"/>
 		<patch file="&patch_dir;glib-goption-disable-localization.patch"/>
 	</patches>
 	<dependencies>
 	    <dep package="gettext"/>
-	    <dep package="iconv"/>
+	    <dep package="gtk-doc"/>
 	</dependencies>
     </tarball>
-    -->
 
 <!-- Compression -->
     <autotools id="zlib"
@@ -182,30 +172,29 @@
 	</dependencies>
     </tarball>
 <!--
-    <tarball id="gtk+" version="2.12.9">
-	<source href="http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.9.tar.bz2";
-		md5sum="33499772fdc3bea569c6d5673e5831b4"/>
-	<patches>
-	</patches>
-
+    <autotools id="gtk+">
+	<branch/>
 	<dependencies>
 	    <dep package="glib"/>
 	    <dep package="cairo"/>
 	    <dep package="atk"/>
 	    <dep package="pango"/>
 	</dependencies>
-    </tarball>
+    </autotools>
     -->
-    <autotools id="gtk+">
-	<branch/>
+
+    <tarball id="gtk+" version="2.14.1">
+	<source href="http://download.gnome.org/sources/gtk+/2.14/gtk+-2.14.1.tar.bz2"; />
+	<patches>
+	</patches>
 	<dependencies>
 	    <dep package="glib"/>
 	    <dep package="cairo"/>
 	    <dep package="atk"/>
 	    <dep package="pango"/>
 	</dependencies>
-    </autotools>
-    -->
+    </tarball>
+
 
 <!-- glade stack -->
     <tarball id="libxml2" version="2.6.32">
@@ -224,29 +213,31 @@
     </tarball>
 
 <!-- python stack -->
-    <tarball id="pygobject" version="2.12.3">
-	<source href="http://ftp.gnome.org/pub/gnome/sources/pygobject/2.12/pygobject-2.12.3.tar.bz2";
-		md5sum="009986021225b7ea6e0ba848707785af"/>
+    <autotools id="pygobject" version="2.14.2">
+	<branch repo="gnome.org" module="sources/pygobject/2.14/pygobject-2.14.2.tar.bz2"
+		version="3.1.2">
+	    <patch file="&patch_dir;pygobject.patch"/>
+	</branch>
+
 	<dependencies>
 	    <dep package="glib"/>
 	</dependencies>
-	<patches>
-	    <patch file="&patch_dir;pygobject.patch"/>
-	</patches>
-    </tarball>
+    </autotools>
 
-    <tarball id="libgda" version="3.0.2">
-	<source href="http://download.gnome.org/sources/libgda/3.1/libgda-3.1.2.tar.bz2";
-		md5sum="fe299d264ddeb7fbc36276f74f1abfdc"/>
+    <autotools id="libgda" version="3.1.5">
+	<branch repo="gnome.org" module="sources/libgda/3.1/libgda-3.1.5.tar.bz2"
+		version="3.1.5">
+	</branch>
 	<dependencies>
 	    <dep package="intltool"/>
 	    <dep package="glib"/>
 	    <dep package="libxml2"/>
 	</dependencies>
-    </tarball>
-    <autotools id="libgnomedb" version="trunk"
+    </autotools>
+
+    <autotools id="libgnomedb" version="3.1.2"
 	autogen-sh="autoreconf">
-	<branch repo="gnome.org" module="libgnomedb/3.1/libgnomedb-3.1.2.tar.bz2"
+	<branch repo="gnome.org" module="sources/libgnomedb/3.1/libgnomedb-3.1.2.tar.bz2"
 		version="3.1.2">
 	    <patch file="&patch_dir;libgnomedb.patch"/>
 	</branch>
@@ -270,6 +261,7 @@
 	    <patch file="&patch_dir;psiconv.patch"/>
 	</patches>
     </tarball>
+
 <!-- Gnumeric stack -->
     <autotools id="libgsf" version="trunk">
 	<branch/>
@@ -281,13 +273,7 @@
 	    <dep package="intltool"/>
 	</dependencies>
     </autotools>
-    <tarball id="libart_lgpl" version="2.3.19">
-	<source href="http://ftp.gnome.org/Public/gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.19.tar.bz2";
-		md5sum="ac885805d1918026a18b560f4015bc66"/>
-	<patches>
-	    <patch file="&patch_dir;libart.patch"/>
-	</patches>
-    </tarball>
+
     <autotools id="goffice" version="trunk">
 	<branch/>
 	<dependencies>
@@ -297,7 +283,6 @@
 	    <dep package="libxml2"/>
 	    <dep package="pango"/>
 	    <dep package="libglade"/>
-	    <dep package="libart_lgpl"/>
 	    <dep package="intltool"/>
 	</dependencies>
 	<patches>

Modified: trunk/tools/win32/patches/glib-goption-disable-localization.patch
==============================================================================
--- trunk/tools/win32/patches/glib-goption-disable-localization.patch	(original)
+++ trunk/tools/win32/patches/glib-goption-disable-localization.patch	Mon Sep  8 09:48:34 2008
@@ -128,3 +128,24 @@
  
  void            g_option_context_add_main_entries (GOptionContext      *context,
  						   const GOptionEntry  *entries,
+Index: glib/glib.symbols
+===================================================================
+--- glib/glib.symbols   2008-09-02 11:09:41.000000000 -0400
++++ glib/glib.symbols   2008-09-04 16:57:16.000000000 -0400
+@@ -809,6 +809,7 @@
+ g_option_context_add_main_entries
+ g_option_error_quark
+ g_option_context_free
++g_option_context_get_delocalize
+ g_option_context_get_description
+ g_option_context_get_help_enabled
+ g_option_context_get_ignore_unknown_options
+@@ -816,6 +817,7 @@
+ g_option_context_get_summary
+ g_option_context_new
+ g_option_context_parse
++g_option_context_set_delocalize
+ g_option_context_set_description
+ g_option_context_set_help_enabled
+ g_option_context_set_ignore_unknown_options
+

Modified: trunk/tools/win32/patches/libgda.patch
==============================================================================
--- trunk/tools/win32/patches/libgda.patch	(original)
+++ trunk/tools/win32/patches/libgda.patch	Mon Sep  8 09:48:34 2008
@@ -1,7 +1,7 @@
-Index: libgda/gtk-doc.make
+Index: gtk-doc.make
 ===================================================================
---- libgda/gtk-doc.make	(revision 3059)
-+++ libgda/gtk-doc.make	(working copy)
+--- gtk-doc.make	(revision 3059)
++++ gtk-doc.make	(working copy)
 @@ -5,11 +5,11 @@
  ####################################
  

Modified: trunk/tools/win32/patches/pygobject.patch
==============================================================================
--- trunk/tools/win32/patches/pygobject.patch	(original)
+++ trunk/tools/win32/patches/pygobject.patch	Mon Sep  8 09:48:34 2008
@@ -1,93 +1,75 @@
 diff -cr configure configure
-*** configure	2006-11-18 09:53:21.000000000 -0500
---- configure	2008-07-08 14:33:23.000000000 -0400
+*** configure	Fri May 23 12:54:08 2008
+--- configure	Thu Sep  4 14:57:17 2008
 ***************
-*** 9303,9310 ****
-  if test "${am_cv_python_pythondir+set}" = set; then
-    echo $ECHO_N "(cached) $ECHO_C" >&6
-  else
-!   am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-!      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-  fi
-  echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-  echo "${ECHO_T}$am_cv_python_pythondir" >&6
---- 9303,9312 ----
+*** 10441,10446 ****
+--- 10441,10447 ----
+  
+                  { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
+  echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; }
++ am_cv_python_pythondir="${prefix}/lib/python2.5/site-packages" 2>/dev/null ||
   if test "${am_cv_python_pythondir+set}" = set; then
     echo $ECHO_N "(cached) $ECHO_C" >&6
   else
-! #  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-! #     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-!     am_cv_python_pythondir="$PY_PREFIX/Lib/site-packages"
-!     echo $am_cv_python_pythondir
-  fi
-  echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-  echo "${ECHO_T}$am_cv_python_pythondir" >&6
 ***************
-*** 9320,9327 ****
-  if test "${am_cv_python_pyexecdir+set}" = set; then
-    echo $ECHO_N "(cached) $ECHO_C" >&6
-  else
-!   am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-!      echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
-  fi
-  echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
-  echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
---- 9322,9331 ----
-  if test "${am_cv_python_pyexecdir+set}" = set; then
-    echo $ECHO_N "(cached) $ECHO_C" >&6
-  else
-! #  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-! #     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
-!   am_cv_python_pyexecdir="$PY_PREFIX/Lib/site-packages"
-!      echo "$am_cv_python_pyexecdir"
-  fi
-  echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
-  echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
-***************
-*** 9340,9351 ****
+*** 10481,10496 ****
   
-  echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
-  echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
+  echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; }
 ! py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
 ! py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+! if test -x "$PYTHON-config"; then
+! PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
+! else
 ! PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
 ! if test "$py_prefix" != "$py_exec_prefix"; then
 !   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
 ! fi
+! fi
   
   save_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
---- 9344,9350 ----
+--- 10482,10488 ----
   
-  echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
-  echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
+  echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; }
 ! PYTHON_INCLUDES="-I${PY_INCLUDE_DIR}"
   
   save_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+***************
+*** 10539,10545 ****
+  { echo "$as_me:$LINENO: checking for PySignal_SetWakeupFd in Python.h" >&5
+  echo $ECHO_N "checking for PySignal_SetWakeupFd in Python.h... $ECHO_C" >&6; }
+  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+  old_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
+  cat >conftest.$ac_ext <<_ACEOF
+--- 10531,10536 ----
 diff -cr gobject/Makefile.am gobject/Makefile.am
-*** gobject/Makefile.am	2006-10-03 10:03:43.000000000 -0400
---- gobject/Makefile.am	2008-07-08 14:24:35.000000000 -0400
+*** gobject/Makefile.am	Fri May 23 12:42:18 2008
+--- gobject/Makefile.am	Thu Sep  4 14:50:05 2008
 ***************
-*** 21,27 ****
+*** 35,41 ****
   
   _gobject_la_CFLAGS = $(GLIB_CFLAGS)
   _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gobject
-! _gobject_la_LIBADD = $(GLIB_LIBS)
+! _gobject_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
   _gobject_la_SOURCES = \
   	gobjectmodule.c \
   	pygboxed.c \
---- 21,27 ----
+--- 35,41 ----
   
   _gobject_la_CFLAGS = $(GLIB_CFLAGS)
   _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gobject
-! _gobject_la_LIBADD = $(GLIB_LIBS) -lpython25
+! _gobject_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) -lpython25
   _gobject_la_SOURCES = \
   	gobjectmodule.c \
   	pygboxed.c \
 diff -cr tests/Makefile.am tests/Makefile.am
-*** tests/Makefile.am	2006-07-10 10:21:07.000000000 -0400
---- tests/Makefile.am	2008-07-08 14:24:35.000000000 -0400
+*** tests/Makefile.am	Fri May 23 12:42:14 2008
+--- tests/Makefile.am	Thu Sep  4 14:49:37 2008
 ***************
 *** 15,21 ****
   linked_LIBS = testhelper.la
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]