Unverified Commit 1cc1fbee authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

jpilot: init at 2.0.2 (#350040)

parents e0bef397 981f762f
Loading
Loading
Loading
Loading
+31 −0
Original line number Diff line number Diff line
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>
+54 −0
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitHub,
  autoreconfHook,
  wrapGAppsHook3,
  gtk3,
  intltool,
  libgcrypt,
  pilot-link,
  pkg-config,
  sqlite,
}:

stdenv.mkDerivation rec {
  pname = "jpilot";
  version = "2.0.2";

  src = fetchFromGitHub {
    owner = "juddmon";
    repo = "jpilot";
    rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}";
    hash = "sha256-ja/P6kq53C7drEPWemGMV5fB4BktHrbrxL39jLEGhRI=";
  };

  patches = [ ./darwin-build.patch ]; # https://github.com/juddmon/jpilot/pull/59

  nativeBuildInputs = [
    autoreconfHook
    intltool
    pkg-config
    wrapGAppsHook3
  ];

  buildInputs = [
    gtk3
    libgcrypt
    sqlite
  ];

  preConfigure = ''
    NOCONFIGURE=1 ./autogen.sh
  '';

  configureFlags = [ "--with-pilot-prefix=${pilot-link}" ];

  meta = {
    description = "Desktop organizer software for the Palm Pilot";
    homepage = "https://www.jpilot.org/";
    license = lib.licenses.gpl2;
    mainProgram = "jpilot";
    maintainers = with lib.maintainers; [ PapayaJackal ];
  };
}
+27 −0
Original line number Diff line number Diff line
--- pilot-link/configure.ac
+++ pilot-link/configure.ac
@@ -63,8 +63,8 @@
 dnl Eat -Werror so configure will run properly, if the user provided it
 enable_werror=no
 save_CFLAGS="$CFLAGS"
-CFLAGS=$(echo $save_CFLAGS | sed -e s/-Werror//g)
-CXXFLAGS=$(echo $save_CXXFLAGS | sed -e s/-Werror//g)
+CFLAGS=$(echo "$save_CFLAGS" | sed -e 's/-Werror[^=]//g')
+CXXFLAGS=$(echo "$save_CXXFLAGS" | sed -e 's/-Werror[^=]//g')
 if test "x$CFLAGS" != "x$save_CFLAGS"; then
 	dnl -Werror was set; treat it as implicit --enable-werror below
 	enable_werror="yes"
@@ -392,11 +392,8 @@
 		dnl Determine if system popt is good enough
 		save_LIBS="$LIBS"
 		AC_CHECK_HEADER(popt.h,
-			AC_CHECK_DECL(POPT_BIT_SET,
-				AC_CHECK_LIB(popt, poptStrippedArgv,,
-					[with_included_popt="yes"]),
-				[with_included_popt="yes"],
-				[#include <popt.h>]),
+			AC_CHECK_LIB(popt, poptStrippedArgv,,
+				[with_included_popt="yes"]),
 			[with_included_popt="yes"]
 		)
 		LIBS="$save_LIBS"
+53 −0
Original line number Diff line number Diff line
--- pilot-link/src/pilot-dlpsh.c
+++ pilot-link/src/pilot-dlpsh.c
@@ -389,7 +389,7 @@
 
 	strftime(timebuf, 80, "Now setting Palm time from desktop to: "
 			      "%a %b %d %H:%M:%S %Z %Y\n", tm_ptr);
-	printf(timebuf);
+	printf("%s", timebuf);
 	gettimeofday(&tv, 0);
 	ltime = tv.tv_sec + 1;
 	usleep(1000000 - tv.tv_usec);
--- pilot-link/src/pilot-hinotes.c
+++ pilot-link/src/pilot-hinotes.c
@@ -79,9 +79,7 @@
 		printf("...\n");
 	else
 		printf("\n");
-	printf("\n");
-	printf(m.text);
-	printf("\n");
+	printf("\n%s\n", m.text);
 }
 
 void write_memo_in_directory(char *dirname, struct HiNoteNote m,
--- pilot-link/src/pilot-xfer.c
+++ pilot-link/src/pilot-xfer.c
@@ -2477,8 +2477,7 @@
 				{
 					fprintf(stderr, "   ERROR: '%s' is not a directory or does not exist.\n"
 							"   Please supply a directory name when performing a "
-							"backup or restore and try again.\n\n", dirname);
-					fprintf(stderr,gracias);
+							"backup or restore and try again.\n\n%s", dirname, gracias);
 					return 1;
 				}
 			}
@@ -2487,14 +2486,12 @@
 		case palm_op_list:
 			if (rargc > 0)
 			{
-				fprintf(stderr,"   ERROR: Do not pass additional arguments to -busrlLC.\n");
-				fprintf(stderr,gracias);
+				fprintf(stderr,"   ERROR: Do not pass additional arguments to -busrlLC.\n%s", gracias);
 				return 1;
 			}
 			break;
 		case palm_op_noop:
-			fprintf(stderr,"   ERROR: Must specify one of -bursimfdlC.\n");
-			fprintf(stderr,gracias);
+			fprintf(stderr,"   ERROR: Must specify one of -bursimfdlC.\n%s", gracias);
 			return 1;
 			break;
 		case palm_op_merge:
+65 −0
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitHub,
  autoreconfHook,
  pkg-config,
  darwin,
  popt,
  bluezSupport ? stdenv.hostPlatform.isLinux,
  bluez,
  readlineSupport ? true,
  readline,
  enableConduits ? true,
  bison,
  enableLibpng ? true,
  libpng,
  enableLibusb ? true,
  libusb-compat-0_1,
}:

stdenv.mkDerivation {
  pname = "pilot-link";
  version = "0.12.3-unstable-2022-09-26";

  src = fetchFromGitHub {
    owner = "desrod";
    repo = "pilot-link";
    rev = "14338868111ce592c7ca7918a1f8a32ceecb7caf";
    hash = "sha256-3b5T/QnRZawnjTgwvQKUbJTE/NiJ93eU2+qbRFuI13I";
  };

  # Resolve build issues on modern systems.
  # https://github.com/desrod/pilot-link/issues/16
  # https://aur.archlinux.org/packages/pilot-link-git
  patches =
    [ ./configure-checks.patch ]
    ++ lib.optionals enableConduits [ ./format-string-literals.patch ]
    ++ lib.optionals enableLibpng [ ./pilot-link-png14.patch ];

  nativeBuildInputs = [
    autoreconfHook
    pkg-config
  ] ++ lib.optionals enableConduits [ bison ];

  buildInputs =
    [ popt ]
    ++ lib.optionals bluezSupport [ bluez ]
    ++ lib.optionals enableLibpng [ libpng ]
    ++ lib.optionals enableLibusb [ libusb-compat-0_1 ]
    ++ lib.optionals readlineSupport [ readline ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]);

  configureFlags =
    [ "--with-libiconv" ]
    ++ lib.optionals enableConduits [ "--enable-conduits" ]
    ++ lib.optionals enableLibpng [ "--enable-libpng" ]
    ++ lib.optionals enableLibusb [ "--enable-libusb" ];

  meta = {
    description = "Suite of tools for connecting to PalmOS handheld devices";
    homepage = "https://github.com/desrod/pilot-link";
    license = lib.licenses.gpl2;
    maintainers = with lib.maintainers; [ PapayaJackal ];
  };
}
Loading