[Git][debian-gis-team/pgrouting][master] 2 commits: Add upstream patch to fix FTBFS with 32bit architectures.

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Sun Nov 26 08:51:22 GMT 2023



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


Commits:
5ace922f by Bas Couwenberg at 2023-11-26T09:14:44+01:00
Add upstream patch to fix FTBFS with 32bit architectures.

- - - - -
6f4dbb8f by Bas Couwenberg at 2023-11-26T09:26:02+01:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/pr2589-size_t-vs-uint64_t.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+pgrouting (3.6.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add upstream patch to fix FTBFS with 32bit architectures.
+    (closes: #1056730)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 26 Nov 2023 09:25:19 +0100
+
 pgrouting (3.6.0-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/pr2589-size_t-vs-uint64_t.patch
=====================================
@@ -0,0 +1,38 @@
+Description: MacOS issues with size_t vs uint64_t
+Author: Paul Ramsey <pramsey at cleverelephant.ca>
+Origin: https://github.com/pgRouting/pgrouting/pull/2589
+Bug: https://github.com/pgRouting/pgrouting/issues/2588
+
+--- a/include/c_types/restriction_t.h
++++ b/include/c_types/restriction_t.h
+@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+ struct Restriction_t {
+     double cost;
+     int64_t * via;
+-    uint64_t via_size;
++    size_t via_size;
+ };
+ 
+ #endif  // INCLUDE_C_TYPES_RESTRICTION_T_H_
+--- a/include/cpp_common/get_check_data.hpp
++++ b/include/cpp_common/get_check_data.hpp
+@@ -59,7 +59,7 @@ char getChar(const HeapTuple, const Tupl
+ int64_t* get_array(ArrayType*, size_t*, bool);
+ 
+ /** @brief Function returns the values of specified columns in array. */
+-int64_t* getBigIntArr(const HeapTuple, const TupleDesc&, const Column_info_t&, uint64_t*);
++int64_t* getBigIntArr(const HeapTuple, const TupleDesc&, const Column_info_t&, size_t*);
+ 
+ /** @brief Function returns the value of specified column in integer type.  */
+ int64_t getBigInt(const HeapTuple, const TupleDesc&, const Column_info_t&);
+--- a/src/cpp_common/get_check_data.cpp
++++ b/src/cpp_common/get_check_data.cpp
+@@ -354,7 +354,7 @@ int64_t* getBigIntArr(
+         const HeapTuple tuple,
+         const TupleDesc &tupdesc,
+         const Column_info_t &info,
+-        uint64_t *the_size) {
++        size_t *the_size) {
+     bool is_null = false;
+ 
+     Datum raw_array = SPI_getbinval(tuple, tupdesc, info.colNumber, &is_null);


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 privacy-breach-uses-embedded-file.patch
 extension-no-version
 sphinx-version
+pr2589-size_t-vs-uint64_t.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/pgrouting/-/compare/d65a3ef5e8bb7fe30137760af291a5acf76eadc1...6f4dbb8f73b10eed31cae1b41bf76b1352f65d0b

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pgrouting/-/compare/d65a3ef5e8bb7fe30137760af291a5acf76eadc1...6f4dbb8f73b10eed31cae1b41bf76b1352f65d0b
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/20231126/968b5ae7/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list