diff options
Diffstat (limited to 'dev-libs/tvision/files')
5 files changed, 136 insertions, 0 deletions
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 new file mode 100644 index 000000000000..d2c1316a794e --- /dev/null +++ b/dev-libs/tvision/files/tvision-2.2.1.4-build-system.patch @@ -0,0 +1,31 @@ +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 new file mode 100644 index 000000000000..ee81c4febd5f --- /dev/null +++ b/dev-libs/tvision/files/tvision-2.2.1.4-fix-dot-INC.patch @@ -0,0 +1,30 @@ +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-flags.patch b/dev-libs/tvision/files/tvision-2.2.1.4-flags.patch new file mode 100644 index 000000000000..832a0c7c2659 --- /dev/null +++ b/dev-libs/tvision/files/tvision-2.2.1.4-flags.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index 722fb29..f4128dc 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -31,7 +31,7 @@ examples: + $(MAKE) -C examples + + rhtv-config$(EXE_EXT): rhtv-config.c include/tv/configtv.h +- @GCC@ -o rhtv-config$(EXE_EXT) -Iinclude rhtv-config.c ++ @GCC@ -o rhtv-config$(EXE_EXT) $(CFLAGS) $(LDFLAGS) -Iinclude rhtv-config.c + + install-headers: + @install_headers@ 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 new file mode 100644 index 000000000000..e882e8539821 --- /dev/null +++ b/dev-libs/tvision/files/tvision-2.2.1.4-gcc6.patch @@ -0,0 +1,45 @@ +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/files/tvision-2.2.1.4-ldconfig.patch b/dev-libs/tvision/files/tvision-2.2.1.4-ldconfig.patch new file mode 100644 index 000000000000..f253eeecbcf4 --- /dev/null +++ b/dev-libs/tvision/files/tvision-2.2.1.4-ldconfig.patch @@ -0,0 +1,17 @@ +diff --git a/config.pl b/config.pl +index caf2ed3..6a7a8b3 100644 +--- a/config.pl ++++ b/config.pl +@@ -1270,12 +1270,6 @@ sub GenerateMakefile + $rep.="\t".GenInstallFiles('0644',"$makeDir/$ver",'$(libdir)'); + $stripDebug=($OSf eq 'Darwin') ? '-S' : '--strip-debug'; + $rep.="\tstrip $stripDebug \$(libdir)/$ver\n" unless $conf{'debugInfo'} eq 'yes'; +- # FreeBSD: merge data from libdir. +- # Darwin: doesn't have ldconfig. +- if ($OSf ne 'Darwin') +- { +- $rep.=($OSf eq 'FreeBSD') ? "\t-ldconfig -m \$(libdir)\n" : "\t-ldconfig\n"; +- } + } + if ($internac) + { |