diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2009-07-22 08:19:01 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2009-07-22 08:19:01 +0000 |
| commit | f0a1975eadb332447a42d2fc6942cabd883c1636 (patch) | |
| tree | 01d0a0f396ed80f8c8ca81a6ab5533045dc07436 /editors/openoffice.org-3-RC/files | |
| parent | * Update to 1.2.1 (diff) | |
Update to OOO310_m16.
Funded by: OpenOffice.org community.
Notes
Notes:
svn path=/head/; revision=238192
Diffstat (limited to 'editors/openoffice.org-3-RC/files')
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-i102679 | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/editors/openoffice.org-3-RC/files/patch-i102679 b/editors/openoffice.org-3-RC/files/patch-i102679 deleted file mode 100644 index bfeb707f2e02..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-i102679 +++ /dev/null @@ -1,30 +0,0 @@ -will be fixed in OOO310_m14 - ---- sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx.orig 2009-06-11 18:24:02.000000000 +0100 -+++ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx 2009-06-11 18:24:13.000000000 +0100 -@@ -30,7 +30,11 @@ - - #include "pnghelper.hxx" - --#include "zlib/zlib.h" -+#ifdef SYSTEM_ZLIB -+#include "zlib.h" -+#else -+#include <zlib/zlib.h> -+#endif - - using namespace pdfi; - ---- sdext/source/pdfimport/xpdfwrapper/makefile.mk.orig 2009-06-11 18:24:29.000000000 +0100 -+++ sdext/source/pdfimport/xpdfwrapper/makefile.mk 2009-06-11 18:24:46.000000000 +0100 -@@ -41,6 +41,10 @@ - - .INCLUDE: settings.mk - -+.IF "$(SYSTEM_ZLIB)" == "YES" -+CFLAGS+=-DSYSTEM_ZLIB -+.ENDIF -+ - .IF "$(ENABLE_PDFIMPORT)" == "NO" - @all: - @echo "PDF Import extension disabled." |