diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2019-12-04 20:57:57 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2019-12-04 21:05:53 +0100 |
| commit | d4f79634805a130759e3b60ef0a0b14047012e50 (patch) | |
| tree | 3a526678c16410fe0e09d3dfb531e24b8409b07f | |
| parent | 186bcaf1de91074a18659d9e850589598dd744f0 (diff) | |
| download | tracker-sam/remove-libuuid.tar.gz | |
Update Meson requirement to 0.50.0sam/remove-libuuid
Meson 0.50.0 was released on 10th March 2019. We should
now be able to depend on it.
In particular, Freedesktop SDK now contains 0.51.0[1] so
this shouldn't break gnome-build-meta like last time (13948fda052e).
Fixes the following warnings:
WARNING: Project specifies a minimum meson_version '>=0.47' but uses features which were added in newer versions:
* 0.49.0: {'/ with string arguments'}
* 0.50.0: {'install arg in configure_file'}
1. https://gitlab.com/freedesktop-sdk/freedesktop-sdk/blob/master/elements%2Fcomponents%2Fmeson.bst
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/libtracker-data/tracker-turtle-reader.vala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 844e4728e..cd9cc0df4 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('tracker', 'c', 'vala', version: '2.99.0', - meson_version: '>=0.47') + meson_version: '>=0.50') gnome = import('gnome') i18n = import('i18n') diff --git a/src/libtracker-data/tracker-turtle-reader.vala b/src/libtracker-data/tracker-turtle-reader.vala index f5f04cdb3..93962faa1 100644 --- a/src/libtracker-data/tracker-turtle-reader.vala +++ b/src/libtracker-data/tracker-turtle-reader.vala @@ -63,7 +63,7 @@ public class Tracker.TurtleReader : Object { int bnodeid = 0; // base UUID used for blank nodes - uchar[] base_uuid; + string base_uuid; MappedFile? mapped_file; uchar[]? buffer; @@ -100,7 +100,7 @@ public class Tracker.TurtleReader : Object { } else { var checksum = new Checksum (ChecksumType.SHA1); // base UUID, unique per file - checksum.update (base_uuid, -1); + checksum.update ((uchar[]) base_uuid, -1); // node ID checksum.update ((uchar[]) user_bnodeid, -1); |