diff options
| -rw-r--r-- | net-p2p/amule/ChangeLog | 12 | ||||
| -rw-r--r-- | net-p2p/amule/Manifest | 14 | ||||
| -rw-r--r-- | net-p2p/amule/amule-2.1.3-r1.ebuild (renamed from net-p2p/amule/amule-2.2.0_pre20070422.ebuild) | 46 | ||||
| -rw-r--r-- | net-p2p/amule/amule-2.2.0_pre20080204.ebuild (renamed from net-p2p/amule/amule-2.2.0_pre20080130.ebuild) | 3 | ||||
| -rw-r--r-- | net-p2p/amule/files/2.1.3-wx-2.8.patch | 156 | ||||
| -rw-r--r-- | net-p2p/amule/files/amuleweb.confd | 6 | ||||
| -rw-r--r-- | net-p2p/amule/files/amuleweb.initd | 4 |
7 files changed, 208 insertions, 33 deletions
diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog index 275c2bf25476..6d91321eaabf 100644 --- a/net-p2p/amule/ChangeLog +++ b/net-p2p/amule/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-p2p/amule # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.98 2008/01/30 15:05:21 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.99 2008/02/04 16:51:50 armin76 Exp $ + +*amule-2.2.0_pre20080204 (04 Feb 2008) +*amule-2.1.3-r1 (04 Feb 2008) + + 04 Feb 2008; Raúl Porcel <armin76@gentoo.org> +files/2.1.3-wx-2.8.patch, + files/amuleweb.confd, files/amuleweb.initd, +amule-2.1.3-r1.ebuild, + -amule-2.2.0_pre20070422.ebuild, -amule-2.2.0_pre20080130.ebuild, + +amule-2.2.0_pre20080204.ebuild: + Add -r1, builds against wx-2.8 bug #208714, uses webserver template, bug + #199108, new snapshot *amule-2.2.0_pre20080130 (30 Jan 2008) diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest index 7c9ca8267ecb..d7b269eb1f5e 100644 --- a/net-p2p/amule/Manifest +++ b/net-p2p/amule/Manifest @@ -1,12 +1,12 @@ +AUX 2.1.3-wx-2.8.patch 4943 RMD160 38b154b4755db86cc00c5f46d36ee30f26014cac SHA1 bd048f7b88ff4c19841f606d03c5a9750e6e6945 SHA256 c0c0a55fb437fdf618137f2cb0c5ff59a1595aeddf5455a1bad2b2ab11b0a244 AUX amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 SHA1 b5872943f5ec0ac41a7c054239a754f1f9669e09 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a AUX amuled.initd 1204 RMD160 d17d6b709f8b7eb91132804fa8a420b5f9499d14 SHA1 936566e113bb91cbc7cfe6803bf7b1d76b8cbadb SHA256 af51a7d148368b2ed3b9cc289e0831c95348dbda9b331360a5635af31b81ed7a -AUX amuleweb.confd 758 RMD160 aa7565de986afd065b7715a196fffeb30394dd03 SHA1 a03edf4222ffb34ae5adf78619ebb09ad3a25d38 SHA256 f201d4ffd6cae939776d625105a0c53586cd831f2de983913e2dd61f7c932052 -AUX amuleweb.initd 1218 RMD160 05cefe9c7be8e03808f65198ca6f8e0221f58465 SHA1 f004434b71aad2a92ac66314a20acdbe0dfee1a8 SHA256 40f941351b8cff50a51cd3cd86046c88d66c7281882290121d8c78ed43920e76 +AUX amuleweb.confd 830 RMD160 1921152543c6f327caf55087269cf0f277545764 SHA1 7800ad36f88a116ca4dcc7b68944b7acaf5877e1 SHA256 e0c4ad636011797618c31ce3d4d5d20ea689ecf6f3ad350fff5b1716c6009c4f +AUX amuleweb.initd 1236 RMD160 d9f417c3145a26d0e2e0879ab8fe4cc6b569dd35 SHA1 c4f7830950db758c1d961e1edb51e8b067cfb50c SHA256 64a2d1c7770b6d975a68a900b6b15f7bc8ff686b249da3ca96c7bc62cfee57d1 DIST aMule-2.1.3.tar.bz2 3248530 RMD160 fcc345000e5ad0a221d1e96d0d514f3be36428c3 SHA1 dd47deb38e7a5b823550b85150f5a814c597b273 SHA256 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244 -DIST aMule-CVS-20070422.tar.bz2 3406102 RMD160 ab2912e5e07c6690a854682373107c532715faea SHA1 d0e519849d5e44d6d73940af505a209fa6fdff9c SHA256 f5a532da419a6a78238144588bb420c4cbd7b1113ea05000abf8a29b3202ac1a -DIST aMule-CVS-20080130.tar.bz2 4068132 RMD160 fa0d5c7235581af78b5abba56bf3f6dd31a91475 SHA1 14443fd06ac2680b570f58612f94550887c702ab SHA256 43acf7e517a4b55c8181185215ae519637b9b14e331601d2f47866779b0b2709 +DIST aMule-CVS-20080204.tar.bz2 4055924 RMD160 9b96507265dfc3d4116e0eafac37222516861597 SHA1 77285daeb7d50dc7abebda903559f9ebc2b3b9fb SHA256 3a0681904c4c00923ee8a61ece5b1cb414a0aab6f9573e2a9341f7e1d1d28274 +EBUILD amule-2.1.3-r1.ebuild 3061 RMD160 776e4a14c59a3566590a81e7d6427deecbab95d0 SHA1 d56c453494fb1c705a1658b042a16cb1e42aa4b2 SHA256 ec91cda54fc5edf0397d3ac5edf90480cf0dc1da0542b424bbfd24089ed3c681 EBUILD amule-2.1.3.ebuild 3013 RMD160 0435e512f6b69ae8e47cf697fa26e0101553ad9f SHA1 421e60db1e7e7041df32437b00ae8b1c4a84cc16 SHA256 e680653b5c7925ae07d8f3282927f9f97831db5a081b8eb1445a4efccd7158ef -EBUILD amule-2.2.0_pre20070422.ebuild 2946 RMD160 52103b048707024ff1c43e7ed67f5a8e87ac881e SHA1 cb9c314a237c76dba4c41cd1b4d0e95a09251b04 SHA256 06f0a03a0bcdac300b73b8f7aa6f93cad06a234108b05122b340a76d25614e09 -EBUILD amule-2.2.0_pre20080130.ebuild 2896 RMD160 63524ebe67d634595eba4761e4eaa9952030f14d SHA1 5aae3961eea9a3c124128fc8adb61f376d0b6b32 SHA256 09049d6b0c15ab69a03b1546f8a4e13c2238922d7258bf70ca1154c3d631ba93 -MISC ChangeLog 14200 RMD160 2a8a6a8c1048d29e74e8fe92aaee49c1054cc27b SHA1 f5b81a082b1d7aa48ec6474254b00dcc3d62d932 SHA256 1fac065817906bc2acf7be010a8ed0aa4a74232811f3799b914c5cd81c1574b3 +EBUILD amule-2.2.0_pre20080204.ebuild 2963 RMD160 5e477ca0fac11c6a3be20109ac4ac20feb2bbff5 SHA1 60bdac5ba9ef011a1247162ce8b1c18e59a6e266 SHA256 937b72a209b824f17021ade9f66ead10c32c731d44702bcf496caf8ab29a363b +MISC ChangeLog 14619 RMD160 e3e20cbbd549fcdb5071c271e356e80aec383ffb SHA1 e98f2cead59f176c48a3ff8e93c769011bcb0900 SHA256 1deccdf1d3959b01b9452dfcdc62a46529b1b185b13885260a8aa9a37b1febdb MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f diff --git a/net-p2p/amule/amule-2.2.0_pre20070422.ebuild b/net-p2p/amule/amule-2.1.3-r1.ebuild index 265a14c50478..eb6b04ae5190 100644 --- a/net-p2p/amule/amule-2.2.0_pre20070422.ebuild +++ b/net-p2p/amule/amule-2.1.3-r1.ebuild @@ -1,26 +1,27 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20070422.ebuild,v 1.4 2008/01/15 13:43:48 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3-r1.ebuild,v 1.1 2008/02/04 16:51:50 armin76 Exp $ inherit eutils flag-o-matic wxwidgets -MY_P=${PN/m/M}-CVS-${PV/2.2.0_pre/} -S="${WORKDIR}/${PN}-cvs" +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="http://www.hirnriss.net/files/cvs/${MY_P}.tar.bz2" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="daemon debug gtk nls remote stats unicode" +IUSE="daemon debug geoip gtk nls remote stats unicode" -DEPEND="=x11-libs/wxGTK-2.6* +DEPEND="=x11-libs/wxGTK-2.8* >=sys-libs/zlib-1.2.1 stats? ( >=media-libs/gd-2.0.26 ) + geoip? ( dev-libs/geoip ) remote? ( >=media-libs/libpng-1.2.0 - unicode? ( >=media-libs/gd-2.0.26 ) )" + unicode? ( >=media-libs/gd-2.0.26 ) )" pkg_setup() { if ! use gtk && ! use remote && ! use daemon; then @@ -49,17 +50,22 @@ pkg_preinst() { fi } +src_unpack() { + unpack ${A} + cd "${S}" + + # Make it compile against wx-2.8 since upstream won't support 2.6 + epatch "${FILESDIR}"/${PV}-wx-2.8.patch +} + src_compile() { local myconf - WX_GTK_VER="2.6" + WX_GTK_VER="2.8" if use gtk; then - einfo "wxGTK with gtk2 and unicode support will be used" + einfo "wxGTK with gtk support will be used" need-wxwidgets unicode - elif use unicode; then - einfo "wxGTK with unicode and without X support will be used" - need-wxwidgets base-unicode else einfo "wxGTK without X support will be used" need-wxwidgets base @@ -83,13 +89,14 @@ src_compile() { --with-wx-config=${WX_CONFIG} \ --with-wxbase-config=${WX_CONFIG} \ --enable-amulecmd \ - `use_enable debug` \ - `use_enable !debug optimize` \ - `use_enable daemon amule-daemon` \ - `use_enable nls` \ - `use_enable remote webserver` \ - `use_enable stats cas` \ - `use_enable stats alcc` \ + $(use_enable debug) \ + $(use_enable !debug optimize) \ + $(use_enable daemon amule-daemon) \ + $(use_enable geoip) \ + $(use_enable nls) \ + $(use_enable remote webserver) \ + $(use_enable stats cas) \ + $(use_enable stats alcc) \ ${myconf} || die # we filter ssp until bug #74457 is closed to build on hardened @@ -109,5 +116,6 @@ src_install() { if use remote; then newconfd "${FILESDIR}"/amuleweb.confd amuleweb newinitd "${FILESDIR}"/amuleweb.initd amuleweb + make_desktop_entry amulegui "aMule Remote" amule "Network;P2P" fi } diff --git a/net-p2p/amule/amule-2.2.0_pre20080130.ebuild b/net-p2p/amule/amule-2.2.0_pre20080204.ebuild index 094bc96c8058..0c3e58ceb1e3 100644 --- a/net-p2p/amule/amule-2.2.0_pre20080130.ebuild +++ b/net-p2p/amule/amule-2.2.0_pre20080204.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20080130.ebuild,v 1.1 2008/01/30 15:05:21 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20080204.ebuild,v 1.1 2008/02/04 16:51:50 armin76 Exp $ inherit eutils flag-o-matic wxwidgets @@ -109,5 +109,6 @@ src_install() { if use remote; then newconfd "${FILESDIR}"/amuleweb.confd amuleweb newinitd "${FILESDIR}"/amuleweb.initd amuleweb + make_desktop_entry amulegui "aMule Remote" amule "Network;P2P" fi } diff --git a/net-p2p/amule/files/2.1.3-wx-2.8.patch b/net-p2p/amule/files/2.1.3-wx-2.8.patch new file mode 100644 index 000000000000..8148d35dd726 --- /dev/null +++ b/net-p2p/amule/files/2.1.3-wx-2.8.patch @@ -0,0 +1,156 @@ +diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp +--- aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp 2005-12-16 13:09:29.000000000 +0100 ++++ aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp 2006-12-17 20:20:47.151203000 +0100 +@@ -297,7 +297,7 @@ + m_validateButton = + new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) ); + m_cancelButton = +- new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) ); ++ new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) ); + + m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 ); + m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 ); +@@ -321,7 +321,6 @@ + EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton ) + EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton ) + EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton ) +-EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel ) // Defined in wxDialog + EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck ) + EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck ) + END_EVENT_TABLE () +--- aMule/src/utils/wxCas/src/wxcasprefs.h.org 2006-12-17 22:17:39.017417250 +0100 ++++ aMule/src/utils/wxCas/src/wxcasprefs.h 2006-12-17 22:18:17.611829250 +0100 +@@ -101,8 +101,7 @@ + ID_AUTOSTATIMG_COMBO, + ID_AUTOSTATIMG_BROWSE_BUTTON, + ID_FTP_UPDATE_CHECK, +- ID_VALIDATE_BUTTON, +- ID_CANCEL_BUTTON ++ ID_VALIDATE_BUTTON + }; + + protected: +--- aMule/src/MuleGifCtrl.cpp 2006-02-03 20:14:05.000000000 +0100 ++++ aMule/src/MuleGifCtrl.cpp 2006-11-19 19:35:33.000000000 +0100 +@@ -24,7 +24,6 @@ + + #include <wx/mstream.h> + #include <wx/gifdecod.h> +-#include <wx/window.h> + #include <wx/dcbuffer.h> + + #include "MuleGifCtrl.h" +@@ -35,6 +34,50 @@ + EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase) + END_EVENT_TABLE() + ++#if wxCHECK_VERSION(2, 7, 1) ++// Wrapper that emulates old wxGIFDecoder API ++ ++class MuleGIFDecoder : public wxGIFDecoder { ++public: ++ MuleGIFDecoder(wxInputStream* stream, bool dummy) { ++ m_stream = stream; ++ dummy = dummy; // Unused. ++ m_nframe = 0; ++ } ++ ++ ~MuleGIFDecoder() { /* don't delete the stream! */ } ++ ++ wxGIFErrorCode ReadGIF() { ++ return LoadGIF(*m_stream); ++ } ++ ++ void GoFirstFrame() { m_nframe = 0; } ++ void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; } ++ void GoLastFrame() { m_nframe = GetFrameCount(); } ++ ++ void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); } ++ ++ size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); } ++ size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); } ++ ++ size_t GetLeft() { return 0; } ++ size_t GetTop() { return 0; } ++ ++ long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); } ++ ++private: ++ uint32_t m_nframe; ++ wxInputStream* m_stream; ++}; ++ ++#else ++class MuleGIFDecoder : public wxGIFDecoder { ++public: ++ MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {}; ++}; ++#endif ++ ++ + + MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos, + const wxSize& size, long style, const wxValidator& validator, +@@ -66,7 +109,7 @@ + } + + wxMemoryInputStream stream(data, size); +- m_decoder = new wxGIFDecoder(&stream, TRUE); ++ m_decoder = new MuleGIFDecoder(&stream, TRUE); + if ( m_decoder->ReadGIF() != wxGIF_OK ) { + delete m_decoder; + m_decoder = NULL; +@@ -137,3 +180,4 @@ + dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true); + } + ++// File_checked_for_headers +--- aMule/src/MuleGifCtrl.h 2006-01-01 06:17:25.000000000 +0100 ++++ aMule/src/MuleGifCtrl.h 2006-11-18 05:01:22.000000000 +0100 +@@ -27,11 +27,10 @@ + + #include <wx/control.h> + #include <wx/timer.h> +-#include <wx/bitmap.h> + + const int GIFTIMERID = 271283; + +-class wxGIFDecoder; ++class MuleGIFDecoder; + class wxBitmap; + + /** +@@ -121,7 +120,7 @@ + void OnErase( wxEraseEvent& WXUNUSED(event) ) {} + + //! A pointer to the current gif-animation. +- wxGIFDecoder* m_decoder; ++ MuleGIFDecoder* m_decoder; + //! Timer used for the delay between each frame. + wxTimer m_timer; + //! Current frame. +@@ -133,3 +132,4 @@ + + #endif + ++// File_checked_for_headers +--- aMule-2.1.3/src/MuleTextCtrl.cpp~ 2006-12-17 20:55:37.157820250 +0100 ++++ aMule-2.1.3/src/MuleTextCtrl.cpp 2006-12-17 20:56:21.328580750 +0100 +@@ -26,6 +26,7 @@ + #include <wx/menu.h> + #include <wx/intl.h> + #include <wx/clipbrd.h> ++#include <wx/dataobj.h> + + /** + * These are the IDs used to identify the different menu-items. +--- amule/src/amule.cpp~ 2006-12-17 21:53:26.474639000 +0100 ++++ amule/src/amule.cpp 2006-12-17 21:55:40.307003000 +0100 +@@ -96,6 +96,7 @@ + #include <CoreFoundation/CFBundle.h> + #include <wx/mac/corefoundation/cfstring.h> + #endif ++ #include <wx/msgdlg.h> + #endif + + diff --git a/net-p2p/amule/files/amuleweb.confd b/net-p2p/amule/files/amuleweb.confd index 56e81a808505..3c398a92ca01 100644 --- a/net-p2p/amule/files/amuleweb.confd +++ b/net-p2p/amule/files/amuleweb.confd @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.confd,v 1.2 2006/01/13 13:56:48 mkay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.confd,v 1.3 2008/02/04 16:51:51 armin76 Exp $ # owner of amuleweb process (must be existing) AMULEUSER="p2p" @@ -24,5 +24,5 @@ AMULEHOST="localhost" # aMule external connection port AMULEPORT="4712" - - +# aMuleweb template (default, php-default, chicane) +TEMPLATE="default" diff --git a/net-p2p/amule/files/amuleweb.initd b/net-p2p/amule/files/amuleweb.initd index 4b0d6cd39e53..6f0e57cfffc9 100644 --- a/net-p2p/amule/files/amuleweb.initd +++ b/net-p2p/amule/files/amuleweb.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.initd,v 1.6 2007/12/05 15:50:28 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.initd,v 1.7 2008/02/04 16:51:51 armin76 Exp $ depend() { need net @@ -23,7 +23,7 @@ start() { rm /var/run/amuleweb.pid fi - OPTIONS="-h ${AMULEHOST} -p ${AMULEPORT} -P ${AMULEPWD} -A ${WEBPWD}" + OPTIONS="-h ${AMULEHOST} -p ${AMULEPORT} -P ${AMULEPWD} -A ${WEBPWD} -t ${TEMPLATE} -q" ebegin "Starting aMule WebServer" env HOME="${AMULEHOME}" start-stop-daemon --start \ |