cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

strigi: drop

Browse source 
It has not been used by KDE for many years and depends on umaintained libraries we want to drop (Qt4 and Gamin).
This commit is contained in:
Jan Tojnar 2020-09-02 01:25:50 +02:00
parent 88bf62113b
commit 77293baff0
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
5 changed files with 0 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/programs/environment.nix
View file

@ -33,7 +33,6 @@ in
{ PATH = [ "/bin" ];
INFOPATH = [ "/info" "/share/info" ];
KDEDIRS = [ "" ];
STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ];
QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];
QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ];
GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];

43
pkgs/development/libraries/strigi/default.nix
View file

@ -1,43 +0,0 @@
{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2
, clucene_core, fam, zlib, dbus, pkgconfig
}:
stdenv.mkDerivation rec {
pname = "strigi";
version = "0.7.8";
src = fetchurl {
url = "https://www.vandenoever.info/software/strigi/${pname}-${version}.tar.bz2";
sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23";
};
includeAllQtDirs = true;
CLUCENE_HOME = clucene_core;
buildInputs =
[ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus.out ];
nativeBuildInputs = [ cmake pkgconfig perl ];
patches = [ ./export_bufferedstream.patch ./gcc6.patch ];
enableParallelBuilding = true;
# Strigi installs some libraries in an incorrect place
# ($out/$out/lib instead of $out/lib), so move them to the right
# place.
postInstall =
''
mv $out/$out/lib/* $out/lib
rm -rf $out/nix
'';
meta = {
homepage = "http://strigi.sourceforge.net";
description = "A very fast and efficient crawler to index data on your harddrive";
license = "LGPL";
maintainers = with stdenv.lib.maintainers; [ sander ];
inherit (qt4.meta) platforms;
};
}

12
pkgs/development/libraries/strigi/export_bufferedstream.patch
View file

@ -1,12 +0,0 @@
diff -u -r strigi-0.7.8/libstreams/include/strigi/bufferedstream.h strigi-0.7.8_new/libstreams/include/strigi/bufferedstream.h
--- strigi-0.7.8/libstreams/include/strigi/bufferedstream.h 2013-02-05 13:34:57.000000000 -0800
+++ strigi-0.7.8_new/libstreams/include/strigi/bufferedstream.h 2013-07-14 17:01:54.000000000 -0700
@@ -34,7 +34,7 @@
* BufferedStream will do the rest.
*/
template <class T>
-class BufferedStream : public StreamBase<T> {
+class STRIGI_EXPORT BufferedStream : public StreamBase<T> {
private:
StreamBuffer<T> buffer;
bool finishedWritingToBuffer;

45
pkgs/development/libraries/strigi/gcc6.patch
View file

@ -1,45 +0,0 @@
https://sourceforge.net/p/strigi/patches/4/
and a fix for
/tmp/nix-build-strigi-0.7.8.drv-0/strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp:325:37: error: no matching function for call to 'make_pair(std::__cxx11::string, std::__cxx11::string&)'
wchartoutf8(name), value));
diff -Naur strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake
--- strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake 2013-02-05 16:34:52.000000000 -0500
+++ strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake 2016-05-14 11:39:54.586260564 -0400
@@ -15,7 +15,7 @@
# get the gcc version
exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+ string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:
if (NOT _gcc_version)
string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")
diff -Naur strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake
--- strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake 2013-02-05 16:34:57.000000000 -0500
+++ strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake 2016-05-14 11:40:11.340134414 -0400
@@ -15,7 +15,7 @@
# get the gcc version
exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+ string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:
if (NOT _gcc_version)
string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")
diff -ru strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp
--- strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2013-02-05 22:34:52.000000000 +0100
+++ strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2017-07-31 10:56:27.067902643 +0200
@@ -321,8 +321,7 @@
string size = value;
doc.size = atoi(size.c_str());
} else {
- doc.properties.insert(make_pair<const string, string>(
- wchartoutf8(name), value));
+ doc.properties.emplace(wchartoutf8(name), value);
}
}
Variant

2
pkgs/top-level/all-packages.nix
View file

@ -15379,8 +15379,6 @@ in
streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; };
streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {};
strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
subdl = callPackage ../applications/video/subdl { };
subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; };