diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch')
-rw-r--r-- | media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch new file mode 100644 index 00000000000..b1a198a93a1 --- /dev/null +++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-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/test/testrunner.cpp b/test/testrunner.cpp +index 7023d25..20a4903 100644 +--- a/test/testrunner.cpp ++++ b/test/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); |