From bdac6b4aec4024fb844f76b91f3b007b86415e68 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Jun 2023 01:39:20 +0100 Subject: gentoo auto-resync : 29:06:2023 - 01:39:20 --- dev-cpp/clucene/Manifest | 3 +- dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild | 66 ------- dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild | 67 +++++++ .../clucene-2.3.3.4-fix-binary-function.patch | 199 +++++++++++++++++++++ 4 files changed, 268 insertions(+), 67 deletions(-) delete mode 100644 dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild create mode 100644 dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild create mode 100644 dev-cpp/clucene/files/clucene-2.3.3.4-fix-binary-function.patch (limited to 'dev-cpp/clucene') diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest index 4b1b5c9b00de..35e3c042da33 100644 --- a/dev-cpp/clucene/Manifest +++ b/dev-cpp/clucene/Manifest @@ -1,4 +1,5 @@ AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183bdcfa7cb51a6109e957650412394796c7825c38dab9f1f9637c436b10714624dcbcfd3b6ab88dbfef9c5de9582e65ccc SHA512 0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3 +AUX clucene-2.3.3.4-fix-binary-function.patch 6521 BLAKE2B c47cdd71144eceece720dcbc7b69a489130c7a2931beba7c4154ce17b80d10d4f163d9c107ea2528d6ec9e13e203806e75cb916ce3567a9324db61dde9b2640d SHA512 bdb96fe9436297600da92db489f7044f12725831cd83b66863c6036b3f530a54dadbf059a4df3a994c1976850d30f1927680b09a695faee992088d44c4e68904 AUX clucene-2.3.3.4-fix-clang.patch 1982 BLAKE2B 2b330b21715d29a1c825d16cb8309319af4267812a68dea4ff045c3a4aaf0e258b22457d7635dc63886bd8856bccad2f8602432b889449b67fb7490c2f604763 SHA512 26e3705682ad970a012a38188ccc8cac89ab22a509474c4401a57200c98b49423ccf63fb70ccbd57265dd62ec2944fe498b217911d1886ea924881699c9968dc AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722 AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60 @@ -6,5 +7,5 @@ AUX clucene-2.3.3.4-libcxx.patch 1486 BLAKE2B 237f5a6b674a56c238ffb42282b610d92f AUX clucene-2.3.3.4-musl-pthread.patch 256 BLAKE2B 30c38a06d98c2e4c34f1ebf1c8b0021d57e66fd2b49e01cd9f165c3c7fef8a67152ed2136ccc733b2e6b07b8c39b3057b3fc4961330e3195c9d0b4c0d686fb95 SHA512 329ae45428e1d9b2f005c818b69030e7146b6441ca0a8d17bc3c711f76aa4c384c61718b717170fd88a1ae16e371396b77f8ba072aac6879b82aedaba3238207 AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18 DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4 -EBUILD clucene-2.3.3.4-r8.ebuild 1596 BLAKE2B f2ae2bbe041902f8339bd12a4175a2ce53a12991e3f4ea62b1489e6625322ecd3a3df710ab1606fb2d533b85f2234ed194e7945b1b01c61de3c5f0a788b58f30 SHA512 20549e2ac6fa4c1e2faef5dd6c0b3028c75c5054c2a11ef55c5aa7abbc4d7eace93c38f862a546ee06a2e1e39b7d7f203975d10c683cf8542708d7d4f3ff3672 +EBUILD clucene-2.3.3.4-r9.ebuild 1642 BLAKE2B 0753b86eff206cd6a5cdb599f38f7077ffbc9048931ec26af028c38e90413909bd436aeb537cff9ba680f2fa9ce74075c5ded0114695ddfddbf9a546483eea1d SHA512 6265485362c51b54b024e4d913acb6c94d18e2e8c258e97afcf10a2c7f1f9e433179acb1775200e9e6c625f35bd41aa7d9e70ebd682eccd13a96681f734c6f4c MISC metadata.xml 243 BLAKE2B f6749558bd65896555f359d7b6f67fdb5a9656eecbb944c5074a450ec952b2c9d5285be4d078c3eba5622bf4084d535f3d0860b8812cc4ad6590f18e593134c1 SHA512 675d016d3802dc7f8d70f98c6f044f39b32ca7722c7e0aa1e1aa6aad4acf83da129cddce37d72a4c899e2dd202f2ba1eba7ea7137ad24354b2c927f310732bae diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild deleted file mode 100644 index 3ee090b7f675..000000000000 --- a/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN}"-core -MY_P="${MY_PN}"-"${PV}" - -inherit cmake - -DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++" -HOMEPAGE="https://clucene.sourceforge.net" -SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz" - -LICENSE="|| ( Apache-2.0 LGPL-2.1 )" -SLOT="1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -IUSE="debug doc static-libs" - -BDEPEND=" - doc? ( >=app-doc/doxygen-1.4.2 ) -" - -RESTRICT="test" - -DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS) - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( - "${FILESDIR}/${P}-fix-clang.patch" - "${FILESDIR}/${P}-contrib.patch" - "${FILESDIR}/${P}-pkgconfig.patch" - "${FILESDIR}/${P}-gcc6.patch" - "${FILESDIR}/${P}-gmtime.patch" - "${FILESDIR}/${P}-musl-pthread.patch" - "${FILESDIR}/${P}-libcxx.patch" -) - -src_prepare() { - cmake_src_prepare - - # patch out installing bundled boost headers, we build against system one - sed -i \ - -e '/ADD_SUBDIRECTORY (src\/ext)/d' \ - CMakeLists.txt || die - rm -rf src/ext || die -} - -src_configure() { - # Disabled threads: see upstream bug - # https://sourceforge.net/p/clucene/bugs/197/ - local mycmakeargs=( - -DENABLE_ASCII_MODE=OFF - -DENABLE_PACKAGING=OFF - -DDISABLE_MULTITHREADING=OFF - -DBUILD_CONTRIBS_LIB=ON - "-DLIB_DESTINATION=${EPREFIX}/usr/$(get_libdir)" - -DENABLE_DEBUG=$(usex debug) - -DENABLE_CLDOCS=$(usex doc) - -DBUILD_STATIC_LIBRARIES=$(usex static-libs) - ) - - cmake_src_configure -} diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild new file mode 100644 index 000000000000..dee944a2e476 --- /dev/null +++ b/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="${PN}"-core +MY_P="${MY_PN}"-"${PV}" + +inherit cmake + +DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++" +HOMEPAGE="https://clucene.sourceforge.net" +SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz" + +LICENSE="|| ( Apache-2.0 LGPL-2.1 )" +SLOT="1" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +IUSE="debug doc static-libs" + +BDEPEND=" + doc? ( >=app-doc/doxygen-1.4.2 ) +" + +RESTRICT="test" + +DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS) + +S="${WORKDIR}/${MY_PN}-${PV}" + +PATCHES=( + "${FILESDIR}/${P}-fix-clang.patch" + "${FILESDIR}/${P}-contrib.patch" + "${FILESDIR}/${P}-pkgconfig.patch" + "${FILESDIR}/${P}-gcc6.patch" + "${FILESDIR}/${P}-gmtime.patch" + "${FILESDIR}/${P}-musl-pthread.patch" + "${FILESDIR}/${P}-libcxx.patch" + "${FILESDIR}/${P}-fix-binary-function.patch" +) + +src_prepare() { + cmake_src_prepare + + # patch out installing bundled boost headers, we build against system one + sed -i \ + -e '/ADD_SUBDIRECTORY (src\/ext)/d' \ + CMakeLists.txt || die + rm -rf src/ext || die +} + +src_configure() { + # Disabled threads: see upstream bug + # https://sourceforge.net/p/clucene/bugs/197/ + local mycmakeargs=( + -DENABLE_ASCII_MODE=OFF + -DENABLE_PACKAGING=OFF + -DDISABLE_MULTITHREADING=OFF + -DBUILD_CONTRIBS_LIB=ON + "-DLIB_DESTINATION=${EPREFIX}/usr/$(get_libdir)" + -DENABLE_DEBUG=$(usex debug) + -DENABLE_CLDOCS=$(usex doc) + -DBUILD_STATIC_LIBRARIES=$(usex static-libs) + ) + + cmake_src_configure +} diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-fix-binary-function.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-binary-function.patch new file mode 100644 index 000000000000..dbcff1bb1169 --- /dev/null +++ b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-binary-function.patch @@ -0,0 +1,199 @@ +Replace std::binary_function with typedefs (deprecated in c++11 and removed in c++17). +Bug: https://bugs.gentoo.org/869170 +--- a/src/core/CLucene/index/_Term.h ++++ b/src/core/CLucene/index/_Term.h +@@ -13,9 +13,12 @@ + CL_NS_DEF(index) + + +-class Term_Equals:public CL_NS_STD(binary_function) ++class Term_Equals + { + public: ++ typedef const Term* first_argument_type; ++ typedef const Term* second_argument_type; ++ typedef bool result_type; + bool operator()( const Term* val1, const Term* val2 ) const{ + return val1->equals(val2); + } +--- a/src/core/CLucene/search/BooleanQuery.cpp ++++ b/src/core/CLucene/search/BooleanQuery.cpp +@@ -25,9 +25,12 @@ CL_NS_USE(index) + CL_NS_USE(util) + CL_NS_DEF(search) + +- class BooleanClause_Compare:public CL_NS_STD(binary_function) ++ class BooleanClause_Compare + { + public: ++ typedef const BooleanClause* first_argument_type; ++ typedef const BooleanClause* second_argument_type; ++ typedef bool result_type; + bool operator()( const BooleanClause* val1, const BooleanClause* val2 ) const { + return val1->equals(val2); + } +--- a/src/core/CLucene/search/MultiPhraseQuery.cpp ++++ b/src/core/CLucene/search/MultiPhraseQuery.cpp +@@ -377,9 +377,12 @@ TCHAR* MultiPhraseQuery::toString(const TCHAR* f) const { + return buffer.giveBuffer(); + } + +-class TermArray_Equals:public CL_NS_STD(binary_function) ++class TermArray_Equals + { + public: ++ typedef const Term** first_argument_type; ++ typedef const Term** second_argument_type; ++ typedef bool result_type; + bool operator()( CL_NS(util)::ArrayBase* val1, CL_NS(util)::ArrayBase* val2 ) const{ + if ( val1->length != val2->length ) + return false; +--- a/src/core/CLucene/util/Equators.h ++++ b/src/core/CLucene/util/Equators.h +@@ -22,21 +22,30 @@ CL_NS_DEF(util) + /** @internal */ + class CLUCENE_INLINE_EXPORT Equals{ + public: +- class CLUCENE_INLINE_EXPORT Int32:public CL_NS_STD(binary_function) ++ class CLUCENE_INLINE_EXPORT Int32 + { + public: ++ typedef const int32_t* first_argument_type; ++ typedef const int32_t* second_argument_type; ++ typedef bool result_type; + bool operator()( const int32_t val1, const int32_t val2 ) const; + }; + +- class CLUCENE_INLINE_EXPORT Char:public CL_NS_STD(binary_function) ++ class CLUCENE_INLINE_EXPORT Char + { + public: ++ typedef const char* first_argument_type; ++ typedef const char* second_argument_type; ++ typedef bool result_type; + bool operator()( const char* val1, const char* val2 ) const; + }; + #ifdef _UCS2 +- class CLUCENE_INLINE_EXPORT WChar: public CL_NS_STD(binary_function) ++ class CLUCENE_INLINE_EXPORT WChar + { + public: ++ typedef const wchar_t* first_argument_type; ++ typedef const wchar_t* second_argument_type; ++ typedef bool result_type; + bool operator()( const wchar_t* val1, const wchar_t* val2 ) const; + }; + class CLUCENE_INLINE_EXPORT TChar: public WChar{ +@@ -48,9 +57,12 @@ public: + + + template +- class CLUCENE_INLINE_EXPORT Void:public CL_NS_STD(binary_function) ++ class CLUCENE_INLINE_EXPORT Void + { + public: ++ typedef const void* first_argument_type; ++ typedef const void* second_argument_type; ++ typedef bool result_type; + bool operator()( _cl* val1, _cl* val2 ) const{ + return val1==val2; + } +--- a/src/core/CLucene/util/_Arrays.h ++++ b/src/core/CLucene/util/_Arrays.h +@@ -124,12 +124,14 @@ CL_NS_DEF(util) + + template +- class CLListEquals: +- public CL_NS_STD(binary_function) ++ class CLListEquals + { + typedef typename class1::const_iterator _itr1; + typedef typename class2::const_iterator _itr2; + public: ++ typedef class1* first_argument_type; ++ typedef class2* second_argument_type; ++ typedef bool result_type; + CLListEquals(){ + } + bool equals( class1* val1, class2* val2 ) const{ +--- a/src/test/index/TestTermVectorsReader.cpp ++++ b/src/test/index/TestTermVectorsReader.cpp +@@ -93,17 +93,21 @@ CL_NS_USE(util); + } + }; + +- struct MyTCharCompare : +- public std::binary_function ++ struct MyTCharCompare + { ++ typedef const TCHAR* first_argument_type; ++ typedef const TCHAR* second_argument_type; ++ typedef bool result_type; + bool operator () (const TCHAR* v1, const TCHAR* v2) const { + return _tcscmp(v1, v2) < 0; + } + }; + +- struct TestTokenCompare : +- public std::binary_function ++ struct TestTokenCompare + { ++ typedef const TestToken* first_argument_type; ++ typedef const TestToken* second_argument_type; ++ typedef bool result_type; + bool operator () (const TestToken* t1, const TestToken* t2) const { + return t1->pos < t2->pos; + } +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,6 +45,14 @@ ELSE(NOT CMAKE_BUILD_TYPE) + MESSAGE( "Compiling as ${CMAKE_BUILD_TYPE}" ) + ENDIF(NOT CMAKE_BUILD_TYPE) + ++IF(CMAKE_C_COMPILER_ID MATCHES "Clang") ++ SET(CMAKE_COMPILER_IS_CLANG 1) ++ENDIF(CMAKE_C_COMPILER_ID MATCHES "Clang") ++ ++IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++ SET(CMAKE_COMPILER_IS_CLANGXX 1) ++ENDIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++ + OPTION(ENABLE_DEBUG + "enable debug support" + OFF) +@@ -62,14 +70,14 @@ OPTION(ENABLE_ASCII_MODE + OFF) + + SET(ENABLE_ANSI_MODE OFF) +-IF(CMAKE_COMPILER_IS_GNUCXX) ++IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) + SET(ENABLE_ANSI_MODE ON) + + #exceptions: + IF(MINGW OR CYGWIN) + SET(ENABLE_ANSI_MODE OFF) + ENDIF(MINGW OR CYGWIN) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) ++ENDIF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) + + OPTION(ENABLE_ANSI_MODE + "compile with -ansi flag" +@@ -109,7 +117,7 @@ OPTION(ENABLE_COMPILE_TESTS + + #check flags... + INCLUDE (TestCXXAcceptsFlag) +-IF ( CMAKE_COMPILER_IS_GNUCC ) ++IF ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG ) + CHECK_CXX_ACCEPTS_FLAG(-pg GccFlagPg) + IF ( GccFlagPg ) + OPTION(ENABLE_GPROF +@@ -131,7 +139,7 @@ IF ( CMAKE_COMPILER_IS_GNUCC ) + IF( ENABLE_ANSI_MODE ) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi") + ENDIF ( ENABLE_ANSI_MODE ) +-ENDIF(CMAKE_COMPILER_IS_GNUCC) ++ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) + + + #Single output directory for building all executables and libraries. -- cgit v1.2.3