summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/tvision/Manifest1
-rw-r--r--dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch33
-rw-r--r--dev-libs/tvision/files/tvision-2.2.1.4-build-system.patch31
-rw-r--r--dev-libs/tvision/files/tvision-2.2.1.4-fix-dot-INC.patch30
-rw-r--r--dev-libs/tvision/files/tvision-2.2.1.4-fix-overloaded-abs.patch100
-rw-r--r--dev-libs/tvision/files/tvision-2.2.1.4-gcc6.patch45
-rw-r--r--dev-libs/tvision/tvision-2.2.1.4.ebuild71
7 files changed, 0 insertions, 311 deletions
diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index f2836cee41a9..fd96210a44dd 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1,2 +1 @@
-DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
DIST tvision-2.2.3.tar.gz 1150257 BLAKE2B a642f2b6b7c30b14fdebd97911230f9b108144f346aff327c7db9d29d230c476d556b5891e7c31e1a126b95c94a938d9ad414a0a19bf720d552f44dbe4f0ada3 SHA512 96785b7539c23cd205f7180024ed0b451fc4c33599d83e625c43a84b42e7fa4655ed2ccb4d0b885e1917e23bad7cb68b7d7ceda7dfdea95f8c1db3f0c59f4030
diff --git a/dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch b/dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch
deleted file mode 100644
index 6721aa9c029c..000000000000
--- a/dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 62fce1e63e92ae71e2ce061c40ba736f4b22f71d Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 8 Feb 2021 23:43:47 +0100
-Subject: [PATCH] [Gentoo-specific] fix linker paths
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- config.pl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config.pl b/config.pl
-index 4664baa..9e2cb96 100644
---- a/config.pl
-+++ b/config.pl
-@@ -179,13 +179,13 @@ if ($OS eq 'UNIX')
- # QNX 6.2 beta 3 workaround
- $MakeDefsRHIDE[3].='/lib ' if ($OSf eq 'QNXRtP');
- # Link with installed libraries
-- $MakeDefsRHIDE[3].=$realPrefix.'/lib';
-+ #$MakeDefsRHIDE[3].=$realPrefix.'/lib';
- $MakeDefsRHIDE[3].='/'.$conf{'libs-subdir'} if $conf{'libs-subdir'};
- $MakeDefsRHIDE[3].=' ';
- $MakeDefsRHIDE[3].='../../makes ' unless $conf{'libs-here'} eq 'no';
- $MakeDefsRHIDE[3].=$here.'/makes ' unless $conf{'libs-here'} eq 'no';
- $MakeDefsRHIDE[3].='../../intl/dummy ' if $UseDummyIntl;
-- $MakeDefsRHIDE[3].=$conf{'X11LibPath'}.' ' if ($conf{'HAVE_X11'} eq 'yes');
-+ #$MakeDefsRHIDE[3].=$conf{'X11LibPath'}.' ' if ($conf{'HAVE_X11'} eq 'yes');
- $MakeDefsRHIDE[3].=$AllegroPath.' ' if $conf{'HAVE_ALLEGRO'} eq 'yes';
- }
- elsif ($OS eq 'DOS')
---
-2.30.0
-
diff --git a/dev-libs/tvision/files/tvision-2.2.1.4-build-system.patch b/dev-libs/tvision/files/tvision-2.2.1.4-build-system.patch
deleted file mode 100644
index d2c1316a794e..000000000000
--- a/dev-libs/tvision/files/tvision-2.2.1.4-build-system.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/config.pl b/config.pl
-index 6a7a8b3..4664baa 100644
---- a/config.pl
-+++ b/config.pl
-@@ -1188,7 +1188,7 @@ sub GenerateMakefile
- $rep.="\t\$(MAKE) -C intl\n";
- }
- $text=~s/\@target_rules\@/$rep/g;
-- $rep="intl-dummy:\n\t\$(MAKE) -C intl/dummy\n";
-+ $rep="intl-dummy:\n\t\$(MAKE) prefix=\$(prefix) -C intl/dummy\n";
- $rep.="\tcp intl/dummy/libtvfintl.a $makeDir\n";
- $rep.="\tranlib $makeDir/libtvfintl.a\n" if $conf{'UseRanLib'};
- $text=~s/\@intl_dummy_rule\@/$rep/g;
-@@ -1273,7 +1273,7 @@ sub GenerateMakefile
- }
- if ($internac)
- {
-- $rep.="\ninstall-internac:\n\t\$(MAKE) -C intl install\n";
-+ $rep.="\ninstall-internac:\n\t\$(MAKE) prefix=\$(prefix) -C intl install\n";
- }
- $text=~s/\@install_rules\@/$rep/g;
-
-@@ -1293,7 +1293,7 @@ sub GenerateMakefile
- $rep.="\trm -f intl/dummy/*.lo\n";
- $rep.="\trm -f intl/dummy/*.a\n";
- $rep.="\t-\$(MAKE) -C examples clean\n";
-- $rep.="\t-\$(MAKE) -C intl clean\n";
-+ $rep.="\t-\$(MAKE) prefix=\$(prefix) -C intl clean\n";
- $rep.="\trm -f configure.cache\n";
- $rep.="\trm -f rhtv-config\$(EXE_EXT)\n";
- $text=~s/\@clean\@/$rep/g;
diff --git a/dev-libs/tvision/files/tvision-2.2.1.4-fix-dot-INC.patch b/dev-libs/tvision/files/tvision-2.2.1.4-fix-dot-INC.patch
deleted file mode 100644
index ee81c4febd5f..000000000000
--- a/dev-libs/tvision/files/tvision-2.2.1.4-fix-dot-INC.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/config.pl b/config.pl
-index caf9c2d..caf2ed3 100644
---- a/config.pl
-+++ b/config.pl
-@@ -5,8 +5,8 @@
- # To specify the compilation flags define the CFLAGS environment variable.
- #
-
--require "miscperl.pl";
--require "conflib.pl";
-+require "./miscperl.pl";
-+require "./conflib.pl";
-
- # This optimization is giving problems and current PCs are quite fast to
- # make a real difference.
-diff --git a/confignt.pl b/confignt.pl
-index e185f49..9ff7ae6 100644
---- a/confignt.pl
-+++ b/confignt.pl
-@@ -3,8 +3,8 @@
- # see copyrigh file for details
- #
-
--require "miscperl.pl";
--require "conflib.pl";
-+require "./miscperl.pl";
-+require "./conflib.pl";
-
- SeeCommandLine();
-
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
deleted file mode 100644
index aab66f3a8cba..000000000000
--- a/dev-libs/tvision/files/tvision-2.2.1.4-fix-overloaded-abs.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-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/files/tvision-2.2.1.4-gcc6.patch b/dev-libs/tvision/files/tvision-2.2.1.4-gcc6.patch
deleted file mode 100644
index e882e8539821..000000000000
--- a/dev-libs/tvision/files/tvision-2.2.1.4-gcc6.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/classes/tdesktop.cc b/classes/tdesktop.cc
-index 38f1be4..f8f44f0 100644
---- a/classes/tdesktop.cc
-+++ b/classes/tdesktop.cc
-@@ -26,6 +26,10 @@ Modified cursor behavior while desktop locked by Salvador E. Tropea (SET)
- #define Uses_TVCodePage
- #include <tv.h>
-
-+#include <cmath>
-+
-+using std::abs;
-+
- TDeskInit::TDeskInit( TBackground *(*cBackground)( TRect ) ) :
- createBackground( cBackground )
- {
-diff --git a/classes/tdisplay.cc b/classes/tdisplay.cc
-index 9225d48..ee5eca8 100644
---- a/classes/tdisplay.cc
-+++ b/classes/tdisplay.cc
-@@ -22,6 +22,10 @@ same used in original Turbo Vision for compatibility purposes.
- #define Uses_TVCodePage
- #include <tv.h>
-
-+#include <cmath>
-+
-+using std::abs;
-+
- // Remove me please!
- int TDisplay::dual_display=0;
-
-diff --git a/classes/x11/x11src.cc b/classes/x11/x11src.cc
-index 538457e..10f9911 100644
---- a/classes/x11/x11src.cc
-+++ b/classes/x11/x11src.cc
-@@ -98,6 +98,10 @@
- #define TIMER_ALARM SIGALRM
- #endif
-
-+#include <cmath>
-+
-+using std::abs;
-+
- const unsigned foWmin=5, foHmin=7, foWmax=20, foHmax=32;
- const int cursorDelay=300000;
-
diff --git a/dev-libs/tvision/tvision-2.2.1.4.ebuild b/dev-libs/tvision/tvision-2.2.1.4.ebuild
deleted file mode 100644
index 12f863d2694a..000000000000
--- a/dev-libs/tvision/tvision-2.2.1.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV=$(ver_rs 3 -)
-DESCRIPTION="Text User Interface that implements the well known CUA widgets"
-HOMEPAGE="http://tvision.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tvision/rhtvision_${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+X debug gpm"
-
-DOCS=( readme.txt THANKS TODO )
-HTML_DOCS=( www-site/. )
-
-# installed lib links to those
-RDEPEND="
- dev-libs/libbsd
- sys-apps/util-linux
- sys-libs/ncurses:0=
- gpm? ( sys-libs/gpm )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- x11-libs/libxcb:=
- )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-dot-INC.patch"
- "${FILESDIR}/${P}-ldconfig.patch"
- "${FILESDIR}/${P}-build-system.patch"
- "${FILESDIR}/${P}-gcc6.patch"
- "${FILESDIR}/${P}-flags.patch"
- "${FILESDIR}/${P}-fix-overloaded-abs.patch"
- "${FILESDIR}/${P}-Gentoo-specific-fix-linker-paths.patch"
-)
-
-src_configure() {
- tc-export CC CXX
-
- # Note: Do not use econf here, this isn't an autoconf configure script,
- # but a perl based script which simply calls config.pl
- ./configure --fhs \
- $(use_with debug debug) \
- --without-static \
- || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install \
- prefix="\${DESTDIR}/${EPREFIX}/usr" \
- libdir="\$(prefix)/$(get_libdir)"
-
- einstalldocs
-
- # remove CVS directory which gets copied over
- rm -r "${ED}/usr/share/doc/${P}/html/CVS" || die
-}