[med-svn] [Git][med-team/lamarc][master] 4 commits: routine-update: Packaging update

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / lamarc


Commits:
7831b47d by Andreas Tille at 2021-10-20T17:48:31+02:00
routine-update: Packaging update

- - - - -
68badbb8 by Andreas Tille at 2021-10-20T17:48:31+02:00
routine-update: Standards-Version: 4.6.0

- - - - -
a0a09dbb by Andreas Tille at 2021-10-20T18:19:31+02:00
Fix ISO C++17 does not allow dynamic exception specifications issue

- - - - -
bf1802e0 by Andreas Tille at 2021-10-20T18:22:07+02:00
Add TODO

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/throw_noexcept.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+lamarc (2.1.10.1+dfsg-6) UNRELEASED; urgency=medium
+
+  * 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
+
+ -- Andreas Tille <tille at debian.org>  Wed, 20 Oct 2021 17:48:52 +0200
+
 lamarc (2.1.10.1+dfsg-5) unstable; urgency=medium
 
   * Standards-Version: 4.5.1 (routine-update)


=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 13),
                libboost-dev,
                libtinyxml-dev,
                libwxgtk3.0-gtk3-dev
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/lamarc
 Vcs-Git: https://salsa.debian.org/med-team/lamarc.git
 Homepage: https://evolution.gs.washington.edu/lamarc/


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


=====================================
debian/patches/throw_noexcept.patch
=====================================
@@ -0,0 +1,71 @@
+Description: Fix ISO C++17 does not allow dynamic exception specifications issue
+Bug-Debian: https://bugs.debian.org/984080
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 20 Oct 2021 17:48:52 +0200
+
+--- a/src/convParse/tixml_util.h
++++ b/src/convParse/tixml_util.h
+@@ -37,8 +37,8 @@ wxString                tiwx_nodeText(Ti
+ wxString                tiwx_attributeValue(TiXmlElement*,wxString attributeName);
+ 
+ double                  tiwx_double_from_text(TiXmlElement *);
+-long                    tiwx_long_from_text(TiXmlElement *) throw (incorrect_xml);
+-size_t                  tiwx_size_t_from_text(TiXmlElement *) throw (incorrect_xml);
++long                    tiwx_long_from_text(TiXmlElement *) noexcept(false);
++size_t                  tiwx_size_t_from_text(TiXmlElement *) noexcept(false);
+ 
+ std::vector<TiXmlElement *>  tiwx_optionalChildren(TiXmlElement* ancestor, wxString nodeName);
+ std::vector<TiXmlElement *>  tiwx_requiredChildren(TiXmlElement* ancestor, wxString nodeName);
+--- a/src/xml/tixml_base.h
++++ b/src/xml/tixml_base.h
+@@ -53,8 +53,8 @@ std::string             ti_attributeValu
+ bool                    ti_hasAttribute(TiXmlElement*,std::string attributeName);
+ 
+ double                  ti_double_from_text(TiXmlElement *);
+-long                    ti_long_from_text(TiXmlElement *) throw (incorrect_xml);
+-size_t                  ti_size_t_from_text(TiXmlElement *) throw (incorrect_xml);
++long                    ti_long_from_text(TiXmlElement *) noexcept(false);
++size_t                  ti_size_t_from_text(TiXmlElement *) noexcept(false);
+ 
+ std::vector<TiXmlElement *>  ti_optionalChildren(TiXmlElement* ancestor, std::string nodeName);
+ std::vector<TiXmlElement *>  ti_requiredChildren(TiXmlElement* ancestor, std::string nodeName);
+--- a/src/convParse/tixml_util.cpp
++++ b/src/convParse/tixml_util.cpp
+@@ -138,7 +138,7 @@ tiwx_double_from_text(TiXmlElement * nod
+ }
+ 
+ long
+-tiwx_long_from_text(TiXmlElement * node) throw (incorrect_xml)
++tiwx_long_from_text(TiXmlElement * node) noexcept(false)
+ {
+     long value;
+     try
+@@ -156,7 +156,7 @@ tiwx_long_from_text(TiXmlElement * node)
+ }
+ 
+ size_t
+-tiwx_size_t_from_text(TiXmlElement * node) throw (incorrect_xml)
++tiwx_size_t_from_text(TiXmlElement * node) noexcept(false)
+ {
+     size_t value;
+     try
+--- a/src/xml/tixml_base.cpp
++++ b/src/xml/tixml_base.cpp
+@@ -125,7 +125,7 @@ ti_double_from_text(TiXmlElement * node)
+ }
+ 
+ long
+-ti_long_from_text(TiXmlElement * node) throw(incorrect_xml)
++ti_long_from_text(TiXmlElement * node) noexcept(false)
+ {
+     std::string nodeText = ti_nodeText(node);
+     long value = LONG_MAX;
+@@ -142,7 +142,7 @@ ti_long_from_text(TiXmlElement * node) t
+ }
+ 
+ size_t
+-ti_size_t_from_text(TiXmlElement * node) throw(incorrect_xml)
++ti_size_t_from_text(TiXmlElement * node) noexcept(false)
+ {
+     long value = ti_long_from_text(node);
+     if(value < 0)



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

-- 
View it on GitLab: https://salsa.debian.org/med-team/lamarc/-/compare/05106df962712c0ea8430aa375609010b996f284...bf1802e01b6b7a5ceb18a55f5ea0f034d9a217d0
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/20211020/e51b1c2d/attachment-0001.htm>