File gnumeric-1.10.15-windows.patch of Package mingw32-gnumeric

Overview Repositories Revisions Requests Users Attributes Meta

File gnumeric-1.10.15-windows.patch of Package mingw32-gnumeric (Revision eb0643a752cf34c4f40e041b406e6409)

Currently displaying revision eb0643a752cf34c4f40e041b406e6409 , Show latest

--- gnumeric-1.10.15/libspreadsheet.pc.in	2011-02-07 02:43:02.000000000 +0100
+++ gnumeric-1.10.15/libspreadsheet.pc.in	2011-07-05 09:59:24.500976115 +0200
@@ -14,7 +14,7 @@
 URL: http://www.gnumeric.org
 Requires: glib-2.0 gobject-2.0 libgsf-1 libxml-2.0 gtk+-2.0 ${libgoffice}
 Requires.private:
-Libs: -L${libdir} -lspreadsheet-${VERSION}
+Libs: -L${libdir} -lspreadsheet
 
 # for now include both the directory and the child, until we rename the includes in svn
 Cflags: -I${includedir}/libspreadsheet-@GNUMERIC_API_VER@/spreadsheet -I${includedir}/libspreadsheet-@GNUMERIC_API_VER@ -I${gnumeric_libdir}/include
--- gnumeric-1.10.15/plugins/excelplugins/xlcall32_emulation.c	2010-04-24 04:31:21.000000000 +0200
+++ gnumeric-1.10.15/plugins/excelplugins/xlcall32_emulation.c	2011-07-05 09:57:53.272976117 +0200
@@ -81,7 +81,3 @@
 	return 1280;
 }
 
-#ifdef WIN32
-asm (".section .drectve");
-asm (".ascii \"-export:Excel4v=Excel4v@16,XLCallVer=XLCallVer@0\"");
-#endif
--- gnumeric-1.10.15/src/parser.y	2011-05-20 23:25:21.000000000 +0200
+++ gnumeric-1.10.15/src/parser.y	2011-07-05 09:57:53.276976117 +0200
@@ -33,6 +33,13 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#ifdef AND
+#undef AND
+#endif
+#ifdef NOT
+#undef NOT
+#endif
+
 #define YYDEBUG 1
 
 /* ------------------------------------------------------------------------- */

Places

File gnumeric-1.10.15-windows.patch of Package mingw32-gnumeric (Revision eb0643a752cf34c4f40e041b406e6409)

Places