mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-25 21:44:49 +00:00
amule: 2.3.1 -> 2.3.2
This commit is contained in:
parent
b0ba94310d
commit
f77ae4e726
pkgs/tools/networking/p2p/amule
@ -13,11 +13,11 @@ let
|
|||||||
edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
|
edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
|
||||||
in
|
in
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
name = "aMule-2.3.1";
|
name = "aMule-2.3.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/amule/${name}.tar.xz";
|
url = "mirror://sourceforge/amule/${name}.tar.xz";
|
||||||
sha256 = "0hvpx3c005nvxsfand5bwfxxiq3mv0mpykajfm2lkygjh1rw2383";
|
sha256 = "0a1rd33hjl30qyzgb5y8m7dxs38asci3kjnlvims1ky6r3yj0izn";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
@ -25,7 +25,7 @@ mkDerivation rec {
|
|||||||
++ lib.optional httpServer libpng
|
++ lib.optional httpServer libpng
|
||||||
++ lib.optional client libX11;
|
++ lib.optional client libX11;
|
||||||
|
|
||||||
patches = [ ./gcc47.patch ]; # from Gentoo
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
configureFlags = ''
|
configureFlags = ''
|
||||||
--with-crypto-prefix=${cryptopp}
|
--with-crypto-prefix=${cryptopp}
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
# http://code.google.com/p/amule/source/detail?r=10772
|
|
||||||
diff -ur aMule-2.3.1.orig//src/ObservableQueue.h aMule-2.3.1/src/ObservableQueue.h
|
|
||||||
--- aMule-2.3.1.orig//src/ObservableQueue.h 2012-04-22 19:40:05.560084120 +0200
|
|
||||||
+++ aMule-2.3.1/src/ObservableQueue.h 2012-04-22 19:40:32.479085322 +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 );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user