From 1e83f7e7253b067dc084245e12d969b8c6cf6114 Mon Sep 17 00:00:00 2001
From: Dave Hibberd <hibby@debian.org>
Date: Thu, 28 Nov 2024 22:50:13 +0000
Subject: [PATCH] First pass of fixes for new build

---
 .gitignore                           | 1 +
 debian/changelog                     | 7 +++++++
 debian/patches/ftbfs-gcc14.patch     | 9 +++++++++
 debian/patches/headers.patch         | 4 ++--
 debian/patches/spelling-errors.patch | 4 ++--
 5 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..224e7f0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc/
diff --git a/debian/changelog b/debian/changelog
index 9e9b543..9e4b81b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linbpq (6.0.24.51-1~hibbian+1) UNRELEASED; urgency=medium
+
+  * New upstream import 
+    - Patches refreshed
+
+ -- Dave Hibberd <hibby@debian.org>  Thu, 28 Nov 2024 22:34:23 +0000
+
 linbpq (6.0.24.50-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
 
   * New upstream import
diff --git a/debian/patches/ftbfs-gcc14.patch b/debian/patches/ftbfs-gcc14.patch
index 4c0e8d1..e7dbe5d 100644
--- a/debian/patches/ftbfs-gcc14.patch
+++ b/debian/patches/ftbfs-gcc14.patch
@@ -11,6 +11,15 @@
  
 --- a/bpqmail.h
 +++ b/bpqmail.h
+@@ -611,7 +611,7 @@
+ 	char	status;
+ 	int		number;
+ 	int		length;
+-	int		xdatereceived;
++	const time_t	xdatereceived;
+ 	char	bbsfrom[7];			// ? BBS we got it from ?
+ 	char	via[41];
+ 	char	from[7];
 @@ -695,8 +695,8 @@
  	unsigned char Type;
  	unsigned char changed;
diff --git a/debian/patches/headers.patch b/debian/patches/headers.patch
index b5497d7..1eb7aa5 100644
--- a/debian/patches/headers.patch
+++ b/debian/patches/headers.patch
@@ -35,7 +35,7 @@
  BOOL CompareCalls(UCHAR * c1, UCHAR * c2);
  
  VOID PostDataAvailable(TRANSPORTENTRY * Session);
-@@ -437,7 +437,6 @@
+@@ -438,7 +438,6 @@
  
  DllExport uint64_t APIENTRY GetPortFrequency(int PortNo, char * FreqStringMhz);
  
@@ -107,7 +107,7 @@
  static UCHAR * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen, int DoNodes);
 --- a/Bpq32.c
 +++ b/Bpq32.c
-@@ -1415,7 +1415,6 @@
+@@ -1420,7 +1420,6 @@
  VOID FindLostBuffers();
  BOOL InitializeTNCEmulator();
  VOID TNCTimer();
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
index abc6e1b..c8e1669 100644
--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
@@ -1,6 +1,6 @@
 --- a/APRSCode.c
 +++ b/APRSCode.c
-@@ -3673,7 +3673,7 @@
+@@ -3674,7 +3674,7 @@
  			if (ptr1)
  				*ptr1 = 0;
  
@@ -86,7 +86,7 @@
  
 --- a/config.c
 +++ b/config.c
-@@ -644,7 +644,7 @@
+@@ -649,7 +649,7 @@
  	if (LOCATOR[0] == 0 && LocSpecified == 0 && RFOnly == 0)
  	{
  		Consoleprintf("");