dev-libs/tvision: Fix invalid characters

Gentoo-bug: 620824

Package-Manager: Portage-2.3.5, Repoman-2.3.1

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 30f8ade335478d4b95c447f5b9465c636ede94b6..8570bb04222eab3b68caaa6f1331393a89e0d1d4 100644 (file)
--- 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}; // \1e\1f±þ²
--TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178}; // \1e\1f±þ²
--TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178}; // \11\10±þ²
--TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178}; // \11\10±þ²
-+TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178}; // \1e\1f±þ²
-+TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178}; // \1e\1f±þ²
-+TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178}; // \11\10±þ²
-+TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178}; // \11\10±þ²
+-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 3e21aab2f9e4093df9e8675e44d4da11e83e6b8b..800f4b2a0c145217ac28d4952a95f4a0be30d24b 100644 (file)
--- 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
 }