diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2016-02-02 11:07:23 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2016-02-02 11:07:23 +0000 |
| commit | d51e130844cbe489a07676e281dc5d19dec8025f (patch) | |
| tree | 4378a6cc71b8238288ef84a62ca8c7ed609de765 /dev-libs/uchardet | |
| parent | Merge remote-tracking branch 'github/pr/767'. (diff) | |
| parent | dev-libs/uchardet: revbump to 0.0.5-r1 to fix return code on error (diff) | |
| download | gentoo-d51e130844cbe489a07676e281dc5d19dec8025f.tar.gz gentoo-d51e130844cbe489a07676e281dc5d19dec8025f.tar.bz2 gentoo-d51e130844cbe489a07676e281dc5d19dec8025f.zip | |
Merge remote-tracking branch 'github/pr/768'.
Diffstat (limited to 'dev-libs/uchardet')
| -rw-r--r-- | dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch | 19 | ||||
| -rw-r--r-- | dev-libs/uchardet/uchardet-0.0.5-r1.ebuild (renamed from dev-libs/uchardet/uchardet-0.0.5.ebuild) | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch b/dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch new file mode 100644 index 000000000000..3b943afea15d --- /dev/null +++ b/dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch @@ -0,0 +1,19 @@ +commit 248d6dbd351c22989090d318128cb38b11a89f98 +Author: Jehan <jehan@girinstud.io> +Date: Thu Jan 21 18:16:42 2016 +0100 + + tools: exit with non-zero value on uchardet error. + +diff --git a/src/tools/uchardet.cpp b/src/tools/uchardet.cpp +index 91912a0..bcfa234 100644 +--- a/src/tools/uchardet.cpp ++++ b/src/tools/uchardet.cpp +@@ -60,7 +60,7 @@ void detect(FILE * fp) + if (retval != 0) + { + fprintf(stderr, "Handle data error.\n"); +- exit(0); ++ exit(1); + } + } + uchardet_data_end(handle); diff --git a/dev-libs/uchardet/uchardet-0.0.5.ebuild b/dev-libs/uchardet/uchardet-0.0.5-r1.ebuild index 1c0d57eb5393..0dd07643a822 100644 --- a/dev-libs/uchardet/uchardet-0.0.5.ebuild +++ b/dev-libs/uchardet/uchardet-0.0.5-r1.ebuild @@ -18,6 +18,7 @@ IUSE="static-libs test" PATCHES=( "${FILESDIR}/${P}-fix-ASCII-detection.patch" "${FILESDIR}/${P}-use-proper-package-name.patch" + "${FILESDIR}/${P}-fix-return-code-on-error.patch" ) src_prepare() { |