diff --git a/srcpkgs/clucene/patches/fix_zlib_detections.diff b/srcpkgs/clucene/patches/fix_zlib_detections.diff new file mode 100644 index 0000000000..bcd732a910 --- /dev/null +++ b/srcpkgs/clucene/patches/fix_zlib_detections.diff @@ -0,0 +1,21 @@ +From: Veit Jahns +Date: Thu, 26 May 2011 11:35:28 +0000 (+0200) +Subject: Fixing ZLIB configuration in shared's CMakeLists +X-Git-Url: http://clucene.git.sourceforge.net/git/gitweb.cgi?p=clucene%2Fclucene;a=commitdiff_plain;h=772481ca94071ddfe65102a451926e4f9aeb4d2c;hp=a834f87bad3543b2a0331cef7202c15ded4245be + +Fixing ZLIB configuration in shared's CMakeLists +--- + +diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt +index 68314a7..3d1975e 100644 +--- src/shared/CMakeLists.txt ++++ src/shared/CMakeLists.txt +@@ -42,7 +42,7 @@ INCLUDE (CheckAtomicFunctions) + find_package(ZLIB) + IF ( ZLIB_FOUND ) + SET ( EXTRA_LIBS ${EXTRA_LIBS} ${ZLIB_LIBRARY} ) +-ELSEIF ( ZLIB_FOUND ) ++ELSE ( ZLIB_FOUND ) + MESSAGE( "ZLIB not found, using local: ${clucene-ext_SOURCE_DIR}/zlib" ) + SET(ZLIB_INCLUDE_DIR ${clucene-ext_SOURCE_DIR}/zlib ) + SET(ZLIB_LIBRARY ${clucene-ext_BINARY_DIR}) diff --git a/srcpkgs/clucene/template b/srcpkgs/clucene/template index 79644ae0c9..6cf88539a5 100644 --- a/srcpkgs/clucene/template +++ b/srcpkgs/clucene/template @@ -1,12 +1,12 @@ # Template file for 'clucene' pkgname=clucene version=2.3.3.4 -revision=3 +revision=4 wrksrc=${pkgname}-core-${version} build_style=cmake configure_args="-DENABLE_ASCII_MODE=OFF -DENABLE_PACKAGING=OFF -DBUILD_CONTRIBS_LIB:BOOL=ON -DLIB_DESTINATION:PATH=/usr/lib - -DLUCENE_SYS_INCLUDES:PATH=/usr/lib -DDISABLE_MULTITHREADING=OFF" + -DLUCENE_SYS_INCLUDES:PATH=/usr/include -DDISABLE_MULTITHREADING=OFF" hostmakedepends="cmake pkg-config" makedepends="zlib-devel boost-devel" short_desc="Text search engine written in C++" @@ -17,12 +17,11 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-core-${version}.tar.gz" checksum=ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab clucene-devel_package() { - depends="libstdc++-devel ${sourcepkg}-${version}_${revision}" + depends="libstdc++-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.so" - vmove usr/lib/CLucene vmove usr/lib/CLuceneConfig.cmake vmove usr/lib/pkgconfig }