pyrox.dev
jpilot: init at 2.0.1
+54
pkgs/by-name/jp/jpilot/fix-broken-types.patch
+54
pkgs/by-name/jp/jpilot/fix-broken-types.patch
···
1
+
From 7ec8251e3570decd97b3050c9ba4fa0d59be93e2 Mon Sep 17 00:00:00 2001
2
+
From: Morgan Kesler <keslerm@aegiszero.is>
3
+
Date: Thu, 13 Oct 2022 15:00:20 -0400
4
+
Subject: [PATCH] Fix broken types from latest pilot-link changes
5
+
6
+
Last year an update to the pilot link source broke this, it's part of
7
+
the patch from here https://github.com/desrod/pilot-link/pull/3
8
+
9
+
This is simply updating the types to match the changes
10
+
---
11
+
contact.c | 2 +-
12
+
jp-contact.c | 2 +-
13
+
jp-pi-contact.h | 2 +-
14
+
3 files changed, 3 insertions(+), 3 deletions(-)
15
+
16
+
diff --git a/contact.c b/contact.c
17
+
index 5ca3df68..f4fd6be1 100644
18
+
--- a/contact.c
19
+
+++ b/contact.c
20
+
@@ -442,7 +442,7 @@ int copy_address_to_contact(const struct Address *a, struct Contact *c)
21
+
c->advance = 0;
22
+
c->advanceUnits = 0;
23
+
memset(&(c->birthday), 0, sizeof(struct tm));
24
+
- for (i=0; i<MAX_CONTACT_BLOBS; i++) {
25
+
+ for (i=0; i<MAX_BLOBS; i++) {
26
+
c->blob[i] = NULL;
27
+
}
28
+
c->picture = NULL;
29
+
diff --git a/jp-contact.c b/jp-contact.c
30
+
index 88d7f7f9..1d02ef2c 100644
31
+
--- a/jp-contact.c
32
+
+++ b/jp-contact.c
33
+
@@ -54,7 +54,7 @@ int jp_pack_Contact(struct Contact *c, pi_buffer_t *buf)
34
+
return pack_Contact(c, buf, contacts_v10);
35
+
}
36
+
37
+
-int jp_Contact_add_blob(struct Contact *c, struct ContactBlob *blob)
38
+
+int jp_Contact_add_blob(struct Contact *c, Blob_t *blob)
39
+
{
40
+
return Contact_add_blob(c, blob);
41
+
}
42
+
diff --git a/jp-pi-contact.h b/jp-pi-contact.h
43
+
index f36e679d..320dc76a 100644
44
+
--- a/jp-pi-contact.h
45
+
+++ b/jp-pi-contact.h
46
+
@@ -47,7 +47,7 @@ extern int jp_pack_ContactAppInfo
47
+
PI_ARGS((struct ContactAppInfo *, pi_buffer_t *buf));
48
+
49
+
extern int jp_Contact_add_blob
50
+
- PI_ARGS((struct Contact *, struct ContactBlob *));
51
+
+ PI_ARGS((struct Contact *, Blob_t *));
52
+
extern int jp_Contact_add_picture
53
+
PI_ARGS((struct Contact *, struct ContactPicture *));
54
+
#ifdef __cplusplus
+51
pkgs/by-name/jp/jpilot/package.nix
+51
pkgs/by-name/jp/jpilot/package.nix
···
1
+
{
2
+
lib,
3
+
stdenv,
4
+
fetchFromGitHub,
5
+
autoreconfHook,
6
+
gtk3,
7
+
intltool,
8
+
libgcrypt,
9
+
pilot-link,
10
+
pkg-config,
11
+
slang,
12
+
}:
13
+
14
+
stdenv.mkDerivation {
15
+
pname = "jpilot";
16
+
version = "2.0.1";
17
+
18
+
src = fetchFromGitHub {
19
+
owner = "juddmon";
20
+
repo = "jpilot";
21
+
rev = "v2_0_1";
22
+
hash = "sha256-CHCNDoYPi+2zMKkI6JIecmiWMvMF6WsgBZ6Ubfl0RJU=";
23
+
};
24
+
25
+
patches = [ ./fix-broken-types.patch ];
26
+
27
+
nativeBuildInputs = [
28
+
autoreconfHook
29
+
intltool
30
+
pkg-config
31
+
];
32
+
buildInputs = [
33
+
gtk3
34
+
libgcrypt
35
+
pilot-link
36
+
slang
37
+
];
38
+
39
+
preConfigure = ''
40
+
NOCONFIGURE=1 ./autogen.sh
41
+
'';
42
+
43
+
configureFlags = [ "--with-pilot-prefix=${pilot-link}" ];
44
+
45
+
meta = {
46
+
description = "Desktop organizer software for the Palm Pilot";
47
+
homepage = "https://www.jpilot.org/";
48
+
license = lib.licenses.gpl2;
49
+
maintainers = with lib.maintainers; [ PapayaJackal ];
50
+
};
51
+
}