From c984a0593e2e8aa9869bbc3bdf924d40ff1cc635 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 23 Apr 2013 12:38:27 +0200 Subject: [PATCH] drop zarafa patch not needed Package-Manager: portage-2.2.0_alpha166 RepoMan-Options: --force --- dev-cpp/clucene/ChangeLog | 4 + dev-cpp/clucene/Manifest | 5 +- dev-cpp/clucene/clucene-0.9.21b-r1.ebuild | 1 - .../files/clucene-0.9.21b-zarafa.patch | 128 ------------------ 4 files changed, 6 insertions(+), 132 deletions(-) delete mode 100644 dev-cpp/clucene/files/clucene-0.9.21b-zarafa.patch diff --git a/dev-cpp/clucene/ChangeLog b/dev-cpp/clucene/ChangeLog index d600c48..373b15e 100644 --- a/dev-cpp/clucene/ChangeLog +++ b/dev-cpp/clucene/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 23 Apr 2013; Mario Fetka + -files/clucene-0.9.21b-zarafa.patch, clucene-0.9.21b-r1.ebuild: + drop zarafa patch not needed + *clucene-0.9.21b-r1 (23 Apr 2013) 23 Apr 2013; Mario Fetka +clucene-0.9.21b-r1.ebuild, diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest index 61c02c8..b3e9c4a 100644 --- a/dev-cpp/clucene/Manifest +++ b/dev-cpp/clucene/Manifest @@ -1,7 +1,6 @@ AUX clucene-0.9.21b-doxygen.patch 320 SHA256 b255bad44fb80d0bb2d371751252954b3ef38eddebbb2c56df07202081774914 SHA512 c3f93f97adcd7e6724b4b6b409acc83f4253aa23919afb082a6b1c3d1673a38b5e02c17b158d7c381196f680a7499304d1e1f43e5c2b476a654ffed04441d71f WHIRLPOOL acade7d165743599fd18f8f433408d3e19fdff8de680b1a83be6d2d2f6fe2aabbeb58bee71bc2aefb8fbfb17599f2e005bab0446d99a24b42f88faba14139033 AUX clucene-0.9.21b-gcc44.patch 218 SHA256 2ab6c9350ae2ddc56e0c3c956c687f22b0a6f5adc438a0e512bca18efc502d2f SHA512 3a7e02fd6ab6225d14a3c34005f55776126cd46d1b6e229c10de338c0c471bdea968c3e336463da66ec97c014d334d8204c496969f0ef52bc9e2e67ab3a9c9da WHIRLPOOL 658de064aa942a64ae83717f3788aad13ccd0bc7a5fc1a136cf802afdcca30d160d141fa3010741165a86e1199bd4769ef4fca79df3903c9e8372e78afd69d9a -AUX clucene-0.9.21b-zarafa.patch 4580 SHA256 8c4bb38a6de507e64fde29e1ab7f26d764a1b863d1053171c9886910de514281 SHA512 c00391ca0c2e86e18bbeb3f27a0f37934c453eb9ef9f15ae66980d0a9059de9960e89b1604fe033002d69ec649d62c66329bcc290376fc319ababc7ac4a671aa WHIRLPOOL 2f88a3431fcd2a387de7d565ea145e871b6a2e4d84f408bbc27dba43f56a75714e00b304c0e9e3d58ee296145cc3382c98b82773ef84638f2f18d76c29dc7092 DIST clucene-core-0.9.21b.tar.bz2 1539103 SHA256 202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317 SHA512 706e8ad1fc944ffe12f0b0057169bca63131ae2263a3e46dd9750bfe2e7401870dac8dc494e0159f9302afb285473d89b5bd62f9c2339a1a1954e4cb98391ee3 WHIRLPOOL df92ebd7692d81bec4a50751c4919a2aa136d3d8de6e117aca08500c519c21a52907ee089d7ee314b85303550002ec199d547037fa6efce2f97f9b12cbd22c08 -EBUILD clucene-0.9.21b-r1.ebuild 1444 SHA256 9620bce61d4d9fc4bfee450c2a478d97eb1e3672948f7ad29ed53fb69484f6a1 SHA512 7165ea8e2589fadaf873bed890205bf66829c02171e047fe34709b83358af111fb2d77bf5dd87df5082bef0057443b00de179351262dd55156103162b41bf98c WHIRLPOOL e67eb7fa62f70d4aca8b582520c461e84b14451c299a59d9f62c811320ebe8486508aa6fa783901e82dee4d33fbfa50ac85c21e78a945e1db6ddc34cbd573720 -MISC ChangeLog 401 SHA256 a7b0e5a3cb797cbc221542bec5caafd111529bda6eb3a30f32af70d0bc4ef63a SHA512 fd3f4f6f9d046739bf8ba7f738482df34e80e25b51224f79ce012f328b52dcab488ae3ad219ca1d44b58f688d952dd0244800cc11a4a36345a3bcbe3ec4f7744 WHIRLPOOL 8fb1eff53a708c253dd6ae46525fb9bf97249d183341e9b24713f92701b22e67f7fc1a2d1ce5a6720d345a1579785ba36aff32a5f0a99b2d17e789e181d1f1d5 +EBUILD clucene-0.9.21b-r1.ebuild 1411 SHA256 d0f924de9da395dddd002e2ea8e12d170231914878cda98208a6c62c914797b6 SHA512 f766ab6402d78b3160ed7e13bb81f64d655b4f7847e429683ee4e051dff12bfb4f2f4ac5d6ed52d7a93c3f7cdb8b97ffc4335628be3cba497b79a8dd1e4a2dfa WHIRLPOOL 34ee9c986ef4c4c91063df1e566347b530983586c5f2ca28bc5c29485dfa43242a7293a5158b6f39cfdedcc080e9a302f83fbfa7b5b6f9383222fae1980bc463 +MISC ChangeLog 550 SHA256 94805214e293ab5d248681542aac5e4a305f6dd3500df4e0ed527e2f9fabe9d2 SHA512 2655381a5bc420c5acb8d3f75d0eb1e1528174575124e76637503b70300fd395f835c8b36a5db62457c9571e33c4194073c26d4356acab5547c03d52458eb975 WHIRLPOOL a121e58ebfa34c7b8c27b305aa0ae7ff2d408724c27ed1eeed4e4439fd01188a67cee0607edce7cce8a204d168b238e67b89fec031f19036553dea5f5b9409a7 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3 diff --git a/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild b/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild index 4f57348..adcf47e 100644 --- a/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild +++ b/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild @@ -22,7 +22,6 @@ RDEPEND="" PATCHES=( "${FILESDIR}/${P}-gcc44.patch" "${FILESDIR}/${P}-doxygen.patch" - "${FILESDIR}/${P}-zarafa.patch" ) S="${WORKDIR}/${MY_P}" diff --git a/dev-cpp/clucene/files/clucene-0.9.21b-zarafa.patch b/dev-cpp/clucene/files/clucene-0.9.21b-zarafa.patch deleted file mode 100644 index 6fa595a..0000000 --- a/dev-cpp/clucene/files/clucene-0.9.21b-zarafa.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff -urb clucene-core-0.9.21/configure.ac clucene-core-0.9.21b/configure.ac ---- clucene-core-0.9.21/configure.ac 2008-09-21 08:19:46.000000000 +0200 -+++ clucene-core-0.9.21b/configure.ac 2008-10-23 20:17:57.000000000 +0200 -@@ -6,14 +6,14 @@ - AC_INIT(src/CLucene/StdHeader.h) - - dnl the clucene-core package version --VERSION=0.9.21 -+VERSION=0.9.21b - - dnl increment if interfaces have been added, removed or changed - clLIB_current=3 - - dnl increment if source code has changed - dnl - set to zero if current is incremented --clLIB_revision=0 -+clLIB_revision=1 - - dnl increment if interfaces have been added - dnl - set to zero if interfaces have been removed or changed -diff -urb clucene-core-0.9.21/src/CLucene/queryParser/MultiFieldQueryParser.cpp clucene-core-0.9.21b/src/CLucene/queryParser/MultiFieldQueryParser.cpp ---- clucene-core-0.9.21/src/CLucene/queryParser/MultiFieldQueryParser.cpp 2008-08-22 16:40:15.000000000 +0200 -+++ clucene-core-0.9.21b/src/CLucene/queryParser/MultiFieldQueryParser.cpp 2008-10-23 19:44:35.000000000 +0200 -@@ -36,7 +36,10 @@ - int32_t i = 0; - while ( fields[i] != NULL ){ - Query* q = QueryParser::parse(query, fields[i], analyzer); -+ if (q && (q->getQueryName()!=_T("BooleanQuery") || ((BooleanQuery*)q)->getClauseCount() > 0)) { - bQuery->add(q, true, false, false); -+ } else -+ _CLDELETE(q); - - i++; - } -@@ -51,6 +54,7 @@ - while ( fields[i] != NULL ) - { - Query* q = QueryParser::parse(query, fields[i], analyzer); -+ if (q && (q->getQueryName()!=_T("BooleanQuery") || ((BooleanQuery*)q)->getClauseCount() > 0)) { - uint8_t flag = flags[i]; - switch (flag) - { -@@ -64,6 +68,9 @@ - bQuery->add(q, true, false, false); - break; - } -+ } else { -+ _CLDELETE(q); -+ } - - i++; - } -diff -urb clucene-core-0.9.21/src/CLucene/store/FSDirectory.cpp clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp ---- clucene-core-0.9.21/src/CLucene/store/FSDirectory.cpp 2008-08-22 16:40:17.000000000 +0200 -+++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp 2008-10-23 20:01:52.000000000 +0200 -@@ -65,7 +65,7 @@ - if ( other.handle == NULL ) - _CLTHROWA(CL_ERR_NullPointer, "other handle is null"); - -- SCOPED_LOCK_MUTEX(other.handle->THIS_LOCK) -+ SCOPED_LOCK_MUTEX(*other.handle->THIS_LOCK) - handle = _CL_POINTER(other.handle); - _pos = other.handle->_fpos; //note where we are currently... - } -@@ -75,6 +75,10 @@ - _length = 0; - _fpos = 0; - path[0]=0; -+ -+#ifdef _LUCENE_THREADMUTEX -+ THIS_LOCK = new _LUCENE_THREADMUTEX; -+#endif - } - FSDirectory::FSIndexInput::SharedHandle::~SharedHandle() throw(CLuceneError&){ - if ( fhandle >= 0 ){ -@@ -100,7 +104,31 @@ - } - void FSDirectory::FSIndexInput::close() { - BufferedIndexInput::close(); -+#ifdef _LUCENE_THREADMUTEX -+ if ( handle != NULL ){ -+ //here we have a bit of a problem... we need to lock the handle to ensure that we can -+ //safely delete the handle... but if we delete the handle, then the scoped unlock, -+ //won't be able to unlock the mutex... -+ -+ //take a reference of the lock object... -+ _LUCENE_THREADMUTEX* mutex = handle->THIS_LOCK; -+ //lock the mutex -+ mutex->lock(); -+ -+ //determine if we are about to delete the handle... -+ bool dounlock = ( handle->__cl_refcount > 1 ); -+ //decdelete (deletes if refcount is down to 0 - _CLDECDELETE(handle); -+ -+ if ( dounlock ){ -+ mutex->unlock(); -+ }else{ -+ delete mutex; -+ } -+ } -+#else -+ _CLDECDELETE(handle); -+#endif - } - - void FSDirectory::FSIndexInput::seekInternal(const int64_t position) { -@@ -110,7 +138,7 @@ - - /** IndexInput methods */ - void FSDirectory::FSIndexInput::readInternal(uint8_t* b, const int32_t len) { -- SCOPED_LOCK_MUTEX(handle->THIS_LOCK) -+ SCOPED_LOCK_MUTEX(*handle->THIS_LOCK) - CND_PRECONDITION(handle!=NULL,"shared file handle has closed"); - CND_PRECONDITION(handle->fhandle>=0,"file is not open"); - -diff -urb clucene-core-0.9.21/src/CLucene/store/FSDirectory.h clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h ---- clucene-core-0.9.21/src/CLucene/store/FSDirectory.h 2008-08-22 16:40:17.000000000 +0200 -+++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h 2008-10-23 20:00:43.000000000 +0200 -@@ -86,7 +86,7 @@ - int32_t fhandle; - int64_t _length; - int64_t _fpos; -- DEFINE_MUTEX(THIS_LOCK) -+ DEFINE_MUTEX(*THIS_LOCK) - char path[CL_MAX_DIR]; //todo: this is only used for cloning, better to get information from the fhandle - SharedHandle(); - ~SharedHandle() throw(CLuceneError&);