From f85f2a1fffaeb9fdd0ec5247dd3a414133d5991b Mon Sep 17 00:00:00 2001
From: Xisco Fauli <xiscofauli@libreoffice.org>
Date: Wed, 15 May 2024 18:11:27 +0200
Subject: [PATCH] lpsolve: remove obsolete dmake patch

Added with 249a4da9cd5217b0c340edd779bd17e44e21d678
"warn free build of dmake, concat-deps and lpsolve"

Change-Id: I1c8eb1e4882526749fe5f46906cdea05e62386a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167698
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
---
 external/lpsolve/UnpackedTarball_lpsolve.mk |  1 -
 external/lpsolve/lp_solve-fixed-warn.patch  | 84 ---------------------
 2 files changed, 85 deletions(-)
 delete mode 100644 external/lpsolve/lp_solve-fixed-warn.patch

diff --git a/external/lpsolve/UnpackedTarball_lpsolve.mk b/external/lpsolve/UnpackedTarball_lpsolve.mk
index 62a182dc7517..bcb885fb9186 100644
--- a/external/lpsolve/UnpackedTarball_lpsolve.mk
+++ b/external/lpsolve/UnpackedTarball_lpsolve.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
 else
 
 $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
-	external/lpsolve/lp_solve-fixed-warn.patch \
 	external/lpsolve/lp_solve_5.5.patch \
 	external/lpsolve/lpsolve-ubsan.patch.0 \
 ))
diff --git a/external/lpsolve/lp_solve-fixed-warn.patch b/external/lpsolve/lp_solve-fixed-warn.patch
deleted file mode 100644
index 46742887a85f..000000000000
--- a/external/lpsolve/lp_solve-fixed-warn.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- misc/build/lp_solve_5.5/lp_report.c	2007-01-14 10:31:34.000000000 -0800
-+++ misc/build/lp_solve_5.5/lp_report.c	2007-01-14 10:31:34.000000000 -0800
-@@ -160,7 +160,7 @@
- {
-   int i, k = 0;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "\n");
-   for(i = first; i <= last; i++) {
-     fprintf(output, " %18g", vector[i]);
-@@ -189,7 +189,7 @@
-   if(last < 0)
-     last = lp->rows;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "\n");
- 
-   if(first == 0) {
-@@ -254,7 +254,7 @@
-   if(last < 0)
-     last = lp->rows;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "\n");
- 
-   for(i = first; i <= last; i++) {
---- misc/build/lp_solve_5.5/lp_rlp.h	2007-01-14 10:31:52.000000000 -0800
-+++ misc/build/lp_solve_5.5/lp_rlp.h	2007-01-14 10:31:52.000000000 -0800
-@@ -615,7 +615,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
-  * we now use fwrite().
-  */
--#define ECHO (void) fwrite( lp_yytext, lp_yyleng, 1, lp_yyout )
-+#define ECHO if(fwrite( lp_yytext, lp_yyleng, 1, lp_yyout ) != 1) YY_FATAL_ERROR( "can't write into lp_yytext" )
- #endif
- 
- /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
---- misc/build/lp_solve_5.5/shared/commonlib.c	2007-01-14 10:33:14.000000000 -0800
-+++ misc/build/lp_solve_5.5/shared/commonlib.c	2007-01-14 10:33:14.000000000 -0800
-@@ -715,7 +715,7 @@
- {
-   int i, k = 0;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "\n");
-   for(i = first; i <= last; i++) {
-     fprintf(output, " %5d", myvector[i]);
-@@ -734,7 +734,7 @@
- {
-   int i, k = 0;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "\n");
-   for(i = first; i <= last; i++) {
-     if(asRaw)
-@@ -756,7 +756,7 @@
- {
-   int i, k = 0;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "\n");
-   for(i = first; i <= last; i++) {
-     fprintf(output, " %18g", myvector[i]);
---- misc/build/lp_solve_5.5/shared/mmio.c	2007-01-14 10:33:14.000000000 -0800
-+++ misc/build/lp_solve_5.5/shared/mmio.c	2007-01-14 10:33:14.000000000 -0800
-@@ -74,7 +74,11 @@
-  
-     for (i=0; i<nz; i++)
-     {
--        fscanf(f, "%d %d %lg\n", &I[i], &J[i], &val[i]);
-+        if(fscanf(f, "%d %d %lg\n", &I[i], &J[i], &val[i]) != 3)
-+        {
-+            fprintf(stderr, "read_unsymmetric_sparse(): could not parse values.\n");
-+            return -1;
-+        }
-         I[i]--;  /* adjust from 1-based to 0-based */
-         J[i]--;
-     }