Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-photos for openSUSE:Factory checked in at 2022-01-21 01:25:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-photos (Old) and /work/SRC/openSUSE:Factory/.gnome-photos.new.1938 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-photos" Fri Jan 21 01:25:15 2022 rev:56 rq:947470 version:40.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-photos/gnome-photos.changes 2021-04-18 21:45:26.456755378 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-photos.new.1938/gnome-photos.changes 2022-01-21 01:25:38.634495162 +0100 @@ -1,0 +2,13 @@ +Sat Jan 15 16:38:46 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Add gnome-photos-fix-vert-align.patch: Fix vertical alignment. + (glgo#GNOME/gnome-photos!172). +- Add upstream bug fix patches from the stable branch: + + 5cafad57982fbef0d02b7ecb0b1a2c9f221de391.patch: + indexing-notification: Remove unused variable. + + 1d22aac8fd7433cd1319fb2ffea0a1e294609f64.patch: + indexing-notification: Handle TrackerMiner proxy being NULL on + start-up. +- Update our Supplements to current standard. + +------------------------------------------------------------------- New: ---- 1d22aac8fd7433cd1319fb2ffea0a1e294609f64.patch 5cafad57982fbef0d02b7ecb0b1a2c9f221de391.patch gnome-photos-fix-vert-align.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-photos.spec ++++++ --- /var/tmp/diff_new_pack.iKDM57/_old 2022-01-21 01:25:39.086492064 +0100 +++ /var/tmp/diff_new_pack.iKDM57/_new 2022-01-21 01:25:39.086492064 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-photos # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,12 @@ Source0: https://download.gnome.org/sources/gnome-photos/40/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM gnome-photos-on-demand-activate-dleyna.patch bsc#992420, glgo#GNOME/gnome-photos#75 sck...@suse.com -- Activate dleyna-renderer-service on demand instead of on start-up. Patch0: gnome-photos-on-demand-activate-dleyna.patch +# PATCH-FIX-UPSTREAM gnome-photos-fix-vert-align.patch -- glgo#GNOME/gnome-photos!172 headerbar: Fix vertical alignment +Patch1: gnome-photos-fix-vert-align.patch +# PATCH-FIX-UPSTREAM 5cafad57982fbef0d02b7ecb0b1a2c9f221de391.patch -- indexing-notification: Remove unused variable +Patch2: https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/5cafad57982fbef0d02b7ecb0b1a2c9f221de391.patch +# PATCH-FIX-UPSTREAM 1d22aac8fd7433cd1319fb2ffea0a1e294609f64.patch -- indexing-notification: Handle TrackerMiner proxy being NULL on start-up +Patch3: https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/1d22aac8fd7433cd1319fb2ffea0a1e294609f64.patch BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -79,7 +85,7 @@ Summary: GNOME Photos -- Search Provider for GNOME Shell Group: Productivity/Graphics/Viewers Requires: %{name} = %{version} -Supplements: packageand(gnome-shell:%{name}) +Supplements: (gnome-shell and %{name}) %description -n gnome-shell-search-provider-gnome-photos This package contains a search provider to enable GNOME Shell to get ++++++ 1d22aac8fd7433cd1319fb2ffea0a1e294609f64.patch ++++++ >From 1d22aac8fd7433cd1319fb2ffea0a1e294609f64 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debars...@gnome.org> Date: Sat, 20 Mar 2021 18:33:45 +0100 Subject: [PATCH] indexing-notification: Handle TrackerMiner proxy being NULL on start-up The TrackerMiner proxy is created asynchronously. Therefore, there's a possibility that it doesn't exist when a Application::miners-changed signal is emitted. Fallout from bd087d67f938c29776842afbc3b7bc745d2ca9a2 https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/189 --- src/photos-indexing-notification.c | 75 +++++++++++++++++++----------- 1 file changed, 49 insertions(+), 26 deletions(-) diff --git a/src/photos-indexing-notification.c b/src/photos-indexing-notification.c index 9ac25826..d214e1fa 100644 --- a/src/photos-indexing-notification.c +++ b/src/photos-indexing-notification.c @@ -172,34 +172,14 @@ photos_indexing_notification_timeout (gpointer user_data) static void -photos_indexing_notification_check_notification_get_progress (GObject *source_object, - GAsyncResult *res, - gpointer user_data) +photos_indexing_notification_update_notification (PhotosIndexingNotification *self, gdouble miner_files_progress) { - PhotosIndexingNotification *self; GApplication *app; GList *miners_running; - TrackerMiner *miner_files = TRACKER_MINER (source_object); gboolean is_indexing_local = FALSE; gboolean is_indexing_remote = FALSE; - gdouble progress; - - { - g_autoptr (GError) error = NULL; - - if (!tracker_miner_call_get_progress_finish (miner_files, &progress, res, &error)) - { - if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) - goto out; - - g_warning ("Unable to get indexing progress from TrackerMiner proxy: %s", error->message); - progress = 1.0; - } - } - self = PHOTOS_INDEXING_NOTIFICATION (user_data); - - if (progress < 1) + if (miner_files_progress < 1) is_indexing_local = TRUE; app = g_application_get_default (); @@ -220,6 +200,32 @@ photos_indexing_notification_check_notification_get_progress (GObject *source_ob } else photos_indexing_notification_destroy (self, FALSE); +} + + +static void +photos_indexing_notification_miner_files_get_progress (GObject *source_object, GAsyncResult *res, gpointer user_data) +{ + PhotosIndexingNotification *self; + TrackerMiner *miner_files = TRACKER_MINER (source_object); + gdouble progress; + + { + g_autoptr (GError) error = NULL; + + if (!tracker_miner_call_get_progress_finish (miner_files, &progress, res, &error)) + { + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + goto out; + + g_warning ("Unable to get indexing progress from TrackerMiner proxy: %s", error->message); + progress = 1.0; + } + } + + self = PHOTOS_INDEXING_NOTIFICATION (user_data); + + photos_indexing_notification_update_notification (self, progress); out: return; @@ -227,15 +233,32 @@ photos_indexing_notification_check_notification_get_progress (GObject *source_ob static void -photos_indexing_notification_check_notification (PhotosIndexingNotification *self) +photos_indexing_notification_miner_files_progress (PhotosIndexingNotification *self) { tracker_miner_call_get_progress (self->miner_files, self->cancellable, - photos_indexing_notification_check_notification_get_progress, + photos_indexing_notification_miner_files_get_progress, self); } +static void +photos_indexing_notification_online_miners_changed (PhotosIndexingNotification *self) +{ + if (self->miner_files == NULL) + { + photos_indexing_notification_update_notification (self, 1.0); + } + else + { + tracker_miner_call_get_progress (self->miner_files, + self->cancellable, + photos_indexing_notification_miner_files_get_progress, + self); + } +} + + static void photos_indexing_notification_tracker_miner (GObject *source_object, GAsyncResult *res, gpointer user_data) { @@ -260,7 +283,7 @@ photos_indexing_notification_tracker_miner (GObject *source_object, GAsyncResult self->miner_files = g_object_ref (miner_files); g_signal_connect_swapped (self->miner_files, "progress", - G_CALLBACK (photos_indexing_notification_check_notification), + G_CALLBACK (photos_indexing_notification_miner_files_progress), self); out: @@ -348,7 +371,7 @@ photos_indexing_notification_init (PhotosIndexingNotification *self) g_signal_connect_object (app, "miners-changed", - G_CALLBACK (photos_indexing_notification_check_notification), + G_CALLBACK (photos_indexing_notification_online_miners_changed), self, G_CONNECT_SWAPPED); } -- GitLab ++++++ 5cafad57982fbef0d02b7ecb0b1a2c9f221de391.patch ++++++ >From 5cafad57982fbef0d02b7ecb0b1a2c9f221de391 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debars...@gnome.org> Date: Sat, 20 Mar 2021 18:25:33 +0100 Subject: [PATCH] indexing-notification: Remove unused variable Fallout from bd087d67f938c29776842afbc3b7bc745d2ca9a2 https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/189 --- src/photos-indexing-notification.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/photos-indexing-notification.c b/src/photos-indexing-notification.c index d819707e..9ac25826 100644 --- a/src/photos-indexing-notification.c +++ b/src/photos-indexing-notification.c @@ -179,7 +179,6 @@ photos_indexing_notification_check_notification_get_progress (GObject *source_ob PhotosIndexingNotification *self; GApplication *app; GList *miners_running; - GSList *running = NULL; TrackerMiner *miner_files = TRACKER_MINER (source_object); gboolean is_indexing_local = FALSE; gboolean is_indexing_remote = FALSE; @@ -223,7 +222,7 @@ photos_indexing_notification_check_notification_get_progress (GObject *source_ob photos_indexing_notification_destroy (self, FALSE); out: - g_slist_free_full (running, g_free); + return; } -- GitLab ++++++ gnome-photos-fix-vert-align.patch ++++++ >From a9767e638d78a7a9c2d0b54d5948cc74b8158d69 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval R <msand...@protonmail.com> Date: Mon, 5 Apr 2021 22:05:20 +0200 Subject: [PATCH] headerbar: Fix vertical alignment Fixes: https://gitlab.gnome.org/GNOME/gnome-photos/-/issues/172 --- src/photos-embed.ui | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/photos-embed.ui b/src/photos-embed.ui index fe893bdd..05ddd39b 100644 --- a/src/photos-embed.ui +++ b/src/photos-embed.ui @@ -21,7 +21,9 @@ <property name="orientation">GTK_ORIENTATION_VERTICAL</property> <property name="visible">1</property> <child> - <object class="PhotosMainToolbar" id="toolbar"/> + <object class="PhotosMainToolbar" id="toolbar"> + <property name="vexpand">False</property> + </object> </child> <child> <object class="GtkOverlay" id="stack_overlay"> -- GitLab
