gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

dev-libs/tvision: Fix invalid characters

Browse Source 
Gentoo-bug: 620824

Package-Manager: Portage-2.3.5, Repoman-2.3.1
This commit is contained in:
Andreas Sturmlechner 2017-06-05 01:13:18 +02:00
parent 34828651c9
commit 7912f0be85
No known key found for this signature in database
GPG Key ID: E7255695D8BA079E
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
View File

@ -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 @@

8
dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
View File

@ -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
}