commit tracker-miners for openSUSE:Factory

Hello community, here is the log from the commit of package tracker-miners for openSUSE:Factory checked in at 2017-10-02 16:51:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tracker-miners (Old) and /work/SRC/openSUSE:Factory/.tracker-miners.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tracker-miners" Mon Oct 2 16:51:19 2017 rev:2 rq:528641 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tracker-miners/tracker-miners.changes 2017-09-13 21:56:03.677019290 +0200 +++ /work/SRC/openSUSE:Factory/.tracker-miners.new/tracker-miners.changes 2017-10-02 16:51:20.734461185 +0200 @@ -1,0 +2,6 @@ +Sat Sep 23 19:02:40 UTC 2017 - zaitor@opensuse.org + +- Add tracker-miners-tracker-extract-fixes.patch: Fix various bugs + in tracker-extract (bgo#785853, bgo#787774). + +------------------------------------------------------------------- New: ---- tracker-miners-tracker-extract-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tracker-miners.spec ++++++ --- /var/tmp/diff_new_pack.MwIE50/_old 2017-10-02 16:51:21.446361268 +0200 +++ /var/tmp/diff_new_pack.MwIE50/_new 2017-10-02 16:51:21.450360707 +0200 @@ -26,6 +26,8 @@ Source: http://download.gnome.org/sources/tracker-miners/2.0/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM tracker-miners-private.patch bgo#725689 dimstar@opensuse.org -- Do not maintain LT versioning for private libs Patch0: tracker-miners-private.patch +# PATCH-FIX-UPSTREAM tracker-miners-tracker-extract-fixes.patch bgo#785853 bgo#787774 zaitor@opensuse.org -- Fix various bugs in tracker-extract +Patch1: tracker-miners-tracker-extract-fixes.patch BuildRequires: giflib-devel BuildRequires: intltool >= 0.40.0 BuildRequires: libjpeg-devel @@ -63,7 +65,7 @@ # Make sure tracker is being updated to 1.99 too Conflicts: tracker < 1.99 # The schema files moved from libtracker-common to tracker-miners -ConflictS: libtracker-common-1_0 < 1.99 +Conflicts: libtracker-common-1_0 < 1.99 Recommends: %{name}-lang %description @@ -99,6 +101,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build # Needed for patch0 ++++++ tracker-miners-tracker-extract-fixes.patch ++++++

From a0da953c8637bef4ddb963e0d459dfa37b5a643a Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 12 Sep 2017 15:13:46 +0200 Subject: tracker-extract: Skip over virtual elements

It is possible to fool tracker-extract into processing virtual elements that aren't backed up by files. Those can be safely ignored instead. https://bugzilla.gnome.org/show_bug.cgi?id=785853 --- src/tracker-extract/tracker-extract-decorator.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/tracker-extract/tracker-extract-decorator.c b/src/tracker-extract/tracker-extract-decorator.c index cfb51d7..6e251f4 100644 --- a/src/tracker-extract/tracker-extract-decorator.c +++ b/src/tracker-extract/tracker-extract-decorator.c @@ -264,6 +264,12 @@ decorator_next_item_cb (TrackerDecorator *decorator, g_clear_error (&error); return; + } else if (!tracker_decorator_info_get_url (info)) { + /* Skip virtual elements with no real file representation */ + priv->n_extracting_files--; + tracker_decorator_info_unref (info); + decorator_get_next_file (decorator); + return; } data = g_new0 (ExtractData, 1); -- cgit v0.12

From 1337de7ccdc38f8865f6c14f4efa3758d569bea8 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Sun, 10 Sep 2017 13:17:10 +0200 Subject: tracker-extract: Remove declaration of undefined function

This function is long gone. --- src/tracker-extract/tracker-main.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/tracker-extract/tracker-main.h b/src/tracker-extract/tracker-main.h index 77d798e..4af2e3e 100644 --- a/src/tracker-extract/tracker-main.h +++ b/src/tracker-extract/tracker-main.h @@ -25,11 +25,6 @@ G_BEGIN_DECLS -/* This is used to not shutdown after the default of 30 seconds if we - * get more work to do. - */ -void tracker_main_quit_timeout_reset (void); - /* Enables getting the config object from extractors */ TrackerConfig *tracker_main_get_config (void); -- cgit v0.12

From 57c47d0b6064b23df40009e448c2aea651789e46 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Sun, 17 Sep 2017 01:35:02 +0200 Subject: tracker-extract: Fix insertion of white balance values

https://bugzilla.gnome.org/show_bug.cgi?id=787774 --- src/tracker-extract/tracker-extract-gif.c | 2 +- src/tracker-extract/tracker-extract-jpeg.c | 2 +- src/tracker-extract/tracker-extract-pdf.c | 2 +- src/tracker-extract/tracker-extract-png.c | 2 +- src/tracker-extract/tracker-extract-tiff.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c index f260bd5..ecff110 100644 --- a/src/tracker-extract/tracker-extract-gif.c +++ b/src/tracker-extract/tracker-extract-gif.c @@ -318,7 +318,7 @@ read_metadata (GifFileType *gifFile, TrackerResource *white_balance; white_balance = tracker_resource_new (xd->white_balance); - tracker_resource_set_relation (metadata, "nmm:meteringMode", white_balance); + tracker_resource_set_relation (metadata, "nmm:whiteBalance", white_balance); g_object_unref (white_balance); } diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c index c6b07bf..00b3764 100644 --- a/src/tracker-extract/tracker-extract-jpeg.c +++ b/src/tracker-extract/tracker-extract-jpeg.c @@ -417,7 +417,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info) TrackerResource *white_balance; white_balance = tracker_resource_new (md.white_balance); - tracker_resource_set_relation (metadata, "nmm:meteringMode", white_balance); + tracker_resource_set_relation (metadata, "nmm:whiteBalance", white_balance); g_object_unref (white_balance); } diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c index acce7c8..a89b94a 100644 --- a/src/tracker-extract/tracker-extract-pdf.c +++ b/src/tracker-extract/tracker-extract-pdf.c @@ -481,7 +481,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info) TrackerResource *white_balance; white_balance = tracker_resource_new (xd->white_balance); - tracker_resource_set_relation (metadata, "nmm:meteringMode", white_balance); + tracker_resource_set_relation (metadata, "nmm:whiteBalance", white_balance); g_object_unref (white_balance); } diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c index 0e19765..54d54ac 100644 --- a/src/tracker-extract/tracker-extract-png.c +++ b/src/tracker-extract/tracker-extract-png.c @@ -433,7 +433,7 @@ read_metadata (TrackerResource *metadata, TrackerResource *white_balance; white_balance = tracker_resource_new (md.white_balance); - tracker_resource_set_relation (metadata, "nmm:meteringMode", white_balance); + tracker_resource_set_relation (metadata, "nmm:whiteBalance", white_balance); g_object_unref (white_balance); } diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c index 64ff894..3c411c3 100644 --- a/src/tracker-extract/tracker-extract-tiff.c +++ b/src/tracker-extract/tracker-extract-tiff.c @@ -545,7 +545,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info) TrackerResource *white_balance; white_balance = tracker_resource_new (md.white_balance); - tracker_resource_set_relation (metadata, "nmm:meteringMode", white_balance); + tracker_resource_set_relation (metadata, "nmm:whiteBalance", white_balance); g_object_unref (white_balance); } -- cgit v0.12