diff options
Diffstat (limited to 'dev-libs/tvision/files')
5 files changed, 0 insertions, 239 deletions
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; - |