Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6086f115dcd229f3a96cf60ef8ba5052d88ea6a3
commit 6086f115dcd229f3a96cf60ef8ba5052d88ea6a3 Author: crazy <[EMAIL PROTECTED]> Date: Wed Jun 18 13:45:01 2008 +0200 amule-2.2.1-1-x86_64 * Version bump * depends / FB cleanup * new m8r diff --git a/source/xapps-extra/amule/FrugalBuild b/source/xapps-extra/amule/FrugalBuild index d129e92..ee56959 100644 --- a/source/xapps-extra/amule/FrugalBuild +++ b/source/xapps-extra/amule/FrugalBuild @@ -1,9 +1,10 @@ # Compiling Time: 2.35 SBU -# Maintainer: BMH1980 <[EMAIL PROTECTED]> +# Maintainer: crazy <[EMAIL PROTECTED]> +# Contributor: BMH1980 <[EMAIL PROTECTED]> pkgname=amule -pkgver=2.1.3 -pkgrel=15 +pkgver=2.2.1 +pkgrel=1 pkgdesc="aMule is a file-sharing program, connects to eDonkey2000 network." _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="aMule" @@ -11,27 +12,21 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://www.amule.org/"; replaces=('xmule') -source=($source aMule-wx.patch fix-broken-server.met-link.patch gcc43.patch) -depends=('wxgtk>=2.8.7' 'libxxf86vm' 'binutils=2.18.50.0.6' 'gd' 'curl') +depends=('wxgtk-u8' 'libstdc++' 'gtk+2' 'libxau' 'libxdmcp' 'libxxf86vm' 'libxdamage' 'libxml2' 'libice' 'readline' 'gd' 'binutils=2.18.50.0.6' 'cryptopp') up2date="lynx -dump $url/files/files.php?cat=6 | grep Latest | tail -n 1 | cut -d ' ' -f 10" license="GPL2" groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') -Fconfopts="$Fconfopts --enable-cas --enable-wxcas \ - --disable-amulecmd --disable-amulecmdgui \ - --disable-webserver --disable-webservergui \ - --enable-kad-compile --enable-amule-daemon \ +Fconfopts="$Fconfopts \ + --enable-cas --enable-wxcas \ + --enable-amule-daemon \ + --enable-static=no --disable-static \ --enable-alc --enable-alcc \ - --enable-ccache --disable-debug" -# br0ken gcc43 - will fix soon -- crazy -- -# --enable-webserver --enable-webservergui -# --enable-amulecmd --enable-amulecmdgui + --enable-ccache --disable-debug \ + --enable-webserver --enable-webservergui \ + --enable-amulecmd --enable-amulecmdgui" _F_cd_path="aMule-$pkgver" -sha1sums=('dd47deb38e7a5b823550b85150f5a814c597b273' \ - 'bd048f7b88ff4c19841f606d03c5a9750e6e6945' \ - '5c74fe3e13cad5d40def64e873f3fe6114ecb91a' \ - 'ce6e079ad3422e76d12152d59e992488956f327c') -export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated" +sha1sums=('c4a98fd034ae9af9ace632c9bc9f51a75405c271') # optimization OK diff --git a/source/xapps-extra/amule/aMule-wx.patch b/source/xapps-extra/amule/aMule-wx.patch deleted file mode 100644 index 8148d35..0000000 --- a/source/xapps-extra/amule/aMule-wx.patch +++ /dev/null @@ -1,156 +0,0 @@ -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/source/xapps-extra/amule/fix-broken-server.met-link.patch b/source/xapps-extra/amule/fix-broken-server.met-link.patch deleted file mode 100644 index 300faec..0000000 --- a/source/xapps-extra/amule/fix-broken-server.met-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur aMule-2.1.3/src/ServerWnd.cpp aMule-2.1.3-p/src/ServerWnd.cpp ---- aMule-2.1.3/src/ServerWnd.cpp 2006-03-17 03:06:48.000000000 +0100 -+++ aMule-2.1.3-p/src/ServerWnd.cpp 2007-12-07 10:09:40.000000000 +0100 -@@ -70,7 +70,7 @@ - - CastChild( ID_SRV_SPLITTER, wxSplitterWindow )->SetSashPosition(splitter_pos, true); - CastChild( ID_SRV_SPLITTER, wxSplitterWindow )->SetSashGravity(0.5f); -- CastChild( IDC_SERVERLISTURL, wxTextCtrl )->SetValue(wxT("http://ocbmaurice.dyns.net/pl/slist.pl?download/server-best.met";)); -+ CastChild( IDC_SERVERLISTURL, wxTextCtrl )->SetValue(wxT("http://www.server-met.de/dl.php?load=gz&trace=33250645.6944";)); - - // Insert two columns, currently without a header - wxListCtrl* ED2KInfoList = CastChild( ID_ED2KINFO, wxListCtrl ); diff --git a/source/xapps-extra/amule/gcc43.patch b/source/xapps-extra/amule/gcc43.patch deleted file mode 100644 index aea9e00..0000000 --- a/source/xapps-extra/amule/gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur aMule-2.1.3/src/ED2KLinkParser.cpp aMule-2.1.3-p/src/ED2KLinkParser.cpp ---- aMule-2.1.3/src/ED2KLinkParser.cpp 2006-01-30 19:53:03.000000000 +0100 -+++ aMule-2.1.3-p/src/ED2KLinkParser.cpp 2008-03-13 02:53:08.000000000 +0100 -@@ -32,6 +32,7 @@ - #include <sstream> - #include <iostream> - #include <fstream> -+#include <cstdlib> - - #ifdef __APPLE__ - #include <CoreServices/CoreServices.h> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
