[med-svn] [Git][med-team/lamarc][master] 2 commits: Add const-operators.patch to fix further #984080

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / lamarc


Commits:
514d8f92 by Étienne Mollier at 2021-10-29T20:39:24+02:00
Add const-operators.patch to fix further #984080

- - - - -
3ed6e4b0 by Étienne Mollier at 2021-10-29T20:49:46+02:00
ready for upload to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/const-operators.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,14 @@
-lamarc (2.1.10.1+dfsg-6) UNRELEASED; urgency=medium
+lamarc (2.1.10.1+dfsg-6) unstable; urgency=medium
 
+  [ Andreas Tille ]
   * Standards-Version: 4.6.0 (routine-update)
   * Fix ISO C++17 does not allow dynamic exception specifications issue
-  TODO: This is only half way down to close bug #984080.  Next error is:
-    /usr/include/c++/11/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const
+    Closes: #984080
 
- -- Andreas Tille <tille at debian.org>  Wed, 20 Oct 2021 17:48:52 +0200
+  [ Étienne Mollier ]
+  * Add const-operators.patch to fix further #984080
+
+ -- Étienne Mollier <emollier at debian.org>  Fri, 29 Oct 2021 20:49:03 +0200
 
 lamarc (2.1.10.1+dfsg-5) unstable; urgency=medium
 


=====================================
debian/patches/const-operators.patch
=====================================
@@ -0,0 +1,50 @@
+Description: declare operator() methods as const
+ This is part of the fixes necessary with the introduction of Gcc 11.
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984080
+Forwarded: no
+Last-Update: 2021-10-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- lamarc.orig/src/tools/rangex.h
++++ lamarc/src/tools/rangex.h
+@@ -33,7 +33,7 @@
+ 
+ struct rangecmp
+ {
+-    bool operator()(const std::pair<long int, long int> & p1, const std::pair<long int, long int> & p2)
++    bool operator()(const std::pair<long int, long int> & p1, const std::pair<long int, long int> & p2) const
+     {
+         if (p1.first == p2.first)
+         {
+@@ -47,7 +47,7 @@
+ 
+ struct linkrangecmp
+ {
+-    bool operator()(const std::pair<unsigned long int, unsigned long int> & p1, const std::pair<unsigned long int, unsigned long int> & p2)
++    bool operator()(const std::pair<unsigned long int, unsigned long int> & p1, const std::pair<unsigned long int, unsigned long int> & p2) const
+     {
+         if (p1.first == p2.first)
+         {
+--- lamarc.orig/src/convModel/gc_file.h
++++ lamarc/src/convModel/gc_file.h
+@@ -78,7 +78,7 @@
+ 
+ struct GCFileCompare
+ {
+-    bool operator()(const GCFile*,const GCFile*);
++    bool operator()(const GCFile*,const GCFile*) const;
+ };
+ 
+ typedef std::set<GCFile*,GCFileCompare>         dataFileSet;
+--- lamarc.orig/src/convModel/gc_file.cpp
++++ lamarc/src/convModel/gc_file.cpp
+@@ -168,7 +168,7 @@
+ }
+ 
+ bool
+-GCFileCompare::operator()(const GCFile* p1, const GCFile* p2)
++GCFileCompare::operator()(const GCFile* p1, const GCFile* p2) const
+ {
+     const wxString name1 = p1->GetName();
+     const wxString name2 = p2->GetName();


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ fix_install_target.patch
 enable_build_on_hurd.patch
 gtk3.patch
 throw_noexcept.patch
+const-operators.patch



View it on GitLab: https://salsa.debian.org/med-team/lamarc/-/compare/bf1802e01b6b7a5ceb18a55f5ea0f034d9a217d0...3ed6e4b00dd5bbe657ef74bbc44fd8e3e967ac3b

-- 
View it on GitLab: https://salsa.debian.org/med-team/lamarc/-/compare/bf1802e01b6b7a5ceb18a55f5ea0f034d9a217d0...3ed6e4b00dd5bbe657ef74bbc44fd8e3e967ac3b
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/20211029/b89c21b6/attachment-0001.htm>