nonamedotc pushed to xfce4-power-manager (f21). "Added patch to fix xfpm panel plugin crashes in non-UTF8 locale"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue May 5 00:25:30 UTC 2015
>From ab41fb262a2f68c2ad1f4c1d306e1005bd119943 Mon Sep 17 00:00:00 2001
From: nonamedotc <nonamedotc at fedoraproject.org>
Date: Mon, 2 Mar 2015 18:14:09 -0600
Subject: Added patch to fix xfpm panel plugin crashes in non-UTF8 locale
diff --git a/fix-xfpm-startup-non-utf8.patch b/fix-xfpm-startup-non-utf8.patch
new file mode 100644
index 0000000..b98db8b
--- /dev/null
+++ b/fix-xfpm-startup-non-utf8.patch
@@ -0,0 +1,22 @@
+--- panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
++++ panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
+@@ -33,6 +33,7 @@
+ #ifdef XFCE_PLUGIN
+ #include <libxfce4panel/libxfce4panel.h>
+ #include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4util/libxfce4util.h>
+ #endif
+
+ #include "../power-manager-button.h"
+@@ -84,6 +85,8 @@ power_manager_plugin_construct (XfcePanelPlugin *plugin)
+ {
+ PowerManagerPlugin *power_manager_plugin;
+
++ xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
++
+ /* create the plugin */
+ power_manager_plugin = power_manager_plugin_new (plugin);
+
+--
+cgit v0.10.1
+
diff --git a/xfce4-power-manager.spec b/xfce4-power-manager.spec
index 416a481..04ea309 100644
--- a/xfce4-power-manager.spec
+++ b/xfce4-power-manager.spec
@@ -3,7 +3,7 @@
Name: xfce4-power-manager
Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Power management for the Xfce desktop environment
Group: User Interface/Desktops
@@ -12,6 +12,9 @@ URL: http://goodies.xfce.org/projects/applications/%{name}
#VCS: git:git://git.xfce.org/xfce/xfce4-power-manager
Source0: http://archive.xfce.org/src/apps/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
+# Fix xfpm panel plugin crash when locale is not utf-8
+# http://git.xfce.org/xfce/xfce4-power-manager/commit/?id=7e3be2a03b4d4b950b31554bb93ce0cebf29475e
+Patch1: fix-xfpm-startup-non-utf8.patch
BuildRequires: pkgconfig(libxfconf-0) >= 4.6.0
BuildRequires: pkgconfig(libxfce4ui-1) >= 4.7.0
@@ -38,6 +41,8 @@ preferences.
%prep
%setup -q
+%patch1 -b .non-utf8
+
%build
%configure
@@ -84,6 +89,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man1/%{name}.1.*
%changelog
+* Mon Mar 02 2015 Mukundan Ragavan <nonamedotc at fedoraproject.org> - 1.4.3-2
+- Added patch to fix xfpm panel plugin crashes in non-UTF8 locale
+
* Sat Feb 28 2015 Mukundan Ragavan <nonamedotc at fedoraproject.org> - 1.4.3-1
- Update to 1.4.3
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xfce4-power-manager.git/commit/?h=f21&id=ab41fb262a2f68c2ad1f4c1d306e1005bd119943
More information about the scm-commits
mailing list