Merge pull request #273154 from wegank/clucene-bump
clucene_core_1: drop
This commit is contained in:
commit
82787a0062
@ -1,35 +0,0 @@
|
||||
{lib, stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clucene-core";
|
||||
version = "0.9.21b";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/clucene/clucene-core-${version}.tar.bz2";
|
||||
sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317";
|
||||
};
|
||||
|
||||
patches = [ ./gcc6.patch ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-std=c++11"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Core library for full-featured text search engine";
|
||||
longDescription = ''
|
||||
CLucene is a high-performance, scalable, cross platform, full-featured,
|
||||
open-source indexing and searching API. Specifically, CLucene is the guts
|
||||
of a search engine, the hard stuff. You write the easy stuff: the UI and
|
||||
the process of selecting and parsing your data files to pump them into
|
||||
the search engine yourself, and any specialized queries to pull it back
|
||||
for display or further processing.
|
||||
|
||||
CLucene is a port of the very popular Java Lucene text search engine API.
|
||||
'';
|
||||
homepage = "https://clucene.sourceforge.net";
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [ asl20 lgpl2 ];
|
||||
};
|
||||
}
|
@ -1,146 +0,0 @@
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=998477
|
||||
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48 clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h
|
||||
--- clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48 2008-10-23 12:44:35.000000000 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h 2013-08-27 13:17:35.754234297 -0500
|
||||
@@ -58,7 +58,7 @@ public:
|
||||
__cl_refcount--;
|
||||
return __cl_refcount;
|
||||
}
|
||||
- virtual ~LuceneBase(){};
|
||||
+ virtual ~LuceneBase() throw(CLuceneError&) {};
|
||||
};
|
||||
|
||||
class LuceneVoidBase{
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp
|
||||
--- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48 2013-08-27 13:17:35.754234297 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp 2013-08-27 13:18:02.844949386 -0500
|
||||
@@ -94,7 +94,7 @@ CompoundFileReader::CompoundFileReader(D
|
||||
)
|
||||
}
|
||||
|
||||
-CompoundFileReader::~CompoundFileReader(){
|
||||
+CompoundFileReader::~CompoundFileReader() throw(CLuceneError&) {
|
||||
close();
|
||||
}
|
||||
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h
|
||||
--- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48 2008-10-23 12:44:37.000000000 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h 2013-08-27 13:17:35.755234286 -0500
|
||||
@@ -95,7 +95,7 @@ protected:
|
||||
|
||||
public:
|
||||
CompoundFileReader(CL_NS(store)::Directory* dir, char* name);
|
||||
- ~CompoundFileReader();
|
||||
+ ~CompoundFileReader() throw(CLuceneError&);
|
||||
CL_NS(store)::Directory* getDirectory();
|
||||
const char* getName() const;
|
||||
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.cpp
|
||||
--- clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48 2008-10-23 12:44:37.000000000 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/index/Term.cpp 2013-08-27 13:17:35.755234286 -0500
|
||||
@@ -81,7 +81,7 @@ Term::Term(const TCHAR* fld, const TCHAR
|
||||
set(fld,txt);
|
||||
}
|
||||
|
||||
-Term::~Term(){
|
||||
+Term::~Term() throw (CLuceneError&) {
|
||||
//Func - Destructor.
|
||||
//Pre - true
|
||||
//Post - The instance has been destroyed. field and text have been deleted if pre(intrn) is false
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.h
|
||||
--- clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48 2008-10-23 12:44:37.000000000 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/index/Term.h 2013-08-27 13:17:35.755234286 -0500
|
||||
@@ -68,7 +68,7 @@ class Term:LUCENE_REFBASE {
|
||||
Term(const TCHAR* fld, const TCHAR* txt);
|
||||
|
||||
///Destructor.
|
||||
- ~Term();
|
||||
+ ~Term() throw(CLuceneError&);
|
||||
|
||||
///Returns the field of this term, an interned string. The field indicates
|
||||
///the part of a document which this term came from.
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/Directory.h
|
||||
--- clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48 2008-10-23 12:44:36.000000000 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/store/Directory.h 2013-08-27 13:17:35.756234276 -0500
|
||||
@@ -41,7 +41,7 @@ CL_NS_DEF(store)
|
||||
public:
|
||||
DEFINE_MUTEX(THIS_LOCK)
|
||||
|
||||
- virtual ~Directory(){ };
|
||||
+ virtual ~Directory() throw(CLuceneError&) { };
|
||||
|
||||
// Returns an null terminated array of strings, one for each file in the directory.
|
||||
char** list() const{
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp
|
||||
--- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48 2008-10-23 13:01:52.000000000 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp 2013-08-27 13:17:35.756234276 -0500
|
||||
@@ -368,7 +368,7 @@ void FSDirectory::FSIndexInput::readInte
|
||||
strcat(buffer,name);
|
||||
}
|
||||
|
||||
- FSDirectory::~FSDirectory(){
|
||||
+ FSDirectory::~FSDirectory() throw(CLuceneError&) {
|
||||
}
|
||||
|
||||
void FSDirectory::list(vector<string>* names) const{ //todo: fix this, ugly!!!
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h
|
||||
--- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48 2008-10-23 13:00:43.000000000 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h 2013-08-27 13:17:35.756234276 -0500
|
||||
@@ -155,7 +155,7 @@
|
||||
///Destructor - only call this if you are sure the directory
|
||||
///is not being used anymore. Otherwise use the ref-counting
|
||||
///facilities of _CLDECDELETE
|
||||
- ~FSDirectory();
|
||||
+ ~FSDirectory() throw(CLuceneError&);
|
||||
|
||||
/// Get a list of strings, one for each file in the directory.
|
||||
void list(vector<string>* names) const;
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp
|
||||
--- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48 2008-10-23 12:44:36.000000000 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp 2013-08-27 13:17:35.757234265 -0500
|
||||
@@ -219,7 +219,7 @@ CL_NS_DEF(store)
|
||||
{
|
||||
}
|
||||
|
||||
- RAMDirectory::~RAMDirectory(){
|
||||
+ RAMDirectory::~RAMDirectory() throw(CLuceneError&) {
|
||||
//todo: should call close directory?
|
||||
}
|
||||
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h
|
||||
--- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48 2008-10-23 12:44:36.000000000 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h 2013-08-27 13:17:35.757234265 -0500
|
||||
@@ -131,7 +131,7 @@ CL_NS_DEF(store)
|
||||
///Destructor - only call this if you are sure the directory
|
||||
///is not being used anymore. Otherwise use the ref-counting
|
||||
///facilities of dir->close
|
||||
- virtual ~RAMDirectory();
|
||||
+ virtual ~RAMDirectory() throw(CLuceneError&);
|
||||
RAMDirectory(Directory* dir);
|
||||
|
||||
/**
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp
|
||||
--- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48 2008-10-23 12:44:36.000000000 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp 2013-08-27 13:17:35.757234265 -0500
|
||||
@@ -16,7 +16,7 @@ CL_NS_USE(util)
|
||||
{
|
||||
transOpen = false;
|
||||
}
|
||||
- TransactionalRAMDirectory::~TransactionalRAMDirectory(){
|
||||
+ TransactionalRAMDirectory::~TransactionalRAMDirectory() throw(CLuceneError&) {
|
||||
}
|
||||
|
||||
bool TransactionalRAMDirectory::archiveOrigFileIfNecessary(const char* name) {
|
||||
diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h
|
||||
--- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48 2008-10-23 12:44:36.000000000 -0500
|
||||
+++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h 2013-08-27 13:17:35.757234265 -0500
|
||||
@@ -44,7 +44,7 @@ CL_NS_DEF(store)
|
||||
|
||||
public:
|
||||
TransactionalRAMDirectory();
|
||||
- virtual ~TransactionalRAMDirectory();
|
||||
+ virtual ~TransactionalRAMDirectory() throw(CLuceneError&);
|
||||
|
||||
bool transIsOpen() const;
|
||||
void transStart();
|
@ -154,6 +154,7 @@ mapAliases ({
|
||||
clash = throw "'clash' has been removed, upstream gone. Consider using 'clash-meta' instead."; # added 2023-11-10
|
||||
clasp = clingo; # added 2022-12-22
|
||||
claws-mail-gtk3 = claws-mail; # Added 2021-07-10
|
||||
clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09
|
||||
cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09
|
||||
code-server = throw "'code-server' has been removed from nixpkgs, as it was depending on EOL Node.js and is unmaintained."; # Added 2023-10-30
|
||||
codimd = hedgedoc; # Added 2020-11-29
|
||||
|
@ -20862,11 +20862,7 @@ with pkgs;
|
||||
|
||||
clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
|
||||
|
||||
clucene_core_1 = callPackage ../development/libraries/clucene-core {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
|
||||
};
|
||||
|
||||
clucene_core = clucene_core_1;
|
||||
clucene_core = clucene_core_2;
|
||||
|
||||
clutter = callPackage ../development/libraries/clutter { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user