From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/
Date: Fri, 5 Jul 2019 14:29:00 +0000 (UTC) [thread overview]
Message-ID: <1562336637.f524f5217331b84965e484eded8b5271b907fb6b.mgorny@gentoo> (raw)
commit: f524f5217331b84965e484eded8b5271b907fb6b
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Wed Jun 12 12:04:40 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 5 14:23:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f524f521
dev-libs/tvision: fix gcc-7 incompatibilities
With gcc-7, they way overloaded functions are handled has changed,
which led to build failures. This has been addressed by upstream,
see https://sourceforge.net/p/tvision/bugs/17/
Closes: https://bugs.gentoo.org/639492
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12245
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/tvision-2.2.1.4-fix-overloaded-abs.patch | 100 +++++++++++++++++++++
dev-libs/tvision/tvision-2.2.1.4.ebuild | 17 ++--
2 files changed, 108 insertions(+), 9 deletions(-)
diff --git a/dev-libs/tvision/files/tvision-2.2.1.4-fix-overloaded-abs.patch b/dev-libs/tvision/files/tvision-2.2.1.4-fix-overloaded-abs.patch
new file mode 100644
index 00000000000..aab66f3a8cb
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.1.4-fix-overloaded-abs.patch
@@ -0,0 +1,100 @@
+From 85185e7787b34545faf095b64935d80982b5cf81 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 12 Jun 2019 11:52:16 +0200
+Subject: [PATCH] Patches from upstream to address abs issue with >gcc-6 See
+ https://sourceforge.net/p/tvision/bugs/17/
+
+The patches declare inline static abs functions where they are
+needed to make gcc happy.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ classes/dos/sescreen.cc | 6 ++++++
+ classes/tdesktop.cc | 6 ++++++
+ classes/x11/x11src.cc | 6 ++++++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/classes/dos/sescreen.cc b/classes/dos/sescreen.cc
+index 4dd3195..8a500d5 100644
+--- a/classes/dos/sescreen.cc
++++ b/classes/dos/sescreen.cc
+@@ -248,6 +248,12 @@ static int is_plane_mode = 0;
+ static int TextModeXres;
+ static int TextModeYres;
+
++inline
++static unsigned abs(unsigned v)
++{
++ return unsigned(abs(int(v)));
++}
++
+ /*****************************************************************************
+
+ *************************** VESA BIOS ROUTINES ******************************
+diff --git a/classes/tdesktop.cc b/classes/tdesktop.cc
+index 38f1be4..26447eb 100644
+--- a/classes/tdesktop.cc
++++ b/classes/tdesktop.cc
+@@ -26,6 +26,12 @@ Modified cursor behavior while desktop locked by Salvador E. Tropea (SET)
+ #define Uses_TVCodePage
+ #include <tv.h>
+
++inline
++static unsigned abs(unsigned v)
++{
++ return unsigned(abs(int(v)));
++}
++
+ TDeskInit::TDeskInit( TBackground *(*cBackground)( TRect ) ) :
+ createBackground( cBackground )
+ {
+diff --git a/classes/x11/x11src.cc b/classes/x11/x11src.cc
+index 538457e..dc350df 100644
+--- a/classes/x11/x11src.cc
++++ b/classes/x11/x11src.cc
+@@ -141,6 +141,12 @@ void (*TScreenX11::writeLine)(int x, int y, int w, void *str, unsigned color)
+ void (*TScreenX11::redrawBuf)(int x, int y, unsigned w, unsigned off)=
+ TScreenX11::redrawBufCP;
+
++inline
++static unsigned abs(unsigned v)
++{
++ return unsigned(abs(int(v)));
++}
++
+ TScreenX11::~TScreenX11()
+ {
+ STOP_UPDATE_THREAD;
+--
+2.21.0
+
+From 9b9f1aea8c9972ab9c1e633835ed4359d7fe000c Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 12 Jun 2019 12:05:58 +0200
+Subject: [PATCH] classes/tdisplay.c: Also add abs patch to tdisplay.cc
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ classes/tdisplay.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/classes/tdisplay.cc b/classes/tdisplay.cc
+index 9225d48..569bc1d 100644
+--- a/classes/tdisplay.cc
++++ b/classes/tdisplay.cc
+@@ -22,6 +22,12 @@ same used in original Turbo Vision for compatibility purposes.
+ #define Uses_TVCodePage
+ #include <tv.h>
+
++inline
++static unsigned abs(unsigned v)
++{
++ return unsigned(abs(int(v)));
++}
++
+ // Remove me please!
+ int TDisplay::dual_display=0;
+
+--
+2.21.0
+
diff --git a/dev-libs/tvision/tvision-2.2.1.4.ebuild b/dev-libs/tvision/tvision-2.2.1.4.ebuild
index 0e8e0a50a55..4cbbeea9403 100644
--- a/dev-libs/tvision/tvision-2.2.1.4.ebuild
+++ b/dev-libs/tvision/tvision-2.2.1.4.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
+MY_PV=$(ver_rs 3 -)
DESCRIPTION="Text User Interface that implements the well known CUA widgets"
HOMEPAGE="http://tvision.sourceforge.net/"
-MY_PVR=${PVR:0:5}-${PVR:6}
-SRC_URI="mirror://sourceforge/tvision/rhtvision_${MY_PVR}.tar.gz"
+SRC_URI="mirror://sourceforge/tvision/rhtvision_${MY_PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -33,7 +34,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXmu
x11-libs/libXt
- x11-libs/libxcb
+ x11-libs/libxcb:=
)"
DEPEND="${RDEPEND}"
@@ -43,6 +44,7 @@ PATCHES=(
"${FILESDIR}/${P}-build-system.patch"
"${FILESDIR}/${P}-gcc6.patch"
"${FILESDIR}/${P}-flags.patch"
+ "${FILESDIR}/${P}-fix-overloaded-abs.patch"
)
src_configure() {
@@ -63,8 +65,5 @@ src_install() {
dosym rhtvision /usr/include/tvision
# remove CVS directory which gets copied over
- rm -rf "${ED%/}/usr/share/doc/${P}/html/CVS" || die
-
- # TODO: remove locales which are not needed, depending on current user
- # locale settings. How?
+ rm -r "${ED}/usr/share/doc/${P}/html/CVS" || die
}
next reply other threads:[~2019-07-05 14:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-05 14:29 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-10 5:38 [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/ Ionen Wolkens
2021-06-15 14:42 Sam James
2017-12-04 20:26 Patrice Clement
2017-11-29 23:19 Andreas Sturmlechner
2017-06-04 23:14 Andreas Sturmlechner
2017-06-03 21:26 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1562336637.f524f5217331b84965e484eded8b5271b907fb6b.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox