From: Jan Rękorajski Date: Sat, 11 Apr 2015 09:11:44 +0000 (+0200) Subject: - fix building using latest g++/ld X-Git-Tag: auto/th/aMule-2.3.1-20 X-Git-Url: http://git.pld-linux.org/?p=packages%2FaMule.git;a=commitdiff_plain;h=82e982372790c87fa3c5e1b1f001b0d0a8db802c - fix building using latest g++/ld - rel 20 --- diff --git a/aMule.spec b/aMule.spec index 3d7cd09..be48f03 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: 19 +Release: 20 License: GPL Group: X11/Applications Source0: http://downloads.sourceforge.net/amule/%{name}-%{version}.tar.bz2 @@ -15,6 +15,7 @@ Patch1: %{name}-cas-datadir.patch Patch2: %{name}-ac.patch Patch3: %{name}-cxx.patch Patch4: wxWidgets3.patch +Patch5: build.patch URL: http://www.amule.org/ BuildRequires: GeoIP-devel BuildRequires: autoconf @@ -90,6 +91,7 @@ Narzędzie do generownia statystyk aMule. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %{__aclocal} -I m4 diff --git a/build.patch b/build.patch new file mode 100644 index 0000000..2e977f3 --- /dev/null +++ b/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