tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
amule: 2.3.1 -> 2.3.2
Lluís Batlle i Rossell
9 years ago
f77ae4e7
b0ba9431
+3
-24
2 changed files
expand all
collapse all
unified
split
pkgs
tools
networking
p2p
amule
default.nix
gcc47.patch
+3
-3
pkgs/tools/networking/p2p/amule/default.nix
···
13
edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
14
in
15
mkDerivation rec {
16
-
name = "aMule-2.3.1";
17
18
src = fetchurl {
19
url = "mirror://sourceforge/amule/${name}.tar.xz";
20
-
sha256 = "0hvpx3c005nvxsfand5bwfxxiq3mv0mpykajfm2lkygjh1rw2383";
21
};
22
23
buildInputs =
···
25
++ lib.optional httpServer libpng
26
++ lib.optional client libX11;
27
28
-
patches = [ ./gcc47.patch ]; # from Gentoo
29
30
configureFlags = ''
31
--with-crypto-prefix=${cryptopp}
···
13
edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
14
in
15
mkDerivation rec {
16
+
name = "aMule-2.3.2";
17
18
src = fetchurl {
19
url = "mirror://sourceforge/amule/${name}.tar.xz";
20
+
sha256 = "0a1rd33hjl30qyzgb5y8m7dxs38asci3kjnlvims1ky6r3yj0izn";
21
};
22
23
buildInputs =
···
25
++ lib.optional httpServer libpng
26
++ lib.optional client libX11;
27
28
+
enableParallelBuilding = true;
29
30
configureFlags = ''
31
--with-crypto-prefix=${cryptopp}
-21
pkgs/tools/networking/p2p/amule/gcc47.patch
···
1
-
# http://code.google.com/p/amule/source/detail?r=10772
2
-
diff -ur aMule-2.3.1.orig//src/ObservableQueue.h aMule-2.3.1/src/ObservableQueue.h
3
-
--- aMule-2.3.1.orig//src/ObservableQueue.h 2012-04-22 19:40:05.560084120 +0200
4
-
+++ aMule-2.3.1/src/ObservableQueue.h 2012-04-22 19:40:32.479085322 +0200
5
-
@@ -331,14 +331,14 @@
6
-
template <typename ValueType>
7
-
void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
8
-
{
9
-
- NotifyObservers( EventType( EventType::STARTING ), o );
10
-
+ this->NotifyObservers( EventType( EventType::STARTING ), o );
11
-
}
12
-
13
-
14
-
template <typename ValueType>
15
-
void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
16
-
{
17
-
- NotifyObservers( EventType( EventType::STOPPING ), o );
18
-
+ this->NotifyObservers( EventType( EventType::STOPPING ), o );
19
-
}
20
-
21
-
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0