[packages/libzypp] - up to 17.38.16, patch not needed for boosts before or after 1.87
qboosh
qboosh at pld-linux.org
Sat Oct 17 15:03:06 CEST 2026
commit 12bafd9d0441ebe7a3bbde59bf36efe095719fbc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Oct 17 15:03:44 2026 +0200
- up to 17.38.16, patch not needed for boosts before or after 1.87
libzypp-ambiguous.patch | 275 ------------------------------------------------
libzypp.spec | 8 +-
2 files changed, 4 insertions(+), 279 deletions(-)
---
diff --git a/libzypp.spec b/libzypp.spec
index 0f2db62..5cc8a69 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -8,15 +8,14 @@
Summary: Package management library
Summary(pl.UTF-8): Biblioteka do zarządzania pakietami
Name: libzypp
-Version: 17.38.15
+Version: 17.38.16
Release: 1
License: GPL v2+
Group: Libraries
#Source0Download: https://github.com/openSUSE/libzypp/tags
Source0: https://github.com/openSUSE/libzypp/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 53ea04e7f007c3e3f17f411d8b2fa9a0
+# Source0-md5: c8ce653b7811f5e5453e75eb4a364c0f
Patch0: %{name}-rpm5.patch
-Patch1: %{name}-ambiguous.patch
URL: https://en.opensuse.org/Portal:Libzypp
BuildRequires: boost-devel
BuildRequires: cmake >= 3.17
@@ -44,6 +43,8 @@ BuildRequires: yaml-cpp-devel
%{?with_zchunk:BuildRequires: zchunk-devel}
BuildRequires: zlib-devel
%{?with_zstd:BuildRequires: zstd-devel}
+# broken operator<< for template std::basic_ostream<> except for std::ostream
+BuildConflicts: boost-devel = 1:1.87.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -93,7 +94,6 @@ Dokumentacja API biblioteki Zypp.
%if %{with rpm5}
%patch -P0 -p1
%endif
-%patch -P1 -p1
%build
# MEDIABACKEND_TESTS require nginx+fcgi+fcgi++
diff --git a/libzypp-ambiguous.patch b/libzypp-ambiguous.patch
deleted file mode 100644
index 6970332..0000000
--- a/libzypp-ambiguous.patch
+++ /dev/null
@@ -1,275 +0,0 @@
---- libzypp-17.38.15/zypp-logic/zypp-core/base/PtrTypes.h.orig 2026-09-04 16:30:36.000000000 +0200
-+++ libzypp-17.38.15/zypp-logic/zypp-core/base/PtrTypes.h 2026-09-20 14:44:23.872161711 +0200
-@@ -115,7 +115,7 @@ namespace zypp
- } // namespace zypp
- ///////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////
--namespace std
-+namespace zypp
- { /////////////////////////////////////////////////////////////////
-
- // namespace sub {
-@@ -156,7 +156,7 @@ namespace std
- /** \overload specialize for void */
- template<>
- inline std::ostream & dumpOn( std::ostream & str, const zypp::shared_ptr<void> & obj )
-- { return str << obj; }
-+ { return zypp::operator<<(str, obj); }
-
- /** relates: zypp::intrusive_ptr Stream output. */
- template<class D>
---- libzypp-17.38.15/zypp/zypp/repo/PackageProvider.cc.orig 2026-09-04 16:30:36.000000000 +0200
-+++ libzypp-17.38.15/zypp/zypp/repo/PackageProvider.cc 2026-09-20 15:53:15.953109640 +0200
-@@ -382,7 +382,7 @@ namespace zypp
- ManagedFile ret( providePackageFromCache() );
- if ( ! ret->empty() )
- {
-- MIL << "provided Package from cache " << _package << " at " << ret << endl;
-+ zypp::operator<<(MIL << "provided Package from cache ", _package) << " at " << ret << endl;
- report()->infoInCache( _package, ret );
- return ret; // <-- cache hit
- }
-@@ -409,7 +409,7 @@ namespace zypp
- if ( ! info.effectiveKeepPackages() )
- ret.setDispose( filesystem::unlink );
-
-- MIL << "provided Package from toplevel cache " << _package << " at " << ret << endl;
-+ zypp::operator<<(MIL << "provided Package from toplevel cache ", _package) << " at " << ret << endl;
- report()->finish( _package, repo::DownloadResolvableReport::NO_ERROR, std::string() );
- return ret; // <-- toplevel cache hit
- }
-@@ -421,7 +421,7 @@ namespace zypp
- if ( info.repoOriginsEmpty() )
- ZYPP_THROW(Exception("No url in repository."));
-
-- MIL << "provide Package " << _package << endl;
-+ zypp::operator<<(MIL << "provide Package ", _package) << endl;
- Url url = info.location();
- try {
- do {
-@@ -438,13 +438,13 @@ namespace zypp
- }
- catch ( const UserRequestException & excpt )
- {
-- ERR << "Failed to provide Package " << _package << endl;
-+ zypp::operator<<(ERR << "Failed to provide Package ", _package) << endl;
- if ( ! _retry )
- ZYPP_RETHROW( excpt );
- }
- catch ( const RpmSigCheckException & excpt )
- {
-- ERR << "Failed to provide Package " << _package << endl;
-+ zypp::operator<<(ERR << "Failed to provide Package ", _package) << endl;
- if ( ! _retry )
- {
- // Signature verification error was already reported by the
-@@ -466,7 +466,7 @@ namespace zypp
- }
- catch ( const FileCheckException & excpt )
- {
-- ERR << "Failed to provide Package " << _package << endl;
-+ zypp::operator<<(ERR << "Failed to provide Package ", _package) << endl;
- if ( ! _retry )
- {
- const std::string & package_str = _package->asUserString();
-@@ -488,7 +488,7 @@ namespace zypp
- }
- catch ( const Exception & excpt )
- {
-- ERR << "Failed to provide Package " << _package << endl;
-+ zypp::operator<<(ERR << "Failed to provide Package ", _package) << endl;
- if ( ! _retry )
- {
- // Aything else gets reported
-@@ -522,7 +522,7 @@ namespace zypp
- }
-
- report()->finish( _package, repo::DownloadResolvableReport::NO_ERROR, std::string() );
-- MIL << "provided Package " << _package << " at " << ret << endl;
-+ zypp::operator<<(MIL << "provided Package ", _package) << " at " << ret << endl;
- return ret;
- }
-
---- libzypp-17.38.15/zypp/zypp/repo/DeltaCandidates.cc.orig 2026-09-04 16:30:36.000000000 +0200
-+++ libzypp-17.38.15/zypp/zypp/repo/DeltaCandidates.cc 2026-09-20 15:59:33.321065262 +0200
-@@ -80,7 +80,7 @@ namespace zypp
- {
- std::list<DeltaRpm> candidates;
-
-- DBG << "package: " << package << endl;
-+ zypp::operator<<(DBG << "package: ", package) << endl;
- for_( rit, _pimpl->repos.begin(), _pimpl->repos.end() )
- {
- sat::LookupRepoAttr q( sat::SolvAttr::repositoryDeltaInfo, *rit );
---- libzypp-17.38.15/zypp/zypp/target/rpm/BinHeader.cc.orig 2026-09-04 16:30:36.000000000 +0200
-+++ libzypp-17.38.15/zypp/zypp/target/rpm/BinHeader.cc 2026-09-20 16:08:13.174915639 +0200
-@@ -175,7 +175,7 @@ BinHeader::BinHeader( Header h_r )
- //
- BinHeader::BinHeader( BinHeader::Ptr & rhs )
- {
-- INT << "INJECT from " << rhs;
-+ zypp::operator<<(INT << "INJECT from ", rhs);
- if ( ! (rhs && rhs->_h) )
- {
- _h = 0;
-@@ -185,7 +185,7 @@ BinHeader::BinHeader( BinHeader::Ptr & r
- _h = rhs->_h; // ::headerLink already done in rhs
- rhs->_h = 0;
- }
-- INT << ": " << *this << " (" << rhs << ")" << endl;
-+ zypp::operator<<(INT << ": " << *this << " (", rhs) << ")" << endl;
- }
-
- ///////////////////////////////////////////////////////////////////
---- libzypp-17.38.15/zypp/zypp/target/TargetImpl.cc.orig 2026-09-04 16:30:36.000000000 +0200
-+++ libzypp-17.38.15/zypp/zypp/target/TargetImpl.cc 2026-09-20 13:10:36.265982405 +0200
-@@ -1500,7 +1500,7 @@ namespace zypp
- if ( ! patch ||patch->message().empty() )
- continue;
-
-- MIL << "Show message for " << patch << endl;
-+ zypp::operator<<(MIL << "Show message for ", patch) << endl;
- callback::SendReport<target::PatchMessageReport> report;
- if ( ! report->show( patch ) )
- {
-@@ -1578,7 +1578,7 @@ namespace zypp
- ZYPP_CAUGHT( exp );
- it->stepStage( sat::Transaction::STEP_ERROR );
- miss = true;
-- WAR << "Skipping cache preload package " << pi->asKind<Package>() << " in commit" << endl;
-+ zypp::operator<<(WAR << "Skipping cache preload package ", pi->asKind<Package>()) << " in commit" << endl;
- continue;
- }
- catch ( const Exception & exp )
-@@ -1588,7 +1588,7 @@ namespace zypp
- ZYPP_CAUGHT( exp );
- it->stepStage( sat::Transaction::STEP_ERROR );
- miss = true;
-- INT << "Unexpected Error: Skipping cache preload package " << pi->asKind<Package>() << " in commit" << endl;
-+ zypp::operator<<(INT << "Unexpected Error: Skipping cache preload package ", pi->asKind<Package>()) << " in commit" << endl;
- continue;
- }
- }
-@@ -1806,7 +1806,7 @@ namespace zypp
- catch ( const SkipRequestException &e )
- {
- ZYPP_CAUGHT( e );
-- WAR << "Skipping package " << p << " in commit" << endl;
-+ zypp::operator<<(WAR << "Skipping package ", p) << " in commit" << endl;
- step->stepStage( sat::Transaction::STEP_ERROR );
- continue;
- }
-@@ -1815,7 +1815,7 @@ namespace zypp
- // bnc #395704: missing catch causes abort.
- // TODO see if packageCache fails to handle errors correctly.
- ZYPP_CAUGHT( e );
-- INT << "Unexpected Error: Skipping package " << p << " in commit" << endl;
-+ zypp::operator<<(INT << "Unexpected Error: Skipping package ", p) << " in commit" << endl;
- step->stepStage( sat::Transaction::STEP_ERROR );
- continue;
- }
-@@ -1940,7 +1940,7 @@ namespace zypp
- break;
- }
- // else
-- WAR << "removal of " << p << " failed";
-+ zypp::operator<<(WAR << "removal of ", p) << " failed";
- step->stepStage( sat::Transaction::STEP_ERROR );
- }
- if ( success && !policy_r.dryRun() )
-@@ -2179,7 +2179,7 @@ namespace zypp
- catch ( const SkipRequestException &e )
- {
- ZYPP_CAUGHT( e );
-- WAR << "Skipping package " << p << " in commit" << endl;
-+ zypp::operator<<(WAR << "Skipping package ", p) << " in commit" << endl;
- step.stepStage( sat::Transaction::STEP_ERROR );
- continue;
- }
-@@ -2188,7 +2188,7 @@ namespace zypp
- // bnc #395704: missing catch causes abort.
- // TODO see if packageCache fails to handle errors correctly.
- ZYPP_CAUGHT( e );
-- INT << "Unexpected Error: Skipping package " << p << " in commit" << endl;
-+ zypp::operator<<(INT << "Unexpected Error: Skipping package ", p) << " in commit" << endl;
- step.stepStage( sat::Transaction::STEP_ERROR );
- continue;
- }
-@@ -2219,7 +2219,7 @@ namespace zypp
-
- } catch ( const Exception &e ) {
- ZYPP_CAUGHT( e );
-- INT << "Unexpected Error: Skipping package " << p << " in commit" << endl;
-+ zypp::operator<<(INT << "Unexpected Error: Skipping package ", p) << " in commit" << endl;
- step.stepStage( sat::Transaction::STEP_ERROR );
- continue;
- }
---- libzypp-17.38.15/zypp/zypp/ProblemSolution.cc.orig 2026-09-04 16:30:36.000000000 +0200
-+++ libzypp-17.38.15/zypp/zypp/ProblemSolution.cc 2026-09-20 13:23:25.648480969 +0200
-@@ -171,7 +171,7 @@ namespace zypp
- std::ostream & operator<<( std::ostream & os, const ProblemSolutionList & obj )
- {
- for ( const auto & ptr: obj )
-- { os << ptr; }
-+ { zypp::operator<<(os, ptr); }
- return os;
- }
-
---- libzypp-17.38.15/zypp-logic/zypp-core/base/LogTools.h.orig 2026-09-04 16:30:36.000000000 +0200
-+++ libzypp-17.38.15/zypp-logic/zypp-core/base/LogTools.h 2026-09-21 05:29:07.591249179 +0200
-@@ -358,6 +358,16 @@ namespace zypp
- inline std::ostream & operator<<( std::ostream & str, MLSep & obj )
- { if ( obj._first ) obj._first = false; else str << obj._sep; return str; }
-
-+ class Product;
-+ class ResolverProblem;
-+ namespace ui { class Selectable; }
-+ inline std::ostream & operator<<( std::ostream & str, const boost::intrusive_ptr<zypp::ResolverProblem> & obj )
-+ { return zypp::operator<<(str, obj); }
-+ inline std::ostream & operator<<( std::ostream & str, const boost::intrusive_ptr<const zypp::Product> & obj )
-+ { return zypp::operator<<(str, obj); }
-+ inline std::ostream & operator<<( std::ostream & str, const boost::intrusive_ptr<zypp::ui::Selectable> & obj )
-+ { return zypp::operator<<(str, obj); }
-+
- /** Print range defined by iterators (multiline style).
- * \code
- * intro [ pfx ITEM [ { sep ITEM }+ ] sfx ] extro
-@@ -424,6 +434,7 @@ namespace zypp
- const std::string & sfx = "\n",
- const std::string & extro = "}" )
- {
-+ using zypp::operator<<;
- str << intro;
- if ( begin != end )
- {
---- libzypp-17.38.15/zypp/tools/zypp-install.cc.orig 2026-09-04 16:30:36.000000000 +0200
-+++ libzypp-17.38.15/zypp/tools/zypp-install.cc 2026-09-21 17:02:03.699345388 +0200
-@@ -212,7 +212,7 @@ try {
- for ( const ui::Selectable_Ptr & sel : zypp->pool().proxy() )
- {
- if ( sel->toModify() )
-- cout << " " << sel << endl;
-+ zypp::operator<<(cout << " ", sel) << endl;
- }
- }
-
---- libzypp-17.38.15/zypp/tools/zypp-rpm/BinHeader.cc.orig 2026-09-04 16:30:36.000000000 +0200
-+++ libzypp-17.38.15/zypp/tools/zypp-rpm/BinHeader.cc 2026-09-21 17:19:53.076885406 +0200
-@@ -160,7 +160,7 @@ BinHeader::BinHeader( Header h_r )
- //
- BinHeader::BinHeader( BinHeader::Ptr & rhs )
- {
-- INT << "INJECT from " << rhs;
-+ zypp::operator<<(INT << "INJECT from ", rhs);
- if ( ! (rhs && rhs->_h) )
- {
- _h = 0;
-@@ -170,7 +170,7 @@ BinHeader::BinHeader( BinHeader::Ptr & r
- _h = rhs->_h; // ::headerLink already done in rhs
- rhs->_h = 0;
- }
-- INT << ": " << *this << " (" << rhs << ")" << endl;
-+ zypp::operator<<(INT << ": " << *this << " (", rhs) << ")" << endl;
- }
-
- ///////////////////////////////////////////////////////////////////
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libzypp.git/commitdiff/12bafd9d0441ebe7a3bbde59bf36efe095719fbc
More information about the pld-cvs-commit
mailing list