Hi Scott,
thanks for your effort. NMU is fine however, it would be really great
if you would commit your changes to SVN. The easiest way to do so
would probably be
debcheckout --user=<your_debian_id> pythonqt
Commit permissions are granted to every DD.
Kind regards and thanks again for helping us out
Andreas.
On Wed, May 09, 2012 at 12:25:14AM -0400, Scott Kitterman wrote:
> I'll upload the attached diff shortly to delay/2 in order to minimize impact
> on
> the Qt 4.8 transition. If you'd prefer I delay it further because you are
> preparing an upload, please let me know.
>
> Scott K
>
> diff -Nru pythonqt-2.0.1/debian/changelog pythonqt-2.0.1/debian/changelog
> --- pythonqt-2.0.1/debian/changelog 2011-03-10 10:19:44.000000000 -0500
> +++ pythonqt-2.0.1/debian/changelog 2012-05-09 00:14:30.000000000 -0400
> @@ -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 <sc...@kitterman.com> Wed, 09 May 2012 00:14:21 -0400
> +
> pythonqt (2.0.1-1) unstable; urgency=low
>
> * Initial release (Closes: #616698)
> 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
> 10:19:44.000000000 -0500
> +++ pythonqt-2.0.1/debian/patches/cmakebuildsystem.patch 2012-05-09
> 00:14:12.000000000 -0400
> @@ -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 10:19:44.000000000
> -0500
> +++ pythonqt-2.0.1/debian/patches/series 2012-05-09 00:14:12.000000000
> -0400
> @@ -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
> 1969-12-31 19:00:00.000000000 -0500
> +++ pythonqt-2.0.1/debian/patches/stddecorators_no_keywords.patch
> 2012-05-09 00:14:12.000000000 -0400
> @@ -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);
> _______________________________________________
> Debian-med-packaging mailing list
> debian-med-packag...@lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-packaging
--
http://fam-tille.de
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
