Hello community, here is the log from the commit of package gnome-photos for openSUSE:Factory checked in at 2018-05-03 12:32:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-photos (Old) and /work/SRC/openSUSE:Factory/.gnome-photos.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-photos" Thu May 3 12:32:02 2018 rev:42 rq:602462 version:3.28.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-photos/gnome-photos.changes 2018-03-24 16:04:56.346080527 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-photos.new/gnome-photos.changes 2018-05-03 12:32:04.304943399 +0200 @@ -1,0 +2,15 @@ +Fri Apr 27 18:33:02 UTC 2018 - [email protected] + +- Add gnome-photos-Bump-minimum-GEGL-version.patch: build: Bump + minimum GEGL version to 0.4.0. +- Following the above, replace pkgconfig(gegl-0.3) with + pkgconfig(gegl-0.4) and add libtool BuildRequires aswell as + passing autoreconf since the patch touches the buildsystem. + +------------------------------------------------------------------- +Thu Apr 26 19:21:52 UTC 2018 - [email protected] + +- Add gnome-photos-export-unbreak-empty-trash-button.patch: + export-notification: Unbreak the "Empty Trash" button. + +------------------------------------------------------------------- New: ---- gnome-photos-Bump-minimum-GEGL-version.patch gnome-photos-export-unbreak-empty-trash-button.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-photos.spec ++++++ --- /var/tmp/diff_new_pack.a10jJN/_old 2018-05-03 12:32:04.848924031 +0200 +++ /var/tmp/diff_new_pack.a10jJN/_new 2018-05-03 12:32:04.852923888 +0200 @@ -23,13 +23,21 @@ License: GPL-3.0-or-later Group: Productivity/Graphics/Viewers URL: https://wiki.gnome.org/Design/Apps/Photos -Source: http://download.gnome.org/sources/gnome-photos/3.28/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-photos/3.28/%{name}-%{version}.tar.xz + +# PATCH-FIX-UPSTREAM gnome-photos-export-unbreak-empty-trash-button.patch -- export-notification: Unbreak the "Empty Trash" button on GNOME >= 3.26 +Patch0: gnome-photos-export-unbreak-empty-trash-button.patch +# PATCH-FEATURE-UPSTREAM gnome-photos-Bump-minimum-GEGL-version.patch -- build: Bump minimum GEGL version to 0.4.0 +Patch1: gnome-photos-Bump-minimum-GEGL-version.patch + BuildRequires: desktop-file-utils BuildRequires: fdupes # Technically seen, glib2-tools would require this, but it introduces a loop there. So explictly require here BuildRequires: gdk-pixbuf-loader-rsvg BuildRequires: itstool BuildRequires: libjpeg-devel +# Needed for patch1 +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: yelp-tools BuildRequires: pkgconfig(babl) @@ -37,7 +45,7 @@ BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(exempi-2.0) >= 1.99.5 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.32 -BuildRequires: pkgconfig(gegl-0.3) >= 0.3.28 +BuildRequires: pkgconfig(gegl-0.4) >= 0.4.0 BuildRequires: pkgconfig(geocode-glib-1.0) BuildRequires: pkgconfig(gexiv2) BuildRequires: pkgconfig(gio-2.0) @@ -57,6 +65,7 @@ BuildRequires: pkgconfig(librsvg-2.0) >= 2.26.0 BuildRequires: pkgconfig(tracker-control-2.0) BuildRequires: pkgconfig(tracker-sparql-2.0) + # gnome-photos references tracker's glib schemas Requires: tracker # If we want to be able to send photos to a remote DLNA renderer, we require the dbus service for it @@ -85,6 +94,8 @@ %autosetup -p1 %build +# Needed for patch1 +autoreconf -fiv %configure %make_build ++++++ gnome-photos-Bump-minimum-GEGL-version.patch ++++++ >From 4479b7da00ba788e85b463e06dbf57f633ec2c01 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <[email protected]> Date: Fri, 27 Apr 2018 10:52:37 +0200 Subject: [PATCH] build: Bump minimum GEGL version to 0.4.0 No code change needed. It's a natural progression from the unstable 0.3.x series to the stable 0.4.x series. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9d78c37..7c7751b 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ CAIRO_MIN_VERSION=1.14.0 DAZZLE_MIN_VERSION=3.26.0 GDATA_MIN_VERSION=0.15.2 GDK_PIXBUF_MIN_VERSION=2.32 -GEGL_MIN_VERSION=0.3.28 +GEGL_MIN_VERSION=0.4.0 GFBGRAPH_MIN_VERSION=0.2.1 GLIB_MIN_VERSION=2.44.0 GOA_MIN_VERSION=3.8.0 @@ -103,7 +103,7 @@ PKG_CHECK_MODULES(CAIRO, [cairo >= $CAIRO_MIN_VERSION cairo-gobject]) PKG_CHECK_MODULES(DAZZLE, [libdazzle-1.0 >= $DAZZLE_MIN_VERSION]) PKG_CHECK_MODULES(GFBGRAPH, [libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION]) PKG_CHECK_MODULES(GDATA, [libgdata >= $GDATA_MIN_VERSION]) -PKG_CHECK_MODULES(GEGL, [gegl-0.3 >= $GEGL_MIN_VERSION]) +PKG_CHECK_MODULES(GEGL, [gegl-0.4 >= $GEGL_MIN_VERSION]) PKG_CHECK_MODULES(GEOCODE, [geocode-glib-1.0]) PKG_CHECK_MODULES(GEXIV2, [gexiv2]) PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0 >= $GDK_PIXBUF_MIN_VERSION]) -- libgit2 0.27.0 ++++++ gnome-photos-export-unbreak-empty-trash-button.patch ++++++ >From 8ad2cbdd0cc8f0dbeb04ea04c91d716fcca3d04e Mon Sep 17 00:00:00 2001 From: Debarshi Ray <[email protected]> Date: Wed, 21 Mar 2018 18:22:48 +0100 Subject: [PATCH] export-notification: Unbreak the "Empty Trash" button on GNOME >= 3.26 The /org/gnome/SettingsDaemon/Housekeeping D-Bus object got moved to the org.gnome.SettingsDaemon.Housekeeping bus name when the gnome-settings-daemon plugins were split into their own processes in GNOME 3.26. Support for older GNOME versions have been retained to allow new Flatpaks to run on older host OSes. --- src/photos-export-notification.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/src/photos-export-notification.c b/src/photos-export-notification.c index 4f84276..9e2a2d4 100644 --- a/src/photos-export-notification.c +++ b/src/photos-export-notification.c @@ -106,6 +106,77 @@ photos_export_notification_close (PhotosExportNotification *self) static void +photos_export_notification_empty_trash_call_empty_trash (GObject *source_object, GAsyncResult *res, gpointer user_data) +{ + GDBusConnection *connection = G_DBUS_CONNECTION (source_object); + g_autoptr (GVariant) variant = NULL; + + { + g_autoptr (GError) error = NULL; + + variant = g_dbus_connection_call_finish (connection, res, &error); + if (error != NULL) + { + if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN) + || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_INTERFACE) + || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD) + || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_OBJECT)) + { + g_warning ("Unable to call org.gnome.SettingsDaemon.Housekeeping:EmptyTrash: " + "unknown interface/method/object/service"); + } + else + { + g_warning ("Unable to call org.gnome.SettingsDaemon.Housekeeping:EmptyTrash: %s", error->message); + } + } + } +} + + +static void +photos_export_notification_empty_trash_call_empty_trash_pre_3_26 (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + GDBusConnection *connection = G_DBUS_CONNECTION (source_object); + g_autoptr (GVariant) variant = NULL; + + { + g_autoptr (GError) error = NULL; + + variant = g_dbus_connection_call_finish (connection, res, &error); + if (error != NULL) + { + if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN) + || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_INTERFACE) + || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD) + || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_OBJECT)) + { + g_dbus_connection_call (connection, + "org.gnome.SettingsDaemon.Housekeeping", + "/org/gnome/SettingsDaemon/Housekeeping", + "org.gnome.SettingsDaemon.Housekeeping", + "EmptyTrash", + NULL, + NULL, + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + photos_export_notification_empty_trash_call_empty_trash, + NULL); + } + else + { + g_warning ("Unable to call org.gnome.SettingsDaemon.Housekeeping:EmptyTrash (GNOME < 3.26): %s", + error->message); + } + } + } +} + + +static void photos_export_notification_empty_trash_bus_get (GObject *source_object, GAsyncResult *result, gpointer user_data) { g_autoptr (PhotosExportNotification) self = PHOTOS_EXPORT_NOTIFICATION (user_data); @@ -132,7 +203,7 @@ photos_export_notification_empty_trash_bus_get (GObject *source_object, GAsyncRe G_DBUS_CALL_FLAGS_NONE, -1, NULL, - NULL, + photos_export_notification_empty_trash_call_empty_trash_pre_3_26, NULL); out: -- libgit2 0.27.0 >From 4771ebd38fde8feb92beea6b7b3b998a09a79823 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <[email protected]> Date: Wed, 21 Mar 2018 18:38:04 +0100 Subject: [PATCH] export-notification: Fix typo The housekeeping plugin's D-Bus name changed in GNOME 3.24, not 3.26, which was shipped in Fedora 26. Confusing! Fallout from 8ad2cbdd0cc8f0dbeb04ea04c91d716fcca3d04e --- src/photos-export-notification.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/photos-export-notification.c b/src/photos-export-notification.c index 9e2a2d4..e956c2c 100644 --- a/src/photos-export-notification.c +++ b/src/photos-export-notification.c @@ -135,7 +135,7 @@ photos_export_notification_empty_trash_call_empty_trash (GObject *source_object, static void -photos_export_notification_empty_trash_call_empty_trash_pre_3_26 (GObject *source_object, +photos_export_notification_empty_trash_call_empty_trash_pre_3_24 (GObject *source_object, GAsyncResult *res, gpointer user_data) { @@ -168,7 +168,7 @@ photos_export_notification_empty_trash_call_empty_trash_pre_3_26 (GObject *sourc } else { - g_warning ("Unable to call org.gnome.SettingsDaemon.Housekeeping:EmptyTrash (GNOME < 3.26): %s", + g_warning ("Unable to call org.gnome.SettingsDaemon.Housekeeping:EmptyTrash (GNOME < 3.24): %s", error->message); } } @@ -203,7 +203,7 @@ photos_export_notification_empty_trash_bus_get (GObject *source_object, GAsyncRe G_DBUS_CALL_FLAGS_NONE, -1, NULL, - photos_export_notification_empty_trash_call_empty_trash_pre_3_26, + photos_export_notification_empty_trash_call_empty_trash_pre_3_24, NULL); out: -- libgit2 0.27.0
