[csw-devel] SF.net SVN: gar:[4232] csw/mgar/pkg/gnumeric/trunk

[hson at users.sourceforge.net]

Revision: 4232
          http://gar.svn.sourceforge.net/gar/?rev=4232&view=rev
Author:   hson
Date:     2009-04-08 21:55:22 +0000 (Wed, 08 Apr 2009)

Log Message:
-----------
gnumeric: Add patches required to compile

Modified Paths:
--------------
    csw/mgar/pkg/gnumeric/trunk/Makefile
    csw/mgar/pkg/gnumeric/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gnumeric/trunk/files/md5.h.diff
    csw/mgar/pkg/gnumeric/trunk/files/numtheory.c.diff

Removed Paths:
-------------
    csw/mgar/pkg/gnumeric/trunk/files/mainpatch

Modified: csw/mgar/pkg/gnumeric/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnumeric/trunk/Makefile	2009-04-08 20:55:24 UTC (rev 4231)
+++ csw/mgar/pkg/gnumeric/trunk/Makefile	2009-04-08 21:55:22 UTC (rev 4232)
@@ -19,7 +19,8 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-#PATCHFILES = mainpatch 
+PATCHFILES  = md5.h.diff
+PATCHFILES += numtheory.c.diff 
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/gnumeric/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnumeric/trunk/checksums	2009-04-08 20:55:24 UTC (rev 4231)
+++ csw/mgar/pkg/gnumeric/trunk/checksums	2009-04-08 21:55:22 UTC (rev 4232)
@@ -1 +1,3 @@
 4bc2ca7b90e953934b086c931238fd04  download/gnumeric-1.9.5.tar.gz
+883cdef1974db050cb0fd002a399d940  download/md5.h.diff
+70046f2846c948a2740cfc9e4c331a50  download/numtheory.c.diff

Deleted: csw/mgar/pkg/gnumeric/trunk/files/mainpatch
===================================================================
--- csw/mgar/pkg/gnumeric/trunk/files/mainpatch	2009-04-08 20:55:24 UTC (rev 4231)
+++ csw/mgar/pkg/gnumeric/trunk/files/mainpatch	2009-04-08 21:55:22 UTC (rev 4232)
@@ -1,57 +0,0 @@
-diff -ru gnumeric-1.8.3.orig/plugins/excel/md5.h gnumeric-1.8.3/plugins/excel/md5.h
---- gnumeric-1.8.3.orig/plugins/excel/md5.h	2008-01-15 00:55:11.000000000 +0100
-+++ gnumeric-1.8.3/plugins/excel/md5.h	2009-03-17 00:23:02.110582251 +0100
-@@ -22,7 +22,11 @@
- #define _MD5_H 1
- 
- #include <stdio.h>
-+#ifdef __sun
-+#include <sys/int_types.h>
-+#else
- #include <stdint.h>
-+#endif
- 
- #define MD5_DIGEST_SIZE 16
- #define MD5_BLOCK_SIZE 64
-diff -ru gnumeric-1.8.3.orig/plugins/numtheory/numtheory.c gnumeric-1.8.3/plugins/numtheory/numtheory.c
---- gnumeric-1.8.3.orig/plugins/numtheory/numtheory.c	2008-01-15 00:55:10.000000000 +0100
-+++ gnumeric-1.8.3/plugins/numtheory/numtheory.c	2009-03-17 00:55:21.253509921 +0100
-@@ -33,7 +33,14 @@
- 
- #define OUT_OF_BOUNDS "#LIMIT!"
- 
-+#ifdef __sun
-+static inline double bit_max_fn(void) {
-+	return MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64);
-+}
-+#define bit_max (bit_max_fn())
-+#else
- static const double bit_max = MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64);
-+#endif
- 
- /* ------------------------------------------------------------------------- */
- 
-diff -ru gnumeric-1.8.3.orig/po/Makefile.in.in gnumeric-1.8.3/po/Makefile.in.in
---- gnumeric-1.8.3.orig/po/Makefile.in.in	2008-05-24 22:40:36.000000000 +0200
-+++ gnumeric-1.8.3/po/Makefile.in.in	2009-03-17 00:59:24.557217225 +0100
-@@ -69,7 +69,7 @@
- EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
- 
- POTFILES = \
--
-+#
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- 
-diff -ru gnumeric-1.8.3.orig/src/gnm-so-polygon.c gnumeric-1.8.3/src/gnm-so-polygon.c
---- gnumeric-1.8.3.orig/src/gnm-so-polygon.c	2008-01-15 00:54:39.000000000 +0100
-+++ gnumeric-1.8.3/src/gnm-so-polygon.c	2009-03-16 23:35:49.881228497 +0100
-@@ -223,7 +223,7 @@
- gnm_so_polygon_write_xml_sax (SheetObject const *so, GsfXMLOut *output)
- {
- 	/* TODO */
--	return gnm_so_polygon_parent_class->write_xml_sax (so, output);
-+	gnm_so_polygon_parent_class->write_xml_sax (so, output);
- }
- 
- static void

Added: csw/mgar/pkg/gnumeric/trunk/files/md5.h.diff
===================================================================
--- csw/mgar/pkg/gnumeric/trunk/files/md5.h.diff	                        (rev 0)
+++ csw/mgar/pkg/gnumeric/trunk/files/md5.h.diff	2009-04-08 21:55:22 UTC (rev 4232)
@@ -0,0 +1,15 @@
+diff -ru ../build-global/gnumeric-1.9.5/plugins/excel/md5.h gnumeric-1.9.5/plugins/excel/md5.h
+--- ../build-global/gnumeric-1.9.5/plugins/excel/md5.h	2007-09-21 02:11:31.000000000 +0200
++++ gnumeric-1.9.5/plugins/excel/md5.h	2009-04-07 08:29:55.235754017 +0200
+@@ -22,7 +22,11 @@
+ #define _MD5_H 1
+ 
+ #include <stdio.h>
++#ifdef __sun
++#include <sys/int_types.h>
++#else
+ #include <stdint.h>
++#endif
+ 
+ #define MD5_DIGEST_SIZE 16
+ #define MD5_BLOCK_SIZE 64

Added: csw/mgar/pkg/gnumeric/trunk/files/numtheory.c.diff
===================================================================
--- csw/mgar/pkg/gnumeric/trunk/files/numtheory.c.diff	                        (rev 0)
+++ csw/mgar/pkg/gnumeric/trunk/files/numtheory.c.diff	2009-04-08 21:55:22 UTC (rev 4232)
@@ -0,0 +1,18 @@
+diff -ru ../build-global/gnumeric-1.9.5/plugins/numtheory/numtheory.c gnumeric-1.9.5/plugins/numtheory/numtheory.c
+--- ../build-global/gnumeric-1.9.5/plugins/numtheory/numtheory.c	2009-03-02 03:05:42.000000000 +0100
++++ gnumeric-1.9.5/plugins/numtheory/numtheory.c	2009-04-08 00:59:37.712247116 +0200
+@@ -38,7 +38,14 @@
+  * represented in a gnm_float _and_ in a guint64.  (For regular "double",
+  * the latter part is irrelevant.)
+  */
++#ifdef __sun
++static inline double bit_max_fn(void) {
++       return MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64);
++}
++#define bit_max (bit_max_fn())
++#else
+ static const double bit_max = MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64);
++#endif
+ 
+ /* ------------------------------------------------------------------------- */
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.