| 1 |
commit: f0ead0194a4732ad6109b934c4f6db7c1cd174df |
| 2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
| 3 |
AuthorDate: Fri Apr 1 13:14:36 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 2 03:30:21 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ead019 |
| 7 |
|
| 8 |
net-libs/libotr: fix build with libgcrypt-1.10 |
| 9 |
|
| 10 |
Also, because of the move to EAPI 8 we no longer need to override src_configure() |
| 11 |
to disable static libraries |
| 12 |
|
| 13 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/24847 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
.../files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch | 11 +++++++++++ |
| 18 |
net-libs/libotr/libotr-4.1.1.ebuild | 13 ++++++------- |
| 19 |
2 files changed, 17 insertions(+), 7 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch b/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch |
| 22 |
new file mode 100644 |
| 23 |
index 000000000000..1aa60f478b88 |
| 24 |
--- /dev/null |
| 25 |
+++ b/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch |
| 26 |
@@ -0,0 +1,11 @@ |
| 27 |
+https://bugs.gentoo.org/836572 |
| 28 |
+--- a/tests/regression/client/client.c |
| 29 |
++++ b/tests/regression/client/client.c |
| 30 |
+@@ -26,6 +26,7 @@ |
| 31 |
+ #include <stdlib.h> |
| 32 |
+ #include <syscall.h> |
| 33 |
+ #include <sys/epoll.h> |
| 34 |
++#include <sys/socket.h> |
| 35 |
+ #include <sys/types.h> |
| 36 |
+ #include <sys/un.h> |
| 37 |
+ #include <unistd.h> |
| 38 |
|
| 39 |
diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild |
| 40 |
index c4976292c2ca..aae1bbc9b0c9 100644 |
| 41 |
--- a/net-libs/libotr/libotr-4.1.1.ebuild |
| 42 |
+++ b/net-libs/libotr/libotr-4.1.1.ebuild |
| 43 |
@@ -1,7 +1,7 @@ |
| 44 |
-# Copyright 1999-2021 Gentoo Authors |
| 45 |
+# Copyright 1999-2022 Gentoo Authors |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
|
| 48 |
-EAPI=6 |
| 49 |
+EAPI=8 |
| 50 |
|
| 51 |
DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging" |
| 52 |
HOMEPAGE="https://otr.cypherpunks.ca" |
| 53 |
@@ -10,21 +10,20 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz" |
| 54 |
LICENSE="GPL-2" |
| 55 |
SLOT="0" |
| 56 |
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
| 57 |
-IUSE="" |
| 58 |
|
| 59 |
RDEPEND=" |
| 60 |
dev-libs/libgcrypt:0= |
| 61 |
dev-libs/libgpg-error:0=" |
| 62 |
DEPEND="${RDEPEND}" |
| 63 |
|
| 64 |
-src_configure() { |
| 65 |
- econf --disable-static |
| 66 |
-} |
| 67 |
+PATCHES=( |
| 68 |
+ "${FILESDIR}/${PN}-4.1.1-fix-build-with-libgcrypt-1.10.patch" |
| 69 |
+) |
| 70 |
|
| 71 |
src_install() { |
| 72 |
default |
| 73 |
dodoc UPGRADING |
| 74 |
|
| 75 |
# no static archives, #465686 |
| 76 |
- find "${D}" -name '*.la' -delete || die |
| 77 |
+ find "${ED}" -name '*.la' -delete || die |
| 78 |
} |
Archives