[med-svn] [Git][med-team/libzeep][master] revert stupid commit and add patch for gcc 10
Maarten L. Hekkelman
gitlab at salsa.debian.org
Thu Sep 10 15:28:18 BST 2020
Maarten L. Hekkelman pushed to branch master at Debian Med / libzeep
Commits:
3f1cd2b6 by Maarten L. Hekkelman at 2020-09-10T16:27:45+02:00
revert stupid commit and add patch for gcc 10
- - - - -
11 changed files:
- GNUmakefile.in
- changelog
- debian/changelog
- debian/control
- + debian/patches/gcc10-patch
- debian/patches/series
- doc/Jamfile.v2
- lib-http/GNUmakefile.in
- lib-json/GNUmakefile.in
- lib-xml/GNUmakefile.in
- lib-xml/src/xpath.cpp
Changes:
=====================================
GNUmakefile.in
=====================================
@@ -16,11 +16,10 @@ CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @BOOST_LDFLAGS@
LIBS = @LIBS@
-prefix = $(DESTDIR)/@prefix@
+prefix = @prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
-docdir = @docdir@
BOOST_LIBS = program_options
ZEEP_LIBS = http json xml
@@ -83,14 +82,6 @@ lib-$(1):
install-$(1):
+$(MAKE) -C lib-$(1) install
-.PHONY: install-$(1)-lib
-install-$(1)-lib:
- +$(MAKE) -C lib-$(1) install-lib
-
-.PHONY: install-$(1)-dev
-install-$(1)-dev:
- +$(MAKE) -C lib-$(1) install-dev
-
lib-$(1): $(OUTPUT_DIR)
endef
@@ -117,17 +108,7 @@ doc:
endif
.PHONY: all
-all: libraries
-
-.PHONY: install-libs
-install-libs: $(ZEEP_LIBS:%=install-%-lib)
-
-.PHONY: install-dev
-install-dev: $(ZEEP_LIBS:%=install-%-dev)
-
-.PHONY: install-doc
-install-doc: doc
- cd doc; for f in `find html -type f`; do install -D $$f $(docdir)/libzeep-doc/$$f; done
+all: libraries test examples
.PHONY: install
install: $(ZEEP_LIBS:%=install-%)
=====================================
changelog
=====================================
@@ -1,3 +1,10 @@
+Version 5.0.1
+
+- Refactored request, it is now a class and credentials are
+ always stored if a valid access-token was detected.
+- A bunch of fixes to make web application work behind a
+ reverse proxy.
+
Version 5.0.0
- Total rewrite of about everything
@@ -11,10 +18,6 @@ Version 5.0.0
- Lots of test code added
- Added some real world examples
- Tested with boost 1.65.1 up to 1.73
-- Refactored request, it is now a class and credentials are
- always stored if a valid access-token was detected.
-- A bunch of fixes to make web application work behind a
- reverse proxy.
Version 4.0.0
=====================================
debian/changelog
=====================================
@@ -1,15 +1,7 @@
libzeep (5.0.0-1) UNRELEASED; urgency=medium
- [ Maarten L. Hekkelman ]
* New upstream release
- [ Andreas Tille ]
- * debhelper-compat 13 (routine-update)
- * Add salsa-ci file (routine-update)
- * Rules-Requires-Root: no (routine-update)
- * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
- Repository-Browse.
-
-- Maarten L. Hekkelman <maarten at hekkelman.com> Tue, 08 Sep 2020 20:55:36 +0200
libzeep (3.0.5-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Maarten L. Hekkelman <maarten at hekkelman.com>,
Andreas Tille <tille at debian.org>
Section: libs
Priority: optional
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 12),
autoconf-archive,
libboost-dev,
libboost-program-options-dev,
@@ -18,7 +18,6 @@ Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/med-team/libzeep
Vcs-Git: https://salsa.debian.org/med-team/libzeep.git
Homepage: https://github.com/mhekkel/libzeep
-Rules-Requires-Root: no
Package: libzeep-dev
Architecture: any
=====================================
debian/patches/gcc10-patch
=====================================
@@ -0,0 +1,44 @@
+Description: Patch required to compile code with gcc version 10
+Author: Maarten L. Hekkelman <maarten at hekkelman.com>
+Last-Update: Thu, 10 Sep 2020 14:57:08 +0200
+
+--- a/include/zeep/json/element.hpp
++++ b/include/zeep/json/element.hpp
+@@ -149,7 +149,14 @@
+ element(std::nullptr_t = nullptr);
+ element(const element& j);
+ element(element&& j);
+- element(const detail::element_reference& r);
++
++ template<typename ElementRef, std::enable_if_t<std::is_same_v<ElementRef,detail::element_reference>, int> = 0>
++ element(const ElementRef& r)
++ : element(r.data())
++ {
++ validate();
++ }
++
+ template<typename T,
+ typename U = typename std::remove_cv_t<typename std::remove_reference_t<T>>,
+ std::enable_if_t<not std::is_same_v<U,element> and detail::is_compatible_type_v<T>, int> = 0>
+--- a/lib-json/src/element.cpp
++++ b/lib-json/src/element.cpp
+@@ -55,12 +55,6 @@
+ validate();
+ }
+
+-element::element(const detail::element_reference& r)
+- : element(r.data())
+-{
+- validate();
+-}
+-
+ element::element(initializer_list_t init)
+ {
+ bool isAnObject = std::all_of(init.begin(), init.end(), [](auto& ref)
+@@ -915,4 +909,4 @@
+ return os;
+ }
+
+-} // namespace zeep::json
+\ No newline at end of file
++} // namespace zeep::json
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ changelog
spelling.patch
install-targets
docs-patch
+gcc10-patch
=====================================
doc/Jamfile.v2
=====================================
@@ -1,16 +1,3 @@
-using boostbook
- : /usr/share/xml/docbook/stylesheet/docbook-xsl/
- : /usr/share/xml/docbook/schema/dtd/4.2/
- : /usr/share/boostbook
- ;
-
-using xsltproc : /usr/bin/xsltproc ;
-
-using doxygen : /usr/bin/doxygen ;
-
-using fop : /usr/bin/fop ;
-
-using quickbook : /usr/bin/quickbook ;
doxygen autodoc
:
=====================================
lib-http/GNUmakefile.in
=====================================
@@ -14,7 +14,7 @@ CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
LIBS = @LIBS@
-prefix = $(DESTDIR)@prefix@
+prefix = @prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
@@ -147,18 +147,11 @@ $(LIB_TARGET): $(OBJECTS)
.PHONY: lib
lib: $(LIB_TARGET)
-.PHONY: install-lib
-install-lib: lib
- install -d $(libdir)
+.PHONY: install
+install: lib
$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
-
-.PHONY: install-dev
-install-dev:
for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
- install -m 644 -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-
-.PHONY: install
-install: install-lib install-dev
+ install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-include $(OBJECTS:%.lo=%.d)
=====================================
lib-json/GNUmakefile.in
=====================================
@@ -15,7 +15,7 @@ CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
LIBS = @LIBS@
-prefix = $(DESTDIR)@prefix@
+prefix = @prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
@@ -99,18 +99,11 @@ $(LIB_TARGET): $(OBJECTS)
.PHONY: lib
lib: $(LIB_TARGET)
-.PHONY: install-lib
-install-lib: lib
- install -d $(libdir)
+.PHONY: install
+install: lib
$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
-
-.PHONY: install-dev
-install-dev:
for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
- install -m 644 -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-
-.PHONY: install
-install: install-lib install-dev
+ install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-include $(OBJECTS:%.lo=%.d)
=====================================
lib-xml/GNUmakefile.in
=====================================
@@ -14,7 +14,7 @@ CXXFLAGS = @CXXFLAGS@ @BOOST_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
LIBS = @LIBS@
-prefix = $(DESTDIR)@prefix@
+prefix = @prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
@@ -101,18 +101,11 @@ $(LIB_TARGET): $(OBJECTS)
.PHONY: lib
lib: $(LIB_TARGET)
-.PHONY: install-lib
-install-lib: lib
- install -d $(libdir)
+.PHONY: install
+install: lib
$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
-
-.PHONY: install-dev
-install-dev:
for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
- install -m 644 -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-
-.PHONY: install
-install: install-lib install-dev
+ install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-include $(OBJECTS:%.lo=%.d)
=====================================
lib-xml/src/xpath.cpp
=====================================
@@ -1927,7 +1927,7 @@ std::string xpath_imp::describe_token(Token token)
case xp_NodeType: result << "node type specification"; break;
case xp_OperatorUnion: result << "union operator"; break;
case xp_OperatorAdd: result << "addition operator"; break;
- case xp_OperatorSubstract: result << "subtraction operator"; break;
+ case xp_OperatorSubstract: result << "substraction operator"; break;
case xp_OperatorEqual: result << "equals operator"; break;
case xp_OperatorNotEqual: result << "not-equals operator"; break;
case xp_OperatorLess: result << "less operator"; break;
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/commit/3f1cd2b65e4d60c4f105d7a730e1de4e5a2c37d1
--
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/commit/3f1cd2b65e4d60c4f105d7a730e1de4e5a2c37d1
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/20200910/52f11c73/attachment-0001.html>
More information about the debian-med-commit
mailing list