Package: adept
Version: 3.0~beta7.2+nmu1
Severity: serious
Tags: patch
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS: rearrange #includes in multiple files to ensure that Xapian
headers are always included before Qt ones. See debbugs #651696 for
discussion.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: i386 (i686)
Kernel: Linux 3.0.0-15-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru adept-3.0~beta7.2+nmu1ubuntu3/adept/commitwidget.h adept-3.0~beta7.2+nmu1ubuntu4/adept/commitwidget.h
--- adept-3.0~beta7.2+nmu1ubuntu3/adept/commitwidget.h 2009-08-03 19:55:52.000000000 +0400
+++ adept-3.0~beta7.2+nmu1ubuntu4/adept/commitwidget.h 2012-01-04 17:22:50.000000000 +0400
@@ -1,14 +1,14 @@
// -*- C++ -*- (c) 2008 Petr Rockai <m...@mornfall.net>
+#include <adept/debconfgui.h>
+#include <adept/guidpkgpm.h>
+
#include <KVBox>
#include <QPushButton>
#include <QStackedWidget>
#include <QProgressBar>
#include <QLabel>
-#include <adept/guidpkgpm.h>
-#include <adept/debconfgui.h>
-
#ifndef ADEPT_COMMITWIDGET_H
#define ADEPT_COMMITWIDGET_H
diff -Nru adept-3.0~beta7.2+nmu1ubuntu3/adept/downloadprogress.h adept-3.0~beta7.2+nmu1ubuntu4/adept/downloadprogress.h
--- adept-3.0~beta7.2+nmu1ubuntu3/adept/downloadprogress.h 2010-05-31 15:32:16.000000000 +0400
+++ adept-3.0~beta7.2+nmu1ubuntu4/adept/downloadprogress.h 2012-01-04 17:31:59.000000000 +0400
@@ -1,6 +1,7 @@
// -*- C++ -*- (c) 2007, 2008 Petr Rockai <m...@mornfall.net>
#include <ept/progresscallback.h>
+#include <adept/util.h>
#include <adept/processevents.h>
#include <apt-pkg/acquire-worker.h>
@@ -17,7 +18,6 @@
#include <QLayout>
#include <KLocale>
#include <KIcon>
-#include <adept/util.h>
#include <QPushButton>
#include <QListView>
diff -Nru adept-3.0~beta7.2+nmu1ubuntu3/adept/guidpkgpm.cpp adept-3.0~beta7.2+nmu1ubuntu4/adept/guidpkgpm.cpp
--- adept-3.0~beta7.2+nmu1ubuntu3/adept/guidpkgpm.cpp 2009-08-03 19:55:53.000000000 +0400
+++ adept-3.0~beta7.2+nmu1ubuntu4/adept/guidpkgpm.cpp 2012-01-04 17:10:12.000000000 +0400
@@ -1,5 +1,6 @@
// -*- C++ -*- (c) 2005-2008 Petr Rockai <m...@mornfall.net>
+#include <adept/util.h>
#include <adept/guidpkgpm.h>
#ifndef RPM
@@ -11,8 +12,6 @@
#include <ept/core/apt.h>
-#include <adept/util.h>
-
#include <QtCore/QStringList>
#include <QtCore/QCoreApplication>
diff -Nru adept-3.0~beta7.2+nmu1ubuntu3/adept/packagedetails.h adept-3.0~beta7.2+nmu1ubuntu4/adept/packagedetails.h
--- adept-3.0~beta7.2+nmu1ubuntu3/adept/packagedetails.h 2009-08-06 21:22:18.000000000 +0400
+++ adept-3.0~beta7.2+nmu1ubuntu4/adept/packagedetails.h 2012-01-04 17:30:16.000000000 +0400
@@ -2,6 +2,12 @@
(c) 2008 Peter Rockai <m...@mornfall.net>
(c) 2008 Yuriy Kozlov <yuriy.koz...@gmail.com> */
+#include <adept/util.h>
+#include <adept/packageinfo.h>
+#include <adept/tokenmodel.h>
+#include <adept/packagelist.h>
+#include <adept/processevents.h>
+
#include <KVBox>
#include <KHBox>
#include <KUrl>
@@ -23,12 +29,6 @@
#include <ept/core/apt.h>
#include <ept/core/apt/action.h>
-#include <adept/util.h>
-#include <adept/packageinfo.h>
-#include <adept/tokenmodel.h>
-#include <adept/packagelist.h>
-#include <adept/processevents.h>
-
#ifndef ADEPT_PACKGEDETAILS_H
#define ADEPT_PACKGEDETAILS_H
diff -Nru adept-3.0~beta7.2+nmu1ubuntu3/adept/packageinfo.h adept-3.0~beta7.2+nmu1ubuntu4/adept/packageinfo.h
--- adept-3.0~beta7.2+nmu1ubuntu3/adept/packageinfo.h 2009-08-03 19:55:53.000000000 +0400
+++ adept-3.0~beta7.2+nmu1ubuntu4/adept/packageinfo.h 2012-01-04 17:33:16.000000000 +0400
@@ -2,6 +2,9 @@
(c) 2008 Peter Rockai <m...@mornfall.net>,
(c) 2008 Yuriy Kozlov <yuriy.koz...@gmail.com> */
+#include <adept/packagedata.h>
+#include <adept/util.h>
+
#include <QtGui/QWidget>
#include <QtGui/QCheckBox>
@@ -11,9 +14,6 @@
#include <ept/core/apt.h>
#include <ept/core/apt/action.h>
-#include <adept/packagedata.h>
-#include <adept/util.h>
-
#ifndef ADEPTPACKAGEINFO_H
#define ADEPTPACKAGEINFO_H
diff -Nru adept-3.0~beta7.2+nmu1ubuntu3/adept/statefilter.h adept-3.0~beta7.2+nmu1ubuntu4/adept/statefilter.h
--- adept-3.0~beta7.2+nmu1ubuntu3/adept/statefilter.h 2009-08-03 19:55:53.000000000 +0400
+++ adept-3.0~beta7.2+nmu1ubuntu4/adept/statefilter.h 2012-01-04 16:57:43.000000000 +0400
@@ -1,5 +1,8 @@
// -*- C++ -*- (c) 2008 Petr Rockai <m...@mornfall.net>
+#include <adept/packagedata.h>
+#include <adept/util.h>
+
#include <QtGui/QGridLayout>
#include <QtGui/QToolTip>
#include <QtGui/QLabel>
@@ -8,9 +11,6 @@
#include <klocale.h>
-#include <adept/packagedata.h>
-#include <adept/util.h>
-
#ifndef ADEPT_STATEFILTER_H
#define ADEPT_STATEFILTER_H
diff -Nru adept-3.0~beta7.2+nmu1ubuntu3/adept/util.h adept-3.0~beta7.2+nmu1ubuntu4/adept/util.h
--- adept-3.0~beta7.2+nmu1ubuntu3/adept/util.h 2009-08-03 19:55:53.000000000 +0400
+++ adept-3.0~beta7.2+nmu1ubuntu4/adept/util.h 2012-01-04 16:51:16.000000000 +0400
@@ -3,6 +3,10 @@
/* TODO this is a "misc" file. Some things here may need to
eventually move to a better location. */
+#include <ept/core/xapian.h>
+#include <ept/core/apt.h>
+#include <ept/core/apt/action.h>
+
#include <QtCore/QString>
#include <QtGui/QPixmap>
#include <QtGui/QFont>
@@ -10,10 +14,6 @@
#include <QtGui/QLabel>
#include <QtGui/QScrollArea>
-#include <ept/core/xapian.h>
-#include <ept/core/apt.h>
-#include <ept/core/apt/action.h>
-
#include <kiconloader.h>
#include <kstandarddirs.h>
#include <klocale.h>
diff -Nru adept-3.0~beta7.2+nmu1ubuntu3/debian/changelog adept-3.0~beta7.2+nmu1ubuntu4/debian/changelog
diff -Nru adept-3.0~beta7.2+nmu1ubuntu3/tools/debconf.h adept-3.0~beta7.2+nmu1ubuntu4/tools/debconf.h
--- adept-3.0~beta7.2+nmu1ubuntu3/tools/debconf.h 2009-08-03 19:55:53.000000000 +0400
+++ adept-3.0~beta7.2+nmu1ubuntu4/tools/debconf.h 2012-01-04 17:36:11.000000000 +0400
@@ -1,5 +1,5 @@
-#include <KMainWindow>
#include <adept/debconfgui.h>
+#include <KMainWindow>
using namespace adept;
diff -Nru adept-3.0~beta7.2+nmu1ubuntu3/tools/main.cpp adept-3.0~beta7.2+nmu1ubuntu4/tools/main.cpp
--- adept-3.0~beta7.2+nmu1ubuntu3/tools/main.cpp 2009-08-28 11:01:23.000000000 +0400
+++ adept-3.0~beta7.2+nmu1ubuntu4/tools/main.cpp 2012-01-04 17:34:57.000000000 +0400
@@ -2,12 +2,12 @@
#include <stdlib.h>
+#include "manager.h"
+
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <kapplication.h>
-#include "manager.h"
-
int main(int argc, char *argv[])
{
KLocale::setMainCatalog("adept");
