[gentoo-commits] repo/gentoo:master commit in: media-libs/libggi/files/, media-libs/libggi/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libggi/files/, media-libs/libggi/

[Sam James]

commit:     0672a2622df370d77641ed5acc972a07b901e8b3
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu May 12 02:56:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 13 20:16:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0672a262

media-libs/libggi: Fix build with slibtool

On Gentoo both -ltinfo and -lncurses are needed when only the latter is
used in the build.

Also remove hardcoded instances of libtool and remove acinclude.m4.

Bug: https://bugs.gentoo.org/775584
Upstream-PR: https://sourceforge.net/p/ggi/patches/7/
Upstream-PR: https://sourceforge.net/p/ggi/patches/8/
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/25452
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libggi/files/libggi-2.2.2-slibtool.patch       | 65 ++++++++++++++++++++++
 media-libs/libggi/libggi-2.2.2-r1.ebuild           | 16 ++++++
 2 files changed, 81 insertions(+)

diff --git a/media-libs/libggi/files/libggi-2.2.2-slibtool.patch b/media-libs/libggi/files/libggi-2.2.2-slibtool.patch
new file mode 100644
index 000000000000..b43c0935b34c
--- /dev/null
+++ b/media-libs/libggi/files/libggi-2.2.2-slibtool.patch
@@ -0,0 +1,65 @@
+Upstream-PR: https://sourceforge.net/p/ggi/patches/8/
+From 9982451bb15f503ccee0690f98bc2a6e4745fe10 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 11 May 2022 19:13:40 -0700
+Subject: [PATCH] build: Fix build with slibtool
+
+On Gentoo both -ltinfo and -lncurses are needed when only the latter is
+used.
+
+Also hardcoded instances of libtool is pointless.
+---
+ configure.in => configure.ac | 12 +++++++++---
+ m4/common.m4                 |  1 -
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+ rename configure.in => configure.ac (99%)
+
+diff --git a/configure.in b/configure.ac
+similarity index 99%
+rename from configure.in
+rename to configure.ac
+index 55801d2..729e1d6 100644
+--- a/configure.in
++++ b/configure.ac
+@@ -557,7 +557,6 @@ AC_CHECK_LIB(socket, connect,
+     SAVECC="$CC"
+     AC_MSG_CHECKING([for connect in -lwsock32])
+     LIBS="$LIBS -lwsock32"
+-    CC="$SHELL ./libtool --mode=link $CC"
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>]], [[connect(0, NULL, 42);]])],[bsdsock_libs="$bsdsock_libs -lwsock32"
+       ac_cv_func_connect=yes
+       AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
+@@ -860,9 +859,16 @@ if test "x$build_terminfo_target" != "xno"; then
+     AC_CHECK_LIB($curseslib, set_term,
+ 	terminfolibs="-l$curseslib",
+ 	build_terminfo_target=no)
++    if test "x$build_terminfo_target" != "xno"; then
++        AC_CHECK_LIB($curseslib, mvwaddchnstr,
++	    foo=bar, build_terminfo_target=no)
++        if test "x$build_terminfo_target" != "xno"; then
++            AC_CHECK_LIB(tinfo, LINES,
++                terminfolibs+=" -ltinfo",
++                build_terminfo_target=no)
++        fi
++    fi
+   fi
+-  AC_CHECK_LIB($curseslib, mvwaddchnstr,
+-	foo=bar, build_terminfo_target=no)
+ fi
+ 
+ if test "x$build_vcsa_target" != "xno"; then
+diff --git a/m4/common.m4 b/m4/common.m4
+index d036155..63e524a 100644
+--- a/m4/common.m4
++++ b/m4/common.m4
+@@ -329,7 +329,6 @@ dnl Check for libs using libtool
+ AC_DEFUN([GGI_CHECK_LIB],
+ [
+    save_CC="$CC"
+-   CC="$SHELL ./libtool --mode=link $CC"
+    AC_CHECK_LIB($1, $2, [
+      CC="$save_CC"
+      $3], [
+-- 
+2.35.1
+

diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
index eec19be578dd..7a418b03850a 100644
--- a/media-libs/libggi/libggi-2.2.2-r1.ebuild
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="Provides an opaque interface to the display's acceleration function"
 HOMEPAGE="https://ibiblio.org/ggicore/packages/libggi.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
@@ -25,6 +27,20 @@ DEPEND="${RDEPEND}
 
 DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README )
 
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch" # 775584
+)
+
+src_prepare() {
+	default
+
+	# We really don't want this
+	# https://sourceforge.net/p/ggi/patches/7/
+	rm -f acinclude.m4 || die
+
+	eautoreconf
+}
+
 src_configure() {
 	local myconf=""