nonamedotc pushed to xfdashboard (master). "Fix for crash due to missing icons"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Mar 27 02:21:51 UTC 2015
>From a358f163f672b59fc8ae71a19e1cd2d35963db35 Mon Sep 17 00:00:00 2001
From: Mukundan Ragavan <nonamedotc at fedoraproject.org>
Date: Thu, 26 Mar 2015 21:21:42 -0500
Subject: Fix for crash due to missing icons
diff --git a/Fix-crash-due-to-missing-icons.patch b/Fix-crash-due-to-missing-icons.patch
new file mode 100644
index 0000000..662e01b
--- /dev/null
+++ b/Fix-crash-due-to-missing-icons.patch
@@ -0,0 +1,28 @@
+From 8c5f8785c04f3725434a339615a4b2803e470315 Mon Sep 17 00:00:00 2001
+From: Stephan Haller <nomad at froevel.de>
+Date: Mon, 23 Mar 2015 07:27:23 +0100
+Subject: [PATCH] Do not throw error message (but a warning message) if neither
+ the requested icon nor the fallback icon can be loaded even if xfdashboard
+ will look more ugly than usual ;)
+
+That should fix some crashes seen at systems running Fedora.
+---
+ xfdashboard/image-content.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xfdashboard/image-content.c b/xfdashboard/image-content.c
+index 60489c5..53b0a2b 100644
+--- a/xfdashboard/image-content.c
++++ b/xfdashboard/image-content.c
+@@ -594,7 +594,7 @@ static void _xfdashboard_image_content_load_from_icon_name(XfdashboardImageConte
+ /* If we still got no icon info then we cannot load icon at all */
+ if(!iconInfo)
+ {
+- g_error(_("Could not lookup fallback icon for icon '%s'"), priv->iconName);
++ g_warning(_("Could not lookup fallback icon '%s' for icon '%s'"), XFDASHBOARD_IMAGE_CONTENT_FALLBACK_ICON_NAME, priv->iconName);
+ return;
+ }
+
+--
+2.3.3
+
diff --git a/xfdashboard.spec b/xfdashboard.spec
index 688920c..6e78739 100644
--- a/xfdashboard.spec
+++ b/xfdashboard.spec
@@ -1,12 +1,12 @@
Name: xfdashboard
Version: 0.3.90
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GNOME shell like dashboard for Xfce
License: GPLv2+
URL: http://xfdashboard.froevel.de
Source0: https://github.com/gmc-holle/xfdashboard/archive/%{version}.tar.gz
-Patch0: force-x11-clutter.patch
+Patch0: Fix-crash-due-to-missing-icons.patch
BuildRequires: libwnck3-devel
BuildRequires: clutter-devel
@@ -34,7 +34,7 @@ Additional themes for use with Xfdashboard
%prep
%setup -q
-## %patch0 -b .fix-clutter
+%patch0 -p1 -b .fix-icon-missing-crash
%build
export CFLAGS="%{optflags}"
@@ -79,6 +79,9 @@ fi
%{_datadir}/themes/%{name}-*
%changelog
+* Thu Mar 26 2015 Mukundan Ragavan <nonamedotc at fedoraproject.org> - 0.3.90-2
+- Fix for crash due to missing icons
+
* Wed Mar 18 2015 Mukundan Ragavan <nonamedotc at fedoraproject.org> - 0.3.90-1
- Update to 0.3.90
- Removed patch for forcing X11 backend in clutter
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xfdashboard.git/commit/?h=master&id=a358f163f672b59fc8ae71a19e1cd2d35963db35
More information about the scm-commits
mailing list