From 981f762fefc73bb09e93cd7f6ccea2cc26a83c00 Mon Sep 17 00:00:00 2001
From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com>
Date: Wed, 23 Oct 2024 13:58:35 +0000
Subject: [PATCH] jpilot: 2.0.1 -> 2.0.2

---
 pkgs/by-name/jp/jpilot/darwin-build.patch     | 31 +++++++++++
 pkgs/by-name/jp/jpilot/fix-broken-types.patch | 54 -------------------
 pkgs/by-name/jp/jpilot/package.nix            | 19 ++++---
 3 files changed, 42 insertions(+), 62 deletions(-)
 create mode 100644 pkgs/by-name/jp/jpilot/darwin-build.patch
 delete mode 100644 pkgs/by-name/jp/jpilot/fix-broken-types.patch

diff --git a/pkgs/by-name/jp/jpilot/darwin-build.patch b/pkgs/by-name/jp/jpilot/darwin-build.patch
new file mode 100644
index 000000000000..553059263cb0
--- /dev/null
+++ b/pkgs/by-name/jp/jpilot/darwin-build.patch
@@ -0,0 +1,31 @@
+diff --git a/configure.in b/configure.in
+index 98055b7..fff401f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -249,6 +249,11 @@ for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ /usr/local/lib64 \
+       PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
+       break
+    fi
++   if test -r "$pilot_libs/libpisock.dylib" ; then
++      pilotlibs=yes
++      PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
++      break
++   fi
+ done
+ fi
+
+diff --git a/libsqlite.c b/libsqlite.c
+index 9557956..cf0b5ed 100644
+--- a/libsqlite.c
++++ b/libsqlite.c
+@@ -3,10 +3,10 @@
+    Elmar Klausmeier, 20-Sep-2022: Initial revision
+ */
+
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>
+-extern char *strptime (const char *__restrict __s, const char *__restrict __fmt, struct tm *__tp) __THROW;
+ #include <sys/stat.h>
+ #include <sqlite3.h>
diff --git a/pkgs/by-name/jp/jpilot/fix-broken-types.patch b/pkgs/by-name/jp/jpilot/fix-broken-types.patch
deleted file mode 100644
index 24177af5d204..000000000000
--- a/pkgs/by-name/jp/jpilot/fix-broken-types.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7ec8251e3570decd97b3050c9ba4fa0d59be93e2 Mon Sep 17 00:00:00 2001
-From: Morgan Kesler <keslerm@aegiszero.is>
-Date: Thu, 13 Oct 2022 15:00:20 -0400
-Subject: [PATCH] Fix broken types from latest pilot-link changes
-
-Last year an update to the pilot link source broke this, it's part of
-the patch from here https://github.com/desrod/pilot-link/pull/3
-
-This is simply updating the types to match the changes
----
- contact.c       | 2 +-
- jp-contact.c    | 2 +-
- jp-pi-contact.h | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/contact.c b/contact.c
-index 5ca3df68..f4fd6be1 100644
---- a/contact.c
-+++ b/contact.c
-@@ -442,7 +442,7 @@ int copy_address_to_contact(const struct Address *a, struct Contact *c)
-    c->advance = 0;
-    c->advanceUnits = 0;    
-    memset(&(c->birthday), 0, sizeof(struct tm));
--   for (i=0; i<MAX_CONTACT_BLOBS; i++) {
-+   for (i=0; i<MAX_BLOBS; i++) {
-       c->blob[i] = NULL;
-    }
-    c->picture = NULL;
-diff --git a/jp-contact.c b/jp-contact.c
-index 88d7f7f9..1d02ef2c 100644
---- a/jp-contact.c
-+++ b/jp-contact.c
-@@ -54,7 +54,7 @@ int jp_pack_Contact(struct Contact *c, pi_buffer_t *buf)
-    return pack_Contact(c, buf, contacts_v10);
- }
- 
--int jp_Contact_add_blob(struct Contact *c, struct ContactBlob *blob)
-+int jp_Contact_add_blob(struct Contact *c, Blob_t *blob)
- {
-    return Contact_add_blob(c, blob);
- }
-diff --git a/jp-pi-contact.h b/jp-pi-contact.h
-index f36e679d..320dc76a 100644
---- a/jp-pi-contact.h
-+++ b/jp-pi-contact.h
-@@ -47,7 +47,7 @@ extern int jp_pack_ContactAppInfo
-     PI_ARGS((struct ContactAppInfo *, pi_buffer_t *buf));
- 
- extern int jp_Contact_add_blob
--    PI_ARGS((struct Contact *, struct ContactBlob *));
-+    PI_ARGS((struct Contact *, Blob_t *));
- extern int jp_Contact_add_picture
-     PI_ARGS((struct Contact *, struct ContactPicture *));
- #ifdef __cplusplus
\ No newline at end of file
diff --git a/pkgs/by-name/jp/jpilot/package.nix b/pkgs/by-name/jp/jpilot/package.nix
index 1b1642ac4ec8..430b6fd094b8 100644
--- a/pkgs/by-name/jp/jpilot/package.nix
+++ b/pkgs/by-name/jp/jpilot/package.nix
@@ -3,37 +3,39 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
+  wrapGAppsHook3,
   gtk3,
   intltool,
   libgcrypt,
   pilot-link,
   pkg-config,
-  slang,
+  sqlite,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "jpilot";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "juddmon";
     repo = "jpilot";
-    rev = "v2_0_1";
-    hash = "sha256-CHCNDoYPi+2zMKkI6JIecmiWMvMF6WsgBZ6Ubfl0RJU=";
+    rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}";
+    hash = "sha256-ja/P6kq53C7drEPWemGMV5fB4BktHrbrxL39jLEGhRI=";
   };
 
-  patches = [ ./fix-broken-types.patch ];
+  patches = [ ./darwin-build.patch ]; # https://github.com/juddmon/jpilot/pull/59
 
   nativeBuildInputs = [
     autoreconfHook
     intltool
     pkg-config
+    wrapGAppsHook3
   ];
+
   buildInputs = [
     gtk3
     libgcrypt
-    pilot-link
-    slang
+    sqlite
   ];
 
   preConfigure = ''
@@ -46,6 +48,7 @@ stdenv.mkDerivation {
     description = "Desktop organizer software for the Palm Pilot";
     homepage = "https://www.jpilot.org/";
     license = lib.licenses.gpl2;
+    mainProgram = "jpilot";
     maintainers = with lib.maintainers; [ PapayaJackal ];
   };
 }