From 150839ccae119da7627d9693a7d983eb387c150b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= <csardi.gabor@gmail.com>
Date: Thu, 5 Sep 2024 09:46:34 +0200
Subject: [PATCH] Use dev lpSolve

Closes #682.
---
 DESCRIPTION                         | 1 +
 src/library/lpSolve/DESCRIPTION     | 6 ++----
 src/library/lpSolve/src/commonlib.c | 6 +-----
 src/library/lpSolve/src/lp_utils.c  | 1 -
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 483a97efb..d2576f2b9 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -66,6 +66,7 @@ Config/needs/dependencies:
     curl,
     filelock,
     jsonlite,
+    gaborcsardi/lpSolve,
     pkgbuild,
     r-lib/pkgcache,
     r-lib/pkgdepends,
diff --git a/src/library/lpSolve/DESCRIPTION b/src/library/lpSolve/DESCRIPTION
index d61b0be47..5fe3dc7d9 100644
--- a/src/library/lpSolve/DESCRIPTION
+++ b/src/library/lpSolve/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: lpSolve
-Version: 5.6.20
+Version: 5.6.20.9000
 Title: Interface to 'Lp_solve' v. 5.5 to Solve Linear/Integer Programs
 Author: Michel Berkelaar and others
 Maintainer: Gábor Csárdi <csardi.gabor@gmail.com>
@@ -14,6 +14,4 @@ URL: https://github.com/gaborcsardi/lpSolve
 BugReports: https://github.com/gaborcsardi/lpSolve/issues
 Encoding: UTF-8
 NeedsCompilation: yes
-Packaged: 2023-12-10 12:59:14 UTC; gaborcsardi
-Repository: CRAN
-Date/Publication: 2023-12-10 13:40:02 UTC
+Packaged: 2024-09-05 07:46:18 UTC; gaborcsardi
diff --git a/src/library/lpSolve/src/commonlib.c b/src/library/lpSolve/src/commonlib.c
index a7f91c7d7..c19858e45 100644
--- a/src/library/lpSolve/src/commonlib.c
+++ b/src/library/lpSolve/src/commonlib.c
@@ -1,11 +1,7 @@
 
 #include <sys/types.h>
 
-#ifdef INTEGERTIME
-# include <time.h>
-#else
-# include <sys/timeb.h>
-#endif
+#include <time.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/library/lpSolve/src/lp_utils.c b/src/library/lpSolve/src/lp_utils.c
index 54b3b2d4f..73a244b5c 100644
--- a/src/library/lpSolve/src/lp_utils.c
+++ b/src/library/lpSolve/src/lp_utils.c
@@ -5,7 +5,6 @@
 #include "lp_lib.h"
 #include "lp_utils.h"
 #include <time.h>
-#include <sys/timeb.h>
 
 #ifdef FORTIFY
 # include "lp_fortify.h"