Update to 3.1.2 (#1988025)
This commit is contained in:
parent
3aceb73b31
commit
2844376c9e
@ -1,35 +0,0 @@
|
|||||||
From 62b46b35d4f151c851d7eb37792aa8890117a1e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Carlos Garnacho <carlosg@gnome.org>
|
|
||||||
Date: Thu, 22 Apr 2021 17:10:49 +0200
|
|
||||||
Subject: [PATCH] libtracker-data: Do not load vtabs if vtab data is missing
|
|
||||||
|
|
||||||
We have one case of direct use of tracker_db_manager_new() in
|
|
||||||
"tracker3 export" CLI command to (ab)use it to open databases from
|
|
||||||
2.x. This doesn't pass a TrackerDataManager nor requires creating
|
|
||||||
the usual 3.x virtual tables.
|
|
||||||
|
|
||||||
Avoid this virtual table creation in that case, and subsequent
|
|
||||||
crashes when trying to access the NULL data manager from those.
|
|
||||||
|
|
||||||
Related: https://bugzilla.redhat.com/show_bug.cgi?id=1951194
|
|
||||||
---
|
|
||||||
src/libtracker-data/tracker-db-manager.c | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/libtracker-data/tracker-db-manager.c b/src/libtracker-data/tracker-db-manager.c
|
|
||||||
index e3044819c..5485ce623 100644
|
|
||||||
--- a/src/libtracker-data/tracker-db-manager.c
|
|
||||||
+++ b/src/libtracker-data/tracker-db-manager.c
|
|
||||||
@@ -776,7 +776,8 @@ tracker_db_manager_create_db_interface (TrackerDBManager *db_manager,
|
|
||||||
g_weak_ref_get (&db_manager->iface_data),
|
|
||||||
g_object_unref);
|
|
||||||
|
|
||||||
- tracker_db_interface_init_vtabs (connection, db_manager->vtab_data);
|
|
||||||
+ if (db_manager->vtab_data)
|
|
||||||
+ tracker_db_interface_init_vtabs (connection, db_manager->vtab_data);
|
|
||||||
|
|
||||||
iface_set_params (connection,
|
|
||||||
readonly,
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (tracker-3.1.1.tar.xz) = 87e6cc6dbfb34cc17bef42defefc51fc9d9586bffebf7a282a89ec3b294e911c504ea862bb05e5a269e438a83fbeb8938670eb32fa11d0d09ba805e0b02e6dcd
|
SHA512 (tracker-3.1.2.tar.xz) = 3c5feb658d7d3e35bcc61ef216e59b069df661d6f13de6f26e71da35bd0ca78878099d1ae507da82860d955954f971ab68d5a3b86a3132781c3f03a12dec1f0c
|
||||||
|
@ -3,15 +3,13 @@
|
|||||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||||
|
|
||||||
Name: tracker
|
Name: tracker
|
||||||
Version: 3.1.1
|
Version: 3.1.2
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Desktop-neutral metadata database and search tool
|
Summary: Desktop-neutral metadata database and search tool
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://gnome.pages.gitlab.gnome.org/tracker/
|
URL: https://gnome.pages.gitlab.gnome.org/tracker/
|
||||||
Source0: https://download.gnome.org/sources/tracker/3.1/tracker-%{tarball_version}.tar.xz
|
Source0: https://download.gnome.org/sources/tracker/3.1/tracker-%{tarball_version}.tar.xz
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1951194
|
|
||||||
Patch0: 0001-libtracker-data-Do-not-load-vtabs-if-vtab-data-is-mi.patch
|
|
||||||
|
|
||||||
BuildRequires: asciidoc
|
BuildRequires: asciidoc
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
@ -171,6 +169,9 @@ The %{name}-devel package contains the documentation for %{name}.
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 29 2021 David King <amigadave@amigadave.com> - 3.1.2-1
|
||||||
|
- Update to 3.1.2 (#1988025)
|
||||||
|
|
||||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-4
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user