Source: libqapt
Version: 3.0.0-5
Severity: important
Control: tag -1 sid stretch patch
Dear Maintainer,
During a rebuild of your package against APT 1.1 from experimental, which
we intend to upload to unstable soon, your package failed to build from
source.
../../src/package.cpp: In member function 'QStringList
QApt::Package::availableVersions() const':
../../src/package.cpp:407:34: error: 'struct pkgCache::PackageFile' has no
member named 'Archive'
QString archive = (File->Archive) ? QLatin1String(File.Archive()) :
This can be fixed by changing File->Archive to File.Archive(), which returns
NULL if File->Archive == 0. After that, the build failed with other errors:
../../src/debfile.cpp: In member function 'void QApt::DebFilePrivate::init()':
../../src/debfile.cpp:81:17: error: use of deleted function 'pkgTagSection&
pkgTagSection::operator=(const pkgTagSection&)'
controlData = extractor->Section;
^
In file included from /usr/include/apt-pkg/debfile.h:29:0,
from ../../src/debfile.cpp:28:
/usr/include/apt-pkg/tagfile.h:37:7: note: 'pkgTagSection&
pkgTagSection::operator=(const pkgTagSection&)' is implicitly deleted because
the default definition would be ill-formed:
class pkgTagSection
^
/usr/include/apt-pkg/tagfile.h:37:7: error: non-static const member
'pkgTagSectionPrivate* const pkgTagSection::d', can't use default assignment
operator
I attached a patch that makes it compile, please check if it works
and upload it (preferably within one week). There should be no problem
compiling that against APT 1.0 for now, so we can then binNMU it for
the transition.
If you have questions, join #debian-apt on OFTC or send us
a mail to [email protected]
-- System Information:
Debian Release: stretch/sid
APT prefers unstable
APT policy: (900, 'unstable'), (100, 'experimental'), (1,
'buildd-experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.1.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
--
Julian Andres Klode - Debian Developer, Ubuntu Member
See http://wiki.debian.org/JulianAndresKlode and http://jak-linux.org/.
Be friendly, do not top-post, and follow RFC 1855 "Netiquette".
- If you don't I might ignore you.
diff -Nru libqapt-3.0.0/debian/changelog libqapt-3.0.0/debian/changelog
--- libqapt-3.0.0/debian/changelog 2015-09-01 22:17:00.000000000 +0200
+++ libqapt-3.0.0/debian/changelog 2015-09-11 21:25:24.000000000 +0200
@@ -1,3 +1,10 @@
+libqapt (3.0.0-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add support for APT 1.1
+
+ -- Julian Andres Klode <[email protected]> Fri, 11 Sep 2015 21:25:15 +0200
+
libqapt (3.0.0-5) unstable; urgency=medium
* Update symbols file.
diff -Nru libqapt-3.0.0/debian/patches/apt_1.1 libqapt-3.0.0/debian/patches/apt_1.1
--- libqapt-3.0.0/debian/patches/apt_1.1 1970-01-01 01:00:00.000000000 +0100
+++ libqapt-3.0.0/debian/patches/apt_1.1 2015-09-11 21:45:59.000000000 +0200
@@ -0,0 +1,167 @@
+--- a/src/package.cpp
++++ b/src/package.cpp
+@@ -404,7 +404,7 @@ QStringList Package::availableVersions()
+ pkgCache::PkgFileIterator File = VF.File();
+
+ // Files without an archive will have a site
+- QString archive = (File->Archive) ? QLatin1String(File.Archive()) :
++ QString archive = File.Archive() ? QLatin1String(File.Archive()) :
+ QLatin1String(File.Site());
+ versions.append(QLatin1String(Ver.VerStr()) % QLatin1String(" (") %
+ archive % ')');
+--- a/src/debfile.cpp
++++ b/src/debfile.cpp
+@@ -53,7 +53,6 @@ class DebFilePrivate
+ bool isValid;
+ QString filePath;
+ debDebFile::MemControlExtract *extractor;
+- pkgTagSection controlData;
+
+ void init();
+ };
+@@ -77,8 +76,6 @@ void DebFilePrivate::init()
+ // from exploding.
+ return;
+ }
+-
+- controlData = extractor->Section;
+ }
+
+ DebFile::DebFile(const QString &filePath)
+@@ -103,47 +100,47 @@ QString DebFile::filePath() const
+
+ QString DebFile::packageName() const
+ {
+- return QString::fromStdString(d->controlData.FindS("Package"));
++ return QString::fromStdString(d->extractor->Section.FindS("Package"));
+ }
+
+ QString DebFile::sourcePackage() const
+ {
+- return QString::fromStdString(d->controlData.FindS("Source"));
++ return QString::fromStdString(d->extractor->Section.FindS("Source"));
+ }
+
+ QString DebFile::version() const
+ {
+- return QString::fromStdString(d->controlData.FindS("Version"));
++ return QString::fromStdString(d->extractor->Section.FindS("Version"));
+ }
+
+ QString DebFile::architecture() const
+ {
+- return QString::fromStdString(d->controlData.FindS("Architecture"));
++ return QString::fromStdString(d->extractor->Section.FindS("Architecture"));
+ }
+
+ QString DebFile::maintainer() const
+ {
+- return QString::fromStdString(d->controlData.FindS("Maintainer"));
++ return QString::fromStdString(d->extractor->Section.FindS("Maintainer"));
+ }
+
+ QString DebFile::section() const
+ {
+- return QString::fromStdString(d->controlData.FindS("Section"));
++ return QString::fromStdString(d->extractor->Section.FindS("Section"));
+ }
+
+ QString DebFile::priority() const
+ {
+- return QString::fromStdString(d->controlData.FindS("Priority"));
++ return QString::fromStdString(d->extractor->Section.FindS("Priority"));
+ }
+
+ QString DebFile::homepage() const
+ {
+- return QString::fromStdString(d->controlData.FindS("Homepage"));
++ return QString::fromStdString(d->extractor->Section.FindS("Homepage"));
+ }
+
+ QString DebFile::longDescription() const
+ {
+- QString rawDescription = QLatin1String(d->controlData.FindS("Description").c_str());
++ QString rawDescription = QLatin1String(d->extractor->Section.FindS("Description").c_str());
+ // Remove short description
+ rawDescription.remove(shortDescription() + '\n');
+
+@@ -174,14 +171,14 @@ QString DebFile::longDescription() const
+
+ QString DebFile::shortDescription() const
+ {
+- QString longDesc = QLatin1String(d->controlData.FindS("Description").c_str());
++ QString longDesc = QLatin1String(d->extractor->Section.FindS("Description").c_str());
+
+ return longDesc.left(longDesc.indexOf(QLatin1Char('\n')));
+ }
+
+ QString DebFile::controlField(const QLatin1String &field) const
+ {
+- return QString::fromStdString(d->controlData.FindS(field.latin1()));
++ return QString::fromStdString(d->extractor->Section.FindS(field.latin1()));
+ }
+
+ QString DebFile::controlField(const QString &field) const
+@@ -266,52 +263,52 @@ QStringList DebFile::iconList() const
+
+ QList<DependencyItem> DebFile::depends() const
+ {
+- return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Depends")), Depends);
++ return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Depends")), Depends);
+ }
+
+ QList<DependencyItem> DebFile::preDepends() const
+ {
+- return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Pre-Depends")), PreDepends);
++ return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Pre-Depends")), PreDepends);
+ }
+
+ QList<DependencyItem> DebFile::suggests() const
+ {
+- return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Suggests")), Suggests);
++ return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Suggests")), Suggests);
+ }
+
+ QList<DependencyItem> DebFile::recommends() const
+ {
+- return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Recommends")), Recommends);
++ return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Recommends")), Recommends);
+ }
+
+ QList<DependencyItem> DebFile::conflicts() const
+ {
+- return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Conflicts")), Conflicts);
++ return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Conflicts")), Conflicts);
+ }
+
+ QList<DependencyItem> DebFile::replaces() const
+ {
+- return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Replaces")), Replaces);
++ return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Replaces")), Replaces);
+ }
+
+ QList<DependencyItem> DebFile::obsoletes() const
+ {
+- return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Obsoletes")), Obsoletes);
++ return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Obsoletes")), Obsoletes);
+ }
+
+ QList<DependencyItem> DebFile::breaks() const
+ {
+- return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Breaks")), Breaks);
++ return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Breaks")), Breaks);
+ }
+
+ QList<DependencyItem> DebFile::enhances() const
+ {
+- return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Enhance")), Enhances);
++ return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Enhance")), Enhances);
+ }
+
+ qint64 DebFile::installedSize() const
+ {
+- QString sizeString = QLatin1String(d->controlData.FindS("Installed-Size").c_str());
++ QString sizeString = QLatin1String(d->extractor->Section.FindS("Installed-Size").c_str());
+
+ return sizeString.toLongLong();
+ }
diff -Nru libqapt-3.0.0/debian/patches/series libqapt-3.0.0/debian/patches/series
--- libqapt-3.0.0/debian/patches/series 2015-09-01 22:17:00.000000000 +0200
+++ libqapt-3.0.0/debian/patches/series 2015-09-11 21:25:42.000000000 +0200
@@ -1 +1,2 @@
add_kf5iconthemes
+apt_1.1
