From 23b4e4f5b70aca721f20ab07a4ae5552d1cc08a2 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 17 Nov 2024 15:07:57 +0100
Subject: [PATCH] libresprite: 1.0 -> 1.1

(cherry picked from commit 6fa830fc0de2b532b6e54767a1239db1ebf700d5)
---
 nixos/tests/libresprite.nix                   |  2 +-
 .../editors/libresprite/default.nix           | 28 +++++++------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/nixos/tests/libresprite.nix b/nixos/tests/libresprite.nix
index 16d272acfa0f..17bdfe7853aa 100644
--- a/nixos/tests/libresprite.nix
+++ b/nixos/tests/libresprite.nix
@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
       machine.wait_for_x()
       machine.succeed("convert -font DejaVu-Sans +antialias label:'IT WORKS' image.png")
       machine.execute("libresprite image.png >&2 &")
-      machine.wait_for_window("LibreSprite v${pkgs.libresprite.version}")
+      machine.wait_for_window("LibreSprite ${pkgs.libresprite.version}-dev")
       machine.wait_for_text("IT WORKS")
       machine.screenshot("screen")
     '';
diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix
index 7bd09e5defbf..e4e6a1dd3c81 100644
--- a/pkgs/applications/editors/libresprite/default.nix
+++ b/pkgs/applications/editors/libresprite/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 
 , cmake
 , pkg-config
@@ -14,8 +13,9 @@
 , libjpeg
 , libpng
 , libwebp
+, libarchive
 , pixman
-, tinyxml
+, tinyxml-2
 , zlib
 , SDL2
 , SDL2_image
@@ -29,25 +29,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libresprite";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "LibreSprite";
     repo = "LibreSprite";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY=";
+    hash = "sha256-piA/hLQqdfyVH4GPu5ElXZtowQL9AGaK7GhZOME4L0Q=";
   };
 
-  # Backport GCC 13 build fix
-  # FIXME: remove in next release
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/LibreSprite/LibreSprite/commit/6ffe8472194bf5d0a73b4b2cd7f6804d3c80aa0c.patch";
-      hash = "sha256-5chXt0H+koofIspYsCJ7/eUxMGcCBVXJcXe3U/7F9Vc=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -62,8 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     libpng
     libwebp
+    libarchive
     pixman
-    tinyxml
+    tinyxml-2
     zlib
     SDL2
     SDL2_image
@@ -95,10 +87,10 @@ stdenv.mkDerivation (finalAttrs: {
     libresprite-can-open-png = nixosTests.libresprite;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://libresprite.github.io/";
     description = "Animated sprite editor & pixel art tool, fork of Aseprite";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     longDescription = ''
         LibreSprite is a program to create animated sprites. Its main features are:
 
@@ -113,8 +105,8 @@ stdenv.mkDerivation (finalAttrs: {
           - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc.
           - Onion skinning.
       '';
-    maintainers = with maintainers; [ fgaz ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.all;
     # https://github.com/LibreSprite/LibreSprite/issues/308
     broken = stdenv.hostPlatform.isDarwin;
   };