[med-svn] r10796 - in trunk/packages/pythonqt/trunk/debian: . patches

[Scott Kitterman]

Author: kitterman
Date: 2012-05-09 12:51:07 +0000 (Wed, 09 May 2012)
New Revision: 10796

Added:
   trunk/packages/pythonqt/trunk/debian/patches/stddecorators_no_keywords.patch
Modified:
   trunk/packages/pythonqt/trunk/debian/changelog
   trunk/packages/pythonqt/trunk/debian/patches/cmakebuildsystem.patch
   trunk/packages/pythonqt/trunk/debian/patches/series
Log:
* Non-maintainer upload.
* Fix FTBFS with Qt 4.8 (Closes: #664569)
  - Add debian/patches/stddecorators_no_keywords.patch
  - Extend debian/patches/cmakebuildsystem.patch to compile with
    -DQT_NO_KEYWORDS
  - Thanks to Felix Geyer for the patch

Modified: trunk/packages/pythonqt/trunk/debian/changelog
===================================================================
--- trunk/packages/pythonqt/trunk/debian/changelog	2012-05-09 12:23:11 UTC (rev 10795)
+++ trunk/packages/pythonqt/trunk/debian/changelog	2012-05-09 12:51:07 UTC (rev 10796)
@@ -1,3 +1,14 @@
+pythonqt (2.0.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with Qt 4.8 (Closes: #664569)
+    - Add debian/patches/stddecorators_no_keywords.patch
+    - Extend debian/patches/cmakebuildsystem.patch to compile with
+      -DQT_NO_KEYWORDS
+    - Thanks to Felix Geyer for the patch
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 09 May 2012 00:14:21 -0400
+
 pythonqt (2.0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #616698)

Modified: trunk/packages/pythonqt/trunk/debian/patches/cmakebuildsystem.patch
===================================================================
--- trunk/packages/pythonqt/trunk/debian/patches/cmakebuildsystem.patch	2012-05-09 12:23:11 UTC (rev 10795)
+++ trunk/packages/pythonqt/trunk/debian/patches/cmakebuildsystem.patch	2012-05-09 12:51:07 UTC (rev 10796)
@@ -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

Modified: trunk/packages/pythonqt/trunk/debian/patches/series
===================================================================
--- trunk/packages/pythonqt/trunk/debian/patches/series	2012-05-09 12:23:11 UTC (rev 10795)
+++ trunk/packages/pythonqt/trunk/debian/patches/series	2012-05-09 12:51:07 UTC (rev 10796)
@@ -1 +1,2 @@
 cmakebuildsystem.patch
+stddecorators_no_keywords.patch

Added: trunk/packages/pythonqt/trunk/debian/patches/stddecorators_no_keywords.patch
===================================================================
--- trunk/packages/pythonqt/trunk/debian/patches/stddecorators_no_keywords.patch	                        (rev 0)
+++ trunk/packages/pythonqt/trunk/debian/patches/stddecorators_no_keywords.patch	2012-05-09 12:51:07 UTC (rev 10796)
@@ -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);