From 591f45259704c7c0c4289228107c6ee61457420e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Dec 2023 07:49:59 +0000 Subject: gentoo auto-resync : 22:12:2023 - 07:49:59 --- net-p2p/Manifest.gz | Bin 6921 -> 6924 bytes net-p2p/amule/Manifest | 6 +- net-p2p/amule/amule-2.3.3-r1.ebuild | 153 --------- net-p2p/amule/amule-2.3.3-r3.ebuild | 160 ++++++++++ net-p2p/amule/amule-2.3.3.ebuild | 146 --------- net-p2p/amule/amule-9999.ebuild | 11 +- net-p2p/amule/files/amule-2.3.3-wx3.2.patch | 461 ++++++++++++++++++++++++++++ 7 files changed, 630 insertions(+), 307 deletions(-) delete mode 100644 net-p2p/amule/amule-2.3.3-r1.ebuild create mode 100644 net-p2p/amule/amule-2.3.3-r3.ebuild delete mode 100644 net-p2p/amule/amule-2.3.3.ebuild create mode 100644 net-p2p/amule/files/amule-2.3.3-wx3.2.patch (limited to 'net-p2p') diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz index 19c01a16080b..50949dd0c5a2 100644 Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest index 1dadc5ee13e3..36b9cead3c1b 100644 --- a/net-p2p/amule/Manifest +++ b/net-p2p/amule/Manifest @@ -2,13 +2,13 @@ AUX amule-2.3.2-disable-version-check.patch 419 BLAKE2B e4ca791348ba80eb34cb876f AUX amule-2.3.3-autoconf-2.70.patch 956 BLAKE2B 2e7bde0e6be3e392555e4a5420ae3736762939150ce1aee39c052a56fbaa2c4192aa43f34b73f9810ad6e3b9a5e06311d374ca1d26ed289f91eaf2acb77f616a SHA512 36918f134eaaae17463ceac3d06e6fdf48d3913212564792067c15c946dd7536bf67772d777734d80f1f833b378e0c212932d5bd564f201aeb9545070d890b78 AUX amule-2.3.3-backport-pr368.patch 1696 BLAKE2B 9d52b6192f4a4cbb7d73be34c23fe59db51f321c3f07412801721d47d9ecb12e0098b7b211766934a5545ed01b330974e56188773e5c844d1bd01fedd1edd454 SHA512 b4cd302c1003720aa4bcd4c1a17233b0303d2d614e359ba7f3da685f520817d58f5056f11437a87e85aaefa74f053d769aacfabdc96621a76bb648d456dfcb17 AUX amule-2.3.3-fix-exception.patch 259 BLAKE2B 9a9ebb025ac3f553432215bc0f2c34bd1b6eeaaf9b436bd19870ba4412326dd37ce372bd5a3866e6cd65f0e98e8aea09025dd751d6b6849c37dd527b1af56da0 SHA512 5c8580f0d294a828b2ce42c59bd3079d9bf9735a88337d2cb3aa2b014c6bb8cecee891e35431b9e22a6ae8ca91f816de89a532fe6c10eae2ecbed33212e4604d +AUX amule-2.3.3-wx3.2.patch 17509 BLAKE2B b14471083d825beb68b65938308c5df265a831ea48a37abd8d2b92e38232c52aa4cc875f703531d388f091e7af0f1d634e4e5394b5f1522297ace0274ec65f93 SHA512 bde8a0db21c5650172084dfbfea155b88c6b44766034cc83738bfe77cd343b389296cbc0069c09066fbbba1df7951bb8763f1b2dd0c63375a1b67f615093902b AUX amuled.confd-r1 199 BLAKE2B e018a8827749b0b5266533adfc549d0c40b339470439fd5a04c9380b5489e3d58b49478c6a1fcc4954d97816e66bdbf8a6105de0aee7991defd1df553db46e27 SHA512 4b82864f874ea5ede360a88aa589baa4336d16074ed10e2841ea5e2cb0961fe8553c28368f3a9b31d19ccaf688d77ac636219e3693e044c735bbd9de5de96bd6 AUX amuled.initd 1105 BLAKE2B 16525a9c5ad8c158d0d4f1ba316fb493cb438b985a0a4d52672b4067acdfae6dd4897d7c37459515ce4a0e6b0b89665b9feaea6b15e3535c8f46b83ce0c16d05 SHA512 3ec351e84da4e33918747de4ccd9ec86895b60f9d94836fc92112489edcfe14af7a21efb79194b80bb81aa666714bd5a21873c954b36948e31369727e71143b6 AUX amuleweb.confd-r1 619 BLAKE2B 7140f6d957760f8184c3c73db0a58a3b7b308a6d8548700cab8517bba5274fbad35ebb940ea11f96527553807b1365b7f7c27a6e7d8b656b51f60072cabe5ab8 SHA512 d9fcfc96f4c1bcd7bdae8ed4da19b4edec05e1b55149c664589c267539d183500a732f70670f0cde935c5f509f9dfbc97fd0e92b7047e1690f1342fa6504994d AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0 DIST aMule-2.3.3.tar.xz 3699376 BLAKE2B 4b1fb98bd52e4c75f81773020d4fc258f8e7c4d7a5d40a7aadabc8fd27b3079705761650fdcd7cd089da77575a74f1950f02039ee14bf4b9894550b8b3d9191b SHA512 a5a80c5ddd1e107d92070c1d8e232c2762c4c54791abc067c739eef7c690062ed164dd7733808f80c762719261162aeb3d602308964dda2670a0bb059d87b74e -EBUILD amule-2.3.3-r1.ebuild 3275 BLAKE2B 5c56cce531b6ad02febf5b116e077a72089f74f1a42285ba2cb7498380098e4a51074feec170014aca44014fd717abd202d0a333bcb3b91e2bcba78a7f5eb3a0 SHA512 57b0551558d62d7bf983d3393133e3300cc6ea2e4ae78c29cea66c54ad00950822780464a89276242ed0e8a35ecfc2bf0eaee4f8eb69efaad39ff37dd28ceefe EBUILD amule-2.3.3-r2.ebuild 3392 BLAKE2B 872383908fc542582baf4662e661c16d0c8075b131cc9928db229e0845182fb1c7d34b3e6debd7432462b469740dc6a5e5eb799799e203f174b73fde6cadf3f1 SHA512 369807c9f8b1dd9b4de900a883661b20872127b0c3a3cda5db044ac818424ff37c44546cf59c6e693648db7554497cc0e8de41d14d562c4536011bbe98bfbdc4 -EBUILD amule-2.3.3.ebuild 3098 BLAKE2B f0205804d79db0f9c72a7df5ac44a0a85d308669011d6dde820a8a6a084e00f81ae04a3c98b01521ff43471968a42a3148be005140110b94360d8ba908437cfa SHA512 97d37e98bf7811d83bbd0e4d90d60105eca0a35a4ab316c6330022d64f77604c727a42e9adfbd31d023ffd653ed94eb160396f6e9a1321826484c99291c2ba0f -EBUILD amule-9999.ebuild 3343 BLAKE2B 75bed8569eca358327fdaf03d2e5614fb88238d9eefd42853db0352db5b8c65be1ea637837beefa4b000c63b59d1b1955ca2b45ef85be6c3548b3265f55f6e43 SHA512 5c1973f7d6664e9276ff2c5e123b0b7bb224b0d7a4223ae9dc137772408deae853f99bf75e3978a9618213f023ec9df15d2145b215f03303e82ad27125792348 +EBUILD amule-2.3.3-r3.ebuild 3427 BLAKE2B f9dc5cd0e086ac5b7867633ffc174223fcf008ec78c1193d13ed4e3e212a4d1317b4d0f7a8e24b492220aef8becc677bd86695f2a5e6889fc5f9a757ffcdcecb SHA512 a36f38a7ec3a98441f2b53282d64e8e10e28d13e4f4cb1eb31e3889c3b8dbcab2e0289f1515df4a5c544b7d75f07a551e8d5c76f7993df574f8a045a5638957d +EBUILD amule-9999.ebuild 3387 BLAKE2B 47bc7dc486f0a5520b8dcdec53f1fa960658221b232a5e9f5dd05dcd060e41d8ed9dc56258819b8f799340047146e52d03fc0db7ef30fe41149d858b9e176ef6 SHA512 87bed1f8378aa1ad87934a074a5a10d9cca8743842b2a58cd056efddff4622624b44d937d2351674865cd9c090c104e46b55fbb74e72e4134bc32fd8577e4e63 MISC metadata.xml 717 BLAKE2B 104a91afec9919613f9897f655886e7d51f3c2f69af4efe47aab38b1c31982f6f97f8fb117ceffe2b53c5ba3bdc6fcef332dc4bf4cd956430187dcc374b3f473 SHA512 37b08e9a0376417b2e8c2372d5a59564ae23b522e36b97c163cb0d5c5113298eeac11b181f129854b983276ec8b8958b3df9599296152fecc5504d34c9554515 diff --git a/net-p2p/amule/amule-2.3.3-r1.ebuild b/net-p2p/amule/amule-2.3.3-r1.ebuild deleted file mode 100644 index dba49dc04a02..000000000000 --- a/net-p2p/amule/amule-2.3.3-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -WX_GTK_VER="3.0-gtk3" - -inherit autotools flag-o-matic wxwidgets xdg-utils - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/amule-project/amule" - inherit autotools git-r3 -else - MY_P="${PN/m/M}-${PV}" - SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -DESCRIPTION="aMule, the all-platform eMule p2p client" -HOMEPAGE="http://www.amule.org/" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="daemon debug geoip nls remote stats upnp +X" - -RDEPEND=" - dev-libs/boost:= - dev-libs/crypto++:= - sys-libs/binutils-libs:0= - sys-libs/readline:0= - sys-libs/zlib - >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?] - daemon? ( acct-user/amule ) - geoip? ( dev-libs/geoip ) - nls? ( virtual/libintl ) - remote? ( - acct-user/amule - media-libs/libpng:0= - ) - stats? ( media-libs/gd:=[jpeg,png] ) - upnp? ( net-libs/libupnp:0 ) -" -DEPEND="${RDEPEND} - X? ( dev-util/desktop-file-utils ) -" -BDEPEND=" - virtual/pkgconfig - >=sys-devel/boost-m4-0.4_p20221019 - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch" - "${FILESDIR}/${PN}-2.3.3-fix-exception.patch" - "${FILESDIR}/${P}-autoconf-2.70.patch" -) - -pkg_setup() { - setup-wxwidgets -} - -src_prepare() { - default - rm m4/boost.m4 || die - - if [[ ${PV} == 9999 ]]; then - ./autogen.sh || die - else - eautoreconf - fi -} - -src_configure() { - append-cxxflags -std=gnu++14 - - local myconf=( - --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) - ) - - 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 "${myconf[@]}" -} - -src_install() { - default - - if use daemon; then - newconfd "${FILESDIR}"/amuled.confd-r1 amuled - newinitd "${FILESDIR}"/amuled.initd amuled - fi - if use remote; then - newconfd "${FILESDIR}"/amuleweb.confd-r1 amuleweb - newinitd "${FILESDIR}"/amuleweb.initd amuleweb - fi - - if use daemon || use remote; then - keepdir /var/lib/${PN} - fowners amule:amule /var/lib/${PN} - fperms 0750 /var/lib/${PN} - fi -} - -pkg_postinst() { - local ver - - if use daemon || use remote; then - for ver in ${REPLACING_VERSIONS}; do - if ver_test ${ver} -lt "2.3.2-r4"; then - elog "Default user under which amuled and amuleweb daemons are started" - elog "have been changed from p2p to amule. Default home directory have been" - elog "changed as well." - echo - elog "If you want to preserve old download/share location, you can create" - elog "symlink /var/lib/amule/.aMule pointing to the old location and adjust" - elog "files ownership *or* restore AMULEUSER and AMULEHOME variables in" - elog "/etc/conf.d/{amuled,amuleweb} to the old values." - - break - fi - done - fi - - use X && xdg_desktop_database_update -} - -pkg_postrm() { - use X && xdg_desktop_database_update -} diff --git a/net-p2p/amule/amule-2.3.3-r3.ebuild b/net-p2p/amule/amule-2.3.3-r3.ebuild new file mode 100644 index 000000000000..e982384b3612 --- /dev/null +++ b/net-p2p/amule/amule-2.3.3-r3.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +WX_GTK_VER="3.2-gtk3" + +inherit autotools flag-o-matic wxwidgets xdg-utils + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/amule-project/amule" + inherit git-r3 +else + MY_P="${PN/m/M}-${PV}" + SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz" + S="${WORKDIR}/${MY_P}" + KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DESCRIPTION="aMule, the all-platform eMule p2p client" +HOMEPAGE="http://www.amule.org/" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="daemon debug geoip nls remote stats upnp +X" + +RDEPEND=" + dev-libs/boost:= + dev-libs/crypto++:= + sys-libs/binutils-libs:0= + sys-libs/readline:0= + sys-libs/zlib + x11-libs/wxGTK:${WX_GTK_VER}[X?] + daemon? ( acct-user/amule ) + geoip? ( dev-libs/geoip ) + nls? ( virtual/libintl ) + remote? ( + acct-user/amule + media-libs/libpng:0= + ) + stats? ( media-libs/gd:=[jpeg,png] ) + upnp? ( net-libs/libupnp:0 ) +" +DEPEND="${RDEPEND} + X? ( dev-util/desktop-file-utils ) +" +BDEPEND=" + virtual/pkgconfig + >=sys-devel/boost-m4-0.4_p20221019 + nls? ( sys-devel/gettext ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch" + "${FILESDIR}/${PN}-2.3.3-fix-exception.patch" + "${FILESDIR}/${P}-autoconf-2.70.patch" + "${FILESDIR}/${PN}-2.3.3-backport-pr368.patch" + "${FILESDIR}/${PN}-2.3.3-wx3.2.patch" +) + +pkg_setup() { + setup-wxwidgets +} + +src_prepare() { + default + rm m4/boost.m4 || die + + if [[ ${PV} == 9999 ]]; then + ./autogen.sh || die + else + eautoreconf + fi +} + +src_configure() { + use debug || append-cppflags -DwxDEBUG_LEVEL=0 + append-cxxflags -std=gnu++14 + + local myconf=( + --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) + ) + + 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 "${myconf[@]}" +} + +src_test() { + emake check +} + +src_install() { + default + + if use daemon; then + newconfd "${FILESDIR}"/amuled.confd-r1 amuled + newinitd "${FILESDIR}"/amuled.initd amuled + fi + if use remote; then + newconfd "${FILESDIR}"/amuleweb.confd-r1 amuleweb + newinitd "${FILESDIR}"/amuleweb.initd amuleweb + fi + + if use daemon || use remote; then + keepdir /var/lib/${PN} + fowners amule:amule /var/lib/${PN} + fperms 0750 /var/lib/${PN} + fi +} + +pkg_postinst() { + local ver + + if use daemon || use remote; then + for ver in ${REPLACING_VERSIONS}; do + if ver_test ${ver} -lt "2.3.2-r4"; then + elog "Default user under which amuled and amuleweb daemons are started" + elog "have been changed from p2p to amule. Default home directory have been" + elog "changed as well." + echo + elog "If you want to preserve old download/share location, you can create" + elog "symlink /var/lib/amule/.aMule pointing to the old location and adjust" + elog "files ownership *or* restore AMULEUSER and AMULEHOME variables in" + elog "/etc/conf.d/{amuled,amuleweb} to the old values." + + break + fi + done + fi + + use X && xdg_desktop_database_update +} + +pkg_postrm() { + use X && xdg_desktop_database_update +} diff --git a/net-p2p/amule/amule-2.3.3.ebuild b/net-p2p/amule/amule-2.3.3.ebuild deleted file mode 100644 index 292872783ad9..000000000000 --- a/net-p2p/amule/amule-2.3.3.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -WX_GTK_VER="3.0-gtk3" - -inherit wxwidgets xdg-utils - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/amule-project/amule" - inherit autotools git-r3 -else - MY_P="${PN/m/M}-${PV}" - SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~riscv ~sparc x86" -fi - -DESCRIPTION="aMule, the all-platform eMule p2p client" -HOMEPAGE="http://www.amule.org/" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="daemon debug geoip nls remote stats upnp +X" - -RDEPEND=" - dev-libs/boost:= - dev-libs/crypto++:= - sys-libs/binutils-libs:0= - sys-libs/readline:0= - sys-libs/zlib - >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?] - daemon? ( acct-user/amule ) - geoip? ( dev-libs/geoip ) - nls? ( virtual/libintl ) - remote? ( - acct-user/amule - media-libs/libpng:0= - ) - stats? ( media-libs/gd:=[jpeg,png] ) - upnp? ( net-libs/libupnp:0 ) -" -DEPEND="${RDEPEND} - X? ( dev-util/desktop-file-utils ) -" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch" - "${FILESDIR}/${PN}-2.3.3-fix-exception.patch" -) - -pkg_setup() { - setup-wxwidgets -} - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - ./autogen.sh || die - fi -} - -src_configure() { - local myconf=( - --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) - ) - - 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 "${myconf[@]}" -} - -src_install() { - default - - if use daemon; then - newconfd "${FILESDIR}"/amuled.confd-r1 amuled - newinitd "${FILESDIR}"/amuled.initd amuled - fi - if use remote; then - newconfd "${FILESDIR}"/amuleweb.confd-r1 amuleweb - newinitd "${FILESDIR}"/amuleweb.initd amuleweb - fi - - if use daemon || use remote; then - keepdir /var/lib/${PN} - fowners amule:amule /var/lib/${PN} - fperms 0750 /var/lib/${PN} - fi -} - -pkg_postinst() { - local ver - - if use daemon || use remote; then - for ver in ${REPLACING_VERSIONS}; do - if ver_test ${ver} -lt "2.3.2-r4"; then - elog "Default user under which amuled and amuleweb daemons are started" - elog "have been changed from p2p to amule. Default home directory have been" - elog "changed as well." - echo - elog "If you want to preserve old download/share location, you can create" - elog "symlink /var/lib/amule/.aMule pointing to the old location and adjust" - elog "files ownership *or* restore AMULEUSER and AMULEHOME variables in" - elog "/etc/conf.d/{amuled,amuleweb} to the old values." - - break - fi - done - fi - - use X && xdg_desktop_database_update -} - -pkg_postrm() { - use X && xdg_desktop_database_update -} diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild index c1743eff2384..3a74fe6369d0 100644 --- a/net-p2p/amule/amule-9999.ebuild +++ b/net-p2p/amule/amule-9999.ebuild @@ -2,18 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -WX_GTK_VER="3.0-gtk3" +WX_GTK_VER="3.2-gtk3" -inherit flag-o-matic wxwidgets xdg-utils +inherit autotools flag-o-matic wxwidgets xdg-utils if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/amule-project/amule" - inherit autotools git-r3 + inherit git-r3 else MY_P="${PN/m/M}-${PV}" SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="aMule, the all-platform eMule p2p client" @@ -29,7 +29,7 @@ RDEPEND=" sys-libs/binutils-libs:0= sys-libs/readline:0= sys-libs/zlib - >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?] + x11-libs/wxGTK:${WX_GTK_VER}[X?] daemon? ( acct-user/amule ) geoip? ( dev-libs/geoip ) nls? ( virtual/libintl ) @@ -53,6 +53,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch" "${FILESDIR}/${PN}-2.3.3-fix-exception.patch" "${FILESDIR}/${PN}-2.3.3-backport-pr368.patch" + "${FILESDIR}/${PN}-2.3.3-wx3.2.patch" ) pkg_setup() { diff --git a/net-p2p/amule/files/amule-2.3.3-wx3.2.patch b/net-p2p/amule/files/amule-2.3.3-wx3.2.patch new file mode 100644 index 000000000000..58590c60f2df --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.3-wx3.2.patch @@ -0,0 +1,461 @@ +Description: Fixes for wxWidgets 3.2 compatibility + Largely based on patch from Mr Hyde in + https://github.com/amule-project/amule/pull/168 +Author: Olly Betts +Bug: https://github.com/amule-project/amule/issues/340 +Bug-Debian: https://bugs.debian.org/1019841 +Forwarded: no +Last-Update: 2023-01-09 + +--- a/src/ColorFrameCtrl.cpp ++++ b/src/ColorFrameCtrl.cpp +@@ -61,7 +61,7 @@ + ///////////////////////////////////////////////////////////////////////////// + void CColorFrameCtrl::SetFrameBrushColour(const wxColour& colour) + { +- m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour, wxSOLID)); ++ m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID)); + + Refresh(FALSE); + } // SetFrameColor +@@ -70,7 +70,7 @@ + ///////////////////////////////////////////////////////////////////////////// + void CColorFrameCtrl::SetBackgroundBrushColour(const wxColour& colour) + { +- m_brushBack = *(wxTheBrushList->FindOrCreateBrush(colour, wxSOLID)); ++ m_brushBack = *(wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID)); + + // clear out the existing garbage, re-start with a clean plot + Refresh(FALSE); +--- a/src/DownloadListCtrl.cpp ++++ b/src/DownloadListCtrl.cpp +@@ -850,7 +850,7 @@ + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); + dc->SetPen( colour.Blend(65).GetPen() ); + } else { +- dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID))); ++ dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID))); + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + dc->SetPen(*wxTRANSPARENT_PEN); + } +@@ -1413,7 +1413,7 @@ + dc->DrawLine( rect.x, rect.y + 2, rect.x + width, rect.y + 2 ); + + // Draw the green line +- dc->SetPen( *(wxThePenList->FindOrCreatePen( crProgress , 1, wxSOLID ) )); ++ dc->SetPen( *(wxThePenList->FindOrCreatePen( crProgress , 1, wxPENSTYLE_SOLID ) )); + dc->DrawLine( rect.x, rect.y + 1, rect.x + width, rect.y + 1 ); + } + } +--- a/src/GenericClientListCtrl.cpp ++++ b/src/GenericClientListCtrl.cpp +@@ -660,7 +660,7 @@ + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); + dc->SetPen( colour.Blend(65).GetPen() ); + } else { +- dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID))); ++ dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID))); + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + dc->SetPen(*wxTRANSPARENT_PEN); + } +--- a/src/MuleColour.cpp ++++ b/src/MuleColour.cpp +@@ -35,7 +35,7 @@ + std::map wxPenCache; + std::map wxBrushCache; + +-const wxPen& CMuleColour::GetPen(int width, int style) const ++const wxPen& CMuleColour::GetPen(int width, wxPenStyle style) const + { + #if USE_MULE_PEN_CACHE + wxPen* result = NULL; +@@ -61,7 +61,7 @@ + #endif + } + +-const wxBrush& CMuleColour::GetBrush(int style) const ++const wxBrush& CMuleColour::GetBrush(wxBrushStyle style) const + { + #if USE_MULE_BRUSH_CACHE + wxBrush* result = NULL; +--- a/src/MuleColour.h ++++ b/src/MuleColour.h +@@ -27,6 +27,9 @@ + + #include + #include ++#include // needed for wxPenStyle enum values ++#include // needed for wxBrushStyle enum values ++#include // needed for wxFontStyle enum values + #include "Types.h" + + class wxPen; +@@ -95,8 +98,8 @@ + return wxColor(m_red, m_green, m_blue); + } + +- const wxPen& GetPen(int width = 1, int style = wxSOLID) const; +- const wxBrush& GetBrush(int style = wxSOLID) const; ++ const wxPen& GetPen(int width = 1, wxPenStyle style = wxPENSTYLE_SOLID) const; ++ const wxBrush& GetBrush(wxBrushStyle style = wxBRUSHSTYLE_SOLID) const; + + private: + uint8_t m_red; +--- a/src/MuleGifCtrl.cpp ++++ b/src/MuleGifCtrl.cpp +@@ -167,7 +167,7 @@ + int x = (clientsize.GetWidth()-gifsize.GetWidth())/2; + int y = (clientsize.GetHeight()-gifsize.GetHeight())/2; + +- dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID))); ++ dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID))); + dc.Clear(); + dc.DrawBitmap(m_frame, x, y, true); + } +--- a/src/OScopeCtrl.cpp ++++ b/src/OScopeCtrl.cpp +@@ -74,7 +74,7 @@ + PlotData_t* ppds = pdsTrends; + for(unsigned i=0; icrPlot = (i<15 ? crPreset[i] : *wxWHITE); +- ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxSOLID)); ++ ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxPENSTYLE_SOLID)); + ppds->fPrev = ppds->fLowerLimit = ppds->fUpperLimit = 0.0; + } + +@@ -166,7 +166,7 @@ + if (ppds->crPlot == cr) + return; + ppds->crPlot = cr; +- ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxSOLID)); ++ ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxPENSTYLE_SOLID)); + InvalidateGraph(); + } + +@@ -179,7 +179,7 @@ + } + + m_bgColour = cr; +- brushBack= *(wxTheBrushList->FindOrCreateBrush(cr, wxSOLID)); ++ brushBack= *(wxTheBrushList->FindOrCreateBrush(cr, wxBRUSHSTYLE_SOLID)); + InvalidateCtrl() ; + } + +@@ -196,7 +196,7 @@ + + wxMemoryDC dcGrid(m_bmapGrid); + +- wxPen solidPen = *(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxSOLID)); ++ wxPen solidPen = *(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxPENSTYLE_SOLID)); + wxString strTemp; + + // fill the grid background +@@ -213,7 +213,7 @@ + dcGrid.SetPen(wxNullPen); + + // create some fonts (horizontal and vertical) +- wxFont axisFont(10, wxSWISS, wxNORMAL, wxNORMAL, false); ++ wxFont axisFont(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false); + dcGrid.SetFont(axisFont); + + // y max +@@ -320,7 +320,7 @@ + // operation, preventing us from simply blitting the plot on top of + // the grid bitmap. + +- dc.SetPen(*(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxLONG_DASH))); ++ dc.SetPen(*(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxPENSTYLE_LONG_DASH))); + for (unsigned j = 1; j < (nYGrids + 1); ++j) { + unsigned GridPos = (m_rectPlot.GetHeight())*j/( nYGrids + 1 ) + m_rectPlot.GetTop(); + +--- a/src/SearchListCtrl.cpp ++++ b/src/SearchListCtrl.cpp +@@ -826,7 +826,7 @@ + + // Define the border of the drawn area + if (highlighted) { +- dc->SetPen(*(wxThePenList->FindOrCreatePen(CMuleColour(dc->GetBackground().GetColour()).Blend(65), 1, wxSOLID))); ++ dc->SetPen(*(wxThePenList->FindOrCreatePen(CMuleColour(dc->GetBackground().GetColour()).Blend(65), 1, wxPENSTYLE_SOLID))); + } else { + dc->SetPen(*wxTRANSPARENT_PEN); + dc->SetTextForeground(GetItemTextColour(item)); +@@ -912,7 +912,7 @@ + const int middle = cur_rec.y + ( cur_rec.height + 1 ) / 2; + + // Set up a new pen for drawing the tree +- dc->SetPen( *(wxThePenList->FindOrCreatePen(dc->GetTextForeground(), 1, wxSOLID)) ); ++ dc->SetPen( *(wxThePenList->FindOrCreatePen(dc->GetTextForeground(), 1, wxPENSTYLE_SOLID)) ); + + if (file->GetParent()) { + // Draw the line to the filename +--- a/src/ServerListCtrl.cpp ++++ b/src/ServerListCtrl.cpp +@@ -327,7 +327,7 @@ + wxFont font = GetFont(); + + if ( highlight ) { +- font.SetWeight( wxBOLD ); ++ font.SetWeight( wxFONTWEIGHT_BOLD ); + + m_connected = server; + } +--- a/src/extern/wxWidgets/listctrl.cpp ++++ b/src/extern/wxWidgets/listctrl.cpp +@@ -1453,7 +1453,7 @@ + if ( highlighted ) + dc->SetBrush( m_owner->GetHighlightBrush() ); + else +- dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(attr->GetBackgroundColour(), wxSOLID))); ++ dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID))); + + dc->SetPen( *wxTRANSPARENT_PEN ); + +@@ -2325,7 +2325,7 @@ + ( + wxSYS_COLOUR_HIGHLIGHT + ), +- wxSOLID ++ wxBRUSHSTYLE_SOLID + )); + + m_highlightUnfocusedBrush = *(wxTheBrushList->FindOrCreateBrush( +@@ -2333,7 +2333,7 @@ + ( + wxSYS_COLOUR_BTNSHADOW + ), +- wxSOLID ++ wxBRUSHSTYLE_SOLID + )); + + SetScrollbars( 0, 0, 0, 0, 0, 0 ); +@@ -2734,7 +2734,7 @@ + + // Ensure an uniform background color, as to avoid differences between + // the automatically cleared parts and the rest of the canvas. +- dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID))); ++ dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID))); + + // We need to clear the DC manually, since we intercept BG-erase events. + // Clearing must be done first thing because caching of the double-buffering causes artifacts otherwise. +@@ -2805,7 +2805,7 @@ + + if ( HasFlag(wxLC_HRULES) ) + { +- wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxSOLID)); ++ wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxPENSTYLE_SOLID)); + wxSize clientSize = GetClientSize(); + + size_t i = visibleFrom; +@@ -2831,7 +2831,7 @@ + // Draw vertical rules if required + if ( HasFlag(wxLC_VRULES) && !IsEmpty() ) + { +- wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxSOLID)); ++ wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxPENSTYLE_SOLID)); + wxRect firstItemRect, lastItemRect; + + GetItemRect(visibleFrom, firstItemRect); +@@ -4859,12 +4859,15 @@ + + void wxListMainWindow::OnScroll(wxScrollWinEvent& event) + { ++ // wxScrolledWindows::OnScroll is deprecated in wx 3.0.0 and it does not exist anymore in 3.1.0. ++ // Please also notice that call to ++ // - wxScrolledWindow::OnScroll ++ // - HandleOnScroll ++ // have been removed in code present in ++ // src/generic/listctrl.cpp, wxListMainWindow::OnScroll ++ // of wxWidgets 3.0 + // FIXME +-#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__) +- wxScrolledWindow::OnScroll(event); +-#else + HandleOnScroll( event ); +-#endif + + // update our idea of which lines are shown when we redraw the window the + // next time +--- a/src/extern/wxWidgets/listctrl.h ++++ b/src/extern/wxWidgets/listctrl.h +@@ -16,7 +16,6 @@ + #include + + #define wxLC_OWNERDRAW 0x10000 +-#define WXWIN_COMPATIBILITY_2_8 1 + + #include + +--- a/src/muuli_wdr.cpp ++++ b/src/muuli_wdr.cpp +@@ -77,7 +77,7 @@ + + CMuleTextCtrl *item4 = new CMuleTextCtrl( parent, -1, wxT(""), wxDefaultPosition, wxSize(-1,20), wxTE_MULTILINE ); + item4->SetName( wxT("FastEd2kLinks") ); +- item2->Add( item4, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 0 ); ++ item2->Add( item4, 1, wxALL|wxEXPAND, 5 ); + + wxButton *item5 = new wxButton( parent, ID_BUTTON_FAST, _("Commit"), wxDefaultPosition, wxDefaultSize, 0 ); + item5->SetToolTip( _("Click here to add the eD2k link in the text control to your download queue.") ); +@@ -474,7 +474,7 @@ + item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); + + CSourceListCtrl *item6 = new CSourceListCtrl( parent, ID_CLIENTLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER ); +- item0->Add( item6, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item0->Add( item6, 1, wxGROW, 5 ); + + if (set_sizer) + { +@@ -1048,7 +1048,7 @@ + wxWindow *item3 = new COScopeCtrl(3,1,GRAPH_DOWN,parent); + item3->SetName(wxT("dloadScope")); + wxASSERT( item3 ); +- item1->Add( item3, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item1->Add( item3, 1, wxGROW|wxALL, 5 ); + + wxFlexGridSizer *item4 = new wxFlexGridSizer( 2, 0, 0 ); + item4->AddGrowableCol( 0 ); +@@ -1089,7 +1089,7 @@ + + item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); + +- item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); ++ item0->Add( item1, 1, wxGROW|wxBOTTOM, 5 ); + + wxStaticBox *item15 = new wxStaticBox( parent, -1, _("Upload-Speed") ); + wxStaticBoxSizer *item14 = new wxStaticBoxSizer( item15, wxVERTICAL ); +@@ -1097,7 +1097,7 @@ + wxWindow *item16 = new COScopeCtrl(3,1,GRAPH_UP,parent); + item16->SetName(wxT("uloadScope")); + wxASSERT( item16 ); +- item14->Add( item16, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item14->Add( item16, 1, wxGROW|wxALL, 5 ); + + wxFlexGridSizer *item17 = new wxFlexGridSizer( 2, 0, 0 ); + item17->AddGrowableCol( 0 ); +@@ -1138,7 +1138,7 @@ + + item14->Add( item17, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); + +- item0->Add( item14, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); ++ item0->Add( item14, 1, wxGROW|wxBOTTOM, 5 ); + + wxStaticBox *item28 = new wxStaticBox( parent, -1, _("Connections") ); + wxStaticBoxSizer *item27 = new wxStaticBoxSizer( item28, wxVERTICAL ); +@@ -1146,7 +1146,7 @@ + wxWindow *item29 = new COScopeCtrl(3,0,GRAPH_CONN,parent); + item29->SetName(wxT("otherScope")); + wxASSERT( item29 ); +- item27->Add( item29, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item27->Add( item29, 1, wxGROW|wxALL, 5 ); + + wxFlexGridSizer *item30 = new wxFlexGridSizer( 2, 0, 0 ); + item30->AddGrowableCol( 0 ); +@@ -1187,16 +1187,15 @@ + + item27->Add( item30, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); + +- item0->Add( item27, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item0->Add( item27, 1, wxGROW|wxALL, 5 ); + + wxStaticBox *item41 = new wxStaticBox( parent, -1, _("Statistics Tree") ); + wxStaticBoxSizer *item40 = new wxStaticBoxSizer( item41, wxVERTICAL ); + + wxTreeCtrl *item42 = new wxTreeCtrl( parent, -1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxSUNKEN_BORDER ); + item42->SetName( wxT("statTree") ); +- item40->Add( item42, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); +- +- item0->Add( item40, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item40->Add( item42, 1, wxGROW|wxALL, 5 ); ++ item0->Add( item40, 1, wxGROW|wxALL, 5 ); + + if (set_sizer) + { +@@ -2030,7 +2029,7 @@ + + wxStaticText *item2 = new wxStaticText( parent, -1, _("!!! WARNING !!!"), wxDefaultPosition, wxDefaultSize, 0 ); + item2->SetForegroundColour( *wxRED ); +- item2->SetFont( wxFont( 24, wxROMAN, wxNORMAL, wxNORMAL ) ); ++ item2->SetFont( wxFont( 24, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL ) ); + item1->Add( item2, 0, wxALIGN_CENTER, 5 ); + + wxStaticText *item3 = new wxStaticText( parent, IDC_AMULE_TWEAKS_WARNING, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); +--- a/src/utils/wxCas/src/wxcasframe.cpp ++++ b/src/utils/wxCas/src/wxcasframe.cpp +@@ -280,11 +280,11 @@ + #ifdef __WINDOWS__ + + memdc. +- SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) ); ++ SetFont ( wxFont ( 6, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) ); + #else + + memdc. +- SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) ); ++ SetFont ( wxFont ( 8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) ); + #endif + + memdc. +--- a/src/amuleDlg.cpp ++++ b/src/amuleDlg.cpp +@@ -763,7 +763,7 @@ + if ( (true == skinChanged) || (currentState != s_oldState) ) { + wxWindowUpdateLocker freezer(m_wndToolbar); + +- wxToolBarToolBase* toolbarTool = m_wndToolbar->RemoveTool(ID_BUTTONCONNECT); ++ wxToolBarToolBase* toolbarTool = m_wndToolbar->FindById(ID_BUTTONCONNECT); + + switch (currentState) { + case ECS_Connecting: +@@ -784,8 +784,6 @@ + toolbarTool->SetNormalBitmap(m_tblist.GetBitmap(0)); + } + +- m_wndToolbar->InsertTool(0, toolbarTool); +- m_wndToolbar->Realize(); + m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady()); + + s_oldState = currentState; +@@ -1416,7 +1414,7 @@ + wxWindowUpdateLocker freezer(this); + #endif + +- wxToolBarToolBase* toolbarTool = m_wndToolbar->RemoveTool(ID_BUTTONNETWORKS); ++ wxToolBarToolBase* toolbarTool = m_wndToolbar->FindById(ID_BUTTONNETWORKS); + + // set the log windows + wxNotebook* logs_notebook = CastChild( ID_SRVLOG_NOTEBOOK, wxNotebook); +@@ -1507,12 +1505,9 @@ + + // Tool bar + +- m_wndToolbar->InsertTool(2, toolbarTool); + m_wndToolbar->EnableTool(ID_BUTTONNETWORKS, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia())); + m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady()); + +- m_wndToolbar->Realize(); +- + ShowConnectionState(); // status in the bottom right + m_searchwnd->FixSearchTypes(); + } +--- a/src/amule-gui.cpp ++++ b/src/amule-gui.cpp +@@ -28,6 +28,7 @@ + #include + + #include // Needed for wxClipBoard ++#include + #include // Needed for wxStringTokenizer + + #include "SharedFilesWnd.h" // Needed for CSharedFilesWnd +@@ -98,6 +99,11 @@ + + CamuleGuiBase::CamuleGuiBase() + { ++ // Disable these checks for now. The code really needs updating to ++ // eliminate these inconsistent flag uses, but these checks are new ++ // since wx3.0, and this should just return us to what 3.0 did. ++ wxSizerFlags::DisableConsistencyChecks(); ++ + amuledlg = NULL; + } + -- cgit v1.2.3