From ac97a56aa76e5eb3193124f203a893417247d8f1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 29 Jan 2022 15:36:13 +0100
Subject: scrot: 1.5 -> 1.7

---
 pkgs/tools/graphics/scrot/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'pkgs/tools/graphics/scrot')

diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix
index aa525abacb07c..3548136a0eff2 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -1,19 +1,20 @@
 { lib, stdenv, fetchFromGitHub, giblib, xlibsWrapper, autoreconfHook
-, autoconf-archive, libXfixes, libXcursor, libXcomposite }:
+, autoconf-archive, libXfixes, libXcomposite
+, pkg-config, gettext, libtool, intltool, gtk-doc, libbsd }:
 
 stdenv.mkDerivation rec {
   pname = "scrot";
-  version = "1.5";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "resurrecting-open-source-projects";
     repo = pname;
     rev = version;
-    sha256 = "sha256-4vguodLnCj0sOBLM4oJXTfX1p8hIo3WTwIuViPtZxHQ=";
+    sha256 = "sha256-oVmEPkEK1xDcIRUQjCp6CKf+aKnnVe3L7aRTdSsCmmY=";
   };
 
-  nativeBuildInputs = [ autoreconfHook autoconf-archive ];
-  buildInputs = [ giblib xlibsWrapper libXfixes libXcursor libXcomposite ];
+  nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ];
+  buildInputs = [ giblib xlibsWrapper libXfixes libXcomposite gettext libtool intltool gtk-doc libbsd ];
 
   meta = with lib; {
     homepage = "https://github.com/resurrecting-open-source-projects/scrot";
-- 
cgit 1.4.1


From b796dfa2a6f156afa24c7a00644404bc159aa58f Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <v@cunat.cz>
Date: Sun, 6 Feb 2022 17:48:27 +0100
Subject: scrot: drop dependency on giblib

It's not used anymore, after the recent update:
https://github.com/resurrecting-open-source-projects/scrot/releases/tag/1.6
---
 pkgs/tools/graphics/scrot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools/graphics/scrot')

diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix
index 3548136a0eff2..63a7df14dbd11 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, giblib, xlibsWrapper, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, imlib2, xlibsWrapper, autoreconfHook
 , autoconf-archive, libXfixes, libXcomposite
 , pkg-config, gettext, libtool, intltool, gtk-doc, libbsd }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ];
-  buildInputs = [ giblib xlibsWrapper libXfixes libXcomposite gettext libtool intltool gtk-doc libbsd ];
+  buildInputs = [ imlib2 xlibsWrapper libXfixes libXcomposite gettext libtool intltool gtk-doc libbsd ];
 
   meta = with lib; {
     homepage = "https://github.com/resurrecting-open-source-projects/scrot";
-- 
cgit 1.4.1


From df68f3a71e458fb6b1c461d4278554acd8e32ec4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 6 Feb 2022 19:12:41 +0100
Subject: scrot: clean up
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove unused dependencies – `gettext libtool intltool gtk-doc` belong to `nativeBuildInputs`. But they are not used even if passed (autoreconf complains still and output does not change).
---
 pkgs/tools/graphics/scrot/default.nix | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'pkgs/tools/graphics/scrot')

diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix
index 63a7df14dbd11..a599f50890c5d 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -1,6 +1,15 @@
-{ lib, stdenv, fetchFromGitHub, imlib2, xlibsWrapper, autoreconfHook
-, autoconf-archive, libXfixes, libXcomposite
-, pkg-config, gettext, libtool, intltool, gtk-doc, libbsd }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, imlib2
+, xlibsWrapper
+, autoreconfHook
+, autoconf-archive
+, libXfixes
+, libXcomposite
+, pkg-config
+, libbsd
+}:
 
 stdenv.mkDerivation rec {
   pname = "scrot";
@@ -13,8 +22,19 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-oVmEPkEK1xDcIRUQjCp6CKf+aKnnVe3L7aRTdSsCmmY=";
   };
 
-  nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ];
-  buildInputs = [ imlib2 xlibsWrapper libXfixes libXcomposite gettext libtool intltool gtk-doc libbsd ];
+  nativeBuildInputs = [
+    autoreconfHook
+    autoconf-archive
+    pkg-config
+  ];
+
+  buildInputs = [
+    imlib2
+    xlibsWrapper
+    libXfixes
+    libXcomposite
+    libbsd
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/resurrecting-open-source-projects/scrot";
-- 
cgit 1.4.1