From 44d582ea5c62406b8658d6599b57c2c648684bda Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 06:40:03 +0800
Subject: [PATCH] pcmanfm: 1.3.2 -> 1.4.0

Diff: https://github.com/lxde/pcmanfm/compare/refs/tags/1.3.2...refs/tags/1.4.0
---
 pkgs/by-name/pc/pcmanfm/package.nix | 42 +++++++++++++----------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/pc/pcmanfm/package.nix b/pkgs/by-name/pc/pcmanfm/package.nix
index b8e8dcda4fc2..3f5e3b0d84b2 100644
--- a/pkgs/by-name/pc/pcmanfm/package.nix
+++ b/pkgs/by-name/pc/pcmanfm/package.nix
@@ -1,8 +1,8 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitHub,
+  autoreconfHook,
   glib,
   intltool,
   libfm,
@@ -21,21 +21,22 @@ let
   gtk = if withGtk3 then gtk3 else gtk2;
   inherit (lib) optional;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pcmanfm";
-  version = "1.3.2";
+  version = "1.4.0";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/pcmanfm/pcmanfm-${version}.tar.xz";
-    sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc=";
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "pcmanfm";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-4kJDCnld//Vbe2KbrLoYZJ/dutagY/GImoOnbpQIdDY=";
   };
 
-  patches = [
-    # Fix build with gcc14 -Werror=incompatible-pointer-types
-    (fetchpatch {
-      url = "https://github.com/lxde/pcmanfm/commit/12abd7e179adb9e31d999824048a5f40f90218fd.patch";
-      hash = "sha256-iuNejg211VOiaIVSNkIV64VIrs6oOp+qwjqz3JFxOTI=";
-    })
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook3
+    intltool
+    autoreconfHook
   ];
 
   buildInputs = [
@@ -46,20 +47,15 @@ stdenv.mkDerivation rec {
     pango
     adwaita-icon-theme
   ];
-  nativeBuildInputs = [
-    pkg-config
-    wrapGAppsHook3
-    intltool
-  ];
 
   configureFlags = optional withGtk3 "--with-gtk=3";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://blog.lxde.org/category/pcmanfm/";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     description = "File manager with GTK interface";
-    maintainers = [ maintainers.ttuegel ];
-    platforms = platforms.linux;
+    maintainers = [ lib.maintainers.ttuegel ];
+    platforms = lib.platforms.linux;
     mainProgram = "pcmanfm";
   };
-}
+})