rpms/gnome-color-manager
5
0
Fork 0
Code Issues Pull Requests Releases Activity

0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch: Backport

Browse Source 
a crash fix from mainline.
This commit is contained in:
Adam Jackson 2011-10-06 10:25:24 -04:00
parent 2d46120054
commit fa7b92dc42
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch Normal file
View File

@ -0,0 +1,27 @@
From e0c575ea768f2f5bb01cfc02908ddd48e691999d Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 3 Oct 2011 00:49:55 +0200
Subject: [PATCH] Initialize error pointer for
gdk_pixbuf_new_from_file_at_size properly
Signed-off-by: Richard Hughes <richard@hughsie.com>
---
src/gcm-calibrate-main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/gcm-calibrate-main.c b/src/gcm-calibrate-main.c
index b8ef50a..cdf25ac 100644
--- a/src/gcm-calibrate-main.c
+++ b/src/gcm-calibrate-main.c
@@ -2072,7 +2072,7 @@ gcm_calib_image_changed_cb (GcmCalibrate *calibrate,
{
gchar *path;
GdkPixbuf *pixbuf;
- GError *error;
+ GError *error = NULL;
if (filename != NULL) {
path = g_build_filename (GCM_DATA, "icons", filename, NULL);
--
1.7.6.4

8
gnome-color-manager.spec
View File

@ -1,11 +1,12 @@
Summary: Color management tools for GNOME Summary: Color management tools for GNOME
Name: gnome-color-manager Name: gnome-color-manager
Version: 3.2.0 Version: 3.2.0
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://projects.gnome.org/gnome-color-manager/ URL: http://projects.gnome.org/gnome-color-manager/
Source0: http://download.gnome.org/sources/gnome-color-manager/3.2/%{name}-%{version}.tar.xz Source0: http://download.gnome.org/sources/gnome-color-manager/3.2/%{name}-%{version}.tar.xz
Patch0: 0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch
Requires: color-filesystem >= 1-7 Requires: color-filesystem >= 1-7
Requires: gnome-icon-theme Requires: gnome-icon-theme
@ -49,6 +50,7 @@ and generate color profiles in the GNOME desktop.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .rui
%build %build
%configure --disable-scrollkeeper --disable-schemas-install %configure --disable-scrollkeeper --disable-schemas-install
@ -102,6 +104,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/dbus-1/services/org.gnome.ColorManager.service %{_datadir}/dbus-1/services/org.gnome.ColorManager.service
%changelog %changelog
* Thu Oct 06 2011 Adam Jackson <ajax@redhat.com> 3.2.0-3
- 0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch: Backport
a crash fix from mainline.
* Mon Sep 26 2011 Richard Hughes <rhughes@redhat.com> - 3.2.0-2 * Mon Sep 26 2011 Richard Hughes <rhughes@redhat.com> - 3.2.0-2
- Rebuild for libmash API update. - Rebuild for libmash API update.