From 5f4ee9b5feafa94430a1e2d4520fc73caf187200 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 1 Nov 2023 11:05:54 +0100
Subject: [PATCH] pdf2odt: 20170207 -> 20220827

---
 pkgs/by-name/pd/pdf2odt/package.nix           | 61 +++++++++++++++++++
 pkgs/tools/typesetting/pdf2odt/default.nix    | 60 ------------------
 .../typesetting/pdf2odt/use_mktemp.patch      | 19 ------
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 61 insertions(+), 81 deletions(-)
 create mode 100644 pkgs/by-name/pd/pdf2odt/package.nix
 delete mode 100644 pkgs/tools/typesetting/pdf2odt/default.nix
 delete mode 100644 pkgs/tools/typesetting/pdf2odt/use_mktemp.patch

diff --git a/pkgs/by-name/pd/pdf2odt/package.nix b/pkgs/by-name/pd/pdf2odt/package.nix
new file mode 100644
index 000000000000..eb748da0842b
--- /dev/null
+++ b/pkgs/by-name/pd/pdf2odt/package.nix
@@ -0,0 +1,61 @@
+{ lib
+, resholve
+, fetchFromGitHub
+, bc
+, coreutils
+, file
+, gawk
+, ghostscript
+, gnused
+, imagemagick
+, zip
+, runtimeShell
+, findutils
+}:
+
+resholve.mkDerivation rec {
+  pname = "pdf2odt";
+  version = "20220827";
+
+  src = fetchFromGitHub {
+    owner = "gutschke";
+    repo = "pdf2odt";
+    rev = "a05fbdebcc39277d905d1ae66f585a19f467b406";
+    hash = "sha256-995iF5Z1V4QEXeXUB8irG451TXpQBHZThJcEfHwfRtE=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm0555 pdf2odt           -t $out/bin
+    install -Dm0444 README.md LICENSE -t $out/share/doc/${pname}
+
+    ln -rs $out/bin/pdf2odt $out/bin/pdf2ods
+
+    runHook postInstall
+  '';
+
+  solutions.default = {
+    scripts = [ "bin/pdf2odt" ];
+    interpreter = runtimeShell;
+    inputs = [
+      bc
+      coreutils
+      file
+      findutils
+      gawk
+      ghostscript
+      gnused
+      imagemagick
+      zip
+    ];
+  };
+
+  meta = with lib; {
+    description = "PDF to ODT/ODS format converter";
+    homepage = "https://github.com/gutschke/pdf2odt";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix
deleted file mode 100644
index e0063d2f72e8..000000000000
--- a/pkgs/tools/typesetting/pdf2odt/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib
-, resholve
-, fetchFromGitHub
-, bc
-, coreutils
-, file
-, gawk
-, ghostscript
-, gnused
-, imagemagick
-, zip
-, bash
-, findutils
-}:
-
-resholve.mkDerivation rec {
-  pname = "pdf2odt";
-  version = "20170207";
-
-  src = fetchFromGitHub {
-    owner  = "gutschke";
-    repo   = "pdf2odt";
-    rev    = "4533bd14306c30c085001db59dbb8114ea09c360";
-    sha256 = "14f9r5f0g6jzanl54jv86ls0frvspka1p9c8dy3fnriqpm584j0r";
-  };
-
-  patches = [ ./use_mktemp.patch ];
-
-  installPhase = ''
-    install -Dm0755 pdf2odt           -t $out/bin
-    install -Dm0644 README.md LICENSE -t $out/share/doc/pdf2odt
-
-    ln -rs $out/bin/pdf2odt $out/bin/pdf2ods
-  '';
-  solutions = {
-    default = {
-      scripts = [ "bin/pdf2odt" ];
-      interpreter = "${bash}/bin/bash";
-      inputs = [
-        coreutils
-        bc
-        file
-        imagemagick
-        gawk
-        gnused
-        ghostscript
-        zip
-        findutils
-      ];
-    };
-  };
-
-  meta = with lib; {
-    description = "PDF to ODT format converter";
-    homepage    = "https://github.com/gutschke/pdf2odt";
-    license     = licenses.mit;
-    platforms   = platforms.all;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch b/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch
deleted file mode 100644
index 1425aa5ae6a3..000000000000
--- a/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/pdf2odt b/pdf2odt
-index d38bb07..e1ddf05 100755
---- a/pdf2odt
-+++ b/pdf2odt
-@@ -173,13 +173,7 @@ if [ -e "${out}" ] &&
- fi
- 
- # Set up temporary staging directory
--TMPDIR="/tmp/pdf2odt.$$"
--[ \! -e "${TMPDIR}" ] || {
--  echo "Staging directory ${TMPDIR} already exists" >&2
--  exit 1
--}
--trap 'rm -rf "${TMPDIR}"' EXIT INT TERM QUIT HUP
--mkdir -p "${TMPDIR}"
-+TMPDIR=$(mktemp -d)
- 
- # Adjust DPI so that the image fits on a letter- or a4-sized page.
- function scale() {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ab185b0d59e..fd3cc219935c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11974,8 +11974,6 @@ with pkgs;
 
   pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { };
 
-  pdf2odt = callPackage ../tools/typesetting/pdf2odt { };
-
   pdfcrack = callPackage ../tools/security/pdfcrack { };
 
   pdfposter = callPackage ../applications/misc/pdfposter { };