sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (d2e8b4f01486c7d0381e286fa315b288e1e46750)

From: Mathieu Lonjaret <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (d2e8b4f01486c7d0381e286fa315b288e1e46750)
Date: Thu, 12 Jun 2008 03:56:39 -0500

GIT changes to master grimoire by Mathieu Lonjaret <lejatorn AT sourcemage.org>:

dev/null |binary
ftp/amule/DEPENDS | 3
ftp/amule/DETAILS | 5 -
ftp/amule/HISTORY | 5 +
ftp/amule/PRE_BUILD | 2
ftp/amule/aMule-2.1.0.tar.bz2.sig | 0
ftp/amule/aMule-wx.patch | 156
--------------------------------------
7 files changed, 9 insertions(+), 162 deletions(-)

New commits:
commit fa34076c14fead16bd36121d0d5daacaaabbb47b
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

amule: update to 2.2.1

diff --git a/ftp/amule/DEPENDS b/ftp/amule/DEPENDS
index e8ed9a7..290b0cf 100755
--- a/ftp/amule/DEPENDS
+++ b/ftp/amule/DEPENDS
@@ -1,2 +1,3 @@
-depends wxgtk &&
+depends wxgtk &&
+depends cryptopp &&
depends curl
diff --git a/ftp/amule/DETAILS b/ftp/amule/DETAILS
index d6f655e..1448367 100755
--- a/ftp/amule/DETAILS
+++ b/ftp/amule/DETAILS
@@ -1,14 +1,13 @@
SPELL=amule
- VERSION=2.1.3
+ VERSION=2.2.1
SOURCE=aMule-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/aMule-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/amule/$SOURCE
LICENSE[0]=GPL
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-
SOURCE_HASH=sha512:f6f07e136a5a398ff9886cd41bd74d49c4b46eb99356947437d1b69a07c8b414d55bb76bdfd19dd94351bda11cc4f3adaaee066221139706ae63651f25ad4a4a
+
SOURCE_HASH=sha512:a8b604286989e788004b824c5dacc6da6dae9556694f5f287961d0192fb4fea0f08b02e135b509ad7e2abd45c7ba179d558201926a00c6f9c690d48cc64b9456
WEB_SITE=http://amule.sourceforge.net/
ENTERED=20031213
- UPDATED=20041111
KEYWORDS="ftp"
SHORT="GPL-2 licensed eMule-client for Linux"
cat << EOF
diff --git a/ftp/amule/HISTORY b/ftp/amule/HISTORY
index 2e86a36..1950d9c 100644
--- a/ftp/amule/HISTORY
+++ b/ftp/amule/HISTORY
@@ -1,3 +1,8 @@
+2008-05-12 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: update to 2.2.1
+ * DEPENDS: added cryptopp
+ * PRE_BUILD: removed, aMule-wx.patch not needed anymore
+
2008-04-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD, aMule-wx.patch: added to fix #14473

diff --git a/ftp/amule/PRE_BUILD b/ftp/amule/PRE_BUILD
deleted file mode 100755
index ef00667..0000000
--- a/ftp/amule/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-default_pre_build &&
-patch -p1 -d "$SOURCE_DIRECTORY" < $SCRIPT_DIRECTORY/aMule-wx.patch
diff --git a/ftp/amule/aMule-2.1.0.tar.bz2.sig
b/ftp/amule/aMule-2.1.0.tar.bz2.sig
deleted file mode 100644
index b68554a..0000000
Binary files a/ftp/amule/aMule-2.1.0.tar.bz2.sig and /dev/null differ
diff --git a/ftp/amule/aMule-wx.patch b/ftp/amule/aMule-wx.patch
deleted file mode 100644
index 8148d35..0000000
--- a/ftp/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
-
-

[SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (d2e8b4f01486c7d0381e286fa315b288e1e46750), Mathieu Lonjaret, 06/12/2008