[ooo-build-commit] patches/dev300

[Petr Mladek]

 patches/dev300/apply                  |    2 ++
 patches/dev300/sdext-system-zlib.diff |   28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

New commits:
commit 41b71f53404dd9f8b4d5a34bf38521481da50c6f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Jun 12 21:43:30 2009 +0200

    Fix sdext build with the system zlib (i#102679)
    
    * patches/dev300/sdext-system-zlib.diff, patches/dev300/apply:
      fix sdext build with the system zlib, patch by Caolan (i#102679)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3a2cf47..a4abd40 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -381,6 +381,8 @@ build-java-target-extensions.diff, i#93115, pmladek
 
 [ ExtensionFixes > ooo310-m11 ]
 pdfimport-no-license.diff
+# fix build with system zlib
+sdext-system-zlib.diff, i#102679, caolan
 
 [ ExtensionFixes <= ooo310-m11 ]
 pdfimport-no-license-m11.diff
diff --git a/patches/dev300/sdext-system-zlib.diff b/patches/dev300/sdext-system-zlib.diff
new file mode 100644
index 0000000..5432684
--- /dev/null
+++ b/patches/dev300/sdext-system-zlib.diff
@@ -0,0 +1,28 @@
+--- 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."