diff --git a/0001-Fix-override-of-GtkApplication-startup-method.patch b/0001-Fix-override-of-GtkApplication-startup-method.patch new file mode 100644 index 0000000..3603c07 --- /dev/null +++ b/0001-Fix-override-of-GtkApplication-startup-method.patch @@ -0,0 +1,38 @@ +From eecccec11134227c1ecbd3654951ebf6579022ad Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Mon, 7 Apr 2014 20:08:21 +0100 +Subject: [PATCH] Fix override of GtkApplication startup method + +When overriding the startup method the parent impl must be +the first thing invoked. + +Signed-off-by: Daniel P. Berrange +--- + src/frontend/entangle-application.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/frontend/entangle-application.c b/src/frontend/entangle-application.c +index cff99cf..8b30c30 100644 +--- a/src/frontend/entangle-application.c ++++ b/src/frontend/entangle-application.c +@@ -158,6 +158,8 @@ static void entangle_application_startup(GApplication *gapp) + EntangleApplicationPrivate *priv = app->priv; + GList *cameras = NULL, *tmp; + ++ (*G_APPLICATION_CLASS(entangle_application_parent_class)->startup)(gapp); ++ + if (entangle_preferences_interface_get_auto_connect(priv->preferences)) + cameras = tmp = entangle_camera_list_get_cameras(priv->cameras); + +@@ -181,8 +183,6 @@ static void entangle_application_startup(GApplication *gapp) + } + g_list_free(cameras); + } +- +- (*G_APPLICATION_CLASS(entangle_application_parent_class)->startup)(gapp); + } + + +-- +1.9.0 + diff --git a/entangle.spec b/entangle.spec index 490b08a..094f2ed 100644 --- a/entangle.spec +++ b/entangle.spec @@ -8,10 +8,11 @@ Summary: Tethered shooting & control of digital cameras Name: entangle Version: 0.5.4 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: GPLv3+ Group: Applications/Multimedia Source: http://entangle-photo.org/download/sources/%{name}-%{version}.tar.gz +Patch1: 0001-Fix-override-of-GtkApplication-startup-method.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://entangle-photo.org/ @@ -47,6 +48,7 @@ and 'hands off' shooting directly from the controlling computer. %prep %setup -q +%patch1 -p1 %build @@ -115,6 +117,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas ||: %dir %{_datadir}/%{name}/plugins %changelog +* Mon Apr 7 2014 Daniel P. Berrange - 0.5.4-3 +- Fix crash in GtkApplication startup with GTK >= 3.12 + * Wed Jan 22 2014 Daniel P. Berrange - 0.5.4-2 - Rebuild for new LibRaw