tracker: 3.0.3 → 3.1.1

Also reverts #118823

Co-Authored-By: Bastian Köcher <info@kchr.de>
Co-Authored-By: Stefan Frijters <sfrijters@gmail.com>
This commit is contained in:
Jan Tojnar 2021-03-21 07:28:27 +00:00
parent 9101fbb0ae
commit 4bf889549d
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 48 additions and 12 deletions

View file

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, gettext
, meson
, ninja
@ -27,15 +28,15 @@
, substituteAll
}:
stdenv.mkDerivation (rec {
stdenv.mkDerivation rec {
pname = "tracker";
version = "3.0.3";
version = "3.1.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-b1yEqzvh7aUgUBsq7XIhYWoM8VKRDFN3V7U4vAXv/KM=";
sha256 = "sha256-Q3bi6YRUBm9E96JC5FuZs7/kwDtn+rGauw7Vhsp0iuc=";
};
patches = [
@ -43,6 +44,17 @@ stdenv.mkDerivation (rec {
src = ./fix-paths.patch;
inherit asciidoc;
})
# Add missing build target dependencies to fix parallel building of docs.
# TODO: Upstream this.
./fix-docs.patch
# Fix 32bit datetime issue, use this upstream patch until 3.1.2 lands
# https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/401
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/tracker/merge_requests/401.patch";
sha256 = "QEf+ciGkkCzanmtGO0aig6nAxd+NxjvuNi4RbNOwZEA=";
})
];
nativeBuildInputs = [
@ -74,22 +86,23 @@ stdenv.mkDerivation (rec {
libstemmer
];
checkInputs = [
python3.pkgs.pygobject3
checkInputs = with python3.pkgs; [
pygobject3
tappy
];
mesonFlags = [
"-Ddocs=true"
];
# https://gitlab.gnome.org/GNOME/tracker/-/issues/292#note_1075369
doCheck = !stdenv.isi686;
doCheck = true;
postPatch = ''
patchShebangs utils/g-ir-merge/g-ir-merge
patchShebangs utils/data-generators/cc/generate
patchShebangs tests/functional-tests/test-runner.sh.in
patchShebangs tests/functional-tests/*.py
patchShebangs examples/python/endpoint.py
'';
preCheck = ''
@ -134,8 +147,3 @@ stdenv.mkDerivation (rec {
platforms = platforms.linux;
};
}
// {
# TMP: fatal error: libtracker-sparql/tracker-sparql-enum-types.h: No such file or directory
enableParallelBuilding = false;
}
)

View file

@ -0,0 +1,28 @@
diff --git a/docs/reference/libtracker-sparql/examples/meson.build b/docs/reference/libtracker-sparql/examples/meson.build
index 1cb1d9f3f..313c72345 100644
--- a/docs/reference/libtracker-sparql/examples/meson.build
+++ b/docs/reference/libtracker-sparql/examples/meson.build
@@ -1,20 +1,20 @@
executable(
'readonly-example',
'readonly-example.c',
- dependencies: tracker_sparql_dep,
+ dependencies: [tracker_common_dep, tracker_sparql_dep],
build_by_default: true
)
executable(
'writeonly-example',
'writeonly-example.c',
- dependencies: tracker_sparql_dep,
+ dependencies: [tracker_common_dep, tracker_sparql_dep],
build_by_default: true
)
executable(
'writeonly-with-blank-nodes-example',
'writeonly-with-blank-nodes-example.c',
- dependencies: tracker_sparql_dep,
+ dependencies: [tracker_common_dep, tracker_sparql_dep],
build_by_default: true
)