[arch-commits] Commit in clucene/trunk (4 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Sun Jun 24 12:44:43 UTC 2012


    Date: Sunday, June 24, 2012 @ 08:44:42
  Author: andyrtr
Revision: 162252

upgpkg: clucene 2.3.3.4-4

add contrib libs required by LibO; minor fixes

Added:
  clucene/trunk/clucene-core-2.3.3.4-install_contribs_lib.patch
  clucene/trunk/clucene-core-2.3.3.4-pkgconfig.patch
  clucene/trunk/fix_zlib_detections.diff
Modified:
  clucene/trunk/PKGBUILD

-------------------------------------------------+
 PKGBUILD                                        |   48 +++++++++++++++-------
 clucene-core-2.3.3.4-install_contribs_lib.patch |   42 +++++++++++++++++++
 clucene-core-2.3.3.4-pkgconfig.patch            |   12 +++++
 fix_zlib_detections.diff                        |   21 +++++++++
 4 files changed, 108 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-24 12:43:16 UTC (rev 162251)
+++ PKGBUILD	2012-06-24 12:44:42 UTC (rev 162252)
@@ -1,40 +1,58 @@
 # $Id$
-# Maintainer: Alexander Rødseth
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Alexander Rødseth
 # Contributor: Alois Nespor <alois.nespor at gmail.com>
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=clucene
 pkgver=2.3.3.4
-pkgrel=3
+pkgrel=4
 pkgdesc="C++ port of the high-performance text search engine Lucene"
 arch=('x86_64' 'i686')
 url="http://clucene.sourceforge.net/"
 license=('APACHE' 'LGPL')
 depends=('gcc-libs' 'zlib' 'boost-libs')
 makedepends=('cmake' 'boost')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.gz")
-sha256sums=('ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.gz
+        clucene-core-2.3.3.4-install_contribs_lib.patch
+        clucene-core-2.3.3.4-pkgconfig.patch
+        fix_zlib_detections.diff)
+sha256sums=('ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab'
+            '3d3f73685f75b4ceacf1941e50b6108941bded3ca558ac1343c35b1b7d0e78dc'
+            '10c808ce483d997d7ff349cc3ec97b8785c365f956d6eef45458e9caf4e5e88d'
+            'e1a6a58dc344d8d5e3218137a5e7a689900eb6ea4cce1dc426e861706ab78889')
 
 build() {
-  cd "$srcdir"
+  cd $srcdir/$pkgname-core-$pkgver
 
-  sed 's:core:core -lclucene-shared:' \
-    -i "$pkgname-core-$pkgver/src/core/libclucene-core.pc.cmake"
+  # add missing contrib-libs needed by LibO 3.6, patch by FC
+  patch -Np1 -i ${srcdir}/clucene-core-2.3.3.4-install_contribs_lib.patch
+  # pkgconfig file is missing clucene-shared (upstream ID: 3461512), patch by FC
+  patch -Np1 -i ${srcdir}/clucene-core-2.3.3.4-pkgconfig.patch
+  # one upstream postrelease commit for proper zlib detection
+  patch -Np1 -i ${srcdir}/fix_zlib_detections.diff
+  sed -i 's:core:core -lclucene-shared:' src/core/libclucene-core.pc.cmake
 
   mkdir build
-  cd build
-  cmake "../$pkgname-core-$pkgver" \
+  pushd build
+  cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DENABLE_ASCII_MODE=OFF \
     -DENABLE_PACKAGING=OFF \
+    -DBUILD_CONTRIBS_LIB=BOOL:ON \
     -DDISABLE_MULTITHREADING=OFF
-  make
+  popd
+  make -C build
 }
 
+#check() {
+#  cd $srcdir/$pkgname-core-$pkgver
+#  make cl_test -C build
+#  make test -C build || /bin/true # currently fails the tests as expected (see FC comment)
+#}
+
 package() {
-  cd "$srcdir/build"
-
-  make DESTDIR="$pkgdir" install
+  cd $srcdir/$pkgname-core-$pkgver
+  make DESTDIR="$pkgdir" install -C build
+  rm -rf $pkgdir/usr/lib/CLuceneConfig.cmake
 }
-
-# vim:set ts=2 sw=2 et:

Added: clucene-core-2.3.3.4-install_contribs_lib.patch
===================================================================
--- clucene-core-2.3.3.4-install_contribs_lib.patch	                        (rev 0)
+++ clucene-core-2.3.3.4-install_contribs_lib.patch	2012-06-24 12:44:42 UTC (rev 162252)
@@ -0,0 +1,42 @@
+diff -NaurpBb clucene-core-2.3.3.4/CMakeLists.txt clucene-core-2.3.3.4-mod/CMakeLists.txt
+--- clucene-core-2.3.3.4/CMakeLists.txt	2011-03-17 03:21:07.000000000 +0300
++++ clucene-core-2.3.3.4-mod/CMakeLists.txt	2011-08-16 16:56:55.968268152 +0400
+@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS )
+   SET(BUILD_CONTRIBS_LIB 1)
+ ENDIF ( BUILD_CONTRIBS )
+ IF ( BUILD_CONTRIBS_LIB )
+-  ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
++  ADD_SUBDIRECTORY (src/contribs-lib)
+ ENDIF ( BUILD_CONTRIBS_LIB )
+ 
+ 
+diff -NaurpBb clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt
+--- clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt	2011-03-17 03:21:07.000000000 +0300
++++ clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt	2011-08-16 17:14:13.499275499 +0400
+@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED
+ )
+ TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
+ 
++#install public headers.
++FOREACH(file ${HEADERS})
++	get_filename_component(apath ${file} PATH)
++	get_filename_component(aname ${file} NAME)
++	file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath})
++	IF ( NOT aname MATCHES "^_.*" )
++		install(FILES ${file} 
++		        DESTINATION include/${relpath}
++		        COMPONENT development)
++	ENDIF ( NOT aname MATCHES "^_.*" )
++ENDFOREACH(file)
++
+ #set properties on the libraries
+ SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
+     VERSION ${CLUCENE_VERSION}
+     SOVERSION ${CLUCENE_SOVERSION}
+     COMPILE_DEFINITIONS_DEBUG _DEBUG
+ )
++
++#and install library
++install(TARGETS clucene-contribs-lib 
++        DESTINATION ${LIB_DESTINATION}  
++        COMPONENT runtime )

Added: clucene-core-2.3.3.4-pkgconfig.patch
===================================================================
--- clucene-core-2.3.3.4-pkgconfig.patch	                        (rev 0)
+++ clucene-core-2.3.3.4-pkgconfig.patch	2012-06-24 12:44:42 UTC (rev 162252)
@@ -0,0 +1,12 @@
+diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake
+--- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes	2011-03-16 19:21:07.000000000 -0500
++++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake	2012-03-19 09:01:00.689263954 -0500
+@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i
+ Name: libclucene
+ Description: CLucene - a C++ search engine, ported from the popular Apache Lucene
+ Version: @CLUCENE_VERSION_MAJOR at .@CLUCENE_VERSION_MINOR at .@CLUCENE_VERSION_REVISION at .@CLUCENE_VERSION_PATCH@
+-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core
+-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext
++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared
++Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I at LUCENE_SYS_INCLUDES@
+ ~

Added: fix_zlib_detections.diff
===================================================================
--- fix_zlib_detections.diff	                        (rev 0)
+++ fix_zlib_detections.diff	2012-06-24 12:44:42 UTC (rev 162252)
@@ -0,0 +1,21 @@
+From: Veit Jahns <idolum at users.sourceforge.net>
+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
+--- a/src/shared/CMakeLists.txt
++++ b/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})




More information about the arch-commits mailing list