[packages/aMule] c++ build error fixed, release 6 for rebuild with new cryptopp, TODO added.

pluto pluto at pld-linux.org
Tue Sep 11 20:40:53 CEST 2012


commit 0b0404d02c79e158863778408cfda513151303b2
Author: Paweł Sikora <pawel.sikora at agmk.net>
Date:   Tue Sep 11 20:40:25 2012 +0200

    c++ build error fixed, release 6 for rebuild with new cryptopp, TODO added.

 aMule-cxx.patch | 19 +++++++++++++++++++
 aMule.spec      |  7 ++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/aMule.spec b/aMule.spec
index 7cc9e3f..9b10740 100644
--- a/aMule.spec
+++ b/aMule.spec
@@ -1,8 +1,11 @@
+#
+# TODO: ./configure --enable-plasmamule
+#
 Summary:	Unix port of eMule client
 Summary(pl.UTF-8):	Uniksowy port klienta eMule
 Name:		aMule
 Version:	2.3.1
-Release:	5
+Release:	6
 License:	GPL
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/amule/%{name}-%{version}.tar.bz2
@@ -10,6 +13,7 @@ Source0:	http://downloads.sourceforge.net/amule/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-cas-datadir.patch
 Patch2:		%{name}-ac.patch
+Patch3:		%{name}-cxx.patch
 URL:		http://www.amule.org/
 BuildRequires:	GeoIP-devel
 BuildRequires:	autoconf
@@ -83,6 +87,7 @@ Narzędzie do generownia statystyk aMule.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal} -I m4
diff --git a/aMule-cxx.patch b/aMule-cxx.patch
new file mode 100644
index 0000000..20f734e
--- /dev/null
+++ b/aMule-cxx.patch
@@ -0,0 +1,19 @@
+--- aMule-2.3.1/src/ObservableQueue.h.orig	2011-06-13 10:50:25.000000000 +0200
++++ aMule-2.3.1/src/ObservableQueue.h	2012-09-11 20:32:12.755720386 +0200
+@@ -331,14 +331,14 @@
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STARTING ), o );
++	this->NotifyObservers( EventType( EventType::STARTING ), o );
+ }
+ 
+ 
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STOPPING ), o );
++	this->NotifyObservers( EventType( EventType::STOPPING ), o );
+ }
+ 
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/aMule.git/commitdiff/0b0404d02c79e158863778408cfda513151303b2



More information about the pld-cvs-commit mailing list