about summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-06-01 09:41:32 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-06-01 09:41:32 +0000
commit433a3c6719f2487ceb35d6e9292945bb5c18cd92 (patch)
tree149e7c438c4949b0a500a0cdf091e476341c846c /pkgs/applications/office
parent3a352968a39b711ed6bbd0da7a7c0641c5afb79b (diff)
Removing an openoffice patch for 3.1.1 not needed anymore
svn path=/nixpkgs/trunk/; revision=22072
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r--pkgs/applications/office/openoffice/OOo-3.1.1-HEADERFIX-1.patch74
1 files changed, 0 insertions, 74 deletions
diff --git a/pkgs/applications/office/openoffice/OOo-3.1.1-HEADERFIX-1.patch b/pkgs/applications/office/openoffice/OOo-3.1.1-HEADERFIX-1.patch
deleted file mode 100644
index ce943890ff60f..0000000000000
--- a/pkgs/applications/office/openoffice/OOo-3.1.1-HEADERFIX-1.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Submitted By:            zippo zippo@oppiz.net
-Date:                    2009-09-23
-Initial Package Version: 3.1.1
-Upstream Status:         Unknown
-Origin:                  zippo@oppiz.net
-Description: Fixes missing headers, GCC-4.3.2 and corrects errors for Glib 2.10
-diff -Naur OOO310_m19/soltools/mkdepend/def.h OOO310_m19.new/soltools/mkdepend/def.h
---- OOO310_m19/soltools/mkdepend/def.h	2008-04-10 18:05:14.000000000 +0000
-+++ OOO310_m19.new/soltools/mkdepend/def.h	2009-09-23 01:17:01.913883308 +0000
-@@ -154,7 +154,7 @@
- 
- char			*copy();
- char			*base_name();
--char			*getline();
-+char			*get_line();
- char			*isdefined();
- struct filepointer	*getfile();
- struct inclist		*newinclude();
-diff -Naur OOO310_m19/soltools/mkdepend/main.c OOO310_m19.new/soltools/mkdepend/main.c
---- OOO310_m19/soltools/mkdepend/main.c	2008-07-22 17:24:34.000000000 +0000
-+++ OOO310_m19.new/soltools/mkdepend/main.c	2009-09-23 01:18:09.160646833 +0000
-@@ -548,7 +548,7 @@
-  * Get the next line.  We only return lines beginning with '#' since that
-  * is all this program is ever interested in.
-  */
--char *getline(filep)
-+char *get_line(filep)
- 	register struct filepointer	*filep;
- {
- 	register char	*p,	/* walking pointer */
-diff -Naur OOO310_m19/soltools/mkdepend/parse.c OOO310_m19.new/soltools/mkdepend/parse.c
---- OOO310_m19/soltools/mkdepend/parse.c	2008-04-10 18:06:39.000000000 +0000
-+++ OOO310_m19.new/soltools/mkdepend/parse.c	2009-09-23 01:18:54.183802453 +0000
-@@ -45,7 +45,7 @@
- 	register int	type;
- 	boolean recfailOK;
- 
--	while ((line = getline(filep))) {
-+	while ((line = get_line(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
- 		case IF:
- 		doif:
-@@ -168,7 +168,7 @@
- 	register char	*line;
- 	register int	type;
- 
--	while ((line = getline(filep))) {
-+	while ((line = get_line(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
- 		case IF:
- 		case IFFALSE:
-diff -Naur OOO310_m19/sw/source/core/doc/docbm.cxx OOO310_m19.new/sw/source/core/doc/docbm.cxx
---- OOO310_m19/sw/source/core/doc/docbm.cxx	2008-09-04 10:19:07.000000000 +0000
-+++ OOO310_m19.new/sw/source/core/doc/docbm.cxx	2009-09-23 12:32:08.011104664 +0000
-@@ -32,7 +32,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sw.hxx"
- 
--
-+#include <stdio.h>
- #include <tools/pstm.hxx>
- #include <svx/linkmgr.hxx>
- #include <fmtanchr.hxx>
-diff -Naur OOO310_m19/sw/source/filter/ww8/WW8TableInfo.cxx OOO310_m19.new/sw/source/filter/ww8/WW8TableInfo.cxx
---- OOO310_m19/sw/source/filter/ww8/WW8TableInfo.cxx	2009-04-21 09:51:46.000000000 +0000
-+++ OOO310_m19.new/sw/source/filter/ww8/WW8TableInfo.cxx	2009-09-23 12:51:12.882511596 +0000
-@@ -31,6 +31,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sw.hxx"
- 
-+#include <stdio.h>
- #include <iostream> 
- #include "WW8TableInfo.hxx"
- #include "swtable.hxx"