From a3f856b85dba488816875a58c0a1dc47e86b0c50 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sat, 24 Feb 2018 11:49:39 +0100
Subject: geeqie: 1.3 -> 1.4

---
 pkgs/applications/graphics/geeqie/default.nix       | 21 ++++++++++++---------
 .../graphics/geeqie/geeqie-no-changelog.patch       | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch

(limited to 'pkgs/applications/graphics/geeqie')

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 1e8f0e209c06f..8815ed4180307 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2
-, lcms, intltool, gettext, fbida
+{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool
+, gtk3, lcms2, exiv2, libchamplain, clutter_gtk, ffmpegthumbnailer, fbida
 }:
 
 stdenv.mkDerivation rec {
   name = "geeqie-${version}";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchurl {
     url = "http://geeqie.org/${name}.tar.xz";
-    sha256 = "0gzc82sy66pbsmq7lnmq4y37zqad1zfwfls3ik3dmfm8s5nmcvsb";
+    sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w";
   };
 
-  preConfigure = "./autogen.sh";
+  # Do not build the changelog as this requires markdown.
+  patches = [ ./geeqie-no-changelog.patch ];
 
-  configureFlags = [ "--enable-gps" ];
+  preConfigure = "./autogen.sh";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ];
   buildInputs = [
-    autoconf automake gtk2 libpng exiv2 lcms intltool gettext
+    gtk3 lcms2 exiv2 libchamplain clutter_gtk ffmpegthumbnailer fbida
   ];
 
   postInstall = ''
@@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
         -e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH'
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Lightweight GTK+ based image viewer";
 
@@ -45,7 +48,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://geeqie.sourceforge.net;
 
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with maintainers; [ jfrankenau pSub ];
     platforms = platforms.gnu;
   };
 }
diff --git a/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch b/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch
new file mode 100644
index 0000000000000..1b8833b135f35
--- /dev/null
+++ b/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch
@@ -0,0 +1,14 @@
+--- geeqie-1.4.orig/Makefile.am	2017-12-31 07:31:21.000000000 -0500
++++ geeqie-1.4/Makefile.am	2018-01-01 15:05:58.742068166 -0500
+@@ -10,9 +10,9 @@
+ readmedir = @readmedir@
+ 
+ if HAVE_MARKDOWN
+-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
++readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html
+ else
+-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
++readme_DATA = README.md COPYING TODO README.lirc AUTHORS
+ endif
+ 
+ desktopdir = $(datadir)/applications
-- 
cgit 1.4.1