From 3b2773da443a047262f960552fa61cda2fa5c556 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Tue, 9 Feb 2021 19:14:54 +0100
Subject: [PATCH] podofo: 0.9.6 -> 0.9.7

---
 pkgs/development/libraries/podofo/default.nix | 17 ++++-------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index e50a2111b43..ee99ab5de6f 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,25 +1,16 @@
 { lib, stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
-, openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch
+, openssl, libpng, lua5, pkg-config, libidn, expat
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.6";
+  version = "0.9.7";
   pname = "podofo";
 
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz";
-    sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9";
+    sha256 = "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw";
   };
 
-  patches = [
-    # https://sourceforge.net/p/podofo/tickets/24/
-    (fetchpatch {
-      url = "https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch";
-      extraPrefix = "";
-      sha256 = "087h51x60zrakzx09baan77hwz99cwb5l1j802r5g4wj7pbjz0mb";
-    })
-  ];
-
   outputs = [ "out" "dev" "lib" ];
 
   nativeBuildInputs = [ cmake pkg-config ];
@@ -41,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "http://podofo.sourceforge.net";
     description = "A library to work with the PDF file format";
     platforms = platforms.all;
-    license = with licenses; [ gpl2 lgpl2 ];
+    license = with licenses; [ gpl2Plus lgpl2Plus ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fb8b0cd463..bb92a00eb3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16197,7 +16197,7 @@ in
 
   poco = callPackage ../development/libraries/poco { };
 
-  podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; };
+  podofo = callPackage ../development/libraries/podofo { };
 
   polkit = callPackage ../development/libraries/polkit { };