Control: tags 949196 + patch
Control: tags 949196 + pending
Dear maintainer,
I've prepared an NMU for libzypp (versioned as 17.7.0-1.1) and
uploaded it to DELAYED/02. Please feel free to tell me if I
should delay it longer.
Regards.
--
Giovanni Mascellani <g.mascell...@gmail.com>
Postdoc researcher - Université Libre de Bruxelles
diff -Nru libzypp-17.7.0/debian/changelog libzypp-17.7.0/debian/changelog
--- libzypp-17.7.0/debian/changelog 2018-09-17 13:31:02.000000000 +0200
+++ libzypp-17.7.0/debian/changelog 2020-06-20 16:35:50.000000000 +0200
@@ -1,3 +1,12 @@
+libzypp (17.7.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Work around broken libsolv detection (closes: #949196).
+ * Fix build with Boost 1.71.
+ * Treat libxml as a C++ library.
+
+ -- Giovanni Mascellani <g...@debian.org> Sat, 20 Jun 2020 16:35:50 +0200
+
libzypp (17.7.0-1) unstable; urgency=medium
* New upstream release.
diff -Nru libzypp-17.7.0/debian/patches/40e772a952ed8b0525430bca6a226e054826c662.patch libzypp-17.7.0/debian/patches/40e772a952ed8b0525430bca6a226e054826c662.patch
--- libzypp-17.7.0/debian/patches/40e772a952ed8b0525430bca6a226e054826c662.patch 1970-01-01 01:00:00.000000000 +0100
+++ libzypp-17.7.0/debian/patches/40e772a952ed8b0525430bca6a226e054826c662.patch 2020-06-20 16:35:50.000000000 +0200
@@ -0,0 +1,69 @@
+From 40e772a952ed8b0525430bca6a226e054826c662 Mon Sep 17 00:00:00 2001
+From: Adam Majer <ama...@suse.de>
+Date: Wed, 28 Nov 2018 16:56:15 +0100
+Subject: [PATCH] Need to explitily cast of Tribool to boolean
+
+Only explicit casts are allowed as of Boost 1.69
+---
+ zypp/RepoInfo.cc | 8 ++++----
+ zypp/RepoManager.cc | 2 +-
+ zypp/repo/Applydeltarpm.cc | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/zypp/RepoInfo.cc b/zypp/RepoInfo.cc
+index 0a3575bc8..db230c727 100644
+--- a/zypp/RepoInfo.cc
++++ b/zypp/RepoInfo.cc
+@@ -387,11 +387,11 @@ namespace zypp
+
+
+ bool RepoInfo::repoGpgCheck() const
+- { return gpgCheck() || _pimpl->cfgRepoGpgCheck(); }
++ { return gpgCheck() || bool(_pimpl->cfgRepoGpgCheck()); }
+
+ bool RepoInfo::repoGpgCheckIsMandatory() const
+ {
+- bool ret = ( gpgCheck() && indeterminate(_pimpl->cfgRepoGpgCheck()) ) || _pimpl->cfgRepoGpgCheck();
++ bool ret = ( gpgCheck() && indeterminate(_pimpl->cfgRepoGpgCheck()) ) || bool(_pimpl->cfgRepoGpgCheck());
+ if ( ret && _pimpl->internalUnsignedConfirmed() ) // relax if unsigned repo was confirmed in the past
+ ret = false;
+ return ret;
+@@ -402,10 +402,10 @@ namespace zypp
+
+
+ bool RepoInfo::pkgGpgCheck() const
+- { return _pimpl->cfgPkgGpgCheck() || ( gpgCheck() && !bool(validRepoSignature())/*enforced*/ ) ; }
++ { return bool(_pimpl->cfgPkgGpgCheck()) || ( gpgCheck() && !bool(validRepoSignature())/*enforced*/ ) ; }
+
+ bool RepoInfo::pkgGpgCheckIsMandatory() const
+- { return _pimpl->cfgPkgGpgCheck() || ( gpgCheck() && indeterminate(_pimpl->cfgPkgGpgCheck()) && !bool(validRepoSignature())/*enforced*/ ); }
++ { return bool(_pimpl->cfgPkgGpgCheck()) || ( gpgCheck() && indeterminate(_pimpl->cfgPkgGpgCheck()) && !bool(validRepoSignature())/*enforced*/ ); }
+
+ void RepoInfo::setPkgGpgCheck( TriBool value_r )
+ { _pimpl->rawPkgGpgCheck( value_r ); }
+diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc
+index dbcf7a1b5..ad53013fe 100644
+--- a/zypp/RepoManager.cc
++++ b/zypp/RepoManager.cc
+@@ -2243,7 +2243,7 @@ namespace zypp
+
+ // Make sure the service repo is created with the appropriate enablement
+ if ( ! indeterminate(toBeEnabled) )
+- it->setEnabled( toBeEnabled );
++ it->setEnabled( ( bool ) toBeEnabled );
+
+ DBG << "Service adds repo " << it->alias() << " " << (it->enabled()?"enabled":"disabled") << endl;
+ addRepository( *it );
+diff --git a/zypp/repo/Applydeltarpm.cc b/zypp/repo/Applydeltarpm.cc
+index 7b382be9b..0a1b8ad7e 100644
+--- a/zypp/repo/Applydeltarpm.cc
++++ b/zypp/repo/Applydeltarpm.cc
+@@ -82,7 +82,7 @@ namespace zypp
+ else
+ WAR << "No executable " << prog << endl;
+ }
+- return _last;
++ return ( bool ) _last;
+ }
+
+ /******************************************************************
diff -Nru libzypp-17.7.0/debian/patches/867c6b3190dafcd07f0ac5d8eef39268cc925141.patch libzypp-17.7.0/debian/patches/867c6b3190dafcd07f0ac5d8eef39268cc925141.patch
--- libzypp-17.7.0/debian/patches/867c6b3190dafcd07f0ac5d8eef39268cc925141.patch 1970-01-01 01:00:00.000000000 +0100
+++ libzypp-17.7.0/debian/patches/867c6b3190dafcd07f0ac5d8eef39268cc925141.patch 2020-06-20 16:35:50.000000000 +0200
@@ -0,0 +1,24 @@
+From 867c6b3190dafcd07f0ac5d8eef39268cc925141 Mon Sep 17 00:00:00 2001
+From: Adam Majer <ama...@suse.de>
+Date: Tue, 27 Nov 2018 15:45:43 +0100
+Subject: [PATCH] Boost.Tribool requires an explicit cast to bool
+
+operator== between boost::logic::tribool returns a tribool, which
+requires an explicit cast to bool
+---
+ zypp/TriBool.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/zypp/TriBool.h b/zypp/TriBool.h
+index aa5e7ffd9..f2c5cfeb5 100644
+--- a/zypp/TriBool.h
++++ b/zypp/TriBool.h
+@@ -68,7 +68,7 @@ namespace boost
+
+ /** \relates TriBool whether 2 tribool have the same state (this is NOT ==) */
+ inline bool sameTriboolState( tribool lhs, tribool rhs )
+- { return( ( indeterminate(lhs) && indeterminate(rhs) ) || ( lhs == rhs ) ); }
++ { return( ( indeterminate(lhs) && indeterminate(rhs) ) || ( bool )( lhs == rhs ) ); }
+ }
+ }
+ #endif // ZYPP_TRIBOOL_H
diff -Nru libzypp-17.7.0/debian/patches/fix-libxml.patch libzypp-17.7.0/debian/patches/fix-libxml.patch
--- libzypp-17.7.0/debian/patches/fix-libxml.patch 1970-01-01 01:00:00.000000000 +0100
+++ libzypp-17.7.0/debian/patches/fix-libxml.patch 2020-06-20 16:35:50.000000000 +0200
@@ -0,0 +1,15 @@
+diff -ur tmp/zypp/parser/xml/libxmlfwd.h libzypp-17.7.0/zypp/parser/xml/libxmlfwd.h
+--- tmp/zypp/parser/xml/libxmlfwd.h 2018-09-07 12:07:57.000000000 +0200
++++ libzypp-17.7.0/zypp/parser/xml/libxmlfwd.h 2020-06-20 16:01:36.714899723 +0200
+@@ -12,11 +12,8 @@
+ #ifndef ZYPP_PARSER_XML_LIBXMLFWD_H
+ #define ZYPP_PARSER_XML_LIBXMLFWD_H
+
+-extern "C"
+-{
+ #include <libxml/xmlreader.h>
+ #include <libxml/xmlerror.h>
+-}
+
+ #include <iosfwd>
+
diff -Nru libzypp-17.7.0/debian/patches/series libzypp-17.7.0/debian/patches/series
--- libzypp-17.7.0/debian/patches/series 2018-05-28 14:25:23.000000000 +0200
+++ libzypp-17.7.0/debian/patches/series 2020-06-20 16:35:50.000000000 +0200
@@ -1,2 +1,5 @@
1002_cmake-module-path-fix.patch
1003_various-typo-fixes.patch
+40e772a952ed8b0525430bca6a226e054826c662.patch
+867c6b3190dafcd07f0ac5d8eef39268cc925141.patch
+fix-libxml.patch
diff -Nru libzypp-17.7.0/debian/rules libzypp-17.7.0/debian/rules
--- libzypp-17.7.0/debian/rules 2018-08-31 09:58:21.000000000 +0200
+++ libzypp-17.7.0/debian/rules 2020-06-20 16:35:50.000000000 +0200
@@ -15,6 +15,9 @@
pre-build::
mkdir -p $(BUILDHOME)/.gnupg
+ # Work around https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949196
+ ln -fs /usr/lib/x86_64-linux-gnu/cmake/libsolv/FindLibSolv.cmake cmake/modules/
+
include /usr/share/cdbs/1/class/cmake.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
