Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=6fc8bef47b2197a1253059688227407e6f9e3920

commit 6fc8bef47b2197a1253059688227407e6f9e3920
Author: Miklos Vajna <[email protected]>
Date:   Wed Jul 11 18:29:43 2012 +0200

clucene-2.3.3.4-1-x86_64

- up to 2.3.3.4

diff --git a/source/lib/clucene/FrugalBuild b/source/lib/clucene/FrugalBuild
index 31ef42d..d48861f 100644
--- a/source/lib/clucene/FrugalBuild
+++ b/source/lib/clucene/FrugalBuild
@@ -2,20 +2,26 @@
# Maintainer: CSÉCSY László <[email protected]>

pkgname=clucene
-pkgver=0.9.21b
+pkgver=2.3.3.4
pkgrel=1
pkgdesc="a C++ port of Lucene: the high-performance, full-featured text search 
engine"
-depends=('libstdc++')
+depends=('libstdc++' 'zlib')
groups=('lib')
archs=('i686' 'x86_64' 'arm')
-_F_sourceforge_ext=".tar.bz2"
+_F_sourceforge_ext=".tar.gz"
_F_sourceforge_dirname="$pkgname"
_F_sourceforge_name="$pkgname-core"
-Finclude sourceforge
-source=($source clucene-0.9.21b-gcc44.patch)
-_F_cd_path="$pkgname-core-$pkgver"
-up2date="lynx -dump 
http://sourceforge.net/projects/clucene/files/clucene-core-stable/ | grep 
tar.bz2 -m1 | sed 's/.*core-\(.*\)\.tar.*/\1/'"
-sha1sums=('8bc505b64f82723c2dc901036cb0607500870973' \
-          '20d4c94095ddb70f3bd02d3ec8a5135567202d53')
+Finclude sourceforge cmake
+source=($source clucene-core-2.3.3.4-install_contribs_lib.patch 
clucene-core-2.3.3.4-pkgconfig.patch)
+sha1sums=('76d6788e747e78abb5abf8eaad78d3342da5f2a4' \
+          '304e5dfaaf6cf0733b8e6f43a192565c9a9a845a' \
+          '77e4fc94e89dcd66ffe824e36949edd1172653b1')
+
+build()
+{
+       Fcd $pkgname-core-$pkgver
+       _F_cmake_confopts="-DBUILD_CONTRIBS_LIB=BOOL:ON"
+       CMake_build
+}

# optimization OK
diff --git a/source/lib/clucene/clucene-0.9.21b-gcc44.patch 
b/source/lib/clucene/clucene-0.9.21b-gcc44.patch
deleted file mode 100644
index 8c7fe44..0000000
--- a/source/lib/clucene/clucene-0.9.21b-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/CLucene/util/bufferedstream.h~
-+++ src/CLucene/util/bufferedstream.h
-@@ -29,6 +29,7 @@
- #include "streambase.h"
- #include "inputstreambuffer.h"
- #include <cassert>
-+#include <stdio.h>
-
- namespace jstreams {
-
diff --git a/source/lib/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch 
b/source/lib/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch
new file mode 100644
index 0000000..8fbb3c7
--- /dev/null
+++ b/source/lib/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch
@@ -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 )
diff --git a/source/lib/clucene/clucene-core-2.3.3.4-pkgconfig.patch 
b/source/lib/clucene/clucene-core-2.3.3.4-pkgconfig.patch
new file mode 100644
index 0000000..aff20d7
--- /dev/null
+++ b/source/lib/clucene/clucene-core-2.3.3.4-pkgconfig.patch
@@ -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@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@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@LUCENE_SYS_INCLUDES@
+ ~
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to