[arch-commits] Commit in ffmpegthumbnailer/trunk (PKGBUILD locale.patch)

[Ronald van Haren]

    Date: Thursday, August 6, 2015 @ 10:43:37
  Author: ronald
Revision: 243069

add upstream patch:  Set locale to the user specified locale (FS#45905)

Added:
  ffmpegthumbnailer/trunk/locale.patch
Modified:
  ffmpegthumbnailer/trunk/PKGBUILD

--------------+
 PKGBUILD     |   13 ++++++++++---
 locale.patch |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-06 05:02:25 UTC (rev 243068)
+++ PKGBUILD	2015-08-06 08:43:37 UTC (rev 243069)
@@ -4,7 +4,7 @@
 
 pkgname=ffmpegthumbnailer
 pkgver=2.0.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="https://github.com/dirkvdb/ffmpegthumbnailer"
 license=('GPL2')
@@ -11,9 +11,16 @@
 arch=('i686' 'x86_64')
 depends=('ffmpeg' 'libjpeg' 'libpng')
 optdepends=('gvfs: support for gio uris')
-source=("https://github.com/dirkvdb/$pkgname/archive/$pkgver.tar.gz")
-sha1sums=('c947cb175dfc6b414046b2ffc7008246fa101f4f')
+source=("https://github.com/dirkvdb/$pkgname/archive/$pkgver.tar.gz"
+        "locale.patch")
+sha1sums=('c947cb175dfc6b414046b2ffc7008246fa101f4f'
+          '569d262435cd5ebc4515e2389df048e3630af034')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/locale.patch"
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./autogen.sh

Added: locale.patch
===================================================================
--- locale.patch	                        (rev 0)
+++ locale.patch	2015-08-06 08:43:37 UTC (rev 243069)
@@ -0,0 +1,46 @@
+From 718f1b1147fe7e9138e2d503ed151e589d643772 Mon Sep 17 00:00:00 2001
+From: Dirk Vanden Boer <dirk.vdb at gmail.com>
+Date: Sat, 18 Jul 2015 10:24:28 +0200
+Subject: [PATCH] Set locale to the user specified locale
+
+---
+ main.cpp            | 5 ++---
+ test/testrunner.cpp | 7 ++-----
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/main.cpp b/main.cpp
+index 6cb6c55..7cb7089 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -54,10 +54,9 @@ int main(int argc, char** argv)
+     string  outputFile;
+     string  imageFormat;
+ 
+-    if (!setlocale(LC_CTYPE, "en_US.UTF-8"))
++    if (!std::setlocale(LC_CTYPE, ""))
+     {
+-        std::cerr << "Locale not specified. Check LANG, LC_CTYPE, LC_ALL" << std::endl;
+-        return 1;
++        std::cerr << "Failed to set locale" << std::endl;
+     }
+ 
+     while ((option = getopt (argc, argv, "i:o:s:t:q:c:afwhvp")) != -1)
+diff --git a/unittest/testrunner.cpp b/unittest/testrunner.cpp
+index 7023d25..20a4903 100644
+--- a/unittest/testrunner.cpp
++++ b/unittest/testrunner.cpp
+@@ -4,12 +4,9 @@
+ #include <gtest/gtest.h>
+ 
+ int main(int argc, char **argv) {
+-    std::cout << "Running ffmpegthumbnailer tests" << std::endl;
+-
+-    if (!setlocale(LC_CTYPE, "en_US.UTF-8"))
++    if (!std::setlocale(LC_CTYPE, ""))
+     {
+-        std::cerr << "Locale not specified. Check LANG, LC_CTYPE, LC_ALL" << std::endl;
+-        return 1;
++        std::cerr << "Failed to set locale" << std::endl;
+     }
+ 
+     testing::InitGoogleTest(&argc, argv);