commit f0349bce84c4c1a624d8807e3a42d3d63a9ac117
Author: Jan Rękorajski <[email protected]>
Date: Sun Jan 19 14:04:55 2014 +0100
- fix building with wxWidgets 3.0
- rel 15
aMule.spec | 4 +++-
wxWidgets3.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 1 deletion(-)
---
diff --git a/aMule.spec b/aMule.spec
index a8e795c..50c36ee 100644
--- a/aMule.spec
+++ b/aMule.spec
@@ -5,7 +5,7 @@ Summary: Unix port of eMule client
Summary(pl.UTF-8): Uniksowy port klienta eMule
Name: aMule
Version: 2.3.1
-Release: 14
+Release: 15
License: GPL
Group: X11/Applications
Source0:
http://downloads.sourceforge.net/amule/%{name}-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Patch0: %{name}-desktop.patch
Patch1: %{name}-cas-datadir.patch
Patch2: %{name}-ac.patch
Patch3: %{name}-cxx.patch
+Patch4: wxWidgets3.patch
URL: http://www.amule.org/
BuildRequires: GeoIP-devel
BuildRequires: autoconf
@@ -88,6 +89,7 @@ Narzędzie do generownia statystyk aMule.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__aclocal} -I m4
diff --git a/wxWidgets3.patch b/wxWidgets3.patch
new file mode 100644
index 0000000..77568b1
--- /dev/null
+++ b/wxWidgets3.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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/aMule.git/commitdiff/f0349bce84c4c1a624d8807e3a42d3d63a9ac117
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
