| 1 |
commit: 7636414fbc647c2b6b9c9de31be50c86df356808 |
| 2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
| 3 |
AuthorDate: Mon Feb 8 23:14:44 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 9 08:48:51 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7636414f |
| 7 |
|
| 8 |
dev-libs/tvision: fix linker flags |
| 9 |
|
| 10 |
Enables linking with LLD |
| 11 |
Fix metadata issues. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/737202 |
| 14 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 15 |
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/19382 |
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
...-2.2.1.4-Gentoo-specific-fix-linker-paths.patch | 33 ++++++++++++++++++++++ |
| 20 |
dev-libs/tvision/metadata.xml | 4 +-- |
| 21 |
dev-libs/tvision/tvision-2.2.1.4.ebuild | 4 +-- |
| 22 |
3 files changed, 37 insertions(+), 4 deletions(-) |
| 23 |
|
| 24 |
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 |
| 25 |
new file mode 100644 |
| 26 |
index 00000000000..6721aa9c029 |
| 27 |
--- /dev/null |
| 28 |
+++ b/dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch |
| 29 |
@@ -0,0 +1,33 @@ |
| 30 |
+From 62fce1e63e92ae71e2ce061c40ba736f4b22f71d Mon Sep 17 00:00:00 2001 |
| 31 |
+From: Bernd Waibel <waebbl-gentoo@××××××.net> |
| 32 |
+Date: Mon, 8 Feb 2021 23:43:47 +0100 |
| 33 |
+Subject: [PATCH] [Gentoo-specific] fix linker paths |
| 34 |
+ |
| 35 |
+Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net> |
| 36 |
+--- |
| 37 |
+ config.pl | 4 ++-- |
| 38 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 39 |
+ |
| 40 |
+diff --git a/config.pl b/config.pl |
| 41 |
+index 4664baa..9e2cb96 100644 |
| 42 |
+--- a/config.pl |
| 43 |
++++ b/config.pl |
| 44 |
+@@ -179,13 +179,13 @@ if ($OS eq 'UNIX') |
| 45 |
+ # QNX 6.2 beta 3 workaround |
| 46 |
+ $MakeDefsRHIDE[3].='/lib ' if ($OSf eq 'QNXRtP'); |
| 47 |
+ # Link with installed libraries |
| 48 |
+- $MakeDefsRHIDE[3].=$realPrefix.'/lib'; |
| 49 |
++ #$MakeDefsRHIDE[3].=$realPrefix.'/lib'; |
| 50 |
+ $MakeDefsRHIDE[3].='/'.$conf{'libs-subdir'} if $conf{'libs-subdir'}; |
| 51 |
+ $MakeDefsRHIDE[3].=' '; |
| 52 |
+ $MakeDefsRHIDE[3].='../../makes ' unless $conf{'libs-here'} eq 'no'; |
| 53 |
+ $MakeDefsRHIDE[3].=$here.'/makes ' unless $conf{'libs-here'} eq 'no'; |
| 54 |
+ $MakeDefsRHIDE[3].='../../intl/dummy ' if $UseDummyIntl; |
| 55 |
+- $MakeDefsRHIDE[3].=$conf{'X11LibPath'}.' ' if ($conf{'HAVE_X11'} eq 'yes'); |
| 56 |
++ #$MakeDefsRHIDE[3].=$conf{'X11LibPath'}.' ' if ($conf{'HAVE_X11'} eq 'yes'); |
| 57 |
+ $MakeDefsRHIDE[3].=$AllegroPath.' ' if $conf{'HAVE_ALLEGRO'} eq 'yes'; |
| 58 |
+ } |
| 59 |
+ elsif ($OS eq 'DOS') |
| 60 |
+-- |
| 61 |
+2.30.0 |
| 62 |
+ |
| 63 |
|
| 64 |
diff --git a/dev-libs/tvision/metadata.xml b/dev-libs/tvision/metadata.xml |
| 65 |
index f49a07fd74f..2b609c0582b 100644 |
| 66 |
--- a/dev-libs/tvision/metadata.xml |
| 67 |
+++ b/dev-libs/tvision/metadata.xml |
| 68 |
@@ -10,11 +10,11 @@ |
| 69 |
<name>Proxy Maintainers</name> |
| 70 |
</maintainer> |
| 71 |
<use> |
| 72 |
- <flag restrict=">dev-libs/tvision-2.2.1-r4" name="gpm"> |
| 73 |
+ <flag name="gpm"> |
| 74 |
Support text mode mouse through <pkg>sys-libs/gpm</pkg> |
| 75 |
</flag> |
| 76 |
</use> |
| 77 |
<upstream> |
| 78 |
- <remote-id type="sourceforge">tvision</remote-id> |
| 79 |
+ <remote-id type="github">set-soft/tvision</remote-id> |
| 80 |
</upstream> |
| 81 |
</pkgmetadata> |
| 82 |
|
| 83 |
diff --git a/dev-libs/tvision/tvision-2.2.1.4.ebuild b/dev-libs/tvision/tvision-2.2.1.4.ebuild |
| 84 |
index 4cbbeea9403..08f6776519e 100644 |
| 85 |
--- a/dev-libs/tvision/tvision-2.2.1.4.ebuild |
| 86 |
+++ b/dev-libs/tvision/tvision-2.2.1.4.ebuild |
| 87 |
@@ -1,4 +1,4 @@ |
| 88 |
-# Copyright 1999-2019 Gentoo Authors |
| 89 |
+# Copyright 1999-2021 Gentoo Authors |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
|
| 92 |
EAPI=7 |
| 93 |
@@ -45,6 +45,7 @@ PATCHES=( |
| 94 |
"${FILESDIR}/${P}-gcc6.patch" |
| 95 |
"${FILESDIR}/${P}-flags.patch" |
| 96 |
"${FILESDIR}/${P}-fix-overloaded-abs.patch" |
| 97 |
+ "${FILESDIR}/${P}-Gentoo-specific-fix-linker-paths.patch" |
| 98 |
) |
| 99 |
|
| 100 |
src_configure() { |
| 101 |
@@ -62,7 +63,6 @@ src_install() { |
| 102 |
libdir="\$(prefix)/$(get_libdir)" |
| 103 |
|
| 104 |
einstalldocs |
| 105 |
- dosym rhtvision /usr/include/tvision |
| 106 |
|
| 107 |
# remove CVS directory which gets copied over |
| 108 |
rm -r "${ED}/usr/share/doc/${P}/html/CVS" || die |
Archives