[gnumeric] commit bfb4ae33fb9fceb10478d87996b80d4a1689bba9

From: Jody Goldberg <jody src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gnumeric] commit bfb4ae33fb9fceb10478d87996b80d4a1689bba9
Date: Tue, 8 Dec 2009 00:03:25 +0000 (UTC)
commit 252ca3b8a452431dc56b78243a65e533e2802e09
Author: Jody Goldberg <jody gnome org>
Date:   Mon Dec 7 19:02:52 2009 -0500

    commit bfb4ae33fb9fceb10478d87996b80d4a1689bba9
    Author: Jody Goldberg <jody gnome org>
    Date:   Fri Dec 4 06:31:03 2009 -0500
    
        [win32] package updates
    
        - poppler to 0.12.2
        - drop gnomedb which is subsumed into gda
        - update gda to 4.1.3
        - update to pcre 8.0
        - restore GOFFICE_VERSION
        - add tok_ prefix to parser tokens with simple names that might be used in other headers (AND, NOT)
        - move to newer versions gtk/glib

 configure.in                                       |    5 +-
 src/parser.y                                       |   66 ++++----
 tools/win32/Makefile.am                            |    8 +-
 tools/win32/build                                  |   15 ++-
 tools/win32/moduleset.in                           |  138 ++++++++--------
 tools/win32/patches/gtk-disable-demo.patch         |    2 +-
 tools/win32/patches/gtk-pending-2.18.3.patch       |  170 --------------------
 .../patches/gtk-use-wine-to-cross-compile.patch    |   28 ++--
 8 files changed, 144 insertions(+), 288 deletions(-)
---
diff --git a/configure.in b/configure.in
index a8a656e..0b10cef 100644
--- a/configure.in
+++ b/configure.in
@@ -133,8 +133,11 @@ dnl **********
 GOFFICE_API_VER="0.8"
 AC_SUBST(GOFFICE_API_VER)
 # Components
-GOFFICE_PLUGINS_DIR=`pkg-config --variable=PluginDir libgoffice-0.8`
+GOFFICE_PLUGINS_DIR=`pkg-config --variable=PluginDir libgoffice-${GOFFICE_API_VER}`
 AC_SUBST(GOFFICE_PLUGINS_DIR)
+GOFFICE_VERSION=`pkg-config --modversion libgoffice-${GOFFICE_API_VER}`
+AC_SUBST(GOFFICE_VERSION)
+
 
 dnl PKG_PROG_PKG_CONFIG is expanded just before the first occurrence of
 dnl PKG_CHECK_MODULES.  Since this is inside an `if,' it can escape
diff --git a/src/parser.y b/src/parser.y
index feca359..d0461a5 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -571,20 +571,20 @@ int yyparse (void);
 }
 %type  <list>	opt_exp arg_list array_row array_rows
 %type  <expr>	exp array_exp function string_opt_quote cellref
-%token <expr>	STRING QUOTED_STRING CONSTANT RANGEREF GTE LTE NE AND OR NOT INTERSECT
+%token <expr>	STRING QUOTED_STRING CONSTANT RANGEREF tok_GTE tok_LTE tok_NE tok_AND tok_OR tok_NOT INTERSECT
 %token		ARG_SEP ARRAY_COL_SEP ARRAY_ROW_SEP SHEET_SEP INVALID_TOKEN
 %type  <sheet>	sheetref
 %type  <wb>	workbookref
 
-%left '<' '>' '=' GTE LTE NE
+%left '<' '>' '=' tok_GTE tok_LTE tok_NE
 %left '&'
 %left '-' '+'
 %left '*' '/'
-%right RIGHT_EXP_TOKEN
-%left LEFT_EXP_TOKEN
+%right tok_RIGHT_EXP
+%left  tok_LEFT_EXP
 %nonassoc '%'
-%nonassoc NEG PLUS NOT
-%left AND OR
+%nonassoc tok_NEG tok_PLUS tok_NOT
+%left tok_AND tok_OR
 %left ','
 %left RANGE_INTERSECT
 %left RANGE_SEP
@@ -624,31 +624,31 @@ exp:	  CONSTANT 	{ $$ = $1; }
 	| exp '-' exp	{ $$ = build_binop ($1, GNM_EXPR_OP_SUB,	$3); }
 	| exp '*' exp	{ $$ = build_binop ($1, GNM_EXPR_OP_MULT,	$3); }
 	| exp '/' exp	{ $$ = build_binop ($1, GNM_EXPR_OP_DIV,	$3); }
-	| exp RIGHT_EXP_TOKEN exp { $$ = build_exp ($1, $3); }
-	| exp LEFT_EXP_TOKEN exp { $$ = build_exp ($1, $3); }
+	| exp tok_RIGHT_EXP exp { $$ = build_exp ($1, $3); }
+	| exp tok_LEFT_EXP  exp { $$ = build_exp ($1, $3); }
 	| exp '&' exp	{ $$ = build_binop ($1, GNM_EXPR_OP_CAT,	$3); }
 	| exp '=' exp	{ $$ = build_binop ($1, GNM_EXPR_OP_EQUAL,	$3); }
 	| exp '<' exp	{ $$ = build_binop ($1, GNM_EXPR_OP_LT,		$3); }
 	| exp '>' exp	{ $$ = build_binop ($1, GNM_EXPR_OP_GT,		$3); }
-	| exp GTE exp	{ $$ = build_binop ($1, GNM_EXPR_OP_GTE,	$3); }
-	| exp NE  exp	{ $$ = build_binop ($1, GNM_EXPR_OP_NOT_EQUAL,	$3); }
-	| exp LTE exp	{ $$ = build_binop ($1, GNM_EXPR_OP_LTE,	$3); }
-	| exp AND exp	{ $$ = build_logical ($1, TRUE,	$3); }
-	| exp OR  exp	{ $$ = build_logical ($1, FALSE, $3); }
+	| exp tok_GTE exp	{ $$ = build_binop ($1, GNM_EXPR_OP_GTE,	$3); }
+	| exp tok_NE  exp	{ $$ = build_binop ($1, GNM_EXPR_OP_NOT_EQUAL,	$3); }
+	| exp tok_LTE exp	{ $$ = build_binop ($1, GNM_EXPR_OP_LTE,	$3); }
+	| exp tok_AND exp	{ $$ = build_logical ($1, TRUE,	$3); }
+	| exp tok_OR  exp	{ $$ = build_logical ($1, FALSE, $3); }
 	| exp RANGE_INTERSECT exp {
 		$$ = build_intersect ($1, $3);
 		if ($$ == NULL) { YYERROR; }
 	}
 
-        | '-' exp %prec NEG {
+        | '-' exp %prec tok_NEG {
 		GnmExpr *tmp = fold_negative_constant ($2);
 		$$ = tmp ? tmp : build_unary_op (GNM_EXPR_OP_UNARY_NEG, $2);
 	}
-        | '+' exp %prec PLUS {
+        | '+' exp %prec tok_PLUS {
 		/* Don't fold here.  */
 		$$ = build_unary_op (GNM_EXPR_OP_UNARY_PLUS, $2);
 	}
-        | NOT exp { $$ = build_not ($2); }
+        | tok_NOT exp { $$ = build_not ($2); }
         | exp '%' { $$ = build_unary_op (GNM_EXPR_OP_PERCENTAGE, $1); }
 
 	| '(' arg_list ')' {
@@ -1039,11 +1039,11 @@ yylex (void)
 			state->ptr += 3;
 			if (*state->ptr == '='){
 				state->ptr++;
-				return LTE;
+				return tok_LTE;
 			}
 			if (!strncmp (state->ptr, "&gt;", 4)) {
 				state->ptr += 4;
-				return NE;
+				return tok_NE;
 			}
 			return '<';
 		}
@@ -1051,7 +1051,7 @@ yylex (void)
 			state->ptr += 3;
 			if (*state->ptr == '='){
 				state->ptr++;
-				return GTE;
+				return tok_GTE;
 			}
 			return '>';
 		}
@@ -1140,15 +1140,15 @@ yylex (void)
 	if (c == '#' && state->convs->accept_hash_logicals) {
 		if (!strncmp (state->ptr, "NOT#", 4)) {
 			state->ptr += 4;
-			return eat_space (state, NOT);
+			return eat_space (state, tok_NOT);
 		}
 		if (!strncmp (state->ptr, "AND#", 4)) {
 			state->ptr += 4;
-			return eat_space (state, AND);
+			return eat_space (state, tok_AND);
 		}
 		if (!strncmp (state->ptr, "OR#", 3)) {
 			state->ptr += 3;
-			return eat_space (state, OR);
+			return eat_space (state, tok_OR);
 		}
 	}
 
@@ -1371,18 +1371,18 @@ yylex (void)
 	case '<':
 		if (*state->ptr == '='){
 			state->ptr++;
-			return eat_space (state, LTE);
+			return eat_space (state, tok_LTE);
 		}
 		if (*state->ptr == '>'){
 			state->ptr++;
-			return eat_space (state, NE);
+			return eat_space (state, tok_NE);
 		}
 		return eat_space (state, c);
 
 	case '>':
 		if (*state->ptr == '='){
 			state->ptr++;
-			return eat_space (state, GTE);
+			return eat_space (state, tok_GTE);
 		}
 		return eat_space (state, c);
 
@@ -1397,17 +1397,17 @@ yylex (void)
 
 	case '^':
 		return state->convs->exp_is_left_associative
-			? LEFT_EXP_TOKEN
-			: RIGHT_EXP_TOKEN;
+			? tok_LEFT_EXP
+			: tok_RIGHT_EXP;
 
-	case UNICODE_LOGICAL_NOT_C: return NOT;
+	case UNICODE_LOGICAL_NOT_C: return tok_NOT;
 	case UNICODE_MINUS_SIGN_C: return '-';
 	case UNICODE_DIVISION_SLASH_C: return '/';
-	case UNICODE_LOGICAL_AND_C: return AND;
-	case UNICODE_LOGICAL_OR_C: return OR;
-	case UNICODE_NOT_EQUAL_TO_C: return eat_space (state, NE);
-	case UNICODE_LESS_THAN_OR_EQUAL_TO_C: return eat_space (state, LTE);
-	case UNICODE_GREATER_THAN_OR_EQUAL_TO_C: return eat_space (state, GTE);
+	case UNICODE_LOGICAL_AND_C: return tok_AND;
+	case UNICODE_LOGICAL_OR_C: return tok_OR;
+	case UNICODE_NOT_EQUAL_TO_C: return eat_space (state, tok_NE);
+	case UNICODE_LESS_THAN_OR_EQUAL_TO_C: return eat_space (state, tok_LTE);
+	case UNICODE_GREATER_THAN_OR_EQUAL_TO_C: return eat_space (state, tok_GTE);
 	}
 
 	if (ignore_space_after (c))
diff --git a/tools/win32/Makefile.am b/tools/win32/Makefile.am
index 65c3860..dad6c68 100755
--- a/tools/win32/Makefile.am
+++ b/tools/win32/Makefile.am
@@ -1,4 +1,6 @@
-all:
+export start module
+
+all: moduleset gnumeric.nsi
 
 debug:: moduleset
 	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) debug
@@ -15,5 +17,7 @@ release_shell:: moduleset
 clean:
 	rm -rf debug release
 
-EXTRA_DIST = gnumeric.nsi.in build gtkrc moduleset.in jhbuildrc.py
+EXTRA_DIST = gnumeric.nsi.in gtkrc moduleset.in \
+	build jhbuildrc.py
+
 .PHONY : debug release debug_shell release_shell
diff --git a/tools/win32/build b/tools/win32/build
index 6e56769..72a2bca 100755
--- a/tools/win32/build
+++ b/tools/win32/build
@@ -2,13 +2,12 @@
 
 # configurable settings
 py_ver=26
-py_pkg_ver=2.6.3
+py_pkg_ver=2.6.4
 
 ###################################################
 builddir="$1"
 srcdir="$2"
 target="$3"
-is_shell="$4"
 
 if [ -z "${builddir}" -o -z "${srcdir}" -o -z "${target}" ]; then
     echo "usage  : $0 <builddir> <srcdir> <target>"
@@ -58,9 +57,17 @@ build_ls_s() {
     build_ls_s "${WINEDIR}/windows/system32/python${py_ver}.dll" 	"bin/libpython${py_ver}.dll"
     build_ls_s "${WINEDIR}/Python${py_ver}/libs/python${py_ver}.lib"	"lib/libpython${py_ver}.dll.a"
 
-# prep jhbuild files
+# example usage:
+#	make debug
+#	make start=foo debug
+#	make module=foo debug
+#	make debug_shell
     if [ ! "x${is_shell}" = "x" ]; then
- 	${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" "${is_shell}"
+ 	${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" shell
+    elif [ ! "x${start}" = "x" ]; then
+ 	${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" build --start-at="${start}"
+    elif [ ! "x${module}" = "x" ]; then
+ 	${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" buildone "${module}"
     else
 	${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py"
 fi
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 7808e63..8c18a5f 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -14,13 +14,13 @@
     <repository type="tarball" name="fontconfig"
 		href="http://fontconfig.org/release/"/>
 
-    <repository type="git" name="freedesktop.org"
-		href="git://cgit.freedesktop.org/git"/>
     <repository type="tarball" name="cairographics"
 		href="http://cairographics.org/releases/"/>
 
     <repository type="tarball" name="debian"
 		href="http://ftp.debian.org/debian/pool/main/"/>
+    <repository type="tarball" name="sourceforge"
+		href="http://downloads.sourceforge.net/project/"/>
 
     <tarball id="gettext" version="0.17">
 	<source href="ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz";
@@ -31,9 +31,27 @@
 	<dependencies/>
     </tarball>
 
-    <tarball id="pcre" version="7.9">
-	<source href="http://downloads.sourceforge.net/pcre/pcre-7.9.tar.bz2"/>
+    <tarball id="pcre" version="8.00">
+	<source href="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.00.tar.bz2"/>
     </tarball>
+
+<!-- Compression -->
+    <autotools id="zlib"
+	makeargs="-f win32/Makefile.gcc"
+	makeinstallargs="-f win32/Makefile.gcc -e install">
+	<branch repo="zlib.net" module="zlib-1.2.3.tar.gz"
+		version="1.2.3"
+		md5sum="debc62758716a169df9f62e6ab2bc634">
+	    <patch file="&patch_dir;zlib.patch"/>
+	</branch>
+    </autotools>
+    <tarball id="libbz2" version="1.0.5">
+	<source href="http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz"/>
+	<patches>
+	    <patch file="&patch_dir;libbz2.patch" strip="1"/>
+	</patches>
+    </tarball>
+
     <autotools id="gtk-doc"
 	autogen-sh="autoreconf"  skip-autogen="never">
 	<branch repo="gnome.org" module="sources/gtk-doc/1.11/gtk-doc-1.11.tar.bz2" version="1.11">
@@ -42,7 +60,7 @@
     </autotools>
 
     <autotools id="glib">
-	<branch repo="gnome.org" module="sources/glib/2.22/glib-2.22.2.tar.bz2" version="2.22.2">
+	<branch repo="gnome.org" module="sources/glib/2.22/glib-2.22.3.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"/>
@@ -50,27 +68,11 @@
 	<dependencies>
 	    <dep package="gettext"/>
 	    <dep package="iconv"/>
+	    <dep package="zlib"/>
 	    <dep package="gtk-doc"/>
 	</dependencies>
     </autotools>
 
-<!-- Compression -->
-    <autotools id="zlib"
-	makeargs="-f win32/Makefile.gcc"
-	makeinstallargs="-f win32/Makefile.gcc -e install">
-	<branch repo="zlib.net" module="zlib-1.2.3.tar.gz"
-		version="1.2.3"
-		md5sum="debc62758716a169df9f62e6ab2bc634">
-	    <patch file="&patch_dir;zlib.patch"/>
-	</branch>
-    </autotools>
-    <tarball id="libbz2" version="1.0.5">
-	<source href="http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz"/>
-	<patches>
-	    <patch file="&patch_dir;libbz2.patch" strip="1"/>
-	</patches>
-    </tarball>
-
 <!-- Image formats  -->
     <tarball id="jpeg" version="6b" checkoutdir="jpeg-6b">
 	<source href="http://www.ijg.org/files/jpegsrc.v7.tar.gz"/>
@@ -97,8 +99,8 @@
 <!-- Gtk stack -->
     <autotools id="pixman">
 	<branch repo="cairographics"
-		module="pixman-0.16.2.tar.gz"
-		version="0.16.2"/>
+		module="pixman-0.17.2.tar.gz"
+		version="0.17.2"/>
     </autotools>
     <autotools id="cairo">
 	<branch repo="cairographics"
@@ -141,13 +143,12 @@
 
     <autotools id="gnome-common">
 	<branch/>
-	<dependencies>
-	</dependencies>
+	<dependencies/>
     </autotools>
 
     <autotools id="freetype"
 	autogen-sh="configure"  skip-autogen="never">
-	<branch repo="savannah" module="freetype/freetype-2.3.9.tar.bz2" version="2.3.9"/>
+	<branch repo="savannah" module="freetype/freetype-2.3.11.tar.bz2" version="2.3.11"/>
 	<dependencies>
 	</dependencies>
     </autotools>
@@ -193,11 +194,10 @@
     </autotools>
 
     <autotools id="gtk+">
-	<branch repo="gnome.org" module="sources/gtk+/2.18/gtk+-2.18.2.tar.bz2"
-		version="2.18.2">
+	<branch repo="gnome.org" module="sources/gtk+/2.18/gtk+-2.18.4.tar.bz2"
+		version="2.18.4">
 	    <patch file="&patch_dir;gtk-disable-demo.patch"/>
-	    <patch file="&patch_dir;gtk-pending-2.18.3.patch" strip="1"/>
-	    <patch file="&patch_dir;gtk-use-wine-to-cross-compile.patch" strip="1"/>
+	    <patch file="&patch_dir;gtk-use-wine-to-cross-compile.patch"/>
 	</branch>
 	<dependencies>
 	    <dep package="glib"/>
@@ -240,8 +240,8 @@
     </autotools>
 
     <autotools id="libgda">
-	<branch repo="gnome.org" module="sources/libgda/4.1/libgda-4.1.2.tar.bz2"
-		version="4.1.2">
+	<branch repo="gnome.org" module="sources/libgda/4.1/libgda-4.1.3.tar.bz2"
+		version="4.1.3">
 	</branch>
 	<dependencies>
 	    <dep package="glib"/>
@@ -249,25 +249,13 @@
 	</dependencies>
     </autotools>
 
-    <autotools id="libgnomedb"
-	autogen-sh="autoreconf" skip-autogen="never">
-	<branch repo="gnome.org" module="sources/libgnomedb/3.99/libgnomedb-3.99.7.tar.bz2"
-		version="3.99.7">
+    <autotools id="pxlib" autogen-sh="configure">
+	<branch repo="sourceforge" module="pxlib/pxlib/0.6.3/pxlib-0.6.3.tar.gz"
+		version="0.6.3">
+	    <patch file="&patch_dir;pxlib-intl.patch"/>
 	</branch>
-	<dependencies>
-	    <dep package="libgda"/>
-	    <dep package="gtk+"/>
-	</dependencies>
     </autotools>
 
-    <tarball id="pxlib" version="0.6.3">
-	<source href="http://superb-east.dl.sourceforge.net/sourceforge/pxlib/pxlib-0.6.3.tar.gz";
-		md5sum="0742020854496fa757d7acbe6a895224"/>
-	<patches>
-	    <patch file="&patch_dir;pxlib-intl.patch"/>
-	</patches>
-    </tarball>
-
     <autotools id="psiconv">
 	<branch repo="debian"
 		module="p/psiconv/psiconv_0.9.8.orig.tar.gz"
@@ -277,8 +265,8 @@
     </autotools>
 
 <!-- print preview -->
-  <tarball id="poppler" version="0.12.0">
-    <source href="http://poppler.freedesktop.org/poppler-0.12.0.tar.gz"/>
+  <tarball id="poppler" version="0.12.2">
+    <source href="http://poppler.freedesktop.org/poppler-0.12.2.tar.gz"/>
     <dependencies>
       <dep package="cairo"/>
       <dep package="glib"/>
@@ -292,24 +280,33 @@
       <dep package="gtk+"/>
     </after>
     <patches>
-	<patch file="&patch_dir;poppler-is-same-color.patch"/>
     </patches>
   </tarball>
-  <autotools id="evince">
-    <branch/>
+<!-- Check license and fix make
+  <tarball id="poppler-data" version="0.3.1">
+    <source href="http://poppler.freedesktop.org/poppler-data-0.3.1.tar.gz"/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-      <!-- <dep package="gnome-icon-theme"/>-->
-      <dep package="libglade"/>
-      <dep package="poppler"/>
-      <!-- <dep package="gnome-doc-utils"/>-->
     </dependencies>
-    <suggests>
-      <dep package="gnome-keyring"/>
-    </suggests>
-  </autotools>
+    <patches>
+    </patches>
+  </tarball>
+-->
+
+    <autotools id="evince">
+	<branch>
+	    <patch file="&patch_dir;evince-no-mkdtemp.patch"/>
+	</branch>
+	<dependencies>
+	    <dep package="glib"/>
+	    <dep package="gtk+"/>
+	    <dep package="libxml2"/>
+	    <!-- <dep package="gnome-icon-theme"/>-->
+	    <dep package="libglade"/>
+	    <dep package="poppler"/>
+	    <!-- <dep package="gnome-doc-utils"/>-->
+	</dependencies>
+    </autotools>
+
 <!-- Gnumeric stack -->
     <autotools id="libgsf">
 	<branch/>
@@ -322,6 +319,12 @@
 	</dependencies>
     </autotools>
 
+    <autotools id="lp_solve">
+	<branch repo="sourceforge" module="lpsolve/lpsolve/5.5.0.15/lp_solve_5.5.0.15_source.tar.gz"
+		version="5.5.0.15" checkoutdir="lp_solve_5.5">
+	</branch>
+    </autotools>
+
     <autotools id="lasem">
 	<branch/>
 	<dependencies>
@@ -347,9 +350,10 @@
 	    <dep package="libglade"/>
 	</dependencies>
 	<suggests>
-<!--	    <dep package="libgnomedb"/> -->
-	    <dep package="pxlib"/>
+	    <dep package="libgda"/>
+	    <dep package="lp_solve"/>
 	    <dep package="psiconv"/>
+	    <dep package="pxlib"/>
 	    <dep package="pygobject"/>
 	</suggests>
     </autotools>
diff --git a/tools/win32/patches/gtk-disable-demo.patch b/tools/win32/patches/gtk-disable-demo.patch
index 1c227aa..0bad55c 100644
--- a/tools/win32/patches/gtk-disable-demo.patch
+++ b/tools/win32/patches/gtk-disable-demo.patch
@@ -1,4 +1,4 @@
-*** Makefile.am.orig	2009-04-11 17:33:04.000000000 -0400
+*** Makefile.am	2009-04-11 17:33:04.000000000 -0400
 --- Makefile.am	2009-05-08 19:45:46.000000000 -0400
 ***************
 *** 1,7 ****
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 9872b15..2c2f8f5 100644
--- a/tools/win32/patches/gtk-use-wine-to-cross-compile.patch
+++ b/tools/win32/patches/gtk-use-wine-to-cross-compile.patch
@@ -1,18 +1,26 @@
-diff -ur gtk+-2.18.2/gdk-pixbuf/Makefile.in /gnome/src/gnumeric/tools/win32/debug/src/gtk+-2.18.2/gdk-pixbuf/Makefile.in
---- gtk+-2.18.2/gdk-pixbuf/Makefile.in	2009-10-05 16:46:07.000000000 -0400
-+++ gtk+-2.18.2/gdk-pixbuf/Makefile.in	2009-10-10 23:44:41.000000000 -0400
-@@ -1390,8 +1390,8 @@
+--- 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
 - 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)"
-+#RUN_QUERY_LOADER_TEST = false
++
  all: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -2330,7 +2330,7 @@
+@@ -2047,7 +2047,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
+@@ -2332,7 +2332,7 @@
  install-data-hook: install-ms-lib install-def-file
  	@if $(RUN_QUERY_LOADER_TEST) ; then \
  	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
@@ -21,7 +29,7 @@ diff -ur gtk+-2.18.2/gdk-pixbuf/Makefile.in /gnome/src/gnumeric/tools/win32/debu
  	else \
  	  echo "***" ; \
  	  echo "*** Warning: gdk-pixbuf.loaders not built" ; \
-@@ -2343,13 +2343,13 @@
+@@ -2345,13 +2345,13 @@
  uninstall-local: uninstall-ms-lib uninstall-def-file
  	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
  
@@ -37,9 +45,9 @@ diff -ur gtk+-2.18.2/gdk-pixbuf/Makefile.in /gnome/src/gnumeric/tools/win32/debu
  @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 gtk+-2.18.2/modules/input/Makefile.in /gnome/src/gnumeric/tools/win32/debug/src/gtk+-2.18.2/modules/input/Makefile.in
---- gtk+-2.18.2/modules/input/Makefile.in	2009-10-05 16:46:10.000000000 -0400
-+++ gtk+-2.18.2/modules/input/Makefile.in	2009-10-11 08:15:33.000000000 -0400
+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 @@
  @INCLUDE_IM_MULTIPRESS_FALSE MULTIPRESS_MODULE = im-multipress.la
  imconffiledir = $(sysconfdir)/gtk-2.0
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]