[Libreoffice-commits] core.git: clucene/patches clucene/UnpackedTarball_clucene.mk

[Caolán McNamara]

 clucene/UnpackedTarball_clucene.mk |    1 
 clucene/patches/clucene-aix.patch  |   40 +++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

New commits:
commit c0c96884208aadf66e4219000e1f8384b1cb20fd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 10 11:24:59 2013 -0500

    workaround #define of open
    
    on aix with gcc
    
    Change-Id: I704890cfae64343937cba8cc9206e493542baae3

diff --git a/clucene/UnpackedTarball_clucene.mk b/clucene/UnpackedTarball_clucene.mk
index 5b53226..6a32698 100644
--- a/clucene/UnpackedTarball_clucene.mk
+++ b/clucene/UnpackedTarball_clucene.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,clucene,\
 	clucene/patches/clucene-narrowing-conversions.patch \
 	clucene/patches/clucene-nullptr.patch \
 	clucene/patches/clucene-warnings.patch \
+	clucene/patches/clucene-aix.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/clucene/patches/clucene-aix.patch b/clucene/patches/clucene-aix.patch
new file mode 100644
index 0000000..2b796fa
--- /dev/null
+++ b/clucene/patches/clucene-aix.patch
@@ -0,0 +1,40 @@
+diff -rc clucene.orig/src/core/CLucene/store/MMapInput.cpp clucene/src/core/CLucene/store/MMapInput.cpp
+*** src/core/CLucene/store/MMapInput.cpp	Wed Apr 10 10:57:37 2013
+--- src/core/CLucene/store/MMapInput.cpp	Wed Apr 10 10:58:30 2013
+***************
+*** 115,121 ****
+  	{
+    }
+    
+!   bool MMapIndexInput::open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize )    {
+  
+  	//Func - Constructor.
+  	//       Opens the file named path
+--- 115,121 ----
+  	{
+    }
+    
+!   bool MMapIndexInput::Open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize )    {
+  
+  	//Func - Constructor.
+  	//       Opens the file named path
+diff -rc clucene.orig/src/core/CLucene/store/_MMapIndexInput.h clucene/src/core/CLucene/store/_MMapIndexInput.h
+*** src/core/CLucene/store/_MMapIndexInput.h	Wed Apr 10 10:57:37 2013
+--- src/core/CLucene/store/_MMapIndexInput.h	Wed Apr 10 10:58:53 2013
+***************
+*** 18,24 ****
+    MMapIndexInput(const MMapIndexInput& clone);
+    MMapIndexInput(Internal* _internal);
+  public:
+!   static bool open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize);
+  
+    ~MMapIndexInput();
+    IndexInput* clone() const;
+--- 18,24 ----
+    MMapIndexInput(const MMapIndexInput& clone);
+    MMapIndexInput(Internal* _internal);
+  public:
+!   static bool Open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize);
+  
+    ~MMapIndexInput();
+    IndexInput* clone() const;