[med-svn] r21946 - in trunk/packages/libzeep/trunk/debian: . patches
Gert Wollny
gert-guest at moszumanska.debian.org
Fri May 13 08:16:24 UTC 2016
Author: gert-guest
Date: 2016-05-13 08:16:23 +0000 (Fri, 13 May 2016)
New Revision: 21946
Added:
trunk/packages/libzeep/trunk/debian/patches/libzeep-3.0-g++6-boost1.60.patch
Modified:
trunk/packages/libzeep/trunk/debian/changelog
trunk/packages/libzeep/trunk/debian/control
trunk/packages/libzeep/trunk/debian/patches/series
Log:
Add patch to compile with g++-6 against libboost1.60 Closes: #824013
Also:
* run cme fix dpkg-control
* set VCS browser url to secure version
Modified: trunk/packages/libzeep/trunk/debian/changelog
===================================================================
--- trunk/packages/libzeep/trunk/debian/changelog 2016-05-12 19:14:51 UTC (rev 21945)
+++ trunk/packages/libzeep/trunk/debian/changelog 2016-05-13 08:16:23 UTC (rev 21946)
@@ -1,3 +1,13 @@
+libzeep (3.0.2-4) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * d/p/libzeep-3.0-g++6-boost1.60.patch: correct compiling with
+ libboost1.60 in combination with g++ Closes: #824013
+ * d/control: cme fix dpkg-control
+ * d/control: set secure url for repository viewer
+
+ -- Gert Wollny <gw.fossdev at gmail.com> Fri, 13 May 2016 07:41:01 +0000
+
libzeep (3.0.2-3) unstable; urgency=medium
* Rename library packages for g++5 ABI transition.
Modified: trunk/packages/libzeep/trunk/debian/control
===================================================================
--- trunk/packages/libzeep/trunk/debian/control 2016-05-12 19:14:51 UTC (rev 21945)
+++ trunk/packages/libzeep/trunk/debian/control 2016-05-13 08:16:23 UTC (rev 21946)
@@ -5,14 +5,14 @@
Section: libs
Priority: optional
Build-Depends: debhelper (>= 9),
- libboost-dev (>= 1.49.0),
- libboost-filesystem-dev (>= 1.49.0),
- libboost-system-dev (>= 1.49.0),
- libboost-regex-dev (>= 1.49.0),
- libboost-math-dev (>= 1.49.0),
- libboost-thread-dev (>= 1.49.0)
-Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/libzeep/trunk/
+ libboost-dev,
+ libboost-filesystem-dev,
+ libboost-system-dev,
+ libboost-regex-dev,
+ libboost-math-dev,
+ libboost-thread-dev
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/libzeep/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/libzeep/trunk/
Homepage: http://sourceforge.net/projects/libzeep/
@@ -21,11 +21,11 @@
Section: libdevel
Depends: ${misc:Depends},
libzeep3.0v5 (= ${binary:Version}),
- libboost-dev (>= 1.49.0),
- libboost-filesystem-dev (>= 1.49.0),
- libboost-system-dev (>= 1.49.0),
- libboost-regex-dev (>= 1.49.0),
- libboost-thread-dev (>= 1.49.0)
+ libboost-dev,
+ libboost-filesystem-dev,
+ libboost-system-dev,
+ libboost-regex-dev,
+ libboost-thread-dev
Description: Development files for libzeep
Libzeep is a C++ library providing a validating XML parser, XML DOM tree
implementation, XPath 1.0 support and code to create SOAP/REST servers as
Added: trunk/packages/libzeep/trunk/debian/patches/libzeep-3.0-g++6-boost1.60.patch
===================================================================
--- trunk/packages/libzeep/trunk/debian/patches/libzeep-3.0-g++6-boost1.60.patch (rev 0)
+++ trunk/packages/libzeep/trunk/debian/patches/libzeep-3.0-g++6-boost1.60.patch 2016-05-13 08:16:23 UTC (rev 21946)
@@ -0,0 +1,130 @@
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Last-Update: Wed, 11 May 2016
+Description: Correct use of boost::fusion::tie
+ With the combination of g++6 and boost-1.60 compiled with g++-6
+ both provide the function tie with equal signatures, hence
+ compilation fails. This patch ensures that always
+ boost::fusion::tie is used.
+
+--- a/src/doctype.cpp
++++ b/src/doctype.cpp
+@@ -132,7 +132,7 @@
+ switch (m_state)
+ {
+ case state_Start:
+- tie(result, done) = m_sub->allow(name);
++ boost::fusion::tie(result, done) = m_sub->allow(name);
+ if (result == true)
+ m_state = state_Loop;
+ else
+@@ -140,7 +140,7 @@
+ break;
+
+ case state_Loop:
+- tie(result, done) = m_sub->allow(name);
++ boost::fusion::tie(result, done) = m_sub->allow(name);
+ if (result == false and done)
+ done = true;
+ break;
+@@ -172,7 +172,7 @@
+ switch (m_state)
+ {
+ case state_Start:
+- tie(result, done) = m_sub->allow(name);
++ boost::fusion::tie(result, done) = m_sub->allow(name);
+ if (result == true)
+ m_state = state_Loop;
+ else
+@@ -180,11 +180,11 @@
+ break;
+
+ case state_Loop:
+- tie(result, done) = m_sub->allow(name);
++ boost::fusion::tie(result, done) = m_sub->allow(name);
+ if (result == false and done)
+ {
+ m_sub->reset();
+- tie(result, done) = m_sub->allow(name);
++ boost::fusion::tie(result, done) = m_sub->allow(name);
+ if (result == false)
+ done = true;
+ }
+@@ -218,28 +218,28 @@
+ switch (m_state)
+ {
+ case state_Start:
+- tie(result, done) = m_sub->allow(name);
++ boost::fusion::tie(result, done) = m_sub->allow(name);
+ if (result == true)
+ m_state = state_FirstLoop;
+ break;
+
+ case state_FirstLoop:
+- tie(result, done) = m_sub->allow(name);
++ boost::fusion::tie(result, done) = m_sub->allow(name);
+ if (result == false and done)
+ {
+ m_sub->reset();
+- tie(result, done) = m_sub->allow(name);
++ boost::fusion::tie(result, done) = m_sub->allow(name);
+ if (result == true)
+ m_state = state_NextLoop;
+ }
+ break;
+
+ case state_NextLoop:
+- tie(result, done) = m_sub->allow(name);
++ boost::fusion::tie(result, done) = m_sub->allow(name);
+ if (result == false and done)
+ {
+ m_sub->reset();
+- tie(result, done) = m_sub->allow(name);
++ boost::fusion::tie(result, done) = m_sub->allow(name);
+ if (result == false)
+ done = true;
+ }
+@@ -319,7 +319,7 @@
+ // fall through
+
+ case state_Element:
+- tie(result, done) = (*m_next)->allow(name);
++ boost::fusion::tie(result, done) = (*m_next)->allow(name);
+ while (result == false and done)
+ {
+ ++m_next;
+@@ -330,7 +330,7 @@
+ break;
+ }
+
+- tie(result, done) = (*m_next)->allow(name);
++ boost::fusion::tie(result, done) = (*m_next)->allow(name);
+ }
+ break;
+ }
+@@ -404,7 +404,7 @@
+ case state_Start:
+ for (list<state_ptr>::iterator choice = m_states.begin(); choice != m_states.end(); ++choice)
+ {
+- tie(result, done) = (*choice)->allow(name);
++ boost::fusion::tie(result, done) = (*choice)->allow(name);
+ if (result == true)
+ {
+ m_sub = *choice;
+@@ -415,7 +415,7 @@
+ break;
+
+ case state_Choice:
+- tie(result, done) = m_sub->allow(name);
++ boost::fusion::tie(result, done) = m_sub->allow(name);
+ break;
+ }
+
+@@ -490,7 +490,7 @@
+ bool validator::allow(const string& name)
+ {
+ bool result;
+- tie(result, m_done) = m_state->allow(name);
++ boost::fusion::tie(result, m_done) = m_state->allow(name);
+ return result;
+ }
+
Modified: trunk/packages/libzeep/trunk/debian/patches/series
===================================================================
--- trunk/packages/libzeep/trunk/debian/patches/series 2016-05-12 19:14:51 UTC (rev 21945)
+++ trunk/packages/libzeep/trunk/debian/patches/series 2016-05-13 08:16:23 UTC (rev 21946)
@@ -1,3 +1,4 @@
hurd-patch
makefile.diff
linking-order.diff
+libzeep-3.0-g++6-boost1.60.patch
More information about the debian-med-commit
mailing list