karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

clucene: Updated (0.9.21b -> 2.3.3.4)

user/chris/wip/linux37
Nagy Karoly Gabriel 12 years ago
parent
a2634cfe8f
commit
50a9a1b867
10 changed files with 362 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      textproc/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch
  2. 28
      textproc/clucene/clucene-core-2.3.3.4-pkgconfig.patch
  3. 27
      textproc/clucene/clucene-debug.patch
  4. 47
      textproc/clucene/clucene-gcc-atomics.patch
  5. 25
      textproc/clucene/clucene-multimap-put.patch
  6. 41
      textproc/clucene/clucene-narrowing-conversions.patch
  7. 70
      textproc/clucene/clucene-warnings.patch
  8. 26
      textproc/clucene/clucene.conf
  9. 6
      textproc/clucene/clucene.desc
  10. 37
      textproc/clucene/fix_zlib_detections.patch

58
textproc/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch
Unescape View File

@ -0,0 +1,58 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clucene/clucene-core-2.3.3.4-install_contribs_lib.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
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 )

28
textproc/clucene/clucene-core-2.3.3.4-pkgconfig.patch
Unescape View File

@ -0,0 +1,28 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clucene/clucene-core-2.3.3.4-pkgconfig.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
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@
~

27
textproc/clucene/clucene-debug.patch
Unescape View File

@ -0,0 +1,27 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clucene/clucene-debug.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- clucene-core-2.3.3.4/src/core/CLucene/index/TermInfosReader.cpp
+++ clucene-core-2.3.3.4/src/core/CLucene/index/TermInfosReader.cpp
@@ -111,7 +111,7 @@
//destroy their elements
#ifdef _DEBUG
for ( int32_t i=0; i<indexTermsLength;++i ){
- indexTerms[i].__cl_refcount--;
+ indexTerms[i].__cl_decref();
}
#endif
//Delete the arrays

47
textproc/clucene/clucene-gcc-atomics.patch
Unescape View File

@ -0,0 +1,47 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clucene/clucene-gcc-atomics.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- clucene-core-2.3.3.4/src/shared/CLucene/config/threads.cpp 2012-02-23 12:06:55.355506304 +0000
+++ clucene-core-2.3.3.4/src/shared/CLucene/config/threads.cpp 2012-02-23 12:07:17.131766381 +0000
@@ -185,7 +185,7 @@
}
int32_t atomic_threads::atomic_increment(_LUCENE_ATOMIC_INT *theInteger){
- #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS
+ #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 ))
return __sync_add_and_fetch(theInteger, 1);
#else
SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK)
@@ -193,7 +193,7 @@
#endif
}
int32_t atomic_threads::atomic_decrement(_LUCENE_ATOMIC_INT *theInteger){
- #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS
+ #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 ))
return __sync_sub_and_fetch(theInteger, 1);
#else
SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK)
--- clucene-core-2.3.3.4/src/shared/CLucene/LuceneThreads.h 2012-02-23 12:36:28.388299322 +0000
+++ clucene-core-2.3.3.4/src/shared/CLucene/LuceneThreads.h 2012-02-23 12:37:23.131885433 +0000
@@ -70,7 +70,7 @@
void NotifyAll();
};
- #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS
+ #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 ))
#define _LUCENE_ATOMIC_INT uint32_t
#define _LUCENE_ATOMIC_INT_SET(x,v) x=v
#define _LUCENE_ATOMIC_INT_GET(x) x

25
textproc/clucene/clucene-multimap-put.patch
Unescape View File

@ -0,0 +1,25 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clucene/clucene-multimap-put.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- clucene-core-2.3.3.4/src/core/CLucene/util/VoidMap.h
+++ clucene-core-2.3.3.4/src/core/CLucene/util/VoidMap.h
@@ -316,6 +316,7 @@ public:
if ( _this::dk || _this::dv )
_this::remove(k);
+ (*this)[k] = v;
}
};

41
textproc/clucene/clucene-narrowing-conversions.patch
Unescape View File

@ -0,0 +1,41 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clucene/clucene-narrowing-conversions.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- clucene-core-2.3.3.4/src/core/CLucene/queryParser/QueryParser.cpp.sav 2011-03-17 01:21:07.000000000 +0100
+++ clucene-core-2.3.3.4/src/core/CLucene/queryParser/QueryParser.cpp 2012-03-09 18:20:58.000000000 +0100
@@ -79,7 +79,7 @@
_T("<RANGEEX_GOOP>")
};
-const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,0x80000000,0x20000000,0x80000000,0x10000,0x80000,0x10000,0x1f68000};
+const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,int32_t(0x80000000),0x20000000,int32_t(0x80000000),0x10000,0x80000,0x10000,0x1f68000};
const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0};
struct QueryParser::JJCalls {
--- clucene-core-2.3.3.4/src/core/CLucene/queryParser/QueryParserTokenManager.cpp.sav 2011-03-17 01:21:07.000000000 +0100
+++ clucene-core-2.3.3.4/src/core/CLucene/queryParser/QueryParserTokenManager.cpp 2012-03-09 18:20:24.000000000 +0100
@@ -15,9 +15,9 @@
CL_NS_DEF(queryParser)
-const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)};
+const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff))};
const int64_t QueryParserTokenManager::jjbitVec0[] = {
- _ILONGLONG(0xfffffffffffffffe), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)
+ int64_t(_ILONGLONG(0xfffffffffffffffe)), int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff))
};
const int32_t QueryParserTokenManager::jjnextStates[]={
15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27,

70
textproc/clucene/clucene-warnings.patch
Unescape View File

@ -0,0 +1,70 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clucene/clucene-warnings.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- clucene-core-2.3.3.4/src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:37:22.531637934 +0000
+++ clucene-core-2.3.3.4/src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:39:15.369916728 +0000
@@ -7,6 +7,8 @@
#ifndef _lucene_analysis_AnalysisHeader_
#define _lucene_analysis_AnalysisHeader_
+#pragma GCC system_header
+
#include "CLucene/index/Payload.h"
#include "CLucene/util/VoidList.h"
#include "CLucene/LuceneThreads.h"
--- clucene-core-2.3.3.4/src/core/CLucene/search/Searchable.h 2012-02-22 12:37:22.513637729 +0000
+++ clucene-core-2.3.3.4/src/core/CLucene/search/Searchable.h 2012-02-22 12:38:51.073641550 +0000
@@ -7,6 +7,7 @@
#ifndef _lucene_search_Searcher_
#define _lucene_search_Searcher_
+#pragma GCC system_header
//#include "CLucene/index/IndexReader.h"
CL_CLASS_DEF(index,Term)
--- clucene-core-2.3.3.4/src/core/CLucene/store/IndexInput.h 2012-02-22 12:37:22.508637673 +0000
+++ clucene-core-2.3.3.4/src/core/CLucene/store/IndexInput.h 2012-02-22 12:39:00.465747935 +0000
@@ -7,6 +7,8 @@
#ifndef _lucene_store_IndexInput_
#define _lucene_store_IndexInput_
+#pragma GCC system_header
+
#include "CLucene/LuceneThreads.h"
#include "CLucene/util/Equators.h"
--- clucene-core-2.3.3.4/src/core/CLucene/util/Array.h 2012-02-22 12:37:22.510637696 +0000
+++ clucene-core-2.3.3.4/src/core/CLucene/util/Array.h 2012-02-22 12:38:33.714444884 +0000
@@ -7,6 +7,8 @@
#ifndef _lucene_util_Array_
#define _lucene_util_Array_
+#pragma GCC system_header
+
#include <stdlib.h>
#include <string.h>
--- clucene-core-2.3.3.4/src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:37:22.510637696 +0000
+++ clucene-core-2.3.3.4/src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:38:40.316519685 +0000
@@ -7,6 +7,8 @@
#ifndef _lucene_util_PriorityQueue_
#define _lucene_util_PriorityQueue_
+#pragma GCC system_header
+
#include <stdlib.h>
CL_NS_DEF(util)

26
textproc/clucene/clucene.conf
Unescape View File

@ -0,0 +1,26 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clucene/clucene.conf
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
runconf=0
#we want some cmake options
var_append cmakeopt ' ' "-DCMAKE_BUILD_TYPE=Release"
var_append cmakeopt ' ' "-DCMAKE_INSTALL_PREFIX=$root/$prefix"
var_append cmakeopt ' ' "-DENABLE_ASCII_MODE=OFF"
var_append cmakeopt ' ' "-DENABLE_PACKAGING=OFF"
var_append cmakeopt ' ' "-DBUILD_CONTRIBS_LIB:BOOL=ON"
var_append cmakeopt ' ' "-DLIB_DESTINATION:PATH=$root/$libdir"
var_append cmakeopt ' ' "-DLUCENE_SYS_INCLUDES:PATH=$root/$libdir"
var_append cmakeopt ' ' "-DDISABLE_MULTITHREADING=OFF"

6
textproc/clucene/clucene.desc
Unescape View File

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../clucene/clucene.desc [COPY] Filename: package/.../clucene/clucene.desc
[COPY] Copyright (C) 2008 - 2010 The OpenSDE Project [COPY] Copyright (C) 2008 - 2013 The OpenSDE Project
[COPY] [COPY]
[COPY] More information can be found in the files COPYING and README. [COPY] More information can be found in the files COPYING and README.
[COPY] [COPY]
@ -27,7 +27,7 @@
[L] LGPL [L] LGPL
[S] Stable [S] Stable
[V] 0.9.21b [V] 2.3.3.4
[P] X -----5---9 128.000 [P] X -----5---9 128.000
[D] 534540098 clucene-core-0.9.21b.tar.bz2 http://dl.sourceforge.net/sourceforge/clucene/ [D] 185264609 clucene-core-2.3.3.4.tar.gz http://dl.sourceforge.net/sourceforge/clucene/clucene-core-unstable/2.3/

37
textproc/clucene/fix_zlib_detections.patch
Unescape View File

@ -0,0 +1,37 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clucene/fix_zlib_detections.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
From: Veit Jahns <idolum@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})
Write Preview
Loading…
Cancel
Save