1 |
commit: 0672a2622df370d77641ed5acc972a07b901e8b3 |
2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
3 |
AuthorDate: Thu May 12 02:56:23 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 13 20:16:19 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0672a262 |
7 |
|
8 |
media-libs/libggi: Fix build with slibtool |
9 |
|
10 |
On Gentoo both -ltinfo and -lncurses are needed when only the latter is |
11 |
used in the build. |
12 |
|
13 |
Also remove hardcoded instances of libtool and remove acinclude.m4. |
14 |
|
15 |
Bug: https://bugs.gentoo.org/775584 |
16 |
Upstream-PR: https://sourceforge.net/p/ggi/patches/7/ |
17 |
Upstream-PR: https://sourceforge.net/p/ggi/patches/8/ |
18 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
19 |
Closes: https://github.com/gentoo/gentoo/pull/25452 |
20 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
21 |
|
22 |
.../libggi/files/libggi-2.2.2-slibtool.patch | 65 ++++++++++++++++++++++ |
23 |
media-libs/libggi/libggi-2.2.2-r1.ebuild | 16 ++++++ |
24 |
2 files changed, 81 insertions(+) |
25 |
|
26 |
diff --git a/media-libs/libggi/files/libggi-2.2.2-slibtool.patch b/media-libs/libggi/files/libggi-2.2.2-slibtool.patch |
27 |
new file mode 100644 |
28 |
index 000000000000..b43c0935b34c |
29 |
--- /dev/null |
30 |
+++ b/media-libs/libggi/files/libggi-2.2.2-slibtool.patch |
31 |
@@ -0,0 +1,65 @@ |
32 |
+Upstream-PR: https://sourceforge.net/p/ggi/patches/8/ |
33 |
+From 9982451bb15f503ccee0690f98bc2a6e4745fe10 Mon Sep 17 00:00:00 2001 |
34 |
+From: orbea <orbea@××××××.net> |
35 |
+Date: Wed, 11 May 2022 19:13:40 -0700 |
36 |
+Subject: [PATCH] build: Fix build with slibtool |
37 |
+ |
38 |
+On Gentoo both -ltinfo and -lncurses are needed when only the latter is |
39 |
+used. |
40 |
+ |
41 |
+Also hardcoded instances of libtool is pointless. |
42 |
+--- |
43 |
+ configure.in => configure.ac | 12 +++++++++--- |
44 |
+ m4/common.m4 | 1 - |
45 |
+ 2 files changed, 9 insertions(+), 4 deletions(-) |
46 |
+ rename configure.in => configure.ac (99%) |
47 |
+ |
48 |
+diff --git a/configure.in b/configure.ac |
49 |
+similarity index 99% |
50 |
+rename from configure.in |
51 |
+rename to configure.ac |
52 |
+index 55801d2..729e1d6 100644 |
53 |
+--- a/configure.in |
54 |
++++ b/configure.ac |
55 |
+@@ -557,7 +557,6 @@ AC_CHECK_LIB(socket, connect, |
56 |
+ SAVECC="$CC" |
57 |
+ AC_MSG_CHECKING([for connect in -lwsock32]) |
58 |
+ LIBS="$LIBS -lwsock32" |
59 |
+- CC="$SHELL ./libtool --mode=link $CC" |
60 |
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>]], [[connect(0, NULL, 42);]])],[bsdsock_libs="$bsdsock_libs -lwsock32" |
61 |
+ ac_cv_func_connect=yes |
62 |
+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) |
63 |
+@@ -860,9 +859,16 @@ if test "x$build_terminfo_target" != "xno"; then |
64 |
+ AC_CHECK_LIB($curseslib, set_term, |
65 |
+ terminfolibs="-l$curseslib", |
66 |
+ build_terminfo_target=no) |
67 |
++ if test "x$build_terminfo_target" != "xno"; then |
68 |
++ AC_CHECK_LIB($curseslib, mvwaddchnstr, |
69 |
++ foo=bar, build_terminfo_target=no) |
70 |
++ if test "x$build_terminfo_target" != "xno"; then |
71 |
++ AC_CHECK_LIB(tinfo, LINES, |
72 |
++ terminfolibs+=" -ltinfo", |
73 |
++ build_terminfo_target=no) |
74 |
++ fi |
75 |
++ fi |
76 |
+ fi |
77 |
+- AC_CHECK_LIB($curseslib, mvwaddchnstr, |
78 |
+- foo=bar, build_terminfo_target=no) |
79 |
+ fi |
80 |
+ |
81 |
+ if test "x$build_vcsa_target" != "xno"; then |
82 |
+diff --git a/m4/common.m4 b/m4/common.m4 |
83 |
+index d036155..63e524a 100644 |
84 |
+--- a/m4/common.m4 |
85 |
++++ b/m4/common.m4 |
86 |
+@@ -329,7 +329,6 @@ dnl Check for libs using libtool |
87 |
+ AC_DEFUN([GGI_CHECK_LIB], |
88 |
+ [ |
89 |
+ save_CC="$CC" |
90 |
+- CC="$SHELL ./libtool --mode=link $CC" |
91 |
+ AC_CHECK_LIB($1, $2, [ |
92 |
+ CC="$save_CC" |
93 |
+ $3], [ |
94 |
+-- |
95 |
+2.35.1 |
96 |
+ |
97 |
|
98 |
diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild |
99 |
index eec19be578dd..7a418b03850a 100644 |
100 |
--- a/media-libs/libggi/libggi-2.2.2-r1.ebuild |
101 |
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild |
102 |
@@ -3,6 +3,8 @@ |
103 |
|
104 |
EAPI=7 |
105 |
|
106 |
+inherit autotools |
107 |
+ |
108 |
DESCRIPTION="Provides an opaque interface to the display's acceleration function" |
109 |
HOMEPAGE="https://ibiblio.org/ggicore/packages/libggi.html" |
110 |
SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2" |
111 |
@@ -25,6 +27,20 @@ DEPEND="${RDEPEND} |
112 |
|
113 |
DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README ) |
114 |
|
115 |
+PATCHES=( |
116 |
+ "${FILESDIR}/${P}-slibtool.patch" # 775584 |
117 |
+) |
118 |
+ |
119 |
+src_prepare() { |
120 |
+ default |
121 |
+ |
122 |
+ # We really don't want this |
123 |
+ # https://sourceforge.net/p/ggi/patches/7/ |
124 |
+ rm -f acinclude.m4 || die |
125 |
+ |
126 |
+ eautoreconf |
127 |
+} |
128 |
+ |
129 |
src_configure() { |
130 |
local myconf="" |