[Git][debian-gis-team/osm2pgsql][master] Revert "Add patch to fix FTBFS on i386."

[Bas Couwenberg (@sebastic)]

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


Commits:
4d961427 by Bas Couwenberg at 2023-09-04T16:56:12+02:00
Revert "Add patch to fix FTBFS on i386."

This reverts commit 118545782cc910f957e594372384cecb9be62a8f.

- - - - -


3 changed files:

- debian/changelog
- − debian/patches/potrace_word.patch
- − debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,3 @@
-osm2pgsql (1.9.2+ds-2) UNRELEASED; urgency=medium
-
-  * Add patch to fix FTBFS on i386.
-
- -- Bas Couwenberg <sebastic at debian.org>  Mon, 04 Sep 2023 16:15:10 +0200
-
 osm2pgsql (1.9.2+ds-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/patches/potrace_word.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Fix FTBFS on i386.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/openstreetmap/osm2pgsql/issues/2065
-
---- a/src/gen/tracer.cpp
-+++ b/src/gen/tracer.cpp
-@@ -48,8 +48,6 @@ static potrace_word bit_squeeze(potrace_
-            w;
- }
- 
--static_assert(sizeof(potrace_word) == 8);
--
- void tracer_t::prepare(canvas_t const &canvas) noexcept
- {
-     std::size_t const size = canvas.size();


=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-potrace_word.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/osm2pgsql/-/commit/4d96142796f5e4873700584b2548b93897fe77cd

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osm2pgsql/-/commit/4d96142796f5e4873700584b2548b93897fe77cd
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/20230904/6ce5450d/attachment-0001.htm>