From b1ae7fa5c4c9c2fedae0badcc075d4a06252fd4a Mon Sep 17 00:00:00 2001
From: Bruce Toll <4109762+tollb@users.noreply.github.com>
Date: Wed, 12 May 2021 11:11:54 -0400
Subject: [PATCH] mdbtools: 0.8.2 -> 0.9.3

Updated to version 0.9.3.  This addresses numerous issues, including an
mdb-schema problem where debugging comments were included in the output.

Updated github repository owner to reflect new upstream for mdbtools.

Updated packaging to remove support for gmdb2.  Upstream split out
support for this largely unmaintained component to another repo:
https://github.com/mdbtools/gmdb2.  For more information, see:
https://github.com/mdbtools/mdbtools/blob/dev/NEWS

Note: Version tags in the repository are prefixed with a "v" starting
with the 0.9.0 series.  Also, the previous 0.8.2 tag does not exist in
the new upstream mdbtools repository.  The commit it pointed to is
still present as:

  commit b753ff36a0f1d88ae8a300ed6712f4aa2ddb7d08
  Author: Cyber Emissary <admin@cyberemissary.com>
  Date:   Fri Dec 28 08:03:02 2018 -0500

      Bumped version to 0.8.2 and updated change log
---
 pkgs/tools/misc/mdbtools/default.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix
index 1c327365916..b25a850311e 100644
--- a/pkgs/tools/misc/mdbtools/default.nix
+++ b/pkgs/tools/misc/mdbtools/default.nix
@@ -1,32 +1,26 @@
 { stdenv, lib, fetchFromGitHub, glib, readline
 , bison, flex, pkg-config, autoreconfHook, libxslt, makeWrapper
 , txt2man, which
-# withUi currently doesn't work. It compiles but fails to run.
-, withUi ? false, gtk2, gnome2
 }:
 
-let
-  uiDeps = [ gtk2 ] ++ (with gnome2; [ GConf libglade libgnomeui gnome-doc-utils ]);
-
-in
 stdenv.mkDerivation rec {
   pname = "mdbtools";
-  version = "0.8.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
-    owner = "cyberemissary";
+    owner = "mdbtools";
     repo = "mdbtools";
-    rev = version;
-    sha256 = "12rhf6rgnws6br5dn1l2j7i77q9p4l6ryga10jpax01vvzhr26qc";
+    rev = "v${version}";
+    sha256 = "11cv7hh8j8akpgm1a6pp7im6iacpgx6wzcg9n9rmb41j0fgxamdf";
   };
 
   configureFlags = [ "--disable-scrollkeeper" ];
 
   nativeBuildInputs = [
     pkg-config bison flex autoreconfHook txt2man which
-  ] ++ lib.optional withUi libxslt;
+  ];
 
-  buildInputs = [ glib readline ] ++ lib.optionals withUi uiDeps;
+  buildInputs = [ glib readline ];
 
   enableParallelBuilding = true;