diff -Nru pythonqt-2.0.1/debian/changelog pythonqt-2.0.1/debian/changelog --- pythonqt-2.0.1/debian/changelog 2011-03-10 15:19:44.000000000 +0000 +++ pythonqt-2.0.1/debian/changelog 2012-03-20 12:28:00.000000000 +0000 @@ -1,3 +1,13 @@ +pythonqt (2.0.1-1ubuntu1) precise; urgency=low + + * Fix FTBFS with Qt 4.8. (LP: #935386) + - stddecorators_no_keywords.patch: Make PythonQtStdDecorators.h work with + QT_NO_KEYWORDS. + - cmakebuildsystem.patch: Build moc_PythonQtStdDecorators.cxx with + -DQT_NO_KEYWORDS. + + -- Felix Geyer Tue, 20 Mar 2012 13:25:13 +0100 + pythonqt (2.0.1-1) unstable; urgency=low * Initial release (Closes: #616698) diff -Nru pythonqt-2.0.1/debian/control pythonqt-2.0.1/debian/control --- pythonqt-2.0.1/debian/control 2011-03-10 15:19:44.000000000 +0000 +++ pythonqt-2.0.1/debian/control 2012-03-20 12:28:06.000000000 +0000 @@ -1,7 +1,8 @@ Source: pythonqt Section: libs Priority: optional -Maintainer: Debian Med Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Med Packaging Team DM-Upload-Allowed: yes Uploaders: Mathieu Malaterre Build-Depends: debhelper (>= 7.0.50~), cmake, quilt (>= 0.46-7~), python-dev, qt4-qmake, libqt4-dev diff -Nru pythonqt-2.0.1/debian/patches/cmakebuildsystem.patch pythonqt-2.0.1/debian/patches/cmakebuildsystem.patch --- pythonqt-2.0.1/debian/patches/cmakebuildsystem.patch 2011-03-10 15:19:44.000000000 +0000 +++ pythonqt-2.0.1/debian/patches/cmakebuildsystem.patch 2012-03-20 12:25:11.000000000 +0000 @@ -2,7 +2,7 @@ =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ PythonQt2.0.1/CMakeLists.txt 2011-03-06 19:23:17.000000000 +0100 -@@ -0,0 +1,259 @@ +@@ -0,0 +1,266 @@ +cmake_minimum_required(VERSION 2.8) + +#----------------------------------------------------------------------------- @@ -240,6 +240,13 @@ +set_target_properties(PythonQt PROPERTIES DEFINE_SYMBOL PYTHONQT_EXPORTS) +set_target_properties(PythonQt PROPERTIES ${PythonQt_LIBRARY_PROPERTIES}) + ++foreach(source ${gen_moc_sources}) ++ string(REGEX MATCH "PythonQtStdDecorators" match ${source}) ++ if(match) ++ set_property(SOURCE ${source} PROPERTY COMPILE_FLAGS -DQT_NO_KEYWORDS) ++ endif(match) ++endforeach(source {gen_moc_sources}) ++ +# +# That should solve linkage error on Mac when the project is used in a superbuild setup +# See http://blog.onesadcookie.com/2008/01/installname-magic.html diff -Nru pythonqt-2.0.1/debian/patches/series pythonqt-2.0.1/debian/patches/series --- pythonqt-2.0.1/debian/patches/series 2011-03-10 15:19:44.000000000 +0000 +++ pythonqt-2.0.1/debian/patches/series 2012-03-20 12:25:11.000000000 +0000 @@ -1 +1,2 @@ cmakebuildsystem.patch +stddecorators_no_keywords.patch diff -Nru pythonqt-2.0.1/debian/patches/stddecorators_no_keywords.patch pythonqt-2.0.1/debian/patches/stddecorators_no_keywords.patch --- pythonqt-2.0.1/debian/patches/stddecorators_no_keywords.patch 1970-01-01 00:00:00.000000000 +0000 +++ pythonqt-2.0.1/debian/patches/stddecorators_no_keywords.patch 2012-03-20 12:25:11.000000000 +0000 @@ -0,0 +1,24 @@ +--- pythonqt-2.0.1.orig/src/PythonQtStdDecorators.h ++++ pythonqt-2.0.1/src/PythonQtStdDecorators.h +@@ -56,16 +56,20 @@ class PYTHONQT_EXPORT PythonQtStdDecorat + { + Q_OBJECT + +-public slots: ++public Q_SLOTS: + bool connect(QObject* sender, const QByteArray& signal, PyObject* callable); + bool connect(QObject* sender, const QByteArray& signal, QObject* receiver, const QByteArray& slot); + bool disconnect(QObject* sender, const QByteArray& signal, PyObject* callable); + bool disconnect(QObject* sender, const QByteArray& signal, QObject* receiver, const QByteArray& slot); + ++#ifndef QT_NO_KEYWORDS + #undef emit ++#endif + void emit(QObject* sender, const QByteArray& signal, PyObject* arg1 = NULL,PyObject* arg2 = NULL, + PyObject* arg3 = NULL,PyObject* arg4 = NULL,PyObject* arg5 = NULL,PyObject* arg6 = NULL,PyObject* arg7 = NULL); ++#ifndef QT_NO_KEYWORDS + #define emit ++#endif + + QObject* parent(QObject* o); + void setParent(QObject* o, QObject* parent);