[gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/

[Andreas Sturmlechner]

commit:     7912f0be85446a42535ba2b4f8f73788e065407e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  4 23:13:18 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun  4 23:14:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7912f0be

dev-libs/tvision: Fix invalid characters

Gentoo-bug: 620824

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch | 20 +++++++++-----------
 dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild        |  8 ++++++++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch 
b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
index 30f8ade3354..8570bb04222 100644
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
@@ -28,21 +28,19 @@ Fix gcc-6 compilation errors; bug 594176
  
 --- a/classes/tvtext1.cc
 +++ b/classes/tvtext1.cc
-@@ -110,10 +110,10 @@
+@@ -110,8 +110,8 @@
  char TCheckBoxes::button[] = " [ ] ";
  char TCheckBoxes::obutton[] = " [ ] ";
  
--TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178}; // ���
--TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178}; // ���
--TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178}; // ���
--TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178}; // ���
-+TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 
178}; // ���
-+TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 
178}; // ���
-+TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 
178}; // ���
-+TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 
178}; // ���
+-TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178};
+-TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178};
+-TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178};
+-TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178};
++TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 
178};
++TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 
178};
++TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 
178};
++TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 
178};
  
- char TButton::shadows[] = "\xDC\xDB\xDF"; // ���
- char TButton::oshadows[] = "\xDC\xDB\xDF"; // ���
 --- a/classes/x11/x11src.cc
 +++ b/classes/x11/x11src.cc
 @@ -94,6 +94,10 @@

diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild 
b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
index 3e21aab2f9e..800f4b2a0c1 100644
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
@@ -30,6 +30,14 @@ PATCHES=(
        "${FILESDIR}/${P}-build-system.patch" # for EAPI=6
 )
 
+src_prepare() {
+       # Strip hunk from invalid characters for gcc6.patch
+       sed -e ":TScrollChars: s:; // \x1E\x1F\xB1\xFE\xB2:;:" \
+               -e ":TScrollChars: s:; // \x11\x10\xB1\xFE\xB2:;:" \
+               -i classes/tvtext1.cc || die
+       default
+}
+
 src_configure() {
        ./configure --fhs || die
 }