diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-11-07 13:56:42 +0100 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-11-07 13:57:50 +0100 |
| commit | 38d98ebcfa5aa1e87190eb3ed76fce7150b6ff51 (patch) | |
| tree | 15231aa47741b38185ea831f62ead53dd3fac8fe /net-p2p/amule/files | |
| parent | x11-plugins/pidgin-sipe: Version bump (diff) | |
| download | gentoo-38d98ebcfa5aa1e87190eb3ed76fce7150b6ff51.tar.gz gentoo-38d98ebcfa5aa1e87190eb3ed76fce7150b6ff51.tar.bz2 gentoo-38d98ebcfa5aa1e87190eb3ed76fce7150b6ff51.zip | |
net-p2p/amule: Support wxGTK:3.0 (#465084)
Package-Manager: portage-2.2.23
Diffstat (limited to 'net-p2p/amule/files')
| -rw-r--r-- | net-p2p/amule/files/amule-2.3.1-build.patch | 10 | ||||
| -rw-r--r-- | net-p2p/amule/files/amule-2.3.1-wx3.0.patch | 45 |
2 files changed, 55 insertions, 0 deletions
diff --git a/net-p2p/amule/files/amule-2.3.1-build.patch b/net-p2p/amule/files/amule-2.3.1-build.patch new file mode 100644 index 000000000000..2e977f3f056b --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.1-build.patch @@ -0,0 +1,10 @@ +--- aMule-2.3.1/src/LoggerConsole.cpp~ 2011-06-13 10:50:25.000000000 +0200 ++++ aMule-2.3.1/src/LoggerConsole.cpp 2015-04-11 10:58:20.592470541 +0200 +@@ -29,6 +29,7 @@ + + #include "Logger.h" // for Add(Debug)LogLineM() + ++DEFINE_LOCAL_EVENT_TYPE(MULE_EVT_LOGLINE) + + #ifdef __DEBUG__ + bool CLogger::IsEnabled(DebugType /*type*/) const diff --git a/net-p2p/amule/files/amule-2.3.1-wx3.0.patch b/net-p2p/amule/files/amule-2.3.1-wx3.0.patch new file mode 100644 index 000000000000..77568b1b8d7c --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.1-wx3.0.patch @@ -0,0 +1,45 @@ +diff -ur aMule-2.3.1/src/amuled.cpp aMule-2.3.1.wx3/src/amuled.cpp +--- aMule-2.3.1/src/amuled.cpp 2011-07-13 17:00:12.000000000 +0200 ++++ aMule-2.3.1.wx3/src/amuled.cpp 2014-01-19 13:55:50.904800356 +0100 +@@ -423,7 +423,9 @@ + #ifndef __WXMSW__ + + ++/* + static EndProcessDataMap endProcDataMap; ++*/ + + + int CDaemonAppTraits::WaitForChild(wxExecuteData &execData) +@@ -449,6 +451,7 @@ + wxSleep(1); + result = AmuleWaitPid(execData.pid, &status, WNOHANG, &msg); + if (result == 0) { ++ /* + // Add a WxEndProcessData entry to the map, so that we can + // support process termination + wxEndProcessData *endProcData = new wxEndProcessData(); +@@ -456,6 +459,7 @@ + endProcData->process = execData.process; + endProcData->tag = 0; + endProcDataMap[execData.pid] = endProcData; ++ */ + + status = execData.pid; + } else { +@@ -480,6 +484,7 @@ + msg << wxT("OnSignalChildHandler() has been called for child process with pid `") << + siginfo->si_pid << + wxT("'. "); ++/* + // Make sure we leave no zombies by calling waitpid() + int status = 0; + pid_t result = AmuleWaitPid(siginfo->si_pid, &status, WNOHANG, &msg); +@@ -503,6 +508,7 @@ + msg << wxT(" Error: the child process pid is not on the pid map."); + } + } ++*/ + + // Log our passage here + AddDebugLogLineN(logGeneral, msg); |