|
|
b5c23e |
From bb0927856f1b5afac23f8658ff439cd37a1fe8e5 Mon Sep 17 00:00:00 2001
|
|
|
b5c23e |
From: Debarshi Ray <debarshir@gnome.org>
|
|
|
b5c23e |
Date: Thu, 7 Jun 2018 11:00:19 +0200
|
|
|
b5c23e |
Subject: [PATCH] Revert to using Tracker 1.0.x
|
|
|
b5c23e |
|
|
|
b5c23e |
RHEL 7.6 doesn't have Tracker 2.0.x.
|
|
|
b5c23e |
|
|
|
b5c23e |
https://bugzilla.redhat.com/show_bug.cgi?id=1569793
|
|
|
b5c23e |
---
|
|
|
b5c23e |
configure.ac | 8 ++++----
|
|
|
b5c23e |
meson.build | 4 ++--
|
|
|
b5c23e |
src/application.js | 2 +-
|
|
|
b5c23e |
src/main.js | 4 ++--
|
|
|
b5c23e |
4 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
b5c23e |
|
|
|
b5c23e |
diff --git a/configure.ac b/configure.ac
|
|
|
b5c23e |
index 8f2004b6f9fe..f66d372ca849 100644
|
|
|
b5c23e |
--- a/configure.ac
|
|
|
b5c23e |
+++ b/configure.ac
|
|
|
b5c23e |
@@ -92,8 +92,8 @@ PKG_CHECK_MODULES(DOCUMENTS,
|
|
|
b5c23e |
gtk+-3.0 >= $GTK_MIN_VERSION
|
|
|
b5c23e |
libsoup-2.4 >= $SOUP_MIN_VERSION
|
|
|
b5c23e |
gnome-desktop-3.0
|
|
|
b5c23e |
- tracker-control-2.0 >= $TRACKER_MIN_VERSION
|
|
|
b5c23e |
- tracker-sparql-2.0 >= $TRACKER_MIN_VERSION)
|
|
|
b5c23e |
+ tracker-control-1.0 >= $TRACKER_MIN_VERSION
|
|
|
b5c23e |
+ tracker-sparql-1.0 >= $TRACKER_MIN_VERSION)
|
|
|
b5c23e |
|
|
|
b5c23e |
# Although GTK+ 3.10 includes hi-dpi functionality, it does not require a cairo with
|
|
|
b5c23e |
# cairo_surface_set_device_scale(), which we also need if we're to support hi-dpi,
|
|
|
b5c23e |
@@ -126,8 +126,8 @@ AX_CHECK_GIRS_GJS([GObject], [2.0])
|
|
|
b5c23e |
AX_CHECK_GIR_SYMBOLS_GJS([Gtk], [3.0], [ShortcutsWindow ShortcutsSection
|
|
|
b5c23e |
ShortcutsGroup ShortcutsShortcut])
|
|
|
b5c23e |
AX_CHECK_GIRS_GJS([Pango], [1.0])
|
|
|
b5c23e |
-AX_CHECK_GIRS_GJS([Tracker], [2.0])
|
|
|
b5c23e |
-AX_CHECK_GIRS_GJS([TrackerControl], [2.0])
|
|
|
b5c23e |
+AX_CHECK_GIRS_GJS([Tracker], [1.0])
|
|
|
b5c23e |
+AX_CHECK_GIRS_GJS([TrackerControl], [1.0])
|
|
|
b5c23e |
AX_CHECK_GIRS_GJS([WebKit2], [4.0])
|
|
|
b5c23e |
AX_CHECK_GIRS_GJS([Zpj], [0.0])
|
|
|
b5c23e |
AX_CHECK_GIRS_GJS([Gepub], [0.6])
|
|
|
b5c23e |
diff --git a/meson.build b/meson.build
|
|
|
b5c23e |
index 5447fa980687..8e2b1043e21d 100644
|
|
|
b5c23e |
--- a/meson.build
|
|
|
b5c23e |
+++ b/meson.build
|
|
|
b5c23e |
@@ -60,8 +60,8 @@ documents_deps = [
|
|
|
b5c23e |
dependency('gobject-introspection-1.0', version: '>= 1.31.6'),
|
|
|
b5c23e |
dependency('gtk+-3.0', version: '>= 3.22.15'),
|
|
|
b5c23e |
dependency('libsoup-2.4', version: '>= 2.41.3'),
|
|
|
b5c23e |
- dependency('tracker-control-2.0', version: tracker_req_version),
|
|
|
b5c23e |
- dependency('tracker-sparql-2.0', version: tracker_req_version),
|
|
|
b5c23e |
+ dependency('tracker-control-1.0', version: tracker_req_version),
|
|
|
b5c23e |
+ dependency('tracker-sparql-1.0', version: tracker_req_version),
|
|
|
b5c23e |
dependency('webkit2gtk-4.0', version: '>= 2.6.0'),
|
|
|
b5c23e |
cc.find_library('m')
|
|
|
b5c23e |
]
|
|
|
b5c23e |
diff --git a/src/application.js b/src/application.js
|
|
|
b5c23e |
index e3b286cb4240..136afa03f022 100644
|
|
|
b5c23e |
--- a/src/application.js
|
|
|
b5c23e |
+++ b/src/application.js
|
|
|
b5c23e |
@@ -150,7 +150,7 @@ var Application = new Lang.Class({
|
|
|
b5c23e |
this.gettingStartedLocation = files[i].get_parent();
|
|
|
b5c23e |
|
|
|
b5c23e |
try {
|
|
|
b5c23e |
- manager.index_file(files[i], null);
|
|
|
b5c23e |
+ manager.index_file(files[i]);
|
|
|
b5c23e |
} catch (e) {
|
|
|
b5c23e |
logError(e, 'Error indexing the getting started PDF');
|
|
|
b5c23e |
}
|
|
|
b5c23e |
diff --git a/src/main.js b/src/main.js
|
|
|
b5c23e |
index 2aceb54e063c..18cd4fa8d02a 100644
|
|
|
b5c23e |
--- a/src/main.js
|
|
|
b5c23e |
+++ b/src/main.js
|
|
|
b5c23e |
@@ -34,8 +34,8 @@ pkg.require({ 'EvinceDocument': '3.0',
|
|
|
b5c23e |
'Goa': '1.0',
|
|
|
b5c23e |
'Gtk': '3.0',
|
|
|
b5c23e |
'GObject': '2.0',
|
|
|
b5c23e |
- 'Tracker': '2.0',
|
|
|
b5c23e |
- 'TrackerControl': '2.0',
|
|
|
b5c23e |
+ 'Tracker': '1.0',
|
|
|
b5c23e |
+ 'TrackerControl': '1.0',
|
|
|
b5c23e |
'WebKit2': '4.0' });
|
|
|
b5c23e |
|
|
|
b5c23e |
const Application = imports.application;
|
|
|
b5c23e |
--
|
|
|
b5c23e |
2.14.4
|
|
|
b5c23e |
|