From: Michael Vogt Date: Mon, 2 Jan 2012 14:15:54 +0000 (+0100) Subject: g++ 4.7 fixes X-Git-Tag: 0.9.0~36 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/5c6ceb4557cb6497dea827d1ec4e2615ccd53e50?hp=-c g++ 4.7 fixes --- 5c6ceb4557cb6497dea827d1ec4e2615ccd53e50 diff --combined apt-pkg/contrib/hashsum_template.h index 51e3b0862,d2d9f92ed..9bf160b2b --- a/apt-pkg/contrib/hashsum_template.h +++ b/apt-pkg/contrib/hashsum_template.h @@@ -10,18 -10,13 +10,20 @@@ #ifndef APTPKG_HASHSUM_TEMPLATE_H #define APTPKG_HASHSUM_TEMPLATE_H +#include + #include #include #include #include + #include + +#ifndef APT_8_CLEANER_HEADERS +using std::string; +using std::min; +#endif + template class HashSumValue { @@@ -110,7 -105,6 +112,7 @@@ class SummationImplementatio { return Add((const unsigned char *)Beg, End - Beg); }; bool AddFD(int Fd, unsigned long long Size = 0); + bool AddFD(FileFd &Fd, unsigned long long Size = 0); }; #endif diff --combined cmdline/apt-mark.cc index dbbef5013,9a628d714..c7d9b6f6a --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@@ -16,6 -16,7 +16,7 @@@ #include #include + #include #include /*}}}*/ @@@ -34,14 -35,14 +35,14 @@@ bool DoAuto(CommandLine &CmdL if (unlikely(Cache == NULL || DepCache == NULL)) return false; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1); if (pkgset.empty() == true) return _error->Error(_("No packages found")); bool MarkAuto = strcasecmp(CmdL.FileList[0],"auto") == 0; int AutoMarkChanged = 0; - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (Pkg->CurrentVer == 0) { @@@ -81,7 -82,7 +82,7 @@@ bool DoMarkAuto(CommandLine &CmdL if (unlikely(Cache == NULL || DepCache == NULL)) return false; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1); if (pkgset.empty() == true) return _error->Error(_("No packages found")); @@@ -89,7 -90,7 +90,7 @@@ bool const Verbose = _config->FindB("APT::MarkAuto::Verbose", false); int AutoMarkChanged = 0; - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (Pkg->CurrentVer == 0 || (((*DepCache)[Pkg].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto) == MarkAuto) @@@ -157,13 -158,13 +158,13 @@@ bool DoHold(CommandLine &CmdL if (unlikely(Cache == NULL)) return false; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1); if (pkgset.empty() == true) return _error->Error(_("No packages found")); bool const MarkHold = strcasecmp(CmdL.FileList[0],"hold") == 0; - for (APT::PackageSet::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if ((Pkg->SelectedState == pkgCache::State::Hold) == MarkHold) { @@@ -181,7 -182,7 +182,7 @@@ if (_config->FindB("APT::Mark::Simulate", false) == true) { - for (APT::PackageSet::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (MarkHold == false) ioprintf(c1out,_("%s set on hold.\n"), Pkg.FullName(true).c_str()); @@@ -201,7 -202,7 +202,7 @@@ if (dpkg == NULL) return _error->Errno("DoHold", "fdopen on dpkg stdin failed"); - for (APT::PackageSet::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (MarkHold == true) { diff --combined debian/changelog index f6a6d38e7,e6389dd06..06c84f31c --- a/debian/changelog +++ b/debian/changelog @@@ -1,48 -1,6 +1,51 @@@ +apt (0.8.16~exp9) UNRELEASED; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/cdrom.cc: + - Accept .bz2, .xz files in addition to .gz files (Closes: #649451) + + [ Michael Vogt ] + * apt-pkg/cdrom.cc: + - use aptconfiguration to get the supported compression types + * debian/control: + - bump debhelper build-dep to debhelper (>= 8.1.3~) + - set libapt-pkg-dev to multi-arch: same too + + [ Colin Watson ] + * Convert libapt-pkg4.12 and libapt-inst1.4 to Multi-Arch: same. + + [ David Kalnischkies ] + * apt-pkg/cacheset.cc: + - make the cachesets real containers which can embedding any container + to be able to use the same interface regardless of set or list usage + - provide a {Package,Version}List similar to {Package,Version}Set + * cmdline/apt-{get,cache,mark}.cc: + - use Lists instead of Sets if input order should be preserved for + commands accepting lists of packages, e.g. policy (Closes: #625960) + * apt-pkg/depcache.cc: + - prefer native providers over foreigns even if the chain is foreign + * cmdline/apt-get.cc: + - ignore foreign architectures if we check if a provides has only one + resolver as it's basically the same for the user, so no need to choose + * cmdline/apt-config.cc: + - dump the APT::Compressor settings correctly and completely + * apt-pkg/contrib/fileutl.{h,cc}: + - implement a ModificationTime method for FileFd + - add a ReadLine method + - drop the explicit export of gz-compression handling + * apt-pkg/cdrom.cc: + - support InRelease files on cdrom ++ ++ [ Michael Vogt ] ++ * g++ 4.7 fixes + + -- David Kalnischkies Sun, 11 Dec 2011 19:34:58 +0100 + apt (0.8.16~exp8) experimental; urgency=low [ David Kalnischkies ] + * algorithms.cc: + - show a debug why a package was kept by ResolveByKeep() * apt-pkg/packagemanager.cc: - do not fail on unpacked packages in SmartUnPack, just don't shedule them for unpack, but do all checks and configure them @@@ -51,6 -9,9 +54,6 @@@ - use a pointer-union to peace gcc strict-aliasing warning * apt-pkg/deb/deblistparser.cc: - M-A: foreign packages provide for other archs, too - - [ Michael Vogt ] - * g++ 4.7 fixes -- David Kalnischkies Thu, 03 Nov 2011 09:40:29 -0500 @@@ -238,25 -199,13 +241,25 @@@ apt (0.8.16~exp1) experimental; urgency -- Michael Vogt Wed, 29 Jun 2011 12:40:31 +0200 -apt (1.8.15.9+nmu1) unstable; urgency=low +apt (0.8.15.10) UNRELEASEDunstable; urgency=low [ David Kalnischkies ] * algorithms.cc: - show a debug why a package was kept by ResolveByKeep() + * doc/manpage-style.xml: + - put around email addresses + * doc/po/de.po: + - apply typo-fix from Michael Basse, thanks! (LP: #900770) + + [ Chris Leick ] + * German manpage translation update + * doc/*.xml: + - find and fix a bunch of misspellings + + [ Program translation updatex ] + * Dutch (Jeroen Schot). Closes: #652230 - -- David Kalnischkies Mon, 17 Oct 2011 16:36:22 +0200 + -- David Kalnischkies Tue, 06 Dec 2011 16:35:39 +0100 apt (0.8.15.9) unstable; urgency=low