From: Francisco Gonzalez Morell Date: Tue, 23 Feb 2010 23:01:39 +0000 (+0100) Subject: qt: fix the patch name for qt-4.5.3 version X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f4f157041eb53f674d21d9a323f7245bc14fd844;p=buildroot.git qt: fix the patch name for qt-4.5.3 version Signed-off-by: Francisco Gonzalez Morell Signed-off-by: Peter Korsgaard --- diff --git a/CHANGES b/CHANGES index d308e938c3..ec71d4ece2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +2010.02, Not yet released: + + Fixes all over the tree. + + Updated/fixed packages: qt + 2010.02-rc2, Released February 23th, 2010: Fixes all over the tree and new features. diff --git a/package/qt/qt-4.5.2-fix-qt-zlib-build.patch b/package/qt/qt-4.5.2-fix-qt-zlib-build.patch deleted file mode 100644 index b191cc751b..0000000000 --- a/package/qt/qt-4.5.2-fix-qt-zlib-build.patch +++ /dev/null @@ -1,20 +0,0 @@ -When QT is compiled in qt-zlib mode, compilation of -src/gui/painting/qprintengine_pdf.cpp fails because zlib.h is not -found. The following patch adds the internal QT zlib directory to the -include path to fix this issue. - ---- - src/gui/painting/painting.pri | 3 +++ - 1 file changed, 3 insertions(+) - -Index: qt-embedded-linux-opensource-src-4.5.2/src/gui/painting/painting.pri -=================================================================== ---- qt-embedded-linux-opensource-src-4.5.2.orig/src/gui/painting/painting.pri -+++ qt-embedded-linux-opensource-src-4.5.2/src/gui/painting/painting.pri -@@ -367,3 +367,6 @@ - SOURCES += painting/qwindowsurface_d3d.cpp - } - -+contains(QT_CONFIG, zlib) { -+ INCLUDEPATH += ../3rdparty/zlib -+} diff --git a/package/qt/qt-4.5.3-fix-qt-zlib-build.patch b/package/qt/qt-4.5.3-fix-qt-zlib-build.patch new file mode 100644 index 0000000000..47fc92f272 --- /dev/null +++ b/package/qt/qt-4.5.3-fix-qt-zlib-build.patch @@ -0,0 +1,20 @@ +When QT is compiled in qt-zlib mode, compilation of +src/gui/painting/qprintengine_pdf.cpp fails because zlib.h is not +found. The following patch adds the internal QT zlib directory to the +include path to fix this issue. + +--- + src/gui/painting/painting.pri | 3 +++ + 1 file changed, 3 insertions(+) + +Index: qt-embedded-linux-opensource-src-4.5.3/src/gui/painting/painting.pri +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.3.orig/src/gui/painting/painting.pri ++++ qt-embedded-linux-opensource-src-4.5.3/src/gui/painting/painting.pri +@@ -367,3 +367,6 @@ + SOURCES += painting/qwindowsurface_d3d.cpp + } + ++contains(QT_CONFIG, zlib) { ++ INCLUDEPATH += ../3rdparty/zlib ++}