Hello community,

here is the log from the commit of package grilo-plugins for openSUSE:Factory 
checked in at 2019-12-11 12:05:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grilo-plugins (Old)
 and      /work/SRC/openSUSE:Factory/.grilo-plugins.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "grilo-plugins"

Wed Dec 11 12:05:26 2019 rev:48 rq:754976 version:0.3.10

Changes:
--------
--- /work/SRC/openSUSE:Factory/grilo-plugins/grilo-plugins.changes      
2019-10-17 13:01:48.196923094 +0200
+++ /work/SRC/openSUSE:Factory/.grilo-plugins.new.4691/grilo-plugins.changes    
2019-12-11 12:05:45.380724423 +0100
@@ -1,0 +2,7 @@
+Fri Dec  6 04:39:29 UTC 2019 - Yifan Jiang <[email protected]>
+
+- Add tracker-fix-crash-if-chromaprint-plugin-not-installed.patch:
+  avoid crash if the chromaprint is disabled on build time
+  (bsc#1158231 glgo#GNOME/grilo-plugins#61).
+
+-------------------------------------------------------------------

New:
----
  tracker-fix-crash-if-chromaprint-plugin-not-installed.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ grilo-plugins.spec ++++++
--- /var/tmp/diff_new_pack.LwjGxv/_old  2019-12-11 12:05:46.768723839 +0100
+++ /var/tmp/diff_new_pack.LwjGxv/_new  2019-12-11 12:05:46.768723839 +0100
@@ -25,6 +25,8 @@
 Group:          Productivity/Multimedia/Other
 URL:            https://live.gnome.org/Grilo
 Source0:        
https://download.gnome.org/sources/grilo-plugins/0.3/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM  
tracker-fix-crash-if-chromaprint-plugin-not-installed.patch bsc#1158231 
glgo#GNOME/grilo-plugins#61 [email protected] -- avoid crash if the chromaprint 
plugin is disabled in build time.
+Patch0:         tracker-fix-crash-if-chromaprint-plugin-not-installed.patch
 
 BuildRequires:  docbook_4
 BuildRequires:  fdupes

++++++ tracker-fix-crash-if-chromaprint-plugin-not-installed.patch ++++++
>From 46d7c0edfbf97ca15c08e5cd1c6d563363843e82 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <[email protected]>
Date: Sun, 29 Sep 2019 16:42:29 +0200
Subject: [PATCH] tracker: Fix crash if chromaprint plugin isn't installed

This is a regression from 7fa5126eace8d9931643f.

See: https://gitlab.gnome.org/GNOME/grilo-plugins/issues/61
---
 src/tracker/grl-tracker-utils.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/tracker/grl-tracker-utils.c b/src/tracker/grl-tracker-utils.c
index 86f0f0c8..406f4efc 100644
--- a/src/tracker/grl-tracker-utils.c
+++ b/src/tracker/grl-tracker-utils.c
@@ -325,11 +325,13 @@ grl_tracker_setup_key_mappings (void)
                      "(SELECT tracker:referenceIdentifier(?rg) AS ?rg_id { 
?urn nmm:musicAlbum ?album . ?album tracker:hasExternalReference ?rg . ?rg 
tracker:referenceSource \"https://musicbrainz.org/doc/Release_Group\"; })",
                      "audio");
 
-  insert_key_mapping_with_setter (grl_metadata_key_chromaprint,
-                                  NULL,
-                                  "(select nfo:hashValue(?h) { ?urn 
nfo:hasHash ?h . ?h nfo:hashAlgorithm \"chromaprint\" })",
-                                  "audio",
-                                  set_string_metadata_keys);
+  if (grl_metadata_key_chromaprint != 0) {
+    insert_key_mapping_with_setter (grl_metadata_key_chromaprint,
+                                    NULL,
+                                    "(select nfo:hashValue(?h) { ?urn 
nfo:hasHash ?h . ?h nfo:hashAlgorithm \"chromaprint\" })",
+                                    "audio",
+                                    set_string_metadata_keys);
+  };
 
   insert_key_mapping (GRL_METADATA_KEY_FRAMERATE,
                       "nfo:frameRate",

Reply via email to