* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/files/, dev-libs/tvision/
@ 2017-06-03 21:26 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-06-03 21:26 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: 6839 bytes --]
commit: 7ef2291f68b16dd0e5c53ee0e760a39c089e048a
Author: Kacper Kołodziej <kacper <AT> kolodziej <DOT> in>
AuthorDate: Fri Mar 10 21:23:42 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=7ef2291f
dev-libs/tvision: Fix gcc-6 compilation errors
Gentoo-bug: 594176
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4182
.../tvision/files/tvision-2.1.0_pre2-gcc6.patch | 149 +++++++++++++++++++++
dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild | 3 +-
2 files changed, 151 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..30f8ade3354
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
@@ -0,0 +1,149 @@
+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,10 +110,10 @@
+ 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±þ²
+
+ 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 @@
+ #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/tvision-2.1.0_pre2-r3.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild
index b013170a41d..01dccfa54ed 100644
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit eutils multilib
@@ -24,6 +24,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-gcc44.patch
epatch "${FILESDIR}"/${P}-ldconfig.patch
epatch "${FILESDIR}"/${P}-flags.patch
+ epatch "${FILESDIR}"/${P}-gcc6.patch
}
src_compile() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/files/, dev-libs/tvision/
@ 2021-02-09 8:52 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-02-09 8:52 UTC (permalink / raw
To: gentoo-commits
commit: 7636414fbc647c2b6b9c9de31be50c86df356808
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Feb 8 23:14:44 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 9 08:48:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7636414f
dev-libs/tvision: fix linker flags
Enables linking with LLD
Fix metadata issues.
Closes: https://bugs.gentoo.org/737202
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19382
Signed-off-by: Sam James <sam <AT> gentoo.org>
...-2.2.1.4-Gentoo-specific-fix-linker-paths.patch | 33 ++++++++++++++++++++++
dev-libs/tvision/metadata.xml | 4 +--
dev-libs/tvision/tvision-2.2.1.4.ebuild | 4 +--
3 files changed, 37 insertions(+), 4 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
new file mode 100644
index 00000000000..6721aa9c029
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch
@@ -0,0 +1,33 @@
+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/metadata.xml b/dev-libs/tvision/metadata.xml
index f49a07fd74f..2b609c0582b 100644
--- a/dev-libs/tvision/metadata.xml
+++ b/dev-libs/tvision/metadata.xml
@@ -10,11 +10,11 @@
<name>Proxy Maintainers</name>
</maintainer>
<use>
- <flag restrict=">dev-libs/tvision-2.2.1-r4" name="gpm">
+ <flag name="gpm">
Support text mode mouse through <pkg>sys-libs/gpm</pkg>
</flag>
</use>
<upstream>
- <remote-id type="sourceforge">tvision</remote-id>
+ <remote-id type="github">set-soft/tvision</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-libs/tvision/tvision-2.2.1.4.ebuild b/dev-libs/tvision/tvision-2.2.1.4.ebuild
index 4cbbeea9403..08f6776519e 100644
--- a/dev-libs/tvision/tvision-2.2.1.4.ebuild
+++ b/dev-libs/tvision/tvision-2.2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}/${P}-gcc6.patch"
"${FILESDIR}/${P}-flags.patch"
"${FILESDIR}/${P}-fix-overloaded-abs.patch"
+ "${FILESDIR}/${P}-Gentoo-specific-fix-linker-paths.patch"
)
src_configure() {
@@ -62,7 +63,6 @@ src_install() {
libdir="\$(prefix)/$(get_libdir)"
einstalldocs
- dosym rhtvision /usr/include/tvision
# remove CVS directory which gets copied over
rm -r "${ED}/usr/share/doc/${P}/html/CVS" || die
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/files/, dev-libs/tvision/
@ 2021-06-15 14:42 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-06-15 14:42 UTC (permalink / raw
To: gentoo-commits
commit: e53e8b3798fcb63bb785a91055b00db45200562d
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Jun 14 12:48:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 14:39:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e53e8b37
dev-libs/tvision: bump to 2.2.3
- Dependency on gpm, X and allegro is automagic, so I made it mandatory
for now. See https://github.com/set-soft/tvision/issues/1. Drop gpm
USE flag for this.
- Add support for media-libs/allegro
- Add USE flag to install examples for testing
- Drop no-op debug USE flag
Closes: https://bugs.gentoo.org/730022
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21241
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/tvision/Manifest | 1 +
.../files/tvision-2.2.3-0001-use-proper-AR.patch | 23 ++++++
dev-libs/tvision/metadata.xml | 5 --
dev-libs/tvision/tvision-2.2.3.ebuild | 81 ++++++++++++++++++++++
4 files changed, 105 insertions(+), 5 deletions(-)
diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index d3349d3da6d..f2836cee41a 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1 +1,2 @@
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.3-0001-use-proper-AR.patch b/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
new file mode 100644
index 00000000000..ce45ec32ef5
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
@@ -0,0 +1,23 @@
+From 017a1059067ab58a9286b3049505cb3e77696de5 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 14 Jun 2021 17:48:45 +0200
+Subject: [PATCH 2/2] use proper AR
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ intl/dummy/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile
+index c32b0a8..d47e185 100644
+--- a/intl/dummy/Makefile
++++ b/intl/dummy/Makefile
+@@ -2,4 +2,4 @@ RHIDE_GCC=gcc
+ CC=$(RHIDE_GCC)
+
+ libtvfintl.a: intldummy.o
+- ar -rv libtvfintl.a intldummy.o
++ $(AR) -rv libtvfintl.a intldummy.o
+--
+2.32.0
+
diff --git a/dev-libs/tvision/metadata.xml b/dev-libs/tvision/metadata.xml
index 9bf7fccc56e..74ce76bd57b 100644
--- a/dev-libs/tvision/metadata.xml
+++ b/dev-libs/tvision/metadata.xml
@@ -9,11 +9,6 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <use>
- <flag name="gpm">
- Support text mode mouse through <pkg>sys-libs/gpm</pkg>
- </flag>
- </use>
<upstream>
<remote-id type="github">set-soft/tvision</remote-id>
</upstream>
diff --git a/dev-libs/tvision/tvision-2.2.3.ebuild b/dev-libs/tvision/tvision-2.2.3.ebuild
new file mode 100644
index 00000000000..28c667ecd8d
--- /dev/null
+++ b/dev-libs/tvision/tvision-2.2.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN="rh${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Text User Interface that implements the well known CUA widgets"
+HOMEPAGE="http://tvision.sourceforge.net/"
+SRC_URI="https://github.com/set-soft/${PN}/releases/download/v${PV}/${MY_P}.src.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples nls"
+
+DOCS=( readme.txt THANKS TODO )
+HTML_DOCS=( www-site/. )
+
+RDEPEND="
+ dev-libs/libbsd
+ media-libs/allegro:0[X]
+ sys-apps/util-linux
+ sys-libs/gpm
+ sys-libs/ncurses:0=
+ 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}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.1.4-flags.patch
+ "${FILESDIR}"/${PN}-2.2.1.4-ldconfig.patch
+ "${FILESDIR}"/${P}-0001-use-proper-AR.patch
+)
+
+src_configure() {
+ tc-export CC CXX AR
+
+ local myconf=()
+ myconf+=(
+ --fhs
+ --prefix="${EPREFIX}/usr"
+ --with-pthread
+ --without-static
+ --x-include="${EPREFIX}/usr/include/X11"
+ )
+
+ use nls || myconf+=( --no-intl )
+
+ # Note: Do not use econf here, this isn't an autoconf configure script,
+ # but a perl based script which simply calls config.pl
+ einfo "Running ./configure ${myconf[@]}"
+ ./configure ${myconf[@]} || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install \
+ prefix="\${DESTDIR}${EPREFIX}/usr" \
+ libdir="\$(prefix)/$(get_libdir)"
+
+ einstalldocs
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ docinto examples
+ dodoc -r examples/*
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/files/, dev-libs/tvision/
@ 2021-06-21 22:26 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-06-21 22:26 UTC (permalink / raw
To: gentoo-commits
commit: 9d31cdd2b84207dafe2af4e969a12742a7630836
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Jun 16 08:43:01 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 22:26:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d31cdd2
dev-libs/tvision: properly detect ar
Closes: https://bugs.gentoo.org/796278
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/21333
Signed-off-by: Sam James <sam <AT> gentoo.org>
...mmand-now-can-be-configured-from-the-envi.patch | 56 ++++++++++++++++++++
.../files/tvision-2.2.3-0001-use-proper-AR.patch | 23 ---------
...ed-configuration-option-to-exclude-libgpm.patch | 60 ++++++++++++++++++++++
.../tvision-2.2.3-0003-Adjusted-c-years.patch | 34 ++++++++++++
...n-2.2.3-0004-Made-ar-command-configurable.patch | 23 +++++++++
dev-libs/tvision/tvision-2.2.3.ebuild | 10 ++--
6 files changed, 180 insertions(+), 26 deletions(-)
diff --git a/dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch b/dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch
new file mode 100644
index 00000000000..239161b2f0a
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch
@@ -0,0 +1,56 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:11:22 -0300
+Subject: [PATCH 1/4] Added `ar` command now can be configured from the
+ environment
+
+- Using the AR environment variable.
+- Related to issue: #1
+- Gentoo issue: https://bugs.gentoo.org/796278
+---
+ conflib.pl | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/conflib.pl b/conflib.pl
+index 0abd33df..946bfa95 100644
+--- a/conflib.pl
++++ b/conflib.pl
+@@ -1386,21 +1386,27 @@ sub LookForGNUMake
+
+ sub LookForGNUar
+ {
+- my $test;
+- print 'Looking for GNU ar: ';
++ my ($ar, $test);
+
+- if ($conf{'GNU_AR'})
++ print 'Looking for GNU ar: ';
++ $ar=$conf{'GNU_AR'};
++ if ($ar)
+ {
+- print "$conf{'GNU_AR'} (cached)\n";
+- return $conf{'GNU_AR'};
++ print "$ar (cached)\n";
++ return $ar;
++ }
++ $ar=$ENV{'AR'};
++ if (!length($ar))
++ {
++ $ar='ar';
+ }
+ $conf{'UseRanLib'}=0;
+- $test=RunRedirect('ar --version',$ErrorLog);
++ $test=RunRedirect($ar.' --version',$ErrorLog);
+ if (($test=~/GNU ar/) || ($test=~/BSD ar/))
+ {
+- $conf{'GNU_AR'}='ar';
+- print "ar\n";
+- return 'ar';
++ $conf{'GNU_AR'}=$ar;
++ print "$ar\n";
++ return $ar;
+ }
+ $test=RunRedirect('gar --version',$ErrorLog);
+ if ($test=~/GNU ar/)
+--
+2.32.0
+
diff --git a/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch b/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
deleted file mode 100644
index ce45ec32ef5..00000000000
--- a/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 017a1059067ab58a9286b3049505cb3e77696de5 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 14 Jun 2021 17:48:45 +0200
-Subject: [PATCH 2/2] use proper AR
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- intl/dummy/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile
-index c32b0a8..d47e185 100644
---- a/intl/dummy/Makefile
-+++ b/intl/dummy/Makefile
-@@ -2,4 +2,4 @@ RHIDE_GCC=gcc
- CC=$(RHIDE_GCC)
-
- libtvfintl.a: intldummy.o
-- ar -rv libtvfintl.a intldummy.o
-+ $(AR) -rv libtvfintl.a intldummy.o
---
-2.32.0
-
diff --git a/dev-libs/tvision/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch b/dev-libs/tvision/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch
new file mode 100644
index 00000000000..03cbb76a82d
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch
@@ -0,0 +1,60 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:28:36 -0300
+Subject: [PATCH 2/4] Added configuration option to exclude libgpm
+
+- Fixes #1
+---
+ config.pl | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/config.pl b/config.pl
+index 21d81ff3..424e3065 100644
+--- a/config.pl
++++ b/config.pl
+@@ -73,7 +73,14 @@ if ($OS eq 'DOS')
+
+ if ($OS eq 'UNIX')
+ {
+- LookForGPM($GPMVersionNeeded);
++ if ($conf{'gpm'} eq 'no')
++ {
++ $conf{'HAVE_GPM'}='no';
++ }
++ else
++ {
++ LookForGPM($GPMVersionNeeded);
++ }
+ LookForNCurses($NCursesVersionNeeded);
+ LookForKeysyms();
+ LookForXlib();
+@@ -424,6 +431,10 @@ sub SeeCommandLine
+ {
+ $conf{'no-dynamic'}='yes';
+ }
++ elsif ($i eq '--without-gpm')
++ {
++ $conf{'gpm'}='no';
++ }
+ # elsif ($i eq '--unsafe-memcpy')
+ # {
+ # $conf{'HAVE_UNSAFE_MEMCPY'}='yes';
+@@ -482,6 +493,7 @@ sub ShowHelp
+ print "--no-intl : don't use international support.\n";
+ print "--without-static : don't create the static library.\n";
+ print "--without-dynamic: don't create the dynamic library.\n";
++ print "--without-gpm : skip gpm library detection.\n";
+ print "--with-mss : compiles with MSS memory debugger.\n";
+ print "--without-mss : compiles without MSS [default].\n";
+ print "--with-ssc : compiles using Simple Streams Compatibility.\n";
+@@ -532,7 +544,7 @@ sub GiveAdvice
+ print " using this library reconfigure using --no-intl. Read about it in the readme.\n";
+ print " [[[[[[[*******************>>>>> IMPORTANT!!! <<<<<*******************]]]]]]]\n";
+ }
+- if ((@conf{'HAVE_GPM'} eq 'no') && ($OSf eq 'Linux'))
++ if ((@conf{'HAVE_GPM'} eq 'no') && ($OSf eq 'Linux') && ($conf{'gpm'} ne 'no'))
+ {
+ print "\n";
+ print "* No mouse support for console! please install the libgpm package needed\n";
+--
+2.32.0
+
diff --git a/dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch b/dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch
new file mode 100644
index 00000000000..743591c324a
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch
@@ -0,0 +1,34 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:35:42 -0300
+Subject: [PATCH 3/4] Adjusted (c) years
+
+---
+ config.pl | 2 +-
+ conflib.pl | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config.pl b/config.pl
+index 424e3065..cda54600 100644
+--- a/config.pl
++++ b/config.pl
+@@ -1,5 +1,5 @@
+ #!/usr/bin/perl
+-# Copyright (C) 1999-2012 by Salvador E. Tropea (SET),
++# Copyright (C) 1999-2021 by Salvador E. Tropea (SET),
+ # see copyrigh file for details
+ #
+ # To specify the compilation flags define the CFLAGS environment variable.
+diff --git a/conflib.pl b/conflib.pl
+index 946bfa95..c8e70204 100644
+--- a/conflib.pl
++++ b/conflib.pl
+@@ -1,5 +1,5 @@
+ #!/usr/bin/perl
+-# Copyright (C) 1999-2004 by Salvador E. Tropea (SET),
++# Copyright (C) 1999-2021 by Salvador E. Tropea (SET),
+ # see copyrigh file for details
+ #
+ # Common configuration routines.
+--
+2.32.0
+
diff --git a/dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch b/dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch
new file mode 100644
index 00000000000..9c67313523a
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch
@@ -0,0 +1,23 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:36:09 -0300
+Subject: [PATCH 4/4] Made ar command configurable.
+
+---
+ intl/dummy/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile
+index c32b0a8b..e24c1976 100644
+--- a/intl/dummy/Makefile
++++ b/intl/dummy/Makefile
+@@ -1,5 +1,6 @@
+ RHIDE_GCC=gcc
++RHIDE_AR=ar
+ CC=$(RHIDE_GCC)
+
+ libtvfintl.a: intldummy.o
+- ar -rv libtvfintl.a intldummy.o
++ $(RHIDE_AR) -rv libtvfintl.a intldummy.o
+--
+2.32.0
+
diff --git a/dev-libs/tvision/tvision-2.2.3.ebuild b/dev-libs/tvision/tvision-2.2.3.ebuild
index 28c667ecd8d..9f8e1f68959 100644
--- a/dev-libs/tvision/tvision-2.2.3.ebuild
+++ b/dev-libs/tvision/tvision-2.2.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nls"
+IUSE="examples gpm nls"
DOCS=( readme.txt THANKS TODO )
HTML_DOCS=( www-site/. )
@@ -25,7 +25,6 @@ RDEPEND="
dev-libs/libbsd
media-libs/allegro:0[X]
sys-apps/util-linux
- sys-libs/gpm
sys-libs/ncurses:0=
x11-libs/libICE
x11-libs/libSM
@@ -36,6 +35,7 @@ RDEPEND="
x11-libs/libXmu
x11-libs/libXt
x11-libs/libxcb:=
+ gpm? ( sys-libs/gpm )
"
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
@@ -43,7 +43,10 @@ BDEPEND="sys-devel/gettext"
PATCHES=(
"${FILESDIR}"/${PN}-2.2.1.4-flags.patch
"${FILESDIR}"/${PN}-2.2.1.4-ldconfig.patch
- "${FILESDIR}"/${P}-0001-use-proper-AR.patch
+ "${FILESDIR}"/${P}-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch
+ "${FILESDIR}"/${P}-0002-Added-configuration-option-to-exclude-libgpm.patch
+ "${FILESDIR}"/${P}-0003-Adjusted-c-years.patch
+ "${FILESDIR}"/${P}-0004-Made-ar-command-configurable.patch
)
src_configure() {
@@ -58,6 +61,7 @@ src_configure() {
--x-include="${EPREFIX}/usr/include/X11"
)
+ use gpm || myconf+=( --without-gpm )
use nls || myconf+=( --no-intl )
# Note: Do not use econf here, this isn't an autoconf configure script,
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-21 22:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-03 21:26 [gentoo-commits] repo/gentoo:master commit in: dev-libs/tvision/files/, dev-libs/tvision/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-02-09 8:52 Sam James
2021-06-15 14:42 Sam James
2021-06-21 22:26 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox