summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper KoƂodziej <kacper@kolodziej.in>2016-09-25 18:20:10 +0200
committerDavid Seifert <soap@gentoo.org>2016-10-01 22:11:13 +0200
commit0917103442096f6487409686fcfa29440587e040 (patch)
treef8731f689a03519af8b38023d1f36de7cbcff038
parentdev-util/staruml-bin: new ebuild. (diff)
downloadgentoo-0917103442096f6487409686fcfa29440587e040.tar.gz
gentoo-0917103442096f6487409686fcfa29440587e040.tar.bz2
gentoo-0917103442096f6487409686fcfa29440587e040.zip
app-editors/fte: fix cpp14 compilation errors; bug #595048
Change config generating Perl script to cast int literals to char in default config file to avoid narrowing conversions. Closes: https://github.com/gentoo/gentoo/pull/2411 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--app-editors/fte/files/fte-cpp14.patch17
-rw-r--r--app-editors/fte/fte-20051115-r3.ebuild3
2 files changed, 19 insertions, 1 deletions
diff --git a/app-editors/fte/files/fte-cpp14.patch b/app-editors/fte/files/fte-cpp14.patch
new file mode 100644
index 00000000000..bea83b6a5cc
--- /dev/null
+++ b/app-editors/fte/files/fte-cpp14.patch
@@ -0,0 +1,17 @@
+Fix C++14 compilation errors. Add casting int literals to char in config
+generator to avoid narrowing conversions.
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=595048
+
+--- a/src/mkdefcfg.pl
++++ b/src/mkdefcfg.pl
+@@ -24,8 +24,8 @@
+
+ @c = split(//, $buf);
+ for ($i = 0; $i < $len; $i++) {
+- $out .= sprintf("0x%02X", ord($c[$i]));
+- if ($n++ % 10) {
++ $out .= sprintf("(char)0x%02X", ord($c[$i]));
++ if ($n++ % 5) {
+ $out .= ", ";
+ } else {
+ $out .= ",\n";
diff --git a/app-editors/fte/fte-20051115-r3.ebuild b/app-editors/fte/fte-20051115-r3.ebuild
index 4f8ff930364..9818594ef2c 100644
--- a/app-editors/fte/fte-20051115-r3.ebuild
+++ b/app-editors/fte/fte-20051115-r3.ebuild
@@ -47,7 +47,8 @@ src_prepare() {
"${FILESDIR}"/fte-gcc34 \
"${FILESDIR}"/${PN}-new_keyword.patch \
"${FILESDIR}"/${PN}-slang.patch \
- "${FILESDIR}"/${PN}-interix.patch
+ "${FILESDIR}"/${PN}-interix.patch \
+ "${FILESDIR}"/${PN}-cpp14.patch # bug #595048
[[ -e /usr/include/linux/keyboard.h ]] && \
sed /usr/include/linux/keyboard.h -e '/wait.h/d' > src/hacked_keyboard.h