gnome3.tracker-miners: 2.1.5 -> 2.2.1
- update patch: meson.build now get stuff correctly from pkgconfig
This commit is contained in:
parent
fb5b2ad53f
commit
d6c8771dd4
|
@ -8,11 +8,11 @@ let
|
||||||
pname = "tracker-miners";
|
pname = "tracker-miners";
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
version = "2.1.5";
|
version = "2.2.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||||
sha256 = "1kdq7fk9c80ngg65p31pjdk4za0fq7nfhblqsma9alvkam5kvzgm";
|
sha256 = "1xbjbd994jxhdan7227kzdnmiblfy0f1vnsws5l809ydgk58f0qr";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,25 +1,3 @@
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -25,15 +25,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')
|
|
||||||
else
|
|
||||||
tracker_subproject = subproject('tracker',
|
|
||||||
default_options: [
|
|
||||||
--- a/src/libtracker-miners-common/tracker-domain-ontology.c
|
--- a/src/libtracker-miners-common/tracker-domain-ontology.c
|
||||||
+++ b/src/libtracker-miners-common/tracker-domain-ontology.c
|
+++ b/src/libtracker-miners-common/tracker-domain-ontology.c
|
||||||
@@ -323,7 +323,7 @@
|
@@ -323,7 +323,7 @@
|
||||||
|
|
Loading…
Reference in a new issue