clucene-2.3.3.4-r4 - build with libc++

5 files changed, 56 insertions, 1 deletions

diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index cd4f7fc..6ea6996 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -1,5 +1,8 @@
+AUX clucene-2.3.3.4-add-missing-include-pthread-h.patch 539 SHA256 c57a9f0122d9b1bc401ec118881418120b5076c084989297d9e9a68bcd12bc51 SHA512 f3528e372ae8b1a1e6b4193877bbe2bfe0cee1764d7822a02c28b3adefae31e13bb11fc7839f1de48f4ec2449f86dd1386a6c626de46a5f378063e6f4363bdd6 WHIRLPOOL 80bda6c787cfa19d23c8b991f034148a82a60e6f06e56ec5e1db5811227bd4635276691501c8c28afffa206ae55ed22d8e162878181fc2fa84631c28113ffe56
 AUX clucene-2.3.3.4-contrib.patch 1697 SHA256 3d3f73685f75b4ceacf1941e50b6108941bded3ca558ac1343c35b1b7d0e78dc SHA512 0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3 WHIRLPOOL 7ba0a5d9cdb9be45e8508fdd602259119c4c1b978257c938ec1c23ab203bda73b37bae4e6296423ecdabf29b6eae348edae9b42108054875132da28ed6e9097e
+AUX clucene-2.3.3.4-libc-disambiguate-typedefs.patch 1069 SHA256 75464833e31e9370e0d02e32ef13c741ece71750896b7166144da85e013b9959 SHA512 ec289a57408db1464b99a31b473964b2eec43d3ba638dd3310741da3cc47d70a111f9ddd8a83d1106c781cacf563e0e9db31679e80e3d84109d8257561e1399c WHIRLPOOL a6fbfd1b775beeca6984ca43166ee05c40078c854778a8ebd3fe854de21a2cfca5e1a11dbfbce0c4a046e1267edeff2ece28247df8bef73b02b6e596d5cc235d
 AUX clucene-2.3.3.4-pkgconfig.patch 871 SHA256 ae92955cecb57ec732233dc33d057f9a0677fc9e17d2461911b300037cbb65f7 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18 WHIRLPOOL 21dbf53462c053efb77cef1356d5bc33d9728ff1ca356b3cdb1b211ca0552d5d299665ecaeebf9115d25e6dda01a6baf44e4787d2124aab6f655e35175ab812d
+AUX series 110 SHA256 6b6c2431e1fe6c7f7a91661980b1dffd866fd53ff6cf20db534e9e0c7e65eee1 SHA512 8352aa3b8267f9b6f9c8af49ae750387dd8944d7f1a7056dcb55906c3c87e50eb3eae8d9ecf44c2389364740cb8b1c83ba8b6df882bbe75f379c88a6b69abfaa WHIRLPOOL 4b9db5f46baca5ba6f3b6676d057838ebf3cd8fae4b192afb46eb89e353b61ecb1cdb94ac655be3da672125cbe6f26a36a89bc295be30f7e474cbfc3c13fce4a
 DIST clucene-core-2.3.3.4.tar.gz 2241498 SHA256 ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4 WHIRLPOOL d9e80807b6a1a9afb318be5e795af1edf1ba60734a33c4ee3a9be95863cb97bd13f6d7e144ddff631a5deebce890ef002f3196fe511c57a33f94db29a56c6315
-EBUILD clucene-2.3.3.4-r4.ebuild 1648 SHA256 1c008645beee5aee785da14a95d7ee7aa8922a376f2ea037c6d955442f17db88 SHA512 26aecf7ece8e629a63b1af45d4b450cd9b456464243adb5426c03f5d6bd5acad42d57d9df201ba08235ebd9493c36d9066de307a8709e1113dbd54aa7b56dcf3 WHIRLPOOL 0d0c4a42724e9b1de0749bc83d0b04e03db4a8f58e5acbacae02a545f6da85a03b21d967d29738aa4210c640e69ddf73bf894afeca0b3339b0c44d6951c69038
+EBUILD clucene-2.3.3.4-r4.ebuild 1757 SHA256 608fa79f7d0737123374bcf3f20a11bd64f3351d12fddbfe78331305ff512b9c SHA512 d3a60f01ccf390e9d58aa33b74e266303d7768d14af96e271ded231634a1fa18d6a2068bc9c75bb2be1aff1fc813ae072e698f7ce7d4ef52ff9cdffcb4c508d2 WHIRLPOOL b00d4d912aed2adb3ed7a89b0fa911fda83eed5ad418e89454122389943cc08615fbebf733f382e79948afca9bd3b3c97a3d7d2649c3c878ae52cb4326f28783
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r4.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r4.ebuild
index 2d7c56a..088c066 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r4.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r4.ebuild
@@ -33,6 +33,8 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 PATCHES=(
 	"${FILESDIR}/${P}-contrib.patch"
 	"${FILESDIR}/${P}-pkgconfig.patch"
+	"${FILESDIR}/${P}-add-missing-include-pthread-h.patch"
+	"${FILESDIR}/${P}-libc-disambiguate-typedefs.patch"
 )
 
 src_prepare() {
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-add-missing-include-pthread-h.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-add-missing-include-pthread-h.patch
new file mode 100644
index 0000000..b702eec
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-add-missing-include-pthread-h.patch
@@ -0,0 +1,24 @@
+add missing #include <pthread.h>
+
+From: eroen <eroen@occam.eroen.eu>
+
+
+---
+ src/shared/CLucene/LuceneThreads.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/shared/CLucene/LuceneThreads.h b/src/shared/CLucene/LuceneThreads.h
+index 97072ee..04ceeb2 100644
+--- a/src/shared/CLucene/LuceneThreads.h
++++ b/src/shared/CLucene/LuceneThreads.h
+@@ -7,6 +7,10 @@
+ #ifndef _LuceneThreads_h
+ #define  _LuceneThreads_h
+ 
++#if defined(_CL_HAVE_PTHREAD)
++#include <pthread.h>
++#endif
++
+ 
+ CL_NS_DEF(util)
+ class CLuceneThreadIdCompare;
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-libc-disambiguate-typedefs.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-libc-disambiguate-typedefs.patch
new file mode 100644
index 0000000..ae97763
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-libc-disambiguate-typedefs.patch
@@ -0,0 +1,24 @@
+libc++ - disambiguate typedefs
+
+From: eroen <eroen@occam.eroen.eu>
+
+
+---
+ src/shared/CLucene/config/repl_tchar.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/CLucene/config/repl_tchar.h b/src/shared/CLucene/config/repl_tchar.h
+index 159dcc1..0ebba42 100644
+--- a/src/shared/CLucene/config/repl_tchar.h
++++ b/src/shared/CLucene/config/repl_tchar.h
+@@ -36,8 +36,8 @@
+         #define _tcsncpy wcsncpy //copy a specified amount of one string to another string.
+         #define _tcscat wcscat //copy a string onto the end of the other string
+     		#define _tcsncat wcsncat
+-        #define _tcschr wcschr //find location of one character
+-        #define _tcsstr wcsstr //find location of a string
++        #define _tcschr std::wcschr //find location of one character
++        #define _tcsstr std::wcsstr //find location of a string
+         #define _tcslen wcslen //get length of a string
+         #define _tcscmp wcscmp //case sensitive compare two strings
+         #define _tcsncmp wcsncmp //case sensitive compare two strings
diff --git a/dev-cpp/clucene/files/series b/dev-cpp/clucene/files/series
new file mode 100644
index 0000000..65c3327
--- /dev/null
+++ b/dev-cpp/clucene/files/series
@@ -0,0 +1,2 @@
+# This series applies on GIT commit 7f2f22b04ae4386af5afae36a80298b2413600d0
+libc-disambiguate-typedefs.patch