Bug#614436: Workaround patch for polkit-qt-1 FTBFS
Here's a patch which fixes the FTBFS problem. I'm not going to tag the bug as
"patch" since this is just an ugly workaround for the fact that
gdbusintrospection.h wants to use "signals" as a field name. I just wanted to
post it in case anybody else wanted to recompile the package, until a proper
fix is worked out.
--
Daniel Schepler
diff -urN polkit-qt-1-0.95.1.old//agent/listeneradapter.cpp polkit-qt-1-0.95.1//agent/listeneradapter.cpp
--- polkit-qt-1-0.95.1.old//agent/listeneradapter.cpp 2009-12-23 11:31:14.000000000 +0000
+++ polkit-qt-1-0.95.1//agent/listeneradapter.cpp 2011-05-01 19:54:06.000000000 +0000
@@ -18,10 +18,10 @@
* Boston, MA 02110-1301, USA.
*/
-#include "listeneradapter_p.h"
-#include <QtCore/QDebug>
#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE 1
#include <polkitagent/polkitagent.h>
+#include "listeneradapter_p.h"
+#include <QtCore/QDebug>
namespace PolkitQt1
{
diff -urN polkit-qt-1-0.95.1.old//agent/polkitqt1-agent-session.cpp polkit-qt-1-0.95.1//agent/polkitqt1-agent-session.cpp
--- polkit-qt-1-0.95.1.old//agent/polkitqt1-agent-session.cpp 2009-12-23 11:31:14.000000000 +0000
+++ polkit-qt-1-0.95.1//agent/polkitqt1-agent-session.cpp 2011-05-01 19:50:07.000000000 +0000
@@ -18,15 +18,15 @@
* Boston, MA 02110-1301, USA.
*/
+#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE 1
+#include <polkitagent/polkitagent.h>
+
#include "polkitqt1-agent-session.h"
#include <QtCore/QDebug>
#include "polkitqt1-identity.h"
-#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE 1
-#include <polkitagent/polkitagent.h>
-
using namespace PolkitQt1::Agent;
class Session::Private
diff -urN polkit-qt-1-0.95.1.old//agent/polkitqtlistener_p.h polkit-qt-1-0.95.1//agent/polkitqtlistener_p.h
--- polkit-qt-1-0.95.1.old//agent/polkitqtlistener_p.h 2009-12-23 11:31:14.000000000 +0000
+++ polkit-qt-1-0.95.1//agent/polkitqtlistener_p.h 2011-05-01 19:53:25.000000000 +0000
@@ -27,8 +27,18 @@
#include "listeneradapter_p.h"
+#ifndef QT_NO_KEYWORDS
+#undef signals
+#endif
+
#include <polkitagent/polkitagent.h>
+#ifndef QT_NO_KEYWORDS
+#ifdef QOBJECTDEFS_H
+#define signals protected
+#endif
+#endif
+
G_BEGIN_DECLS
#define POLKIT_QT_TYPE_LISTENER (polkit_qt_listener_get_type())
diff -urN polkit-qt-1-0.95.1.old//core/polkitqt1-actiondescription.cpp polkit-qt-1-0.95.1//core/polkitqt1-actiondescription.cpp
--- polkit-qt-1-0.95.1.old//core/polkitqt1-actiondescription.cpp 2009-12-23 11:31:14.000000000 +0000
+++ polkit-qt-1-0.95.1//core/polkitqt1-actiondescription.cpp 2011-05-01 19:49:11.000000000 +0000
@@ -18,12 +18,12 @@
* Boston, MA 02110-1301, USA.
*/
+#include <polkit/polkit.h>
+
#include "polkitqt1-actiondescription.h"
#include <QtCore/QString>
-#include <polkit/polkit.h>
-
namespace PolkitQt1
{
diff -urN polkit-qt-1-0.95.1.old//core/polkitqt1-authority.cpp polkit-qt-1-0.95.1//core/polkitqt1-authority.cpp
--- polkit-qt-1-0.95.1.old//core/polkitqt1-authority.cpp 2009-12-23 11:31:13.000000000 +0000
+++ polkit-qt-1-0.95.1//core/polkitqt1-authority.cpp 2011-05-01 19:46:26.000000000 +0000
@@ -21,13 +21,13 @@
* Boston, MA 02110-1301, USA.
*/
+#include <polkit/polkit.h>
+
#include "polkitqt1-authority.h"
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusReply>
-#include <polkit/polkit.h>
-
namespace PolkitQt1
{
diff -urN polkit-qt-1-0.95.1.old//core/polkitqt1-details.cpp polkit-qt-1-0.95.1//core/polkitqt1-details.cpp
--- polkit-qt-1-0.95.1.old//core/polkitqt1-details.cpp 2009-12-23 11:31:14.000000000 +0000
+++ polkit-qt-1-0.95.1//core/polkitqt1-details.cpp 2011-05-01 19:48:30.000000000 +0000
@@ -18,12 +18,12 @@
* Boston, MA 02110-1301, USA.
*/
+#include <polkit/polkit.h>
+
#include "polkitqt1-details.h"
#include <QtCore/QStringList>
-#include <polkit/polkit.h>
-
namespace PolkitQt1
{
diff -urN polkit-qt-1-0.95.1.old//core/polkitqt1-identity.cpp polkit-qt-1-0.95.1//core/polkitqt1-identity.cpp
--- polkit-qt-1-0.95.1.old//core/polkitqt1-identity.cpp 2009-12-23 11:31:13.000000000 +0000
+++ polkit-qt-1-0.95.1//core/polkitqt1-identity.cpp 2011-05-01 19:47:12.000000000 +0000
@@ -18,10 +18,10 @@
* Boston, MA 02110-1301, USA.
*/
-#include "polkitqt1-identity.h"
-
#include <polkit/polkit.h>
+#include "polkitqt1-identity.h"
+
#include <QtCore/QDebug>
namespace PolkitQt1
diff -urN polkit-qt-1-0.95.1.old//core/polkitqt1-subject.cpp polkit-qt-1-0.95.1//core/polkitqt1-subject.cpp
--- polkit-qt-1-0.95.1.old//core/polkitqt1-subject.cpp 2009-12-23 11:31:14.000000000 +0000
+++ polkit-qt-1-0.95.1//core/polkitqt1-subject.cpp 2011-05-01 19:47:40.000000000 +0000
@@ -18,10 +18,11 @@
* Boston, MA 02110-1301, USA.
*/
+#include <polkit/polkit.h>
+
#include "polkitqt1-subject.h"
#include <QtCore/QDebug>
-#include <polkit/polkit.h>
namespace PolkitQt1
{
diff -urN polkit-qt-1-0.95.1.old//core/polkitqt1-temporaryauthorization.cpp polkit-qt-1-0.95.1//core/polkitqt1-temporaryauthorization.cpp
--- polkit-qt-1-0.95.1.old//core/polkitqt1-temporaryauthorization.cpp 2009-12-23 11:31:14.000000000 +0000
+++ polkit-qt-1-0.95.1//core/polkitqt1-temporaryauthorization.cpp 2011-05-01 19:48:10.000000000 +0000
@@ -18,11 +18,11 @@
* Boston, MA 02110-1301, USA.
*/
+#include <polkit/polkit.h>
+
#include "polkitqt1-temporaryauthorization.h"
#include "polkitqt1-authority.h"
-#include <polkit/polkit.h>
-
namespace PolkitQt1
{
diff -urN polkit-qt-1-0.95.1.old//debian/changelog polkit-qt-1-0.95.1//debian/changelog
--- polkit-qt-1-0.95.1.old//debian/changelog 2010-01-16 08:08:53.000000000 +0000
+++ polkit-qt-1-0.95.1//debian/changelog 2011-05-01 19:46:40.000000000 +0000
@@ -1,3 +1,9 @@
+polkit-qt-1 (0.95.1-1+bpb1) pbuildd; urgency=low
+
+ * Local build using pbuildd.
+
+ -- Pbuildd daemon <pbuildd@frobozz.homelinux.net> Sun, 01 May 2011 19:46:40 +0000
+
polkit-qt-1 (0.95.1-1) unstable; urgency=low
* Initial release. (Closes: #565395)
Reply to: