Op 18 mei 2011, om 11:08 heeft Paul Eggleton het volgende geschreven: > From: Paul Eggleton <[email protected]> > > Remove Qt 4.6.3 in favour of 4.7.3 (which should be binary compatible with > 4.6.x), add Upstream-Status to remaining patches and re-enable some patches > that were missed with the original upgrade to 4.7.x. > > Pull URL: git://git.openembedded.org/openembedded-core-contrib > Branch: paule/qt4-cleanup-core > Browse: > http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-cleanup-core
I haven't build tested it yet, but the series looks good to me from a quick glance. > > Thanks, > Paul Eggleton <[email protected]> > --- > > > Paul Eggleton (3): > qt4: remove Qt 4.6.3 > qt4: add comments and Upstream-Status to all patches > qt4: re-enable two 4.6.x patches in 4.7.3 > > meta/recipes-qt/qt4/files/0001-cross-compile.patch | 36 ------ > .../qt4/files/0002-fix-resinit-declaration.patch | 22 ---- > meta/recipes-qt/qt4/files/0004-no-qmake.patch | 1 + > .../qt4/files/0006-freetype-host-includes.patch | 3 +- > meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch | 7 +- > meta/recipes-qt/qt4/files/0009-support-2bpp.patch | 5 + > .../files/0010-no-simpledecoration-example.patch | 14 -- > ...klist-fraudulent-comodo-certificates-patch.diff | 134 -------------------- > .../recipes-qt/qt4/files/compile.test-lflags.patch | 4 + > meta/recipes-qt/qt4/files/configure-lflags.patch | 5 + > meta/recipes-qt/qt4/files/configure-paths.patch | 5 + > meta/recipes-qt/qt4/files/fix-config-tests.patch | 2 + > meta/recipes-qt/qt4/files/g++.conf | 53 -------- > meta/recipes-qt/qt4/files/hack-out-pg_config.patch | 30 ----- > meta/recipes-qt/qt4/files/linux.conf | 54 -------- > meta/recipes-qt/qt4/files/mips-relocate.patch | 28 ---- > meta/recipes-qt/qt4/files/qmake-exists-check.patch | 1 + > meta/recipes-qt/qt4/files/qt-config.patch | 5 + > .../qt4/files/qthelp-lib-qtclucene.patch | 86 ------------- > meta/recipes-qt/qt4/qt-4.6.3.inc | 57 --------- > meta/recipes-qt/qt4/qt-4.7.3.inc | 2 + > .../0001-Added-Openembedded-crossarch-option.patch | 5 +- > .../qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch | 12 ++ > meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb | 9 -- > meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb | 2 +- > meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb | 11 -- > meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb | 6 - > meta/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf | 54 -------- > meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb | 6 - > meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb | 2 +- > 30 files changed, 56 insertions(+), 605 deletions(-) > delete mode 100644 meta/recipes-qt/qt4/files/0001-cross-compile.patch > delete mode 100644 > meta/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch > delete mode 100644 > meta/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch > delete mode 100644 > meta/recipes-qt/qt4/files/blacklist-fraudulent-comodo-certificates-patch.diff > delete mode 100644 meta/recipes-qt/qt4/files/g++.conf > delete mode 100644 meta/recipes-qt/qt4/files/hack-out-pg_config.patch > delete mode 100644 meta/recipes-qt/qt4/files/linux.conf > delete mode 100644 meta/recipes-qt/qt4/files/mips-relocate.patch > delete mode 100644 meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch > delete mode 100644 meta/recipes-qt/qt4/qt-4.6.3.inc > delete mode 100644 meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb > delete mode 100644 meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb > delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb > delete mode 100644 meta/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf > delete mode 100644 meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb > > -- > 1.7.4.1 > > > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
