Merge remote-tracking branch 'origin/master'

9 files changed, 188 insertions, 16 deletions

diff --git a/makefu/5pkgs/airdcpp-webclient/default.nix b/makefu/5pkgs/airdcpp-webclient/default.nix
new file mode 100644
index 000000000..361a7da65
--- /dev/null
+++ b/makefu/5pkgs/airdcpp-webclient/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl
+}:
+stdenv.mkDerivation rec {
+  name = "airdcpp-webclient-${version}";
+  version = "2.3.0";
+  
+  src = fetchurl {
+    url = http://web-builds.airdcpp.net/stable/airdcpp_2.3.0_webui-2.3.0_64-bit_portable.tar.gz;
+    sha256 = "0yvcl0nc70fghc7vfsgvbpryi5q97arld8adql4way4qa0mdnyv1";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+  installPhase = ''
+    mkdir -p $out/{share,bin}
+    cp -r *  $out/share
+    ln -s $out/share/airdcppd $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    # to start it: airdcpp -p=<pid-file> -c=<config-store-path (must be writeable)> --configure
+    description = "dcpp client (statically precompiled)";
+    homepage = http://fixme;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ makefu ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/makefu/5pkgs/bento4/default.nix b/makefu/5pkgs/bento4/default.nix
index 07c64a101..6f5f1deba 100644
--- a/makefu/5pkgs/bento4/default.nix
+++ b/makefu/5pkgs/bento4/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchFromGitHub
-, pkgconfig
 , cmake
 }:
 stdenv.mkDerivation rec {
@@ -13,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1cq6vhrq3n3lc1n454slbc66qdyqam2srxgdhfpyfxbq5c4y06nf";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake ];
   installPhase = ''
     mkdir -p $out/{lib,bin}
     find -iname '*.so' -exec mv --target-directory="$out/lib" {} \;
diff --git a/makefu/5pkgs/cozy-audiobooks/default.nix b/makefu/5pkgs/cozy-audiobooks/default.nix
index f1d655a0a..870fa8ce2 100644
--- a/makefu/5pkgs/cozy-audiobooks/default.nix
+++ b/makefu/5pkgs/cozy-audiobooks/default.nix
@@ -85,13 +85,9 @@ stdenv.mkDerivation rec {
     ninja test
   '';
 
-  #preInstall = ''
-  #  export MESON_INSTALL_PREFIX=$out
-  #'';
-
   meta = with stdenv.lib; {
     description = ''
-       Eval nix code from python.
+       A modern audio book player for Linux using GTK+ 3
     '';
     maintainers = [ maintainers.makefu ];
     license = licenses.mit;
diff --git a/makefu/5pkgs/custom/quodlibet/remove-override-warning.patch b/makefu/5pkgs/custom/quodlibet/remove-override-warning.patch
new file mode 100644
index 000000000..0f9d41024
--- /dev/null
+++ b/makefu/5pkgs/custom/quodlibet/remove-override-warning.patch
@@ -0,0 +1,54 @@
+diff --git a/quodlibet/qltk/edittags.py b/quodlibet/quodlibet/qltk/edittags.py
+index 148866ef7..e741b9c3d 100644
+--- a/quodlibet/qltk/edittags.py
++++ b/quodlibet/qltk/edittags.py
+@@ -740,13 +740,6 @@ class EditTags(Gtk.VBox):
+         win.show()
+         all_done = False
+         for song in songs:
+-            if not song.valid():
+-                win.hide()
+-                dialog = OverwriteWarning(self, song)
+-                resp = dialog.run()
+-                win.show()
+-                if resp != OverwriteWarning.RESPONSE_SAVE:
+-                    break
+ 
+             changed = False
+             for key, values in iteritems(updated):
+diff --git a/quodlibet/qltk/tagsfrompath.py b/quodlibet/quodlibet/qltk/tagsfrompath.py
+index fd3f0709c..cb5b44f20 100644
+--- a/quodlibet/qltk/tagsfrompath.py
++++ b/quodlibet/qltk/tagsfrompath.py
+@@ -284,13 +284,6 @@ class TagsFromPath(Gtk.VBox):
+         for entry in ((model and itervalues(model)) or []):
+             song = entry.song
+             changed = False
+-            if not song.valid():
+-                win.hide()
+-                dialog = OverwriteWarning(self, song)
+-                resp = dialog.run()
+-                win.show()
+-                if resp != OverwriteWarning.RESPONSE_SAVE:
+-                    break
+ 
+             for i, h in enumerate(pattern.headers):
+                 text = entry.get_match(h)
+diff --git a/quodlibet/qltk/tracknumbers.py b/quodlibet/quodlibet/qltk/tracknumbers.py
+index 1ab4d0b9a..52f087db4 100644
+--- a/quodlibet/qltk/tracknumbers.py
++++ b/quodlibet/qltk/tracknumbers.py
+@@ -160,13 +160,6 @@ class TrackNumbers(Gtk.VBox):
+             if song.get("tracknumber") == track:
+                 win.step()
+                 continue
+-            if not song.valid():
+-                win.hide()
+-                dialog = OverwriteWarning(self, song)
+-                resp = dialog.run()
+-                win.show()
+-                if resp != OverwriteWarning.RESPONSE_SAVE:
+-                    break
+             song["tracknumber"] = track
+             try:
+                 song.write()
diff --git a/makefu/5pkgs/custom/quodlibet/single-digit-discnumber.patch b/makefu/5pkgs/custom/quodlibet/single-digit-discnumber.patch
new file mode 100644
index 000000000..05778fde7
--- /dev/null
+++ b/makefu/5pkgs/custom/quodlibet/single-digit-discnumber.patch
@@ -0,0 +1,13 @@
+diff --git a/quodlibet/pattern/_pattern.py b/quodlibet/pattern/_pattern.py
+index fc056d07a..8fb559c6e 100644
+--- a/quodlibet/pattern/_pattern.py
++++ b/quodlibet/pattern/_pattern.py
+@@ -387,7 +387,7 @@ def _number(key, value):
+     elif key == "discnumber":
+         parts = value.split("/")
+         try:
+-            return "%02d" % int(parts[0])
++            return "%d" % int(parts[0])
+         except (TypeError, ValueError):
+             return value
+     else:
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 390c13ffe..390aabd73 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -20,6 +20,10 @@ with super.lib; with builtins; let
               (filterAttrs (_: eq "directory") (readDir path));
 
 in {
+    quodlibet = super.pkgs.stdenv.lib.overrideDerivation super.quodlibet (old: {
+      patches = [ ./custom/quodlibet/single-digit-discnumber.patch
+                  ./custom/quodlibet/remove-override-warning.patch ];
+    });
     alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";};
     alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";};
     alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";};
@@ -29,15 +33,6 @@ in {
     inkscape = super.pkgs.stdenv.lib.overrideDerivation super.inkscape (old: {
       patches = [ ./custom/inkscape/dxf_fix.patch ];
     });
-    pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> {
-      wordset-file = super.pkgs.fetchurl {
-        urls = [
-          https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c
-          https://archive.org/download/nixos-stockholm-tarballs/pviar5j1gxiqcf3l34b4n2pil06xc8zf-wordset_4k.c
-        ];
-        sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";
-      };
-    };
 }
 
 // (mapAttrs (_: flip callPackage {})
diff --git a/makefu/5pkgs/esniper/default.nix b/makefu/5pkgs/esniper/default.nix
new file mode 100644
index 000000000..a6aac5748
--- /dev/null
+++ b/makefu/5pkgs/esniper/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl , openssl, curl, coreutils, gawk, bash, which }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-2-35-0";
+  pname = "esniper";
+  version = "2.35.0";
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${name}.tgz";
+    sha256 = "04iwjb42lw90c03125bjdpnm0fp78dmwf2j35r7mah0nwcrlagd9";
+  };
+
+
+  buildInputs = [ openssl curl ];
+
+  # Add support for CURL_CA_BUNDLE variable.
+  # Fix <http://sourceforge.net/p/esniper/bugs/648/>.
+  patches = [ ./find-ca-bundle.patch ];
+
+  postInstall = ''
+    sed <"frontends/snipe" >"$out/bin/snipe" \
+      -e "2i export PATH=\"$out/bin:${stdenv.lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\""
+    chmod 555 "$out/bin/snipe"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple, lightweight tool for sniping eBay auctions";
+    homepage    = http://esniper.sourceforge.net;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ lovek323 peti ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/makefu/5pkgs/esniper/find-ca-bundle.patch b/makefu/5pkgs/esniper/find-ca-bundle.patch
new file mode 100644
index 000000000..e4df272a0
--- /dev/null
+++ b/makefu/5pkgs/esniper/find-ca-bundle.patch
@@ -0,0 +1,26 @@
+diff -ubr '--exclude=*.o' esniper-2-27-0-orig/http.c esniper-2-27-0-patched/http.c
+--- esniper-2-27-0-orig/http.c	2012-02-06 22:04:06.000000000 +0100
++++ esniper-2-27-0-patched/http.c	2012-07-27 10:54:20.893054646 +0200
+@@ -200,6 +200,9 @@
+ int
+ initCurlStuff(void)
+ {
++	/* Path to OpenSSL bundle file. */
++	const char *ssl_capath=NULL;
++
+ 	/* list for custom headers */
+ 	struct curl_slist *slist=NULL;
+ 
+@@ -241,6 +244,12 @@
+ 	if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_COOKIEFILE, "")))
+ 		return initCurlStuffFailed();
+ 
++	/* If the environment variable CURL_CA_BUNDLE is set, pass through its
++	 * contents to curl. */
++	if ((ssl_capath = getenv("CURL_CA_BUNDLE")))
++		if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_CAINFO, ssl_capath)))
++			return initCurlStuffFailed();
++
+ 	slist = curl_slist_append(slist, "Accept: text/*");
+ 	slist = curl_slist_append(slist, "Accept-Language: en");
+ 	slist = curl_slist_append(slist, "Accept-Charset: iso-8859-1,*,utf-8");
diff --git a/makefu/5pkgs/pavumeter/default.nix b/makefu/5pkgs/pavumeter/default.nix
new file mode 100644
index 000000000..b1822530a
--- /dev/null
+++ b/makefu/5pkgs/pavumeter/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv,  fetchurl, libusb, libtool, autoconf, pkgconfig, git,
+gettext, automake, libxml2 
+, autoreconfHook
+, lynx
+, gtkmm2
+, libpulseaudio
+, gnome2
+, libsigcxx
+}:
+stdenv.mkDerivation rec {
+  pname = "pavumeter";
+  name = "${pname}-${version}";
+  version = "0.9.3";
+
+  src = fetchurl {
+    url = "http://0pointer.de/lennart/projects/${pname}/${name}.tar.gz";
+    sha256 = "0yq67w8j8l1xsv8pp37bylax22npd6msbavr6pb25yvyq825i3gx";
+  };
+
+  buildInputs = [ gtkmm2 libpulseaudio gnome2.gnome_icon_theme ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook lynx ];
+
+  meta = {
+    description = "PulseAudio volumene meter";
+    homepage = http://0pointer.de/lennart/projects/pavumeter;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ makefu ];
+  };
+}