From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 30E05139694 for ; Sun, 4 Jun 2017 23:14:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C10321C03C; Sun, 4 Jun 2017 23:14:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E0AF21C03C for ; Sun, 4 Jun 2017 23:14:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 254DA3418EA for ; Sun, 4 Jun 2017 23:14:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 200FB746E for ; Sun, 4 Jun 2017 23:14:51 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1496618068.7912f0be85446a42535ba2b4f8f73788e065407e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild X-VCS-Directories: dev-libs/tvision/ dev-libs/tvision/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7912f0be85446a42535ba2b4f8f73788e065407e X-VCS-Branch: master Date: Sun, 4 Jun 2017 23:14:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5fdeaf35-2e5b-4cbc-8fe8-a986a2d92179 X-Archives-Hash: a70f385236ddce5bffc1e4dfbd6747f7 commit: 7912f0be85446a42535ba2b4f8f73788e065407e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 4 23:13:18 2017 +0000 Commit: Andreas Sturmlechner gentoo 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 }