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

[Antonio Rojas]

    Date: Saturday, January 23, 2016 @ 21:39:33
  Author: arojas
Revision: 258529

Update to 2.1.0

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

--------------+
 PKGBUILD     |    2 +-
 locale.patch |   46 ----------------------------------------------
 2 files changed, 1 insertion(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-23 20:36:13 UTC (rev 258528)
+++ PKGBUILD	2016-01-23 20:39:33 UTC (rev 258529)
@@ -4,7 +4,7 @@
 
 pkgname=ffmpegthumbnailer
 pkgver=2.1.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="https://github.com/dirkvdb/ffmpegthumbnailer"
 license=('GPL2')

Deleted: locale.patch
===================================================================
--- locale.patch	2016-01-23 20:36:13 UTC (rev 258528)
+++ locale.patch	2016-01-23 20:39:33 UTC (rev 258529)
@@ -1,46 +0,0 @@
-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);