[Git][debian-gis-team/osmctools][master] Add patch to fix FTBFS with GCC 15. (closes: #1097529)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / osmctools


Commits:
1eb582f4 by Bas Couwenberg at 2025-02-18T09:38:08+01:00
Add patch to fix FTBFS with GCC 15. (closes: #1097529)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/gcc-15.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -4,6 +4,8 @@ osmctools (0.9-5) UNRELEASED; urgency=medium
   * Bump debhelper compat to 13.
   * Enable Salsa CI.
   * Update watch file to use searchmode=plain.
+  * Add patch to fix FTBFS with GCC 15.
+    (closes: #1097529)
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Jan 2023 17:04:28 +0100
 


=====================================
debian/patches/gcc-15.patch
=====================================
@@ -0,0 +1,59 @@
+Description: Use stdbool.h to fix FTBFS with GCC 15.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/1097529
+Forwarded: https://gitlab.com/osm-c-tools/osmctools/-/merge_requests/2
+
+--- a/src/osmconvert.c
++++ b/src/osmconvert.c
+@@ -461,6 +461,7 @@ const char* helptext=
+ #define _FILE_OFFSET_BITS 64
+ #include <zlib.h>
+ #include <inttypes.h>
++#include <stdbool.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+@@ -471,7 +472,6 @@ const char* helptext=
+ #include <fcntl.h>
+ #include <signal.h>
+ 
+-typedef enum {false= 0,true= 1} bool;
+ typedef uint8_t byte;
+ typedef unsigned int uint;
+ #define isdig(x) isdigit((unsigned char)(x))
+--- a/src/osmfilter.c
++++ b/src/osmfilter.c
+@@ -374,6 +374,7 @@ const char* helptext=
+ 
+ #define _FILE_OFFSET_BITS 64
+ #include <inttypes.h>
++#include <stdbool.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+@@ -383,7 +384,6 @@ const char* helptext=
+ #include <fcntl.h>
+ #include <signal.h>
+ 
+-typedef enum {false= 0,true= 1} bool;
+ typedef uint8_t byte;
+ typedef unsigned int uint;
+ #define isdig(x) isdigit((unsigned char)(x))
+--- a/src/osmupdate.c
++++ b/src/osmupdate.c
+@@ -169,6 +169,7 @@ const char* helptext=
+ 
+ #define _FILE_OFFSET_BITS 64
+ #include <inttypes.h>
++#include <stdbool.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+@@ -180,7 +181,6 @@ const char* helptext=
+ #include <signal.h>
+ #include <sys/stat.h>
+ 
+-typedef enum {false= 0,true= 1} bool;
+ typedef uint8_t byte;
+ typedef unsigned int uint;
+ #define isdig(x) isdigit((unsigned char)(x))


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+gcc-15.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmctools/-/commit/1eb582f4ccae1634a920533f27990705ca54ba42

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmctools/-/commit/1eb582f4ccae1634a920533f27990705ca54ba42
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250218/d00942a6/attachment-0001.htm>