[gentoo-commits] repo/gentoo:master commit in: x11-misc/xnee/, x11-misc/xnee/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xnee/, x11-misc/xnee/files/

[Sam James]

commit:     f4609296a949159c046762c4a98624bf9ac2e12c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  8 05:12:04 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  8 05:12:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4609296

x11-misc/xnee: fix build with slibtool

Closes: https://bugs.gentoo.org/778962
Thanks-to: orbea <orbea <AT> riseup.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/xnee/files/xnee-3.19-slibtool.patch | 19 +++++++++++++++++++
 x11-misc/xnee/xnee-3.19-r2.ebuild            |  3 +++
 2 files changed, 22 insertions(+)

diff --git a/x11-misc/xnee/files/xnee-3.19-slibtool.patch b/x11-misc/xnee/files/xnee-3.19-slibtool.patch
new file mode 100644
index 00000000000..411cfd61749
--- /dev/null
+++ b/x11-misc/xnee/files/xnee-3.19-slibtool.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/778962
+https://savannah.gnu.org/support/index.php?110470
+
+Author: orbea <orbea@riseup.net>
+Date:   Thu Apr 1 14:39:10 2021 -0700
+
+    build: Fix build with slibtool.
+
+--- a/cnee/src/Makefile.am
++++ b/cnee/src/Makefile.am
+@@ -63,7 +63,7 @@ endif
+ 
+ 
+ AM_CFLAGS = -I../include -I${LIBXNEE_DIR}/include  ${PEDANTIC_FLAGS}  ${X_CFLAGS}  -g ${VERBOSE_FLAG} ${BUF_VERBOSE_FLAG}  ${USER_CFLAGS} ${GCOV_FLAG} ${GPROF_FLAG} ${XNEE_XINPUT_SUPPORT_FLAGS}   ${XNEE_XINPUT_SUPPORT_FLAGS} 
+-cnee_LDADD =   -L${LIBXNEE_DIR}/src -lxnee ${X_LIBS} ${X11_LIBS} ${LIBDL} ${LIBXI}
++cnee_LDADD =  $(top_srcdir)/libxnee/src/libxnee.la ${X_LIBS} ${X11_LIBS} ${LIBDL} ${LIBXI}
+ 
+ if BUILD_STATIC
+ STATIC_FLAGS = -static

diff --git a/x11-misc/xnee/xnee-3.19-r2.ebuild b/x11-misc/xnee/xnee-3.19-r2.ebuild
index 17cd30ca867..f87a29dadb4 100644
--- a/x11-misc/xnee/xnee-3.19-r2.ebuild
+++ b/x11-misc/xnee/xnee-3.19-r2.ebuild
@@ -45,10 +45,13 @@ DOCS=( AUTHORS BUGS ChangeLog FAQ NEWS README TODO )
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.18-linker.patch
 	"${FILESDIR}"/${P}-libgnomeui-only-for-applets.patch
+	"${FILESDIR}"/${P}-slibtool.patch
 )
 
 src_prepare() {
 	default
+
+	mv configure.{in,ac} || die
 	eautoreconf
 }