| 1 |
commit: 7912f0be85446a42535ba2b4f8f73788e065407e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 4 23:13:18 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 4 23:14:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7912f0be |
| 7 |
|
| 8 |
dev-libs/tvision: Fix invalid characters |
| 9 |
|
| 10 |
Gentoo-bug: 620824 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
| 13 |
|
| 14 |
dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch | 20 +++++++++----------- |
| 15 |
dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild | 8 ++++++++ |
| 16 |
2 files changed, 17 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index 30f8ade3354..8570bb04222 100644 |
| 20 |
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch |
| 21 |
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch |
| 22 |
@@ -28,21 +28,19 @@ Fix gcc-6 compilation errors; bug 594176 |
| 23 |
|
| 24 |
--- a/classes/tvtext1.cc |
| 25 |
+++ b/classes/tvtext1.cc |
| 26 |
-@@ -110,10 +110,10 @@ |
| 27 |
+@@ -110,8 +110,8 @@ |
| 28 |
char TCheckBoxes::button[] = " [ ] "; |
| 29 |
char TCheckBoxes::obutton[] = " [ ] "; |
| 30 |
|
| 31 |
--TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178}; // ±þ² |
| 32 |
--TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178}; // ±þ² |
| 33 |
--TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178}; // ±þ² |
| 34 |
--TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178}; // ±þ² |
| 35 |
-+TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178}; // ±þ² |
| 36 |
-+TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178}; // ±þ² |
| 37 |
-+TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178}; // ±þ² |
| 38 |
-+TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178}; // ±þ² |
| 39 |
+-TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178}; |
| 40 |
+-TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178}; |
| 41 |
+-TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178}; |
| 42 |
+-TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178}; |
| 43 |
++TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178}; |
| 44 |
++TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178}; |
| 45 |
++TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178}; |
| 46 |
++TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178}; |
| 47 |
|
| 48 |
- char TButton::shadows[] = "\xDC\xDB\xDF"; // ÜÛß |
| 49 |
- char TButton::oshadows[] = "\xDC\xDB\xDF"; // ÜÛß |
| 50 |
--- a/classes/x11/x11src.cc |
| 51 |
+++ b/classes/x11/x11src.cc |
| 52 |
@@ -94,6 +94,10 @@ |
| 53 |
|
| 54 |
diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild |
| 55 |
index 3e21aab2f9e..800f4b2a0c1 100644 |
| 56 |
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild |
| 57 |
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild |
| 58 |
@@ -30,6 +30,14 @@ PATCHES=( |
| 59 |
"${FILESDIR}/${P}-build-system.patch" # for EAPI=6 |
| 60 |
) |
| 61 |
|
| 62 |
+src_prepare() { |
| 63 |
+ # Strip hunk from invalid characters for gcc6.patch |
| 64 |
+ sed -e ":TScrollChars: s:; // \x1E\x1F\xB1\xFE\xB2:;:" \ |
| 65 |
+ -e ":TScrollChars: s:; // \x11\x10\xB1\xFE\xB2:;:" \ |
| 66 |
+ -i classes/tvtext1.cc || die |
| 67 |
+ default |
| 68 |
+} |
| 69 |
+ |
| 70 |
src_configure() { |
| 71 |
./configure --fhs || die |
| 72 |
} |
Archives