From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- net-p2p/amule/Manifest | 4 +- net-p2p/amule/amule-2.3.2-r1.ebuild | 104 -------------------- net-p2p/amule/amule-2.3.2-r3.ebuild | 106 +++++++++++++++++++++ net-p2p/amule/files/amule-2.2.6-fallocate.diff | 23 ----- ...2.3.2-fix-crash-when-shared-files-changed.patch | 50 ++++++++++ 5 files changed, 158 insertions(+), 129 deletions(-) delete mode 100644 net-p2p/amule/amule-2.3.2-r1.ebuild create mode 100644 net-p2p/amule/amule-2.3.2-r3.ebuild delete mode 100644 net-p2p/amule/files/amule-2.2.6-fallocate.diff create mode 100644 net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch (limited to 'net-p2p/amule') diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest index 9640d4a6ff0a..912d232d830b 100644 --- a/net-p2p/amule/Manifest +++ b/net-p2p/amule/Manifest @@ -1,14 +1,14 @@ -AUX amule-2.2.6-fallocate.diff 687 BLAKE2B c7c7df787b417e58db50c59192eb455c495ecd38f9fd5f547ff3db6cfa642eba323f4ade99c66fe981777479a728afb9e12e1ae494853af8bbb4634448820dcd SHA512 406eb05eecfa7d027f7eaeefa2ead92078d5f7ed0e72f3ce47ac4f1f23b2852577f429f999a009198515e35efacfa6e54283494bb3eaf6332ee6bed9963c65ba AUX amule-2.3.2-cryptopp-6.patch 927 BLAKE2B 3be08b8219cebdaf252f21dd4a7e469d0371aa62a5ed9856c13d8772163c8f85cb7f19d9cf383e226276852c7acbb73ffdcc4f46a3e23118491154ddd47ca1da SHA512 fe07cdddf447d327ac517366449ec329d81f49ef327183eac36aca522db244732713837ac8c4d4ca0d92d648bd96dad670597b466e375324204427a381bc2b26 AUX amule-2.3.2-disable-version-check.patch 419 BLAKE2B e4ca791348ba80eb34cb876fe05c2b85a70e2d704ecb3dd14ec6fc47550d4a677fcdd071906b93c56652c133462d5065b5907564e91c092430e310e2dd8c2523 SHA512 6d98c1a78b16778ad94ef9d70e87fe7ded2228b101bdb961565c3f2a0f2687e55c97bd824e331b53cbd45fbafbfa5803ce4c2f1fa8e245a3ebc97cdd7f282b65 AUX amule-2.3.2-fix-crash-closing-last-search-tab-1.patch 3620 BLAKE2B f6dbba7491472d1c15f2253ea94cb83681c4f745f6cbe8662d95daaa54f69ff3eee94e02a1d5d5d69cf303c55db5cfef630096750b6bfcc431d48e120cfca91f SHA512 752f2dc7590001d830da2aa211349a2e04601c76ab01620f741e57f8c7a05851e1a4a4cba2ec88167b8c8047b8c3bca1a120003ec85c1155d6b8e71bff05f42c AUX amule-2.3.2-fix-crash-closing-last-search-tab-2.patch 5073 BLAKE2B a90260842bbadae7ea2f068a2c4fb94d3024e61ff0eecf340257fbbdb7657a7946aed36b8bdfe3f5a5c06852be55d144909f74cdb01761fb0e167c67ea4c0fc6 SHA512 8227cbb72af28a076e03dec466fb53660985de33fd84ef8856b6d098035015bc4e9c4d5a3da5a320053525d0356f3a73f2fe0b9f1c1eb7991b29bc4e1e93751f AUX amule-2.3.2-fix-crash-shared-dir-utf8.patch 2204 BLAKE2B 3266ef16038176af0e3cef9e8a16517a34f78723e725c453e557f88fac3b8b233edb34aa10b3295563a769df3fc9a1c0ef88cf2eaf5b43a5bd2d60f4b4a09757 SHA512 f0ae3e7e8ee4105c4999d248f58ad946db7c163f6f2fa1ee54f97509d82cf43cbadffcd537d728f2dc547cbe83deaa8737e794d42a773707b2fe85d6a671b4e1 +AUX amule-2.3.2-fix-crash-when-shared-files-changed.patch 1648 BLAKE2B f3bf70c65b374d468935f8b2f32519bbda66bb49387a81727fd52efaa15156bc0a8a5cb49ba8bbcfa212c7ec79b8b141e27e318bee95ceb8f37e35cdd98b2988 SHA512 748d8746e01d2aeefe7084030db190302c71b57c97fa438fc958d5fe7eb415b2b624f04f6bb436ca612731061b863f9251bbd81a10e87d8acc0f9ff5fc948b7e AUX amuled.confd 300 BLAKE2B 891cf5d274eb10a23b5b43200d861b5e4361b9c0a11acd020542ff1f0d7d96725b113fb6d74ab34c56d408311582d8524f7bb8f77d1255f3e374abe3b9f34a8b SHA512 88a3fcc64ed4c4729609e3ffef098d4bf30bda0d17b5165fff3417161c18766df79de11c98ee510677291bca7ded33d2a23d3aff0d99781f98173cc189f44901 AUX amuled.initd 1105 BLAKE2B 16525a9c5ad8c158d0d4f1ba316fb493cb438b985a0a4d52672b4067acdfae6dd4897d7c37459515ce4a0e6b0b89665b9feaea6b15e3535c8f46b83ce0c16d05 SHA512 3ec351e84da4e33918747de4ccd9ec86895b60f9d94836fc92112489edcfe14af7a21efb79194b80bb81aa666714bd5a21873c954b36948e31369727e71143b6 AUX amuleweb.confd 720 BLAKE2B 1bcb4349f34c8deef069d156da29ff3dcb642f9b5c15fbef742d0154ff6580142fa2c2c797a3864cd398c980c1e2b2eb41f2c958c6f356f3077e79de47fe7610 SHA512 ba760e45002a80bb55e2729178d0901f885e8d142903f8eb98a31b8544bf6989801dabfa0315e0d1f7d8bfa3df5716cce43bf415f45a4605895dc2907716ca41 AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0 DIST aMule-2.3.2.tar.xz 3895300 BLAKE2B cf1bce3a0fcd0c108e369b7aed257f067a4ce3ce2fd4e8509b577ac58f8bc52fbc9aabc5c703bc9111dd06ac011ee1f3756279b093b69bcaada106226493237a SHA512 3064b086f8459b4372ea0c11f239a08167c7beac3dde26889f056f617b480b487bea10c2cae8fdfa1ae99c10fc9e715adc8e01e4b968389861aa47c3ec8c0016 -EBUILD amule-2.3.2-r1.ebuild 2264 BLAKE2B ffa5219b33d63414838be657972556be4122717478698053454e3a7da290a5f174e6730e52b3ff05305b7010821a0588ca2ab092d28c9e0daae19e83d0f6043a SHA512 defd04e15bc4d77fe48a78999dac8410228199029011bba8ecf295388354029bf43a1f17741696c65b36acc90dea0e4b5c47ebbcbab5111d4eb95a84949179fc EBUILD amule-2.3.2-r2.ebuild 2339 BLAKE2B 16698d20edb786d3a1be426c65a89c53d3127dca0b6b0ce38adff0d37bf03ac2cb428f30935f75fd99ef62ba1f900a30c8e7eec3ae79a088885b74c26638dce7 SHA512 490dec5064d9e560626931616e4c9d9188f68815cc477df4ea39a4ff4a82af25f5ceea12a223c7b5188c8e661990a960534bffeca35ce97afb402713b5e1029c +EBUILD amule-2.3.2-r3.ebuild 2409 BLAKE2B 9b6c0d8bfd0a5b9be5dae5ea88fb13f2209b8be7cb0f28e8503ad3ec8500e89ee446876c025ce4c1c9664c401cdaa9133a832a737d1923de7589b7c93352cd85 SHA512 ad6380175c73b4f53751a28eefbfe4b6623e2d68bbfdeb1b6d08657c29c637b664bd6acd9073b2b945a9c27e75fb65c481c6e87a96a2bb418c751908fa0e5e3b MISC metadata.xml 636 BLAKE2B 3384c1c34c9963570b17793188db257a5c0648390aaa8ca73f4bad50db8b54be9d0fe5d379b873fd0f21bf6ecaeaf5840ca65ad92c72a1449b25035f9b7ee3c3 SHA512 bd93ef13a5d116f81c8a6901e524032a85eab90589067e57e165f643f8f0a75047869801b4485fa47a0bc41008f3b8f1aff1aa8b413c83b4c27610ef6ea58d5f diff --git a/net-p2p/amule/amule-2.3.2-r1.ebuild b/net-p2p/amule/amule-2.3.2-r1.ebuild deleted file mode 100644 index 51bb5d2472b5..000000000000 --- a/net-p2p/amule/amule-2.3.2-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WX_GTK_VER="3.0" - -inherit wxwidgets user - -MY_P="${PN/m/M}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="aMule, the all-platform eMule p2p client" -HOMEPAGE="http://www.amule.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86" -IUSE="daemon debug geoip nls remote stats unicode upnp +X" - -COMMON_DEPEND=" - dev-libs/crypto++ - sys-libs/binutils-libs:0= - sys-libs/zlib - x11-libs/wxGTK:${WX_GTK_VER}[X?] - stats? ( media-libs/gd:=[jpeg,png] ) - geoip? ( dev-libs/geoip ) - upnp? ( net-libs/libupnp:* ) - remote? ( media-libs/libpng:0= - unicode? ( media-libs/gd:= ) ) - !net-p2p/imule" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-2.2.6-fallocate.diff" ) - -pkg_setup() { - if use stats && ! use X; then - einfo "Note: You would need both the X and stats USE flags" - einfo "to compile aMule Statistics GUI." - einfo "I will now compile console versions only." - fi -} - -pkg_preinst() { - if use daemon || use remote; then - enewgroup p2p - enewuser p2p -1 -1 /home/p2p p2p - fi -} - -src_configure() { - local myconf - - if use X; then - einfo "wxGTK with X support will be used" - need-wxwidgets unicode - else - einfo "wxGTK without X support will be used" - need-wxwidgets base-unicode - fi - - if use X ; then - use stats && myconf="${myconf} - --enable-wxcas - --enable-alc" - use remote && myconf="${myconf} - --enable-amule-gui" - else - myconf=" - --disable-monolithic - --disable-amule-gui - --disable-wxcas - --disable-alc" - fi - - econf \ - --with-denoise-level=0 \ - --with-wx-config="${WX_CONFIG}" \ - --enable-amulecmd \ - --without-boost \ - $(use_enable debug) \ - $(use_enable daemon amule-daemon) \ - $(use_enable geoip) \ - $(use_enable nls) \ - $(use_enable remote webserver) \ - $(use_enable stats cas) \ - $(use_enable stats alcc) \ - $(use_enable upnp) \ - ${myconf} -} - -src_install() { - default - - if use daemon; then - newconfd "${FILESDIR}"/amuled.confd amuled - newinitd "${FILESDIR}"/amuled.initd amuled - fi - if use remote; then - newconfd "${FILESDIR}"/amuleweb.confd amuleweb - newinitd "${FILESDIR}"/amuleweb.initd amuleweb - fi -} diff --git a/net-p2p/amule/amule-2.3.2-r3.ebuild b/net-p2p/amule/amule-2.3.2-r3.ebuild new file mode 100644 index 000000000000..7a7035ef43eb --- /dev/null +++ b/net-p2p/amule/amule-2.3.2-r3.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +WX_GTK_VER="3.0-gtk3" + +inherit wxwidgets user + +MY_P="${PN/m/M}-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="aMule, the all-platform eMule p2p client" +HOMEPAGE="http://www.amule.org/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +IUSE="daemon debug geoip nls remote stats upnp +X" + +COMMON_DEPEND=" + dev-libs/boost:= + dev-libs/crypto++:= + sys-libs/binutils-libs:0= + sys-libs/zlib + >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?] + stats? ( media-libs/gd:=[jpeg,png] ) + geoip? ( dev-libs/geoip ) + upnp? ( net-libs/libupnp:* ) + remote? ( media-libs/libpng:0= ) + !net-p2p/imule" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.2-fix-crash-shared-dir-utf8.patch" + "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-1.patch" + "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-2.patch" + "${FILESDIR}/${PN}-2.3.2-cryptopp-6.patch" + "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch" + "${FILESDIR}/${PN}-2.3.2-fix-crash-when-shared-files-changed.patch" +) + +pkg_setup() { + if use stats && ! use X; then + einfo "Note: You would need both the X and stats USE flags" + einfo "to compile aMule Statistics GUI." + einfo "I will now compile console versions only." + fi + + setup-wxwidgets +} + +pkg_preinst() { + if use daemon || use remote; then + enewgroup p2p + enewuser p2p -1 -1 /home/p2p p2p + fi +} + +src_configure() { + local myconf + + if use X; then + myconf=" + $(use_enable remote amule-gui) + $(use_enable stats alc) + $(use_enable stats wxcas) + " + else + myconf=" + --disable-monolithic + --disable-amule-gui + --disable-alc + --disable-wxcas + " + fi + + econf \ + --with-denoise-level=0 \ + --with-wx-config="${WX_CONFIG}" \ + --enable-amulecmd \ + --with-boost \ + $(use_enable debug) \ + $(use_enable daemon amule-daemon) \ + $(use_enable geoip) \ + $(use_enable nls) \ + $(use_enable remote webserver) \ + $(use_enable stats cas) \ + $(use_enable stats alcc) \ + $(use_enable upnp) \ + ${myconf} +} + +src_install() { + default + + if use daemon; then + newconfd "${FILESDIR}"/amuled.confd amuled + newinitd "${FILESDIR}"/amuled.initd amuled + fi + if use remote; then + newconfd "${FILESDIR}"/amuleweb.confd amuleweb + newinitd "${FILESDIR}"/amuleweb.initd amuleweb + fi +} diff --git a/net-p2p/amule/files/amule-2.2.6-fallocate.diff b/net-p2p/amule/files/amule-2.2.6-fallocate.diff deleted file mode 100644 index 8d1485a67786..000000000000 --- a/net-p2p/amule/files/amule-2.2.6-fallocate.diff +++ /dev/null @@ -1,23 +0,0 @@ -Disable fallocate #562992 - -This is only a workaround to fix FTBFS, the configure check is wrong and needs to be fixed: -http://www.amule.org/abugs/view.php?id=1572 - ---- a/src/ThreadTasks.cpp -+++ b/src/ThreadTasks.cpp -@@ -506,6 +506,15 @@ void CCompletionTask::OnExit() - #include - #include - -+// #562992 -+#if defined(__alpha__) || defined(__hppa__) -+#undef HAVE_FALLOCATE -+#endif -+ -+#if defined(__hppa__) -+#undef HAVE_SYS_FALLOCATE -+#endif -+ - CAllocateFileTask::CAllocateFileTask(CPartFile *file, bool pause) - // GetPrintable is used to improve the readability of the log. - : CThreadTask(wxT("Allocating"), file->GetFullName().RemoveExt().GetPrintable(), ETP_High), diff --git a/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch b/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch new file mode 100644 index 000000000000..81e0ef7b6296 --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch @@ -0,0 +1,50 @@ +From 110a056fa4bcfc0fe8c1f8eadcc2bd5df0bbf5e1 Mon Sep 17 00:00:00 2001 +From: xinhuang +Date: Thu, 4 Jan 2018 00:44:35 -0800 +Subject: [PATCH] fix crash when shared files changed on Shared files tab + +--- + src/extern/wxWidgets/listctrl.cpp | 10 ---------- + src/extern/wxWidgets/listctrl.h | 5 ----- + 2 files changed, 15 deletions(-) + +diff --git a/src/extern/wxWidgets/listctrl.cpp b/src/extern/wxWidgets/listctrl.cpp +index 18a30f205..460700691 100644 +--- a/src/extern/wxWidgets/listctrl.cpp ++++ b/src/extern/wxWidgets/listctrl.cpp +@@ -5803,16 +5803,6 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y ) + #endif + } + +-void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const +-{ +- m_mainWin->DoClientToScreen(x, y); +-} +- +-void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const +-{ +- m_mainWin->DoScreenToClient(x, y); +-} +- + void wxGenericListCtrl::SetFocus() + { + // The test in window.cpp fails as we are a composite +diff --git a/src/extern/wxWidgets/listctrl.h b/src/extern/wxWidgets/listctrl.h +index b18a61866..e72f7eaf0 100644 +--- a/src/extern/wxWidgets/listctrl.h ++++ b/src/extern/wxWidgets/listctrl.h +@@ -232,11 +232,6 @@ public: + protected: + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); + +- // take into account the coordinates difference between the container +- // window and the list control window itself here +- virtual void DoClientToScreen( int *x, int *y ) const; +- virtual void DoScreenToClient( int *x, int *y ) const; +- + virtual wxSize DoGetBestSize() const; + + // return the text for the given column of the given item +-- +2.21.0 + -- cgit v1.2.3