Fix compile errors caused by changes in the libapt API.

Whoever's in charge of libapt these days apparently doesn't believe in
backwards compatibility.  Or in documenting how their APIs are to be
used, or why names are deprecated </gripe>

3 files changed, 10 insertions, 8 deletions

diff --git a/src/cmdline/cmdline_download.cc b/src/cmdline/cmdline_download.cc
index 48881643..68329faf 100644
--- a/src/cmdline/cmdline_download.cc
+++ b/src/cmdline/cmdline_download.cc
@@ -63,7 +63,8 @@ int cmdline_download(int argc, char *argv[])
   std::pair<download_signal_log *, boost::shared_ptr<acquire_download_progress> >
     progress_display = create_cmdline_download_progress(term, term, term, term);
 
-  pkgAcquire fetcher(progress_display.first);
+  pkgAcquire fetcher;
+  fetcher.Setup(progress_display.first);
   string filenames[(*apt_cache_file)->Head().PackageCount];
   string default_release = aptcfg->Find("APT::Default-Release");
 
diff --git a/src/cmdline/cmdline_download_progress_display.cc b/src/cmdline/cmdline_download_progress_display.cc
index 15febc6f..5c16cb38 100644
--- a/src/cmdline/cmdline_download_progress_display.cc
+++ b/src/cmdline/cmdline_download_progress_display.cc
@@ -1,6 +1,6 @@
 /** \file cmdline_download_progress_display.cc */
 
-// Copyright (C) 2010 Daniel Burrows
+// Copyright (C) 2010-2011 Daniel Burrows
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -74,11 +74,11 @@ namespace aptitude
 
         void file_started(const std::string &description,
                           const boost::optional<unsigned long> &id,
-                          const boost::optional<unsigned long> &file_size);
+                          const boost::optional<unsigned long long> &file_size);
 
         void file_already_downloaded(const std::string &description,
                                      const boost::optional<unsigned long> &id,
-                                     const boost::optional<unsigned long> &file_size);
+                                     const boost::optional<unsigned long long> &file_size);
 
         void error(bool ignored,
                    const std::string &error,
@@ -122,7 +122,7 @@ namespace aptitude
 
       void download_progress::file_started(const std::string &description,
                                            const boost::optional<unsigned long> &id,
-                                           const boost::optional<unsigned long> &file_size)
+                                           const boost::optional<unsigned long long> &file_size)
       {
         if(display_messages)
           {
@@ -145,7 +145,7 @@ namespace aptitude
 
       void download_progress::file_already_downloaded(const std::string &description,
                                                       const boost::optional<unsigned long> &id,
-                                                      const boost::optional<unsigned long> &file_size)
+                                                      const boost::optional<unsigned long long> &file_size)
       {
         if(display_messages)
           {
diff --git a/src/cmdline/cmdline_prompt.cc b/src/cmdline/cmdline_prompt.cc
index 2e888ab6..eb94fac9 100644
--- a/src/cmdline/cmdline_prompt.cc
+++ b/src/cmdline/cmdline_prompt.cc
@@ -1,6 +1,6 @@
 // cmdline_prompt.cc
 //
-// Copyright (C) 2010 Daniel Burrows
+// Copyright (C) 2010-2011 Daniel Burrows
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -82,7 +82,8 @@ static bool pkg_byname_compare(const pkgCache::PkgIterator &a, const pkgCache::P
 static bool get_fetchinfo(fetchinfo &f)
 {
   download_signal_log m;
-  pkgAcquire fetcher(&m);
+  pkgAcquire fetcher;
+  fetcher.Setup(&m);
   pkgSourceList l;
   if(!l.ReadMainList())
     return _error->Error(_("Couldn't read list of sources"));