From 34afff7c8023556bd25d37f5326613a7880bbf01 Mon Sep 17 00:00:00 2001
From: Gutyina Gergő <gutyina.gergo.2@gmail.com>
Date: Wed, 17 Jan 2024 02:08:31 +0100
Subject: feh: 3.10.1 -> 3.10.2

---
 pkgs/applications/graphics/feh/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'pkgs/applications/graphics')

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 16447ac6d4d71..3cc665407cc18 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -1,28 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, fetchpatch
+{ lib, stdenv, fetchFromGitHub, makeWrapper
 , xorg, imlib2, libjpeg, libpng
 , curl, libexif, jpegexiforient, perl
 , enableAutoreload ? !stdenv.hostPlatform.isDarwin }:
 
 stdenv.mkDerivation rec {
   pname = "feh";
-  version = "3.10.1";
+  version = "3.10.2";
 
   src = fetchFromGitHub {
     owner = "derf";
     repo = pname;
     rev = version;
-    hash = "sha256-1dz04RcaoP79EoE+SsatXm2wMRCbNnmAzMECYk3y3jg=";
+    hash = "sha256-378rhZhpcua3UbsY0OcGKGXdMIQCuG84YjJ9vfJhZVs=";
   };
 
-  patches = [
-    # upstream PR: https://github.com/derf/feh/pull/723
-    (fetchpatch {
-      name = "fix-right-click-buffer-overflow.patch";
-      url = "https://github.com/derf/feh/commit/2c31f8863b80030e772a529ade519fc2fee4a991.patch";
-      sha256 = "sha256-sUWS06qt1d1AyGfqKb+1BzZslYxOzur4q0ePEHcTz1g=";
-    })
-  ];
-
   outputs = [ "out" "man" "doc" ];
 
   nativeBuildInputs = [ makeWrapper ];
-- 
cgit 1.4.1


From 73b6c4ae76f74d6f103a6b2abc219644ec524f99 Mon Sep 17 00:00:00 2001
From: Gutyina Gergő <gutyina.gergo.2@gmail.com>
Date: Wed, 17 Jan 2024 02:09:27 +0100
Subject: feh: switch to finalAttrs pattern and format

---
 pkgs/applications/graphics/feh/default.nix | 33 ++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'pkgs/applications/graphics')

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 3cc665407cc18..bbf103b7bc10f 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -1,16 +1,26 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper
-, xorg, imlib2, libjpeg, libpng
-, curl, libexif, jpegexiforient, perl
-, enableAutoreload ? !stdenv.hostPlatform.isDarwin }:
-
-stdenv.mkDerivation rec {
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, xorg
+, imlib2
+, libjpeg
+, libpng
+, curl
+, libexif
+, jpegexiforient
+, perl
+, enableAutoreload ? !stdenv.hostPlatform.isDarwin
+}:
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "feh";
   version = "3.10.2";
 
   src = fetchFromGitHub {
     owner = "derf";
-    repo = pname;
-    rev = version;
+    repo = "feh";
+    rev = finalAttrs.version;
     hash = "sha256-378rhZhpcua3UbsY0OcGKGXdMIQCuG84YjJ9vfJhZVs=";
   };
 
@@ -21,9 +31,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ xorg.libXt xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];
 
   makeFlags = [
-    "PREFIX=${placeholder "out"}" "exif=1"
+    "PREFIX=${placeholder "out"}"
+    "exif=1"
   ] ++ lib.optional stdenv.isDarwin "verscmp=0"
-    ++ lib.optional enableAutoreload "inotify=1";
+  ++ lib.optional enableAutoreload "inotify=1";
 
   installTargets = [ "install" ];
   postInstall = ''
@@ -44,4 +55,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     mainProgram = "feh";
   };
-}
+})
-- 
cgit 1.4.1


From 2dc76c4e8150ce5c8351c963bc908f4bd2e5f0c8 Mon Sep 17 00:00:00 2001
From: Gutyina Gergő <gutyina.gergo.2@gmail.com>
Date: Wed, 17 Jan 2024 02:10:00 +0100
Subject: feh: add maintainer gepbird

---
 pkgs/applications/graphics/feh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/applications/graphics')

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index bbf103b7bc10f..de43122b9080c 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     # released under a variant of the MIT license
     # https://spdx.org/licenses/MIT-feh.html
     license = licenses.mit-feh;
-    maintainers = with maintainers; [ viric willibutz globin ];
+    maintainers = with maintainers; [ gepbird globin viric willibutz ];
     platforms = platforms.unix;
     mainProgram = "feh";
   };
-- 
cgit 1.4.1