[arch-commits] Commit in xfce4-power-manager/trunk (2 files)

[Evangelos Foutras]

    Date: Thursday, May 31, 2012 @ 13:39:56
  Author: foutrelis
Revision: 160262

upgpkg: xfce4-power-manager 1.2.0-3

Fix FS#30055: Segmentation faults when inserting/removing charger.

Added:
  xfce4-power-manager/trunk/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch
Modified:
  xfce4-power-manager/trunk/PKGBUILD

--------------------------------------------------------+
 PKGBUILD                                               |   13 ++++-
 xfce4-power-manager-1.2.0-sync-en-gb-translation.patch |   34 +++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-31 17:12:14 UTC (rev 160261)
+++ PKGBUILD	2012-05-31 17:39:56 UTC (rev 160262)
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-power-manager
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Power manager for Xfce desktop"
 arch=('i686' 'x86_64')
 url="http://xfce-goodies.berlios.de/"
@@ -14,12 +14,19 @@
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2)
-sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9')
+source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2
+        xfce4-power-manager-1.2.0-sync-en-gb-translation.patch)
+sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9'
+            'c8e1dfafd685c2abf1fcc2b3682f5b1eb2e7f1d4fa557f11a7478437eef9a933')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Fix en_GB translation
+  # https://bugs.archlinux.org/task/30055
+  patch -d po -Np0 -i \
+    "$srcdir/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch"
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \

Added: xfce4-power-manager-1.2.0-sync-en-gb-translation.patch
===================================================================
--- xfce4-power-manager-1.2.0-sync-en-gb-translation.patch	                        (rev 0)
+++ xfce4-power-manager-1.2.0-sync-en-gb-translation.patch	2012-05-31 17:39:56 UTC (rev 160262)
@@ -0,0 +1,34 @@
+--- en_GB.po.orig	2012-05-31 20:18:09.000000000 +0300
++++ en_GB.po	2012-05-31 20:25:09.000000000 +0300
+@@ -345,9 +345,8 @@ msgid ""
+ "An application is currently disabling the automatic sleep. Doing this action "
+ "now may damage the working state of this application."
+ msgstr ""
+-"An application is currently disabling the automatic sleep, doing this action "
+-"now may damage the working state of this application, are you sure you want "
+-"to hibernate the system?"
++"An application is currently disabling the automatic sleep. Doing this action "
++"now may damage the working state of this application."
+ 
+ #: ../src/xfpm-power.c:331
+ msgid "Are you sure you want to hibernate the system?"
+@@ -548,8 +547,7 @@ msgid ""
+ "%s (%i%%)\n"
+ "%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 +566,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