* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/
@ 2017-11-29 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2017-11-29 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 00b1c4b1bd755b05fdddca6c1f4e696892f8e117
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sat Nov 25 14:04:50 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 23:19:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b1c4b1
dev-libs/tvision: Version bump to 2.2.1.4
Copied over from release 2.1.0_pre2-r4
Add some USE flags: X, debug, gpm
Update metadata.xml: Add maintainer, longdescription, use
Application to proxy maintaining this package.
Closes: https://bugs.gentoo.org/638794
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6295
dev-libs/tvision/Manifest | 3 +-
.../files/tvision-2.2.1.4-build-system.patch | 31 ++++++++++
.../files/tvision-2.2.1.4-fix-dot-INC.patch | 30 ++++++++++
dev-libs/tvision/files/tvision-2.2.1.4-flags.patch | 13 ++++
dev-libs/tvision/files/tvision-2.2.1.4-gcc6.patch | 45 ++++++++++++++
.../tvision/files/tvision-2.2.1.4-ldconfig.patch | 17 ++++++
dev-libs/tvision/metadata.xml | 17 +++++-
dev-libs/tvision/tvision-2.2.1.4.ebuild | 70 ++++++++++++++++++++++
8 files changed, 224 insertions(+), 2 deletions(-)
diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index e976d4ba28a..c74c34504d3 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1 +1,2 @@
-DIST rhtvision_2.1.0-2.tar.gz 1590449 SHA256 fef19d839069dea2cd5459f24a190883a3b2b600a60d6f7823f456d8e6889412 SHA512 0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1 WHIRLPOOL 5ce2e0bd7eb161aaef520a3bfafde7146784ac5a9d528ce73a51f502b23d790f42caeee5028508a8902615dfa31e295a988daef341f3fa3f6bb1c360b4b90d2b
+DIST rhtvision_2.1.0-2.tar.gz 1590449 BLAKE2B f5c31f997396f7b41b40089d3ebad8cdb5f24fce22f19defe3530d8a6cfcd728bf9cd3bcbb4e5d1d76c1fa3bc13c3b84f1147bd3c5aa07810077f5f159684eb0 SHA512 0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1
+DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
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 00000000000..d2c1316a794
--- /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 00000000000..ee81c4febd5
--- /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 00000000000..832a0c7c265
--- /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 00000000000..e882e853982
--- /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 00000000000..f253eeecbcf
--- /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)
+ {
diff --git a/dev-libs/tvision/metadata.xml b/dev-libs/tvision/metadata.xml
index ae4bd97fa26..8fc9090f78d 100644
--- a/dev-libs/tvision/metadata.xml
+++ b/dev-libs/tvision/metadata.xml
@@ -1,7 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>waebbl@gmail.com</email>
+ <name>Bernd Waibel</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Text User Interface (TUI) that implements the well known CUA widgets.
+ </longdescription>
+ <use>
+ <flag restrict=">dev-libs/tvision-2.2.1-r4" name="gpm">
+ Support text mode mouse through <pkg>sys-libs/gpm</pkg>
+ </flag>
+ </use>
<upstream>
<remote-id type="sourceforge">tvision</remote-id>
</upstream>
diff --git a/dev-libs/tvision/tvision-2.2.1.4.ebuild b/dev-libs/tvision/tvision-2.2.1.4.ebuild
new file mode 100644
index 00000000000..0e8e0a50a55
--- /dev/null
+++ b/dev-libs/tvision/tvision-2.2.1.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+X debug gpm"
+
+DOCS=( readme.txt THANKS TODO )
+HTML_DOCS=( www-site/. )
+
+S=${WORKDIR}/${PN}
+
+# 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"
+)
+
+src_configure() {
+ # 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
+ 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?
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/
@ 2021-08-10 5:38 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2021-08-10 5:38 UTC (permalink / raw
To: gentoo-commits
commit: a869257503e4e8c79ca36796e8795715dc1ffdc7
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Aug 9 19:26:18 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Aug 10 05:29:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8692575
dev-libs/tvision: drop 2.2.1.4
cleanup old
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21936
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-libs/tvision/Manifest | 1 -
...-2.2.1.4-Gentoo-specific-fix-linker-paths.patch | 33 -------
.../files/tvision-2.2.1.4-build-system.patch | 31 -------
.../files/tvision-2.2.1.4-fix-dot-INC.patch | 30 -------
.../files/tvision-2.2.1.4-fix-overloaded-abs.patch | 100 ---------------------
dev-libs/tvision/files/tvision-2.2.1.4-gcc6.patch | 45 ----------
dev-libs/tvision/tvision-2.2.1.4.ebuild | 71 ---------------
7 files changed, 311 deletions(-)
diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index f2836cee41a..fd96210a44d 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 6721aa9c029..00000000000
--- 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 d2c1316a794..00000000000
--- 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 ee81c4febd5..00000000000
--- 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 aab66f3a8cb..00000000000
--- 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 e882e853982..00000000000
--- 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 12f863d2694..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/
@ 2021-06-15 14:42 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-06-15 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 4be13fee7a71000d8306f7b2035a779e4d814c91
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Jun 14 11:02:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 14:39:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be13fee
dev-libs/tvision: drop 2.1.0_pre2
Cleanup old
Closes: https://bugs.gentoo.org/760576
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/tvision/Manifest | 1 -
.../files/tvision-2.1.0_pre2-asneeded.patch | 45 -------
.../files/tvision-2.1.0_pre2-build-system.patch | 30 -----
.../tvision/files/tvision-2.1.0_pre2-flags.patch | 11 --
.../tvision/files/tvision-2.1.0_pre2-gcc41.patch | 11 --
.../tvision/files/tvision-2.1.0_pre2-gcc44.patch | 21 ---
.../tvision/files/tvision-2.1.0_pre2-gcc6.patch | 147 ---------------------
.../files/tvision-2.1.0_pre2-ldconfig.patch | 15 ---
.../tvision/files/tvision-2.1.0_pre2-outb.patch | 41 ------
.../files/tvision-2.1.0_pre2-perl-INC.patch | 30 -----
.../files/tvision-2.1.0_pre2-underflow.patch | 14 --
dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild | 53 --------
12 files changed, 419 deletions(-)
diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index c74c34504d3..d3349d3da6d 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1,2 +1 @@
-DIST rhtvision_2.1.0-2.tar.gz 1590449 BLAKE2B f5c31f997396f7b41b40089d3ebad8cdb5f24fce22f19defe3530d8a6cfcd728bf9cd3bcbb4e5d1d76c1fa3bc13c3b84f1147bd3c5aa07810077f5f159684eb0 SHA512 0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1
DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
deleted file mode 100644
index 314ab225f05..00000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -206,6 +206,7 @@
- }
- # Flags to link as a dynamic lib
- $MakeDefsRHIDE[6]='RHIDE_LDFLAGS=';
-+$MakeDefsRHIDE[7]='RHIDE_LIBS=';
- if ($OS eq 'UNIX')
- {
- if ($OSf ne 'Darwin')
-@@ -229,15 +230,15 @@
- }
- $libs=$conf{'X11Lib'};
- $libs=~s/(\S+)/-l$1/g;
-- $MakeDefsRHIDE[6].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
-+ $MakeDefsRHIDE[7].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
-- $MakeDefsRHIDE[6].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
-+ $MakeDefsRHIDE[7].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
-- $MakeDefsRHIDE[6].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
-+ $MakeDefsRHIDE[7].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
-- $MakeDefsRHIDE[6].=" $stdcxx -lm -lc";
-+ $MakeDefsRHIDE[7].=" $stdcxx -lm -lc";
-- $MakeDefsRHIDE[6].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
-+ $MakeDefsRHIDE[7].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
-- $MakeDefsRHIDE[6].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
-+ $MakeDefsRHIDE[7].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
- }
--$MakeDefsRHIDE[7]="LIB_VER=$Version";
-+$MakeDefsRHIDE[8]="LIB_VER=$Version";
--$MakeDefsRHIDE[8]="LIB_VER_MAJOR=$VersionMajor";
-+$MakeDefsRHIDE[9]="LIB_VER_MAJOR=$VersionMajor";
-
- ModifyMakefiles('intl/dummy/Makefile');
- CreateRHIDEenvs('examples/rhide.env','makes/rhide.env','compat/rhide.env');
---- tvision/makes/common.imk
-+++ tvision/makes/common.imk
-@@ -54,7 +54,7 @@
- C_EXTRA_FLAGS=$(SHARED_CODE_OPTION)
- RHIDE_COMPILE_ARCHIVE=$(RHIDE_LD) $(RHIDE_LIBDIRS) $(LDFLAGS) \
- $(RHIDE_LDFLAGS) $(C_EXTRA_FLAGS) -o $(OUTFILE) \
-- $(OBJFILES)
-+ $(OBJFILES) $(addprefix -l,$(RHIDE_OS_LIBS))
- else
- RHIDE_COMPILE_ARCHIVE=$(RHIDE_AR) $(RHIDE_ARFLAGS) $(OUTFILE)\
- $(ALL_PREREQ)
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
deleted file mode 100644
index 8ba26208948..00000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-index 8b78ba3..92aa570 100644
---- a/config.pl
-+++ b/config.pl
-@@ -1111,7 +1111,7 @@ sub GenerateMakefile
- $rep.="\t\$(MAKE) prefix=\$(prefix) -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;
-@@ -1196,7 +1196,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;
-
-@@ -1216,7 +1216,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.1.0_pre2-flags.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-flags.patch
deleted file mode 100644
index e74b09ee57d..00000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tvision/Makefile.in
-+++ tvision/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.1.0_pre2-gcc41.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc41.patch
deleted file mode 100644
index 36246b214f9..00000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tvision/include/tv/inputln.h
-+++ tvision/include/tv/inputln.h
-@@ -201,7 +201,7 @@
- { return name; }
-
- protected:
-- TInputLine::TInputLine(StreamableInit) :
-+ TInputLine(StreamableInit) :
- TInputLineBaseT<char,TDrawBuffer>(streamableInit) {}
-
- public:
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch
deleted file mode 100644
index 40911f3a3e2..00000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tvision/classes/ipstream.cc
-+++ tvision/classes/ipstream.cc
-@@ -19,6 +19,7 @@
- *
- */
- #include <assert.h>
-+#include <stdio.h>
- #define Uses_string
- #define Uses_TStreamable
- #define Uses_TStreamableClass
---- tvision/include/tv/textdev.h
-+++ tvision/include/tv/textdev.h
-@@ -16,6 +16,8 @@
- #if defined( Uses_TTextDevice ) && !defined( __TTextDevice )
- #define __TTextDevice
-
-+#include <stdio.h>
-+
- class TRect;
- class TScrollBar;
-
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
deleted file mode 100644
index 8570bb04222..00000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-Fix gcc-6 compilation errors; bug 594176
-
---- 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 )
- {
---- 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;
-
---- a/classes/tvtext1.cc
-+++ b/classes/tvtext1.cc
-@@ -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};
-
---- a/classes/x11/x11src.cc
-+++ b/classes/x11/x11src.cc
-@@ -94,6 +94,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;
-
-@@ -2555,49 +2559,49 @@ Cursor TScreenX11::busyCursor,
- TScreenX11::leftPtr;
- char TScreenX11::busyCursorMap[]=
- {
-- 0xff, 0xff, 0xff, 0x1f,
-- 0xfd, 0xff, 0xff, 0x1f,
-- 0xf9, 0xff, 0xff, 0x1f,
-- 0xf1, 0xff, 0xff, 0x1f,
-- 0xe1, 0x7f, 0xc0, 0x1f,
-- 0xc1, 0x7f, 0xc0, 0x1f,
-- 0x81, 0x3f, 0x80, 0x1f,
-- 0x01, 0x9f, 0x3b, 0x1f,
-- 0x01, 0xce, 0x7b, 0x1e,
-- 0xc1, 0xef, 0xfb, 0x1e,
-- 0xc9, 0xef, 0xf1, 0x18,
-- 0x9d, 0xef, 0xf1, 0x18,
-- 0x9f, 0xef, 0xfe, 0x18,
-- 0x3f, 0x6f, 0xff, 0x1e,
-- 0x3f, 0xcf, 0x7f, 0x1e,
-- 0xff, 0x9f, 0x3f, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x7f, 0xc0, 0x1f,
-- 0xff, 0x7f, 0xc0, 0x1f,
-- 0xff, 0xff, 0xff, 0x1f
-+ (char)0xff, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xfd, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf9, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf1, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xe1, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xc1, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0x81, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x01, (char)0x9f, (char)0x3b, (char)0x1f,
-+ (char)0x01, (char)0xce, (char)0x7b, (char)0x1e,
-+ (char)0xc1, (char)0xef, (char)0xfb, (char)0x1e,
-+ (char)0xc9, (char)0xef, (char)0xf1, (char)0x18,
-+ (char)0x9d, (char)0xef, (char)0xf1, (char)0x18,
-+ (char)0x9f, (char)0xef, (char)0xfe, (char)0x18,
-+ (char)0x3f, (char)0x6f, (char)0xff, (char)0x1e,
-+ (char)0x3f, (char)0xcf, (char)0x7f, (char)0x1e,
-+ (char)0xff, (char)0x9f, (char)0x3f, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
-+ (char)0xff, (char)0xff, (char)0xff, (char)0x1f
- };
- char TScreenX11::busyCursorMask[]=
- {
-- 0xfc, 0xff, 0xff, 0x1f,
-- 0xf8, 0xff, 0xff, 0x1f,
-- 0xf0, 0xff, 0xff, 0x1f,
-- 0xe0, 0x3f, 0x80, 0x1f,
-- 0xc0, 0x3f, 0x80, 0x1f,
-- 0x80, 0x3f, 0x80, 0x1f,
-- 0x00, 0x1f, 0x00, 0x1f,
-- 0x00, 0x0e, 0x00, 0x1e,
-- 0x00, 0x04, 0x00, 0x1c,
-- 0x00, 0x04, 0x00, 0x10,
-- 0x80, 0x07, 0x00, 0x10,
-- 0x08, 0x07, 0x00, 0x10,
-- 0x0c, 0x07, 0x00, 0x10,
-- 0x1f, 0x06, 0x00, 0x10,
-- 0x1f, 0x06, 0x00, 0x1c,
-- 0x3f, 0x0f, 0x00, 0x1e,
-- 0xff, 0x1f, 0x00, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f,
-- 0xff, 0x3f, 0x80, 0x1f
-+ (char)0xfc, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf8, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xf0, (char)0xff, (char)0xff, (char)0x1f,
-+ (char)0xe0, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xc0, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x80, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0x00, (char)0x1f, (char)0x00, (char)0x1f,
-+ (char)0x00, (char)0x0e, (char)0x00, (char)0x1e,
-+ (char)0x00, (char)0x04, (char)0x00, (char)0x1c,
-+ (char)0x00, (char)0x04, (char)0x00, (char)0x10,
-+ (char)0x80, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x08, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x0c, (char)0x07, (char)0x00, (char)0x10,
-+ (char)0x1f, (char)0x06, (char)0x00, (char)0x10,
-+ (char)0x1f, (char)0x06, (char)0x00, (char)0x1c,
-+ (char)0x3f, (char)0x0f, (char)0x00, (char)0x1e,
-+ (char)0xff, (char)0x1f, (char)0x00, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
-+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f
- };
-
- /* This is the function which creates cursors. On success it return
-
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch
deleted file mode 100644
index 6d7d94fe8a0..00000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -1193,12 +1193,6 @@
- $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)
- {
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch
deleted file mode 100644
index 0735f8ffeb7..00000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-outb.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Recent kernel headers no longer provide asm/io.h.
-
---- tvision/classes/linux/linuxdis.cc
-+++ tvision/classes/linux/linuxdis.cc
-@@ -300,7 +300,11 @@
- *****************************************************************************/
-
- #ifdef h386LowLevel
-+#if HAVE_OUTB_IN_SYS
-+#include <sys/io.h>
-+#else
- #include <asm/io.h>
-+#endif
-
- static inline
- unsigned char I(unsigned char i)
---- tvision/classes/linux/linuxscr.cc
-+++ tvision/classes/linux/linuxscr.cc
-@@ -123,7 +123,11 @@
- #include <tv/linux/log.h>
-
- #ifdef h386LowLevel
-+ #if HAVE_OUTB_IN_SYS
-+ #include <sys/io.h>
-+ #else
- #include <asm/io.h>
-+ #endif
- #endif
-
- // What a hell is that?!
---- tvision/config.pl
-+++ tvision/config.pl
-@@ -77,7 +77,7 @@
- # glibc I use but the fact is that the needed tricks make it very Linux
- # dependent.
- LookForPThread() if $OSf eq 'Linux';
-- #LookForOutB();
-+ LookForOutB();
- }
- if ($Compf eq 'Cygwin')
- {# Cygwin incorporates a XFree86 port
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch
deleted file mode 100644
index 8a559bde5cc..00000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/config.pl b/config.pl
-index 53a7b50..784676b 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";
-
- # If the script is newer discard the cache.
- #GetCache() unless (-M 'config.pl' < -M 'configure.cache');
-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.1.0_pre2-underflow.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-underflow.patch
deleted file mode 100644
index d693a359a6c..00000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre2-underflow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Bug #160591; fixes a buffer underflow.
-Reported by B Douglas Hilton <b.d.hilton@verizon.net>
-
---- tvision/classes/ttermina.cc
-+++ tvision/classes/ttermina.cc
-@@ -233,7 +233,7 @@
- }
- }
- }
-- while (pos-->=queBack);
-+ while (pos-->queBack);
-
- return queBack;
- }
diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
deleted file mode 100644
index 0990426185e..00000000000
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Text User Interface that implements the well known CUA widgets"
-HOMEPAGE="http://tvision.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DOCS=( readme.txt THANKS TODO )
-
-HTML_DOCS=( www-site/. )
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
- "${FILESDIR}/${P}-gcc41.patch"
- "${FILESDIR}/${P}-outb.patch"
- "${FILESDIR}/${P}-underflow.patch"
- "${FILESDIR}/${P}-asneeded.patch"
- "${FILESDIR}/${P}-gcc44.patch"
- "${FILESDIR}/${P}-ldconfig.patch"
- "${FILESDIR}/${P}-flags.patch"
- "${FILESDIR}/${P}-gcc6.patch" # bug #594176
- "${FILESDIR}/${P}-build-system.patch" # for EAPI=6
- "${FILESDIR}/${P}-perl-INC.patch" # dot-in-INC
-)
-
-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
-}
-
-src_install() {
- emake DESTDIR="${D}" install \
- prefix="\${DESTDIR}/usr" \
- libdir="\$(prefix)/$(get_libdir)"
-
- einstalldocs
- dosym rhtvision /usr/include/tvision
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/
@ 2019-07-05 14:29 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2019-07-05 14:29 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/
@ 2017-12-04 20:26 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2017-12-04 20:26 UTC (permalink / raw
To: gentoo-commits
commit: 206f0333252feea61ad01bdceb927ac0a1ee6d60
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sat Nov 11 15:49:08 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 20:26:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=206f0333
dev-libs/tvision: fix dot-in-INC issue.
Closes: https://bugs.gentoo.org/634684
Closes: https://github.com/gentoo/gentoo/pull/6172
Package-Manager: Portage-2.3.13, Repoman-2.3.4
.../files/tvision-2.1.0_pre2-perl-INC.patch | 30 ++++++++++++++++++++++
dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch
new file mode 100644
index 00000000000..8a559bde5cc
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-perl-INC.patch
@@ -0,0 +1,30 @@
+diff --git a/config.pl b/config.pl
+index 53a7b50..784676b 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";
+
+ # If the script is newer discard the cache.
+ #GetCache() unless (-M 'config.pl' < -M 'configure.cache');
+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/tvision-2.1.0_pre2-r4.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
index 1bac9ca9f3f..0990426185e 100644
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
@@ -28,6 +28,7 @@ PATCHES=(
"${FILESDIR}/${P}-flags.patch"
"${FILESDIR}/${P}-gcc6.patch" # bug #594176
"${FILESDIR}/${P}-build-system.patch" # for EAPI=6
+ "${FILESDIR}/${P}-perl-INC.patch" # dot-in-INC
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/
@ 2017-06-04 23:14 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2017-06-04 23:14 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 3201 bytes --]
commit: 7912f0be85446a42535ba2b4f8f73788e065407e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 23:13:18 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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}; // \x1e\x1f±þ²
--TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178}; // \x1e\x1f±þ²
--TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178}; // \x11\x10±þ²
--TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178}; // \x11\x10±þ²
-+TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178}; // \x1e\x1f±þ²
-+TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178}; // \x1e\x1f±þ²
-+TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178}; // \x11\x10±þ²
-+TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178}; // \x11\x10±þ²
+-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
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/
@ 2017-06-03 21:26 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2017-06-03 21:26 UTC (permalink / raw
To: gentoo-commits
commit: a1956cb78426714fd8f0fcc55b5a60e5390724b0
Author: Kacper Kołodziej <kacper <AT> kolodziej <DOT> in>
AuthorDate: Sat Mar 11 11:34:59 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 3 21:26:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1956cb7
dev-libs/tvision: Bump to EAPI=6
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4182
.../files/tvision-2.1.0_pre2-build-system.patch | 30 +++++++++++++++
dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild | 44 ++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
new file mode 100644
index 00000000000..8ba26208948
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
@@ -0,0 +1,30 @@
+index 8b78ba3..92aa570 100644
+--- a/config.pl
++++ b/config.pl
+@@ -1111,7 +1111,7 @@ sub GenerateMakefile
+ $rep.="\t\$(MAKE) prefix=\$(prefix) -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;
+@@ -1196,7 +1196,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;
+
+@@ -1216,7 +1216,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/tvision-2.1.0_pre2-r4.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
new file mode 100644
index 00000000000..3e21aab2f9e
--- /dev/null
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Text User Interface that implements the well known CUA widgets"
+HOMEPAGE="http://tvision.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DOCS=( readme.txt THANKS TODO )
+
+HTML_DOCS=( www-site/. )
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+ "${FILESDIR}/${P}-gcc41.patch"
+ "${FILESDIR}/${P}-outb.patch"
+ "${FILESDIR}/${P}-underflow.patch"
+ "${FILESDIR}/${P}-asneeded.patch"
+ "${FILESDIR}/${P}-gcc44.patch"
+ "${FILESDIR}/${P}-ldconfig.patch"
+ "${FILESDIR}/${P}-flags.patch"
+ "${FILESDIR}/${P}-gcc6.patch" # bug #594176
+ "${FILESDIR}/${P}-build-system.patch" # for EAPI=6
+)
+
+src_configure() {
+ ./configure --fhs || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install \
+ prefix="\${DESTDIR}/usr" \
+ libdir="\$(prefix)/$(get_libdir)"
+
+ einstalldocs
+ dosym rhtvision /usr/include/tvision
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-08-10 5:38 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-29 23:19 [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/, dev-libs/tvision/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-08-10 5:38 Ionen Wolkens
2021-06-15 14:42 Sam James
2019-07-05 14:29 Michał Górny
2017-12-04 20:26 Patrice Clement
2017-06-04 23:14 Andreas Sturmlechner
2017-06-03 21:26 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox