From b54b3be1ca8b12c86c1ae1963f536afcd19f7a3f Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 25 Sep 2012 15:25:33 +0000 Subject: Fix crash with en_GB locale wrt #419973 by Ciprian Ciubotariu (Portage version: 2.2.0_alpha128/cvs/Linux x86_64) --- xfce-extra/xfce4-power-manager/ChangeLog | 9 +++- ...ger-1.2.0-prevent_crash_with_locale-en_GB.patch | 24 +++++++++ .../xfce4-power-manager-1.2.0-r1.ebuild | 62 ++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch create mode 100644 xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r1.ebuild (limited to 'xfce-extra/xfce4-power-manager') diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog index f8c8ef24e84a..b11a92ead055 100644 --- a/xfce-extra/xfce4-power-manager/ChangeLog +++ b/xfce-extra/xfce4-power-manager/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for xfce-extra/xfce4-power-manager # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.55 2012/09/05 10:50:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.56 2012/09/25 15:25:33 ssuominen Exp $ + +*xfce4-power-manager-1.2.0-r1 (25 Sep 2012) + + 25 Sep 2012; Samuli Suominen + +xfce4-power-manager-1.2.0-r1.ebuild, + +files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch: + Fix crash with en_GB locale wrt #419973 by Ciprian Ciubotariu 05 Sep 2012; Samuli Suominen xfce4-power-manager-1.2.0.ebuild, metadata.xml: diff --git a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch new file mode 100644 index 000000000000..f43fe9d91c0c --- /dev/null +++ b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/419973 +http://bugzilla.xfce.org/show_bug.cgi?id=8992 + +--- po/en_GB.po ++++ po/en_GB.po +@@ -549,7 +549,6 @@ msgid "" + "%s until is fully charged." + msgstr "" +-"%s\n" +-"Your %s is charging (%i%%)\n" ++"%s (%i%%)\n" + "%s until is fully charged." + + #: ../src/xfpm-battery.c:232 ../src/xfpm-battery.c:268 +@@ -568,8 +567,7 @@ msgid "" + "%s (%i%%)\n" + "Estimated time left is %s." + msgstr "" +-"%s\n" +-"Your %s is discharging (%i%%)\n" ++"%s (%i%%)\n" + "Estimated time left is %s." + + #: ../src/xfpm-battery.c:250 ../src/xfpm-battery.c:271 diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r1.ebuild new file mode 100644 index 000000000000..c89a1e4dce89 --- /dev/null +++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r1.ebuild,v 1.1 2012/09/25 15:25:33 ssuominen Exp $ + +EAPI=4 +inherit flag-o-matic linux-info xfconf + +DESCRIPTION="Power manager for the Xfce desktop environment" +HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager" +SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="debug kernel_linux networkmanager policykit +udisks +xfce_plugins_brightness" + +COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 + >=dev-libs/glib-2.24 + >=sys-power/upower-0.9.16 + >=x11-libs/gtk+-2.20:2 + >=x11-libs/libnotify-0.7 + x11-libs/libX11 + >=x11-libs/libXrandr-1.2 + x11-libs/libXext + >=xfce-base/xfconf-4.10 + >=xfce-base/libxfce4ui-4.10 + >=xfce-base/libxfce4util-4.10 + policykit? ( >=sys-auth/polkit-0.104-r1 ) + xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 )" +RDEPEND="${COMMON_DEPEND} + networkmanager? ( net-misc/networkmanager ) + udisks? ( sys-fs/udisks:0 )" +DEPEND="${COMMON_DEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig + x11-proto/xproto" + +pkg_setup() { + PATCHES=( "${FILESDIR}"/${P}-prevent_crash_with_locale-en_GB.patch ) + + if use kernel_linux; then + CONFIG_CHECK="~TIMER_STATS" + linux-info_pkg_setup + fi + + XFCONF=( + $(use_enable policykit polkit) + --enable-dpms + $(use_enable networkmanager network-manager) + $(use_enable xfce_plugins_brightness panel-plugins) + $(xfconf_use_debug) + ) + + DOCS=( AUTHORS ChangeLog NEWS README TODO ) +} + +src_install() { + xfconf_src_install \ + docdir=/usr/share/doc/${PF}/html \ + imagesdir=/usr/share/doc/${PF}/html/images +} -- cgit v1.2.3-65-gdbad