commit: 6583c127f5e43111c651093417fbc5c5840f406d Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> AuthorDate: Sun Jun 30 09:19:43 2024 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Sat Jul 13 11:06:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6583c127
net-p2p/amule: use xdg-open instead of mplayer for media previews Also call setup-wxwidgets() from src_configure() Closes: https://bugs.gentoo.org/931622 Closes: https://bugs.gentoo.org/935481 Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> .../amule/{amule-9999.ebuild => amule-2.3.3-r4.ebuild} | 8 ++++---- net-p2p/amule/amule-9999.ebuild | 7 +++---- .../amule-2.3.3-use-xdg-open-as-preview-default.patch | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-2.3.3-r4.ebuild similarity index 96% copy from net-p2p/amule/amule-9999.ebuild copy to net-p2p/amule/amule-2.3.3-r4.ebuild index 80d5beab4994..a1aa3c9c2ce6 100644 --- a/net-p2p/amule/amule-9999.ebuild +++ b/net-p2p/amule/amule-2.3.3-r4.ebuild @@ -52,14 +52,12 @@ BDEPEND=" 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" + "${FILESDIR}/${PN}-2.3.3-use-xdg-open-as-preview-default.patch" ) -pkg_setup() { - setup-wxwidgets -} - src_prepare() { default rm m4/boost.m4 || die @@ -72,6 +70,8 @@ src_prepare() { } src_configure() { + setup-wxwidgets + use debug || append-cppflags -DwxDEBUG_LEVEL=0 append-cxxflags -std=gnu++14 diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild index 80d5beab4994..9673e620eb9c 100644 --- a/net-p2p/amule/amule-9999.ebuild +++ b/net-p2p/amule/amule-9999.ebuild @@ -54,12 +54,9 @@ PATCHES=( "${FILESDIR}/${PN}-2.3.3-fix-exception.patch" "${FILESDIR}/${PN}-2.3.3-backport-pr368.patch" "${FILESDIR}/${PN}-2.3.3-wx3.2.patch" + "${FILESDIR}/${PN}-2.3.3-use-xdg-open-as-preview-default.patch" ) -pkg_setup() { - setup-wxwidgets -} - src_prepare() { default rm m4/boost.m4 || die @@ -72,6 +69,8 @@ src_prepare() { } src_configure() { + setup-wxwidgets + use debug || append-cppflags -DwxDEBUG_LEVEL=0 append-cxxflags -std=gnu++14 diff --git a/net-p2p/amule/files/amule-2.3.3-use-xdg-open-as-preview-default.patch b/net-p2p/amule/files/amule-2.3.3-use-xdg-open-as-preview-default.patch new file mode 100644 index 000000000000..816f44f00dd0 --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.3-use-xdg-open-as-preview-default.patch @@ -0,0 +1,17 @@ +commit f54a851586ff3762e0426ea9265ffb3499f93ad5 +Author: Adeodato Simó <[email protected]> +Date: Sun Mar 1 14:10:15 2009 +0100 + + src/DownloadListCtrl.cpp: use xdg-open as default instead of mplayer. + +--- a/src/DownloadListCtrl.cpp ++++ b/src/DownloadListCtrl.cpp +@@ -1429,7 +1429,7 @@ void CDownloadListCtrl::PreviewFile(CPar + _("File preview"), wxOK, this); + // Since newer versions for some reason mplayer does not automatically + // select video output device and needs a parameter, go figure... +- command = wxT("xterm -T \"aMule Preview\" -iconic -e mplayer ") QUOTE wxT("$file") QUOTE; ++ command = wxT("xterm -T \"aMule Preview\" -iconic -e xdg-open ") QUOTE wxT("$file") QUOTE; + } else { + command = thePrefs::GetVideoPlayer(); + }
