| 1 |
commit: c7dc14033cc6464195f718cad55c157e1dbf2f81 |
| 2 |
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> |
| 3 |
AuthorDate: Fri Sep 30 16:16:35 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 1 03:14:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7dc1403 |
| 7 |
|
| 8 |
net-p2p/amule: fix build with gcc-11 and musl |
| 9 |
|
| 10 |
Also update EAPI 7 -> 8 and apply pathes to the live version. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/836739 |
| 13 |
Closes: https://bugs.gentoo.org/872263 |
| 14 |
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/27543 |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
net-p2p/amule/amule-2.3.3.ebuild | 3 ++- |
| 19 |
net-p2p/amule/amule-9999.ebuild | 6 ++++-- |
| 20 |
net-p2p/amule/files/amule-2.3.3-fix-exception.patch | 12 ++++++++++++ |
| 21 |
3 files changed, 18 insertions(+), 3 deletions(-) |
| 22 |
|
| 23 |
diff --git a/net-p2p/amule/amule-2.3.3.ebuild b/net-p2p/amule/amule-2.3.3.ebuild |
| 24 |
index 1c0c098150de..292872783ad9 100644 |
| 25 |
--- a/net-p2p/amule/amule-2.3.3.ebuild |
| 26 |
+++ b/net-p2p/amule/amule-2.3.3.ebuild |
| 27 |
@@ -1,7 +1,7 @@ |
| 28 |
# Copyright 1999-2022 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
-EAPI=7 |
| 32 |
+EAPI=8 |
| 33 |
WX_GTK_VER="3.0-gtk3" |
| 34 |
|
| 35 |
inherit wxwidgets xdg-utils |
| 36 |
@@ -50,6 +50,7 @@ BDEPEND=" |
| 37 |
|
| 38 |
PATCHES=( |
| 39 |
"${FILESDIR}/${PN}-2.3.2-disable-version-check.patch" |
| 40 |
+ "${FILESDIR}/${PN}-2.3.3-fix-exception.patch" |
| 41 |
) |
| 42 |
|
| 43 |
pkg_setup() { |
| 44 |
|
| 45 |
diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild |
| 46 |
index a108c9752909..392ddb148410 100644 |
| 47 |
--- a/net-p2p/amule/amule-9999.ebuild |
| 48 |
+++ b/net-p2p/amule/amule-9999.ebuild |
| 49 |
@@ -1,7 +1,7 @@ |
| 50 |
-# Copyright 1999-2020 Gentoo Authors |
| 51 |
+# Copyright 1999-2022 Gentoo Authors |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
|
| 54 |
-EAPI=7 |
| 55 |
+EAPI=8 |
| 56 |
WX_GTK_VER="3.0-gtk3" |
| 57 |
|
| 58 |
inherit wxwidgets xdg-utils |
| 59 |
@@ -49,6 +49,8 @@ BDEPEND=" |
| 60 |
" |
| 61 |
|
| 62 |
PATCHES=( |
| 63 |
+ "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch" |
| 64 |
+ "${FILESDIR}/${PN}-2.3.3-fix-exception.patch" |
| 65 |
) |
| 66 |
|
| 67 |
pkg_setup() { |
| 68 |
|
| 69 |
diff --git a/net-p2p/amule/files/amule-2.3.3-fix-exception.patch b/net-p2p/amule/files/amule-2.3.3-fix-exception.patch |
| 70 |
new file mode 100644 |
| 71 |
index 000000000000..ef38f94cfccf |
| 72 |
--- /dev/null |
| 73 |
+++ b/net-p2p/amule/files/amule-2.3.3-fix-exception.patch |
| 74 |
@@ -0,0 +1,12 @@ |
| 75 |
+diff --git a/src/libs/common/MuleDebug.cpp b/src/libs/common/MuleDebug.cpp |
| 76 |
+index 4b023815c..19c172e61 100644 |
| 77 |
+--- a/src/libs/common/MuleDebug.cpp |
| 78 |
++++ b/src/libs/common/MuleDebug.cpp |
| 79 |
+@@ -55,6 +55,7 @@ |
| 80 |
+ #endif |
| 81 |
+ |
| 82 |
+ #include <vector> |
| 83 |
++#include <exception> |
| 84 |
+ |
| 85 |
+ |
| 86 |
+ /** |
Archives