author | Ronald van Haren
<ronald@archlinux.org> 2015-08-06 08:43:37 UTC |
committer | Ronald van Haren
<ronald@archlinux.org> 2015-08-06 08:43:37 UTC |
parent | 1f4210ffed97befff8d22b3996cfb267e1834867 |
PKGBUILD | +10 | -3 |
locale.patch | +46 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index ba92766..655c493 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,15 +3,22 @@ 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') 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}" diff --git a/locale.patch b/locale.patch new file mode 100644 index 0000000..82347a0 --- /dev/null +++ b/locale.patch @@ -0,0 +1,46 @@ +From 718f1b1147fe7e9138e2d503ed151e589d643772 Mon Sep 17 00:00:00 2001 +From: Dirk Vanden Boer <dirk.vdb@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);