summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-06-05 01:13:18 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-06-05 01:14:28 +0200
commit7912f0be85446a42535ba2b4f8f73788e065407e (patch)
tree95de4a155f70cdadc7ea02b9a263ed600ae9942d /dev-libs/tvision/files
parentdev-libs/tvision: Revert gcc-6 fix (diff)
downloadgentoo-7912f0be85446a42535ba2b4f8f73788e065407e.tar.gz
gentoo-7912f0be85446a42535ba2b4f8f73788e065407e.tar.bz2
gentoo-7912f0be85446a42535ba2b4f8f73788e065407e.zip
dev-libs/tvision: Fix invalid characters
Gentoo-bug: 620824 Package-Manager: Portage-2.3.5, Repoman-2.3.1
Diffstat (limited to 'dev-libs/tvision/files')
-rw-r--r--dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch20
1 files changed, 9 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 30f8ade33547..8570bb04222e 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 @@