summaryrefslogtreecommitdiff
path: root/net/xmule/patches
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-06-28 10:55:46 +0000
committerjmmv <jmmv>2003-06-28 10:55:46 +0000
commit604d6948da90fda5e8b49833c174aab2632ea6be (patch)
tree6466713e73e00f51ab703769d4c7947ef5baedf9 /net/xmule/patches
parent6a4f35d027f5fa5557d898e900d780715697bd7b (diff)
downloadpkgsrc-604d6948da90fda5e8b49833c174aab2632ea6be.tar.gz
Update to 1.4.1a:
Version 1.4.1a -------------- Madcat's contributions: * FIXED: Crash on GetPeer() call during socket failure. * FIXED: Crash when trying to send hash of nonexistent knownfile. Version 1.4.1 ------------- Madcat's contributions: * FIXED: Various crashes regarding Shared Files Reloading. * FIXED: Several Search Tab Closing/Global Search related crashes. * FIXED: Several eMule/xMule typos. * FIXED: Endless loop if UDP packet sending failed. * FIXED: Endless loop/memleak at ProcessMuleInfoPacket(). * FIXED: Endless loop at CPartFile::FlushBuffer(). * FIXED: CPU leak in ProcessHelloPacket(). * FIXED: gsocket.c compilation problems with older compilers. * FIXED: Crash when search results were added to nonexistent search tab. * FIXED: Endless loop in case UDP packet sending fails. * FIXED: Sockets are also closed on crash now. * Revised Search Result packet handling, shouldn't crash/memleak there anymore. * Removed annoying MAX_RESULTS check from search tab. * Added log line when ipfilter is loaded. * All log messages are also written into file ($HOME/.xMule/logfile). * Shared files list is now resorted after reloading. * Implemented external ED2K links handling. Use ed2k <link> instead of xmule <link> from now on. * Changed popup window to log message when shared file is not found. Kry's contributions: * FIXED: --version commandline argument. * FIXED: Bogus 2.1.0.1 servers on serverlist. * FIXED: Shared folders not shared in some systems. * FIXED: Shared files not being shared in non-english languages. * FIXED: Download limit being higher than capacity. * Made ./xmule statistics more readable. * Added a notification message in case second xMule is started. Un-Thesis' contributions: * FIXED: GTK-only XPM compatibillity problems. * FIXED: GetTickCount compilation errors. * FIXED: LOWID problems (AGAIN!). * Removed pure GTK code from GetColour. * Added eMule's LOWID icon to main status bar on LOWID connection. MikaelB's contributions: * FIXED: Toolbar sizing with i18n Seneca's contributions: * FIXED: Clipboard handling (ctrl+v instead of middleclick for pasting). Closes PR pkg/21940.
Diffstat (limited to 'net/xmule/patches')
-rw-r--r--net/xmule/patches/patch-ad42
-rw-r--r--net/xmule/patches/patch-af20
2 files changed, 8 insertions, 54 deletions
diff --git a/net/xmule/patches/patch-ad b/net/xmule/patches/patch-ad
index 37e18e384f0..e62eadbd111 100644
--- a/net/xmule/patches/patch-ad
+++ b/net/xmule/patches/patch-ad
@@ -1,24 +1,21 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/06/03 09:17:21 jmmv Exp $
+$NetBSD: patch-ad,v 1.2 2003/06/28 10:55:47 jmmv Exp $
---- src/xmule.cpp.orig 2003-06-01 19:33:55.000000000 +0000
-+++ src/xmule.cpp 2003-06-01 19:34:19.000000000 +0000
-@@ -103,8 +103,13 @@
+--- src/xmule.cpp.orig 2003-06-19 12:04:38.000000000 +0200
++++ src/xmule.cpp
+@@ -93,8 +93,10 @@ int CxmuleApp::OnExit() {
delete clientlist;
#endif
- hashing_mut.Unlock();
- pendingMutex.Unlock();
-+ if (hashing_mut.TryLock() == wxMUTEX_NO_ERROR) {
++ if (hashing_mut.TryLock() == wxMUTEX_NO_ERROR)
+ hashing_mut.Unlock();
-+ }
-+
-+ if (pendingMutex.TryLock() == wxMUTEX_NO_ERROR) {
++ if (pendingMutex.TryLock() == wxMUTEX_NO_ERROR)
+ pendingMutex.Unlock();
-+ }
printf("xMule shutdown completed.\n");
}
-@@ -207,6 +212,28 @@
+@@ -197,6 +199,28 @@ public:
extern void InitXmlResource();
@@ -47,7 +44,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2003/06/03 09:17:21 jmmv Exp $
bool CxmuleApp::OnInit()
{
// catch fatal exceptions
-@@ -214,6 +241,8 @@
+@@ -204,6 +228,8 @@ bool CxmuleApp::OnInit()
//putenv("LANG=en_US");
@@ -56,26 +53,3 @@ $NetBSD: patch-ad,v 1.1.1.1 2003/06/03 09:17:21 jmmv Exp $
// for resources
wxFileSystem::AddHandler(new wxZipFSHandler);
wxXmlResource::Get()->InitAllHandlers();
-@@ -641,11 +670,13 @@
-
- } //End Added By Bouc7
-
--
-+#if defined(linux)
- #include <execinfo.h>
-+#endif
-
- void CxmuleApp::OnFatalException()
- {
-+#if defined(linux)
- // (stkn) create backtrace
- void * bt_array[100]; // 100 should be enough ?!?
- char ** bt_strings;
-@@ -666,6 +697,7 @@
- fprintf(stderr, "[%d] %s\n", i, bt_strings[i]);
-
- free(bt_strings);
-+#endif
- }
-
- #define wxGTK_WINDOW 1
diff --git a/net/xmule/patches/patch-af b/net/xmule/patches/patch-af
deleted file mode 100644
index 80821a5cc20..00000000000
--- a/net/xmule/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2003/06/03 09:17:20 jmmv Exp $
-
---- src/gsocket.c.orig 2003-05-31 21:53:44.000000000 +0200
-+++ src/gsocket.c 2003-05-31 21:54:24.000000000 +0200
-@@ -363,6 +363,7 @@
- GSocketError GSocket_SetServer(GSocket *sck)
- {
- int arg = 1;
-+ int intYes = 1;
-
- assert(sck != NULL);
-
-@@ -400,7 +401,6 @@
- /* Added by Un-Thesis 2003-05-15 */
- /* Allows socket reuse */
- /* Code contributed by McCabe and arkanes */
--int intYes = 1;
- if(setsockopt(sck->m_fd, SOL_SOCKET, SO_REUSEADDR, &intYes, sizeof(int))) {
- return GSOCK_IOERR;
- }