Date: Mon, 20 Sep 2004 15:17:17 -0400 From: Anish Mistry <mistry.7@osu.edu> To: freebsd-ports@freebsd.org Subject: [PATCH] Unbreak gnumeric Message-ID: <200409201517.18016.mistry.7@osu.edu>
next in thread | raw e-mail | index | archive | help
--Boundary-00=_+yyTB3HPb9i6ag7
Content-Type: multipart/signed;
boundary="nextPart2733057.ahnOXNTSQJ";
protocol="application/pgp-signature";
micalg=pgp-sha1
Content-Transfer-Encoding: 7bit
--nextPart2733057.ahnOXNTSQJ
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
The attached patch will unbreak gnumeric so gnucash can work with 5.x.
=2D-=20
Anish Mistry
--nextPart2733057.ahnOXNTSQJ
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (FreeBSD)
iD8DBQBBTyy9xqA5ziudZT0RAvg6AKC/2FvHN5PzoiZz9+CJ4VWI/+svYwCgu9jv
SaKPCwCzlqpsmXRyrDo0kqM=
=MS4I
-----END PGP SIGNATURE-----
--nextPart2733057.ahnOXNTSQJ--
--Boundary-00=_+yyTB3HPb9i6ag7
Content-Type: text/x-diff;
charset="us-ascii";
name="gnumeric-5.x.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="gnumeric-5.x.patch"
diff -ruN gnumeric.orig/Makefile gnumeric/Makefile
--- gnumeric.orig/Makefile Sun Sep 19 17:11:26 2004
+++ gnumeric/Makefile Sun Sep 19 17:12:20 2004
@@ -38,10 +38,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502126
-BROKEN= "Does not compile on FreeBSD >= 5.x"
-.endif
-
post-install:
.for dir in share/gnome lib
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${dir}/gnumeric
diff -ruN gnumeric.orig/files/plugins::html::html.c.patch gnumeric/files/plugins::html::html.c.patch
--- gnumeric.orig/files/plugins::html::html.c.patch Wed Dec 31 19:00:00 1969
+++ gnumeric/files/plugins::html::html.c.patch Sun Sep 19 16:37:43 2004
@@ -0,0 +1,10 @@
+--- plugins/html/html.c.orig Sun Sep 19 16:34:22 2004
++++ plugins/html/html.c Sun Sep 19 16:34:43 2004
+@@ -410,6 +410,7 @@
+ "</HEAD>\n<BODY>\n", fp);
+ break;
+ default:
++ break;
+ }
+
+ sheets = workbook_sheets (wb);
diff -ruN gnumeric.orig/files/plugins::psiconv::psiconv-read.c.patch gnumeric/files/plugins::psiconv::psiconv-read.c.patch
--- gnumeric.orig/files/plugins::psiconv::psiconv-read.c.patch Wed Dec 31 19:00:00 1969
+++ gnumeric/files/plugins::psiconv::psiconv-read.c.patch Sun Sep 19 16:45:43 2004
@@ -0,0 +1,27 @@
+--- plugins/psiconv/psiconv-read.c.orig Sun Sep 19 16:43:32 2004
++++ plugins/psiconv/psiconv-read.c Sun Sep 19 16:44:35 2004
+@@ -301,7 +301,7 @@
+ /* case psiconv_formula_mark_opend: */
+ default:
+ /* kind = -1; */
+- /* break; */
++ break;
+ }
+
+ if (kind == -1) {
+@@ -336,6 +336,7 @@
+ v = value_new_cellrange(cr1,cr2,1,1);
+ break;
+ default:
++ break;
+ }
+ if (!v)
+ return NULL;
+@@ -407,6 +408,7 @@
+ return NULL;
+ return parse_subexpr(psi_form1);
+ default:
++ break;
+ }
+ }
+
--Boundary-00=_+yyTB3HPb9i6ag7--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409201517.18016.mistry.7>