gnome3.tracker-miners: 2.0.5 → 2.1.1
This commit is contained in:
parent
c219d313dd
commit
21e9b85928
@ -1,24 +1,24 @@
|
||||
{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, makeWrapper
|
||||
{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt
|
||||
, meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server
|
||||
, exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif
|
||||
, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid
|
||||
, libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid
|
||||
, libvorbis, libxml2, poppler, taglib, upower }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
let
|
||||
pname = "tracker-miners";
|
||||
version = "2.0.5";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
|
||||
sha256 = "00k8nb8dbkjnqjk12gcs5n2cm6yny553qildsm5b2c8nfs1w16b4";
|
||||
sha256 = "107638773mihxdi194wf3saacqrr4cp9xn3qjfmx60bwq5451ma0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
itstool
|
||||
libxslt
|
||||
makeWrapper
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
# TODO: add libgrss, libenca, libosinfo
|
||||
# TODO: add libenca, libosinfo
|
||||
buildInputs = [
|
||||
bzip2
|
||||
dbus
|
||||
@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
json-glib
|
||||
libcue
|
||||
libexif
|
||||
libgrss
|
||||
libgsf
|
||||
libiptcdata
|
||||
libjpeg
|
||||
@ -60,7 +61,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dminer_rss=false" # needs libgrss
|
||||
# TODO: tests do not like our sandbox
|
||||
"-Dfunctional_tests=false"
|
||||
];
|
||||
|
||||
patches = [
|
||||
@ -75,13 +77,7 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome3.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
# Symlinks require absolute path and we still cannot use placeholders
|
||||
# https://github.com/NixOS/nixpkgs/pull/39534#discussion_r184339131
|
||||
# https://github.com/NixOS/nixpkgs/pull/37693
|
||||
preConfigure = ''
|
||||
@ -92,10 +88,13 @@ stdenv.mkDerivation rec {
|
||||
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=796145
|
||||
postFixup = ''
|
||||
rm $out/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service
|
||||
'';
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome3.${pname}";
|
||||
versionPolicy = "none";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Projects/Tracker;
|
||||
|
@ -1,3 +1,25 @@
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -37,15 +37,15 @@
|
||||
#
|
||||
# This check acts as a guard to make sure we are being configured with the
|
||||
# right prefix, among other things.
|
||||
- tracker_store = find_program(join_paths(get_option('prefix'), get_option('libexecdir'), 'tracker-store'))
|
||||
+ tracker_store = find_program(join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'libexec', 'tracker-store'))
|
||||
tracker_store_path = tracker_store.path()
|
||||
|
||||
# If we are building against an installed version of tracker core rather than
|
||||
# having it as a subproject, these 'uninstalled' locations point to the actual
|
||||
# installed locations.
|
||||
- tracker_uninstalled_domain_rule = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'domain-ontologies', 'default.rule')
|
||||
- tracker_uninstalled_nepomuk_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'ontologies', 'nepomuk')
|
||||
- tracker_uninstalled_stop_words_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'stop-words', 'default.rule')
|
||||
+ tracker_uninstalled_domain_rule = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'domain-ontologies', 'default.rule')
|
||||
+ tracker_uninstalled_nepomuk_ontologies_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'ontologies', 'nepomuk')
|
||||
+ tracker_uninstalled_stop_words_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'stop-words', 'default.rule')
|
||||
endif
|
||||
|
||||
avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
|
||||
--- a/src/libtracker-miners-common/tracker-domain-ontology.c
|
||||
+++ b/src/libtracker-miners-common/tracker-domain-ontology.c
|
||||
@@ -313,7 +313,7 @@
|
||||
@ -9,7 +31,7 @@
|
||||
DEFAULT_RULE, NULL);
|
||||
|
||||
if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
|
||||
@@ -372,7 +372,7 @@
|
||||
@@ -378,7 +378,7 @@
|
||||
if (!priv->ontology_location) {
|
||||
gchar *ontology_path;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user