1 |
commit: f4609296a949159c046762c4a98624bf9ac2e12c |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 8 05:12:04 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 8 05:12:04 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4609296 |
7 |
|
8 |
x11-misc/xnee: fix build with slibtool |
9 |
|
10 |
Closes: https://bugs.gentoo.org/778962 |
11 |
Thanks-to: orbea <orbea <AT> riseup.net> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
x11-misc/xnee/files/xnee-3.19-slibtool.patch | 19 +++++++++++++++++++ |
15 |
x11-misc/xnee/xnee-3.19-r2.ebuild | 3 +++ |
16 |
2 files changed, 22 insertions(+) |
17 |
|
18 |
diff --git a/x11-misc/xnee/files/xnee-3.19-slibtool.patch b/x11-misc/xnee/files/xnee-3.19-slibtool.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..411cfd61749 |
21 |
--- /dev/null |
22 |
+++ b/x11-misc/xnee/files/xnee-3.19-slibtool.patch |
23 |
@@ -0,0 +1,19 @@ |
24 |
+https://bugs.gentoo.org/778962 |
25 |
+https://savannah.gnu.org/support/index.php?110470 |
26 |
+ |
27 |
+Author: orbea <orbea@××××××.net> |
28 |
+Date: Thu Apr 1 14:39:10 2021 -0700 |
29 |
+ |
30 |
+ build: Fix build with slibtool. |
31 |
+ |
32 |
+--- a/cnee/src/Makefile.am |
33 |
++++ b/cnee/src/Makefile.am |
34 |
+@@ -63,7 +63,7 @@ endif |
35 |
+ |
36 |
+ |
37 |
+ 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} |
38 |
+-cnee_LDADD = -L${LIBXNEE_DIR}/src -lxnee ${X_LIBS} ${X11_LIBS} ${LIBDL} ${LIBXI} |
39 |
++cnee_LDADD = $(top_srcdir)/libxnee/src/libxnee.la ${X_LIBS} ${X11_LIBS} ${LIBDL} ${LIBXI} |
40 |
+ |
41 |
+ if BUILD_STATIC |
42 |
+ STATIC_FLAGS = -static |
43 |
|
44 |
diff --git a/x11-misc/xnee/xnee-3.19-r2.ebuild b/x11-misc/xnee/xnee-3.19-r2.ebuild |
45 |
index 17cd30ca867..f87a29dadb4 100644 |
46 |
--- a/x11-misc/xnee/xnee-3.19-r2.ebuild |
47 |
+++ b/x11-misc/xnee/xnee-3.19-r2.ebuild |
48 |
@@ -45,10 +45,13 @@ DOCS=( AUTHORS BUGS ChangeLog FAQ NEWS README TODO ) |
49 |
PATCHES=( |
50 |
"${FILESDIR}"/${PN}-3.18-linker.patch |
51 |
"${FILESDIR}"/${P}-libgnomeui-only-for-applets.patch |
52 |
+ "${FILESDIR}"/${P}-slibtool.patch |
53 |
) |
54 |
|
55 |
src_prepare() { |
56 |
default |
57 |
+ |
58 |
+ mv configure.{in,ac} || die |
59 |
eautoreconf |
60 |
} |