diff options
| author | Timo Jyrinki <timo.jyrinki@canonical.com> | 2013-03-21 06:42:40 +0000 |
|---|---|---|
| committer | Timo Jyrinki <timo.jyrinki@canonical.com> | 2013-03-21 06:42:40 +0000 |
| commit | d6a7f74ce8b8b5443c1eefe32000bb161202d740 (patch) | |
| tree | ebee76d77aba5a55af71ab5a8afa87a1024b09e3 | |
| parent | b618ce409395511024719b722fcc0619b42a0e66 (diff) | |
| download | qtbase-d6a7f74ce8b8b5443c1eefe32000bb161202d740.tar.gz | |
Sync powerpc build fix from Ubuntu
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/undef_B0.diff | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..cbd57f0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +undef_B0.diff diff --git a/debian/patches/undef_B0.diff b/debian/patches/undef_B0.diff new file mode 100644 index 0000000..62b3d57 --- /dev/null +++ b/debian/patches/undef_B0.diff @@ -0,0 +1,15 @@ +Index: qtbase-opensource-src-5.0.1+dfsg/src/gui/painting/qpagedpaintdevice.h +=================================================================== +--- qtbase-opensource-src-5.0.1+dfsg.orig/src/gui/painting/qpagedpaintdevice.h 2013-01-29 12:03:00.000000000 -0700 ++++ qtbase-opensource-src-5.0.1+dfsg/src/gui/painting/qpagedpaintdevice.h 2013-02-18 13:21:01.000000000 -0700 +@@ -44,6 +44,10 @@ + + #include <QtGui/qpaintdevice.h> + ++#if defined(B0) ++#undef B0 // Terminal hang-up. We assume that you do not want that. ++#endif ++ + QT_BEGIN_HEADER + + QT_BEGIN_NAMESPACE |