[Git][debian-gis-team/tinyows][master] 2 commits: Add patch to fix FTBFS with ICU 71.1. (closes: #1012231)

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Thu Jun 2 06:50:34 BST 2022



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


Commits:
80dfdce9 by Bas Couwenberg at 2022-06-02T07:45:54+02:00
Add patch to fix FTBFS with ICU 71.1. (closes: #1012231)

- - - - -
7f17acab by Bas Couwenberg at 2022-06-02T07:46:05+02:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/bool.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,12 @@
-tinyows (1.2.0-2) UNRELEASED; urgency=medium
+tinyows (1.2.0-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.6.0, no changes.
   * Bump debhelper compat to 12, changes:
     - Drop --list-missing from dh_install
+  * Add patch to fix FTBFS with ICU 71.1.
+    (closes: #1012231)
 
- -- Bas Couwenberg <sebastic at debian.org>  Wed, 08 Sep 2021 17:47:32 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 02 Jun 2022 07:45:56 +0200
 
 tinyows (1.2.0-1) unstable; urgency=medium
 


=====================================
debian/patches/bool.patch
=====================================
@@ -0,0 +1,116 @@
+Description: Fix collision with stdbool.h definitions.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://github.com/MapServer/tinyows/issues/98
+Forwarded: https://github.com/MapServer/tinyows/issues/98#issuecomment-1144452700
+
+--- a/src/ows_struct.h
++++ b/src/ows_struct.h
+@@ -29,12 +29,12 @@
+ 
+ /* ========= Structures ========= */
+ 
+-enum Bool {
+-  false,
+-  true
++enum Bool_ {
++  FALSE = 0,
++  TRUE = 1
+ };
+ 
+-typedef enum Bool bool;
++typedef enum Bool_ bool_;
+ 
+ #define BUFFER_SIZE_INIT   256
+ 
+@@ -107,7 +107,7 @@ typedef struct Ows_layer_storage {
+   buffer * pkey;
+   buffer * pkey_sequence;
+   buffer * pkey_default;
+-  bool is_geographic;    /* true for a geographic CRS (or a compound CRS
++  bool_ is_geographic;   /* true for a geographic CRS (or a compound CRS
+                             whose base is geographic), false for a projected
+                             CRS (or a compound CRS whose base is projected) */
+   array * attributes;
+@@ -117,11 +117,11 @@ typedef struct Ows_srs {
+   int srid;
+   buffer * auth_name;
+   int auth_srid;
+-  bool is_geographic;              /* true for a geographic CRS (or a compound
++  bool_ is_geographic;             /* true for a geographic CRS (or a compound
+                                       CRS whose base is geographic), false for
+                                       a projected CRS (or a compound CRS whose
+                                       base is projected) */
+-  bool is_axis_order_gis_friendly;   /* true for a CRS whose axis order is
++  bool_ is_axis_order_gis_friendly;  /* true for a CRS whose axis order is
+                                         typically easting, northing (e.g most
+                                         projected CRS, such as EPSG:32631)
+                                         false for example for EPSG:4326 (WGS 84),
+@@ -129,10 +129,10 @@ typedef struct Ows_srs {
+ 
+   /* The two below fields are not properties of the SRS, but of its context
+    * of use. */
+-  bool honours_authority_axis_order; /* true for a context where the axis order
+-                                        as defined by the authority should be
+-                                        respected */
+-  bool is_long;                      /* true for a context where the srsname must
++  bool_ honours_authority_axis_order; /* true for a context where the axis order
++                                         as defined by the authority should be
++                                         respected */
++  bool_ is_long;                     /* true for a context where the srsname must
+                                         be exported as a long URN */
+ } ows_srs;
+ 
+@@ -184,8 +184,8 @@ typedef struct Ows_layer {
+   buffer * name_prefix;     /* Nominally concatenation of ns_prefix:name_no_uri, e.g. "tows:world" , or name_no_uri if no ns_prefix */
+   buffer * name_no_uri;     /* the name as in the "name" attribute in the config, e.g "world" */
+   buffer * title;
+-  bool retrievable;
+-  bool writable;
++  bool_ retrievable;
++  bool_ writable;
+   list * srid;
+   ows_geobbox * geobbox;
+   buffer * abstract;
+@@ -346,8 +346,8 @@ enum fe_error_code {
+ };
+ 
+ typedef struct Filter_encoding {
+-  bool in_not;
+-  bool is_numeric;
++  bool_ in_not;
++  bool_ is_numeric;
+   buffer * sql;
+   enum fe_error_code error_code;
+ } filter_encoding;
+@@ -370,10 +370,10 @@ typedef struct Ows_request {
+ #define OWS_MAX_DOUBLE 1e15  /* %f vs %g */
+ 
+ typedef struct Ows {
+-  bool init;
+-  bool exit;
++  bool_ init;
++  bool_ exit;
+   PGconn * pg;
+-  bool mapfile;
++  bool_ mapfile;
+   buffer * config_file;
+   buffer * schema_dir;
+   buffer * online_resource;
+@@ -396,12 +396,12 @@ typedef struct Ows {
+   int max_features;
+   ows_geobbox * max_geobbox;
+ 
+-  bool display_bbox;
+-  bool expose_pk;
+-  bool estimated_extent;
++  bool_ display_bbox;
++  bool_ expose_pk;
++  bool_ estimated_extent;
+ 
+-  bool check_schema;
+-  bool check_valid_geom;
++  bool_ check_schema;
++  bool_ check_valid_geom;
+ 
+   array * cgi;
+   list * psql_requests;


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 buffer_copy.patch
 liborder.patch
+bool.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/tinyows/-/compare/6d3d66bd9ddfc4c3aff68cc9c23c0a4a61136ac0...7f17acabcee0d1cb764fadbf22742652451201d3

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/tinyows/-/compare/6d3d66bd9ddfc4c3aff68cc9c23c0a4a61136ac0...7f17acabcee0d1cb764fadbf22742652451201d3
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/20220602/bc4d4922/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list