[packages/loaddap] - rediffed includes patch, adjusted for octave 6 using stdbool.h; release 7

[qboosh]

commit fc30d7e2cc7719ed9adf4240029847039cee266d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jan 19 18:19:59 2023 +0100

    - rediffed includes patch, adjusted for octave 6 using stdbool.h; release 7

 loaddap-includes.patch | 38 +++++---------------------------------
 loaddap.spec           |  9 ++++-----
 2 files changed, 9 insertions(+), 38 deletions(-)
---
diff --git a/loaddap.spec b/loaddap.spec
index 31614f7..8a65218 100644
--- a/loaddap.spec
+++ b/loaddap.spec
@@ -2,21 +2,20 @@ Summary:	The OPeNDAP Matlab Command Line Interface Client
 Summary(pl.UTF-8):	Klient linii poleceń Matlaba do OPeNDAP
 Name:		loaddap
 Version:	3.7.3
-Release:	6
+Release:	7
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	http://www.opendap.org/pub/source/%{name}-%{version}.tar.gz
+Source0:	https://www.opendap.org/pub/source/%{name}-%{version}.tar.gz
 # Source0-md5:	9482c748418c38c6e26a2b63dfd5643b
-#Patch0:		%{name}-libdap.patch
 Patch0:		%{name}-includes.patch
 Patch1:		%{name}-octave.patch
-URL:		http://opendap.org/
+URL:		https://www.opendap.org/
 BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake
 BuildRequires:	libdap-devel >= 3.12.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:2
-BuildRequires:	octave-devel
+BuildRequires:	octave-devel >= 6
 BuildRequires:	pkgconfig
 Requires:	libdap >= 3.12.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/loaddap-includes.patch b/loaddap-includes.patch
index 19b57f8..42b818d 100644
--- a/loaddap-includes.patch
+++ b/loaddap-includes.patch
@@ -8,41 +8,13 @@
  #include <string.h>
  #include <errno.h>
  #ifdef WIN32
---- loaddap-3.7.2/extend.c.orig	2012-05-31 19:22:55.000000000 +0200
-+++ loaddap-3.7.2/extend.c	2014-03-15 12:36:26.140537321 +0100
-@@ -46,6 +46,7 @@
- 
- static char id[]= { "$Id: extend.c 21443 2009-09-02 08:52:42Z dan $" };
- 
-+/* cannot use <stdbool.h>, it conflicts with mex.h for C */
- #include <stdio.h>
- #include <string.h>
- 
-@@ -840,7 +841,7 @@
- 	int status, nFields, idx, i, j;
- 	int numUniqueVariables;
- 	int start, next, count;
--	bool Found = false;
-+	bool Found = FALSE;
- 	const char *name;
- 	MLVars *structArray;
- 	mxArray *ret_array;
-@@ -875,7 +876,7 @@
- #endif
- 		for (i=0; i<count; i++) {
- 			if (strcmp(names[i], name)==0) {
--				Found = true;
-+				Found = TRUE;
- 			}
- 		}
- 		if ( !Found ) {
---- loaddap-3.7.2/process_values.c.orig	2012-05-31 19:22:54.000000000 +0200
-+++ loaddap-3.7.2/process_values.c	2014-03-15 12:36:47.487203091 +0100
-@@ -44,6 +44,7 @@
- static char id[] not_used = {"$Id: process_values.c 21569 2009-09-30 04:12:29Z jimg $"};
+--- loaddap-3.7.3/process_values.c.orig	2023-01-19 18:00:14.647338290 +0100
++++ loaddap-3.7.3/process_values.c	2023-01-19 18:00:55.880448244 +0100
+@@ -42,6 +42,7 @@
+ #include "config.h"
  
  #include <errno.h>
 +#include <stdio.h>
  #include <string.h>
+ #include <math.h>
  
- #include <mex.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/loaddap.git/commitdiff/fc30d7e2cc7719ed9adf4240029847039cee266d