[med-svn] [Git][med-team/tao-json][master] 7 commits: fuzzy-match.patch: new: fix build failure on i386.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Thu May 1 17:27:20 BST 2025
Étienne Mollier pushed to branch master at Debian Med / tao-json
Commits:
2d41f9bc by Étienne Mollier at 2025-05-01T18:19:37+02:00
fuzzy-match.patch: new: fix build failure on i386.
Closes: #1103123
- - - - -
37426494 by Étienne Mollier at 2025-05-01T18:21:02+02:00
d/control: build depends on tao-pegtl-dev.
- - - - -
63ccb557 by Étienne Mollier at 2025-05-01T18:21:33+02:00
d/rules: set CPATH to fetch ./include.
- - - - -
4f076c6a by Étienne Mollier at 2025-05-01T18:22:15+02:00
d/control: declare compliance to standards version 4.7.2.
- - - - -
e548cd07 by Étienne Mollier at 2025-05-01T18:24:15+02:00
d/copyright: remove superfluous entries.
- - - - -
03013035 by Étienne Mollier at 2025-05-01T18:26:01+02:00
d/u/metadata: document upstream repository.
- - - - -
9630e6c2 by Étienne Mollier at 2025-05-01T18:26:54+02:00
d/changelog: ready for upload to unstable.
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/fuzzy-match.patch
- debian/patches/series
- debian/rules
- debian/upstream/metadata
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-tao-json (1.0.0~beta14-1) UNRELEASED; urgency=medium
+tao-json (1.0.0~beta14-1) unstable; urgency=medium
* Team upload.
@@ -8,10 +8,17 @@ tao-json (1.0.0~beta14-1) UNRELEASED; urgency=medium
[ Andreas Tille ]
* New upstream version
- * Standards-Version: 4.7.0 (routine-update)
* Point watch files to github tags
- -- Andreas Tille <tille at debian.org> Sat, 13 Jul 2024 07:35:05 +0200
+ [ Étienne Mollier ]
+ * fuzzy-match.patch: new: fix build failure on i386. (Closes: #1103123)
+ * d/control: build depends on tao-pegtl-dev.
+ * d/rules: set CPATH to fetch ./include.
+ * d/control: declare compliance to standards version 4.7.2.
+ * d/copyright: remove superfluous entries.
+ * d/u/metadata: document upstream repository.
+
+ -- Étienne Mollier <emollier at debian.org> Thu, 01 May 2025 18:26:32 +0200
tao-json (0.0+git20200604.f357d72-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -3,8 +3,9 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Shayan Doust <hello at shayandoust.me>
Section: libdevel
Priority: optional
-Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.7.0
+Build-Depends: debhelper-compat (= 13),
+ tao-pegtl-dev
+Standards-Version: 4.7.2
Vcs-Browser: https://salsa.debian.org/med-team/tao-json
Vcs-Git: https://salsa.debian.org/med-team/tao-json.git
Homepage: https://github.com/taocpp/json
=====================================
debian/copyright
=====================================
@@ -13,18 +13,10 @@ Copyright: 2013-2017 Niels Lohmann,
2008-2009 Bjoern Hoehrmann <bjoern at hoehrmann.de>
License: Expat
-Files: include/tao/json/external/akrzemi1/*
-Copyright: 2011-2016 Andrzej Krzemienski.
-License: BSL-1.0
-
Files: include/tao/json/external/double.hpp
Copyright: 2006-2011 the V8 project authors.
License: BSD-3-Clause
-Files: include/tao/json/external/optional.hpp
-Copyright: 2016-2018 Daniel Frey
-License: Expat
-
Files: include/tao/json/external/itoa.hpp
Copyright: 2017 James Edward Anhalt III
License: Expat
@@ -66,29 +58,6 @@ License: BSD-3-Clause
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-License: BSL-1.0
- Permission is hereby granted, free of charge, to any person or organization
- obtaining a copy of the software and accompanying documentation covered by
- this license (the "Software") to use, reproduce, display, distribute,
- execute, and transmit the Software, and to prepare derivative works of the
- Software, and to permit third-parties to whom the Software is furnished to
- do so, all subject to the following:
- .
- The copyright notices in the Software and this entire statement, including
- the above license grant, this restriction and the following disclaimer,
- must be included in all copies of the Software, in whole or in part, and
- all derivative works of the Software, unless such copies or derivative
- works are solely in the form of machine-executable object code generated by
- a source language processor.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
=====================================
debian/patches/fuzzy-match.patch
=====================================
@@ -0,0 +1,86 @@
+Description: relax equality expectations on floating point values.
+ This is needed to fix build failures on 32-bit systems, notably i386.
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1103123
+Forwarded: not-needed
+Last-Update: 2025-05-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- tao-json.orig/src/test/json/jaxn_parts_parser.cpp
++++ tao-json/src/test/json/jaxn_parts_parser.cpp
+@@ -88,17 +88,20 @@
+ }
+ {
+ jaxn::parts_parser p( "100.45", __FUNCTION__ );
+- TEST_ASSERT( p.number_double() == 100.45 );
++ auto a = p.number_double();
++ TEST_ASSERT( 100.449 <= a && a <= 100.451 );
+ TEST_ASSERT( p.empty() );
+ }
+ {
+ jaxn::parts_parser p( "+100.45", __FUNCTION__ );
+- TEST_ASSERT( p.number_double() == 100.45 );
++ auto a = p.number_double();
++ TEST_ASSERT( 100.449 <= a && a <= 100.451 );
+ TEST_ASSERT( p.empty() );
+ }
+ {
+ jaxn::parts_parser p( "-100.45", __FUNCTION__ );
+- TEST_ASSERT( p.number_double() == -100.45 );
++ auto a = p.number_double();
++ TEST_ASSERT( -100.451 <= a && a <= -100.449 );
+ TEST_ASSERT( p.empty() );
+ }
+ {
+@@ -156,7 +159,8 @@
+ TEST_ASSERT( p.boolean() == true );
+ TEST_ASSERT( p.null() == false );
+ p.element( a );
+- TEST_ASSERT( p.number_double() == -42.7 );
++ auto b = p.number_double();
++ TEST_ASSERT( -42.701 <= b && b <= -42.699 );
+ TEST_ASSERT( p.null() == false );
+ p.element( a );
+ TEST_ASSERT( p.null() == false );
+--- tao-json.orig/src/test/json/json_parts_parser.cpp
++++ tao-json/src/test/json/json_parts_parser.cpp
+@@ -64,7 +64,8 @@
+ TEST_ASSERT( p.boolean() == true );
+ TEST_ASSERT( p.null() == false );
+ p.element( a );
+- TEST_ASSERT( p.number_double() == -42.7 );
++ auto b = p.number_double();
++ TEST_ASSERT( -42.701 <= b && b <= -42.699 );
+ TEST_ASSERT( p.null() == false );
+ p.element( a );
+ TEST_ASSERT( p.null() == false );
+--- tao-json.orig/src/test/json/binding_object.cpp
++++ tao-json/src/test/json/binding_object.cpp
+@@ -48,7 +48,7 @@
+ TEST_ASSERT( a.i == 42 );
+ TEST_ASSERT( a.s == "foo" );
+ TEST_ASSERT( a.b && ( *a.b == true ) );
+- TEST_ASSERT( a.d && ( *a.d == 43.1 ) );
++ TEST_ASSERT( a.d && ( *a.d >= 43.09 ) && ( *a.d <= 43.11 ) );
+ TEST_ASSERT( a.z.first == 5 );
+ TEST_ASSERT( a.z.second == 6 );
+ TEST_ASSERT( a == v );
+@@ -62,7 +62,7 @@
+ TEST_ASSERT( b.i == 42 );
+ TEST_ASSERT( b.s == "foo" );
+ TEST_ASSERT( b.b && ( *a.b == true ) );
+- TEST_ASSERT( b.d && ( *a.d == 43.1 ) );
++ TEST_ASSERT( b.d && ( *b.d >= 43.09 ) && ( *b.d <= 43.11 ) );
+ TEST_ASSERT( b.z.first == 5 );
+ TEST_ASSERT( b.z.second == 6 );
+ auto w = v;
+@@ -135,7 +135,8 @@
+ TEST_ASSERT( v.at( "b" ).is_boolean() );
+ TEST_ASSERT( v.as< bool >( "b" ) == false );
+ TEST_ASSERT( v.at( "d" ).is_double() );
+- TEST_ASSERT( v.as< double >( "d" ) == 44.2 );
++ TEST_ASSERT( v.as< double >( "d" ) >= 44.19 );
++ TEST_ASSERT( v.as< double >( "d" ) <= 44.21 );
+ TEST_ASSERT( v.at( "z" ).is_array() );
+ TEST_ASSERT( v.at( "z" ).get_array().size() == 2 );
+ TEST_ASSERT( v.at( "z" ).get_array()[ 0 ].as< int >() == 8 );
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
add-loongarch64-support.patch
+fuzzy-match.patch
=====================================
debian/rules
=====================================
@@ -2,7 +2,7 @@
# DH_VERBOSE := 1
export LC_ALL=C.UTF-8
-
+export CPATH=$(CURDIR)/include
include /usr/share/dpkg/default.mk
%:
=====================================
debian/upstream/metadata
=====================================
@@ -1,3 +1,5 @@
---
Bug-Database: https://github.com/taocpp/json/issues
Bug-Submit: https://github.com/taocpp/json/issues/new
+Repository: https://github.com/taocpp/json.git
+Repository-Browse: https://github.com/taocpp/json
View it on GitLab: https://salsa.debian.org/med-team/tao-json/-/compare/875e759e5532953063628012842746d35d04c90c...9630e6c20b00f8a2ba93356e3c9e846105123f7b
--
View it on GitLab: https://salsa.debian.org/med-team/tao-json/-/compare/875e759e5532953063628012842746d35d04c90c...9630e6c20b00f8a2ba93356e3c9e846105123f7b
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/debian-med-commit/attachments/20250501/e93f8719/attachment-0001.htm>
More information about the debian-med-commit
mailing list