Merge remote-tracking branch 'upstream/master' into hardened-stdenv

5 files changed, 42 insertions, 16 deletions

diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index 73b92b3974df..1dceb210235c 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "https://github.com/POV-Ray/povray.git";
     rev = "39ce8a24e50651904010dda15872d63be15d7c37";
-    sha256 = "0d56631d9daacb8967ed359025f56acf0bd505d1d9e752859e8ff8656ae72d20";
+    sha256 = "1nbs9vwf6fn3jkm0myfnbn7nrc17q8ppzmr4h7kj49nr0710ifw0";
   };
 
 
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index 624f5321c2a6..094d9deadbf1 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -1,20 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, ghostscript, gd, libjpeg, zlib, plotutils }:
+{ stdenv, fetchurl, pkgconfig
+, zlib, ghostscript, imagemagick, plotutils, gd
+, libjpeg, libwebp
+}:
 
 stdenv.mkDerivation rec {
-  name = "pstoedit-3.62";
+  name = "pstoedit-3.70";
 
   src = fetchurl {
     url = "mirror://sourceforge/pstoedit/${name}.tar.gz";
-    sha256 = "0j410dm9nqwa7n03yiyz0jwvln0jlqc3n9iv4nls33yl6x3c8x40";
+    sha256 = "130kz0ghsrggdn70kygrmsy3n533hwd948q69vyvqz44yw9n3f06";
   };
 
-  buildInputs = [ pkgconfig ghostscript gd libjpeg zlib plotutils ];
+  outputs = [ "dev" "out" ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ];
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "Translates PostScript and PDF graphics into other vector formats";
-    homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://sourceforge.net/projects/pstoedit/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix
index f2a85c73c2af..f39071b394c1 100644
--- a/pkgs/tools/graphics/qrcode/default.nix
+++ b/pkgs/tools/graphics/qrcode/default.nix
@@ -8,7 +8,7 @@ let
     name = "${baseName}-${version}";
     url = "https://github.com/qsantos/qrcode";
     rev = "2843cbada3b768f60ee1ae13c65160083558cc03";
-    sha256 = "0x321xhzxk6ldvpr2090w14khj9n2gfay9db5vvvli16affpcrvb";
+    sha256 = "1qli0b62yngqj66v6vdqqgcysy3q3fr5vwpf7yf0d9a0dg862x8a";
   };
   buildInputs = [
   ];
diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix
index 6da565b292f9..2769a9886695 100644
--- a/pkgs/tools/graphics/quirc/default.nix
+++ b/pkgs/tools/graphics/quirc/default.nix
@@ -8,7 +8,7 @@ let
     name = "${baseName}-${version}";
     url = "https://github.com/dlbeer/quirc";
     rev = "3a3df0d1d6adc59fdc2cadecfaed91650b84cacb";
-    sha256 = "0wk2lmnw1k6m12dxs5a684mrm05x362h5kr3dwkfj8pyvdw3am18";
+    sha256 = "1r7jzxl4j93dmky8p5szpcxq7i5f7p1kfrklnzhazlizjc7a2844";
   };
   buildInputs = [
     SDL SDL_gfx libjpeg pkgconfig
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index b96c469e3468..9a181e7d087d 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, imagemagickBig, pkgconfig, python, pygtk, perl
-, libX11, libv4l, qt4, lzma, gtk2
+, libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook
 }:
 
 stdenv.mkDerivation rec {
@@ -11,11 +11,32 @@ stdenv.mkDerivation rec {
     sha256 = "1imdvf5k34g1x2zr6975basczkz3zdxg6xnci50yyp5yvcwznki3";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch";
+      url = "https://git.recluse.de/raw/debian/pkg-zbar.git/35182c3ac2430c986579b25f1826fe1b7dfd15de/debian!patches!0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch";
+      sha256 = "1zy1wdyhmpw877pv6slfhjy0c6dm0gxli0i4zs1akpvh052j4a69";
+    })
+    (fetchpatch {
+      name = "python-zbar-import-fix-am.patch";
+      url = "https://git.recluse.de/raw/debian/pkg-zbar.git/1f15f52e53ee0bf7b4761d673dc859c6b10e6be5/debian!patches!python-zbar-import-fix-am.patch";
+      sha256 = "15xx9ms137hvwpynbgvbc6zgmmzfaf7331rfhls24rgbnywbgirx";
+    })
+    (fetchpatch {
+      name = "new_autotools_build_fix.patch";
+      url = "https://git.recluse.de/raw/debian/pkg-zbar.git/2c641cc94d4f728421ed750d95d6d1c2d06a534d/debian!patches!new_autotools_build_fix.patch";
+      sha256 = "0jhl5jnnjhfdv51xqimkbkdvj8d38z05fhd11yx1sgmw82f965s3";
+    })
+    (fetchpatch {
+      name = "threading-fix.patch";
+      url = "https://git.recluse.de/raw/debian/pkg-zbar.git/d3eba6e2c3acb0758d19519015bf1a53ffb8e645/debian!patches!threading-fix.patch";
+      sha256 = "1jjgrx9nc7788vfriai4z26mm106sg5ylm2w5rdyrwx7420x1wh7";
+    })
+  ];
+
   buildInputs =
     [ imagemagickBig pkgconfig python pygtk perl libX11
-      libv4l qt4 lzma gtk2 ];
-
-  configureFlags = [ "--disable-video" ];
+      libv4l qt4 lzma gtk2 autoreconfHook ];
 
   hardeningDisable = [ "fortify" ];