From d8c18cf11b7b57796be5d3a780878e63612ebec0 Mon Sep 17 00:00:00 2001 From: Phil Wyett Date: Dec 13 2018 04:18:44 +0000 Subject: Changes... See below... * Cherry pick patch to fix MapsContactStore.state not introspectable - Fixes: #1654206. --- diff --git a/gnome-maps.spec b/gnome-maps.spec index 126c046..2f61fd0 100644 --- a/gnome-maps.spec +++ b/gnome-maps.spec @@ -12,6 +12,8 @@ Source0: https://download.gnome.org/sources/%{name}/3.30/%{name}-%{versio # https://bugzilla.redhat.com/show_bug.cgi?id=1654199 Patch0: parsing_json_from_buffers.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1654206 +Patch1: mapscontactstore_state_not_introspectable.patch BuildRequires: gettext BuildRequires: meson @@ -43,6 +45,7 @@ GNOME Maps is a simple map application for the GNOME desktop. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build @@ -79,6 +82,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Maps.deskto %changelog * Thu Dec 13 2018 Phil Wyett - 3.30.2.1-2 - Cherry pick patch to fix deprecated parsing json from buffers (#1654199) +- Cherry pick patch to fix MapsContactStore.state not introspectable (#1654206) * Fri Nov 09 2018 Kalev Lember - 3.30.2.1-1 - Update to 3.30.2.1 diff --git a/mapscontactstore_state_not_introspectable.patch b/mapscontactstore_state_not_introspectable.patch new file mode 100644 index 0000000..6489b2d --- /dev/null +++ b/mapscontactstore_state_not_introspectable.patch @@ -0,0 +1,43 @@ +From 77b7a025b731fe4d3301f78de5a54f5335f3f68c Mon Sep 17 00:00:00 2001 +From: James Westman +Date: Sat, 8 Dec 2018 11:28:59 -0600 +Subject: [PATCH] lib: Fix MapsContactStore.state not introspectable + +This was caused by a bug in the Meson file where a necessary header file +was not passed to `gnome.generate_gir`. + +Fixes #140 +--- + lib/maps-contact-store.c | 2 +- + lib/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/maps-contact-store.c b/lib/maps-contact-store.c +index 1c9ea34..227fc5f 100644 +--- a/lib/maps-contact-store.c ++++ b/lib/maps-contact-store.c +@@ -84,7 +84,7 @@ maps_contact_store_class_init (MapsContactStoreClass *klass) + /** + * MapsContactStore:state: + * +- * The type of the contact. ++ * The current loading state of the contact store. + */ + pspec = g_param_spec_enum ("state", + "State", +diff --git a/lib/meson.build b/lib/meson.build +index c11fec2..6054364 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -56,7 +56,7 @@ libmaps = shared_library( + + gnome.generate_gir( + libmaps, +- sources: sources + [maps_enums[0], headers_private], ++ sources: sources + [maps_enums, headers_private], + nsversion: maps_gir_version, + namespace: maps_gir_name, + identifier_prefix: maps_ns, +-- +2.18.1 +