Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/uchardet/files/, dev-libs/uchardet/
Date: Tue, 02 Feb 2016 11:09:35
Message-Id: 1454380080.3f45f91de0a6998760c3dbb3e827bacd95f0d46f.monsieurp@gentoo
1 commit: 3f45f91de0a6998760c3dbb3e827bacd95f0d46f
2 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
3 AuthorDate: Tue Feb 2 02:28:00 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 2 02:28:00 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f45f91d
7
8 dev-libs/uchardet: revbump to 0.0.5-r1 to fix return code on error
9
10 Package-Manager: portage-2.2.27
11
12 .../uchardet-0.0.5-fix-return-code-on-error.patch | 19 +++++++++++++++++++
13 ...uchardet-0.0.5.ebuild => uchardet-0.0.5-r1.ebuild} | 1 +
14 2 files changed, 20 insertions(+)
15
16 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
17 new file mode 100644
18 index 0000000..3b943af
19 --- /dev/null
20 +++ b/dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch
21 @@ -0,0 +1,19 @@
22 +commit 248d6dbd351c22989090d318128cb38b11a89f98
23 +Author: Jehan <jehan@×××××××××.io>
24 +Date: Thu Jan 21 18:16:42 2016 +0100
25 +
26 + tools: exit with non-zero value on uchardet error.
27 +
28 +diff --git a/src/tools/uchardet.cpp b/src/tools/uchardet.cpp
29 +index 91912a0..bcfa234 100644
30 +--- a/src/tools/uchardet.cpp
31 ++++ b/src/tools/uchardet.cpp
32 +@@ -60,7 +60,7 @@ void detect(FILE * fp)
33 + if (retval != 0)
34 + {
35 + fprintf(stderr, "Handle data error.\n");
36 +- exit(0);
37 ++ exit(1);
38 + }
39 + }
40 + uchardet_data_end(handle);
41
42 diff --git a/dev-libs/uchardet/uchardet-0.0.5.ebuild b/dev-libs/uchardet/uchardet-0.0.5-r1.ebuild
43 similarity index 93%
44 rename from dev-libs/uchardet/uchardet-0.0.5.ebuild
45 rename to dev-libs/uchardet/uchardet-0.0.5-r1.ebuild
46 index 1c0d57e..0dd0764 100644
47 --- a/dev-libs/uchardet/uchardet-0.0.5.ebuild
48 +++ b/dev-libs/uchardet/uchardet-0.0.5-r1.ebuild
49 @@ -18,6 +18,7 @@ IUSE="static-libs test"
50 PATCHES=(
51 "${FILESDIR}/${P}-fix-ASCII-detection.patch"
52 "${FILESDIR}/${P}-use-proper-package-name.patch"
53 + "${FILESDIR}/${P}-fix-return-code-on-error.patch"
54 )
55
56 src_prepare() {