diff --git a/geeqie-1.1-cms-screen-profile.patch b/geeqie-1.1-cms-screen-profile.patch new file mode 100644 index 0000000..4b48c3e --- /dev/null +++ b/geeqie-1.1-cms-screen-profile.patch @@ -0,0 +1,12 @@ +diff -Nurb --strip-trailing-cr geeqie-1.1-orig/src/layout_util.c geeqie-1.1/src/layout_util.c +--- geeqie-1.1-orig/src/layout_util.c 2012-08-12 22:13:41.000000000 +0200 ++++ geeqie-1.1/src/layout_util.c 2014-05-28 12:55:30.080458921 +0200 +@@ -2313,7 +2313,7 @@ + if (layout_image_color_profile_get_status(lw, &image_profile, &screen_profile)) + { + gchar *buf; +- buf = g_strdup_printf(_("Image profile: %s\nScreen profile: %s"), image_profile, screen_profile); ++ buf = g_strdup_printf(_("Image profile: %s"), image_profile); + g_object_set(G_OBJECT(action), "tooltip", buf, NULL); + g_free(image_profile); + g_free(screen_profile); diff --git a/geeqie.spec b/geeqie.spec index 4d885ff..6b99799 100644 --- a/geeqie.spec +++ b/geeqie.spec @@ -8,7 +8,7 @@ Summary: Image browser and viewer Name: geeqie Version: 1.1 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ Group: User Interface/X Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz @@ -40,6 +40,8 @@ Patch7: geeqie-1.1-large-files.patch Patch8: geeqie-1.1-lcms2.patch # from master Patch9: geeqie-1.1-percent-char-in-filenames.patch +# don't print CMS screen profileID "garbage" that crashes g_markup +Patch10: geeqie-1.1-cms-screen-profile.patch BuildRequires: gtk2-devel %if %{with lcms1} @@ -100,6 +102,7 @@ done autoreconf -f -i %endif %patch9 -p1 -b .percent-char-in-filenames +%patch10 -p1 -b .cms-screen-profile %build %configure --enable-lirc --disable-tiff \ @@ -149,6 +152,10 @@ update-desktop-database &> /dev/null || : %changelog +* Wed May 28 2014 Michael Schwendt - 1.1-19 +- Don't print CMS screen profileID garbage that crashes g_markup + (this should also fix #1051660). + * Tue May 27 2014 Michael Schwendt - 1.1-18 - Merge fix for avoiding crash due to inexistent files in collections. This also replaces the history path_list patch.