From a9e1aca1abc7877359e44159a78a1ce8e414b46d Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 5 Mar 2013 19:52:50 +0100 Subject: [PATCH] qt4-embedded: update bbappend for 4.8.4 --- ...om-npapi-while-keeping-some-basic-fu.patch | 0 .../0002-Qt-Add-HbbTv-MIME-types.patch | 0 ...e-WebKits-WebSecurityEnabled-setting.patch | 0 ...keypress-event-and-correct-keycode-f.patch | 0 ...k-to-disable-use-of-WebkitWebSourceG.patch | 0 ...1.bbappend => qt4-embedded_4.8.4.bbappend} | 22 +++++++++++++------ 6 files changed, 15 insertions(+), 7 deletions(-) rename meta-opendreambox/recipes-qt/qt4/{qt4-embedded-4.8.1 => qt4-embedded-4.8.4}/0001-Qt-remove-x11-from-npapi-while-keeping-some-basic-fu.patch (100%) rename meta-opendreambox/recipes-qt/qt4/{qt4-embedded-4.8.1 => qt4-embedded-4.8.4}/0002-Qt-Add-HbbTv-MIME-types.patch (100%) rename meta-opendreambox/recipes-qt/qt4/{qt4-embedded-4.8.1 => qt4-embedded-4.8.4}/0003-Qt-expose-WebKits-WebSecurityEnabled-setting.patch (100%) rename meta-opendreambox/recipes-qt/qt4/{qt4-embedded-4.8.1 => qt4-embedded-4.8.4}/0004-QtWebkit-Expose-keypress-event-and-correct-keycode-f.patch (100%) rename meta-opendreambox/recipes-qt/qt4/{qt4-embedded-4.8.1 => qt4-embedded-4.8.4}/0005-WebKit-small-hack-to-disable-use-of-WebkitWebSourceG.patch (100%) rename meta-opendreambox/recipes-qt/qt4/{qt4-embedded_4.8.1.bbappend => qt4-embedded_4.8.4.bbappend} (83%) diff --git a/meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.1/0001-Qt-remove-x11-from-npapi-while-keeping-some-basic-fu.patch b/meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.4/0001-Qt-remove-x11-from-npapi-while-keeping-some-basic-fu.patch similarity index 100% rename from meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.1/0001-Qt-remove-x11-from-npapi-while-keeping-some-basic-fu.patch rename to meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.4/0001-Qt-remove-x11-from-npapi-while-keeping-some-basic-fu.patch diff --git a/meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.1/0002-Qt-Add-HbbTv-MIME-types.patch b/meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.4/0002-Qt-Add-HbbTv-MIME-types.patch similarity index 100% rename from meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.1/0002-Qt-Add-HbbTv-MIME-types.patch rename to meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.4/0002-Qt-Add-HbbTv-MIME-types.patch diff --git a/meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.1/0003-Qt-expose-WebKits-WebSecurityEnabled-setting.patch b/meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.4/0003-Qt-expose-WebKits-WebSecurityEnabled-setting.patch similarity index 100% rename from meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.1/0003-Qt-expose-WebKits-WebSecurityEnabled-setting.patch rename to meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.4/0003-Qt-expose-WebKits-WebSecurityEnabled-setting.patch diff --git a/meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.1/0004-QtWebkit-Expose-keypress-event-and-correct-keycode-f.patch b/meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.4/0004-QtWebkit-Expose-keypress-event-and-correct-keycode-f.patch similarity index 100% rename from meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.1/0004-QtWebkit-Expose-keypress-event-and-correct-keycode-f.patch rename to meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.4/0004-QtWebkit-Expose-keypress-event-and-correct-keycode-f.patch diff --git a/meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.1/0005-WebKit-small-hack-to-disable-use-of-WebkitWebSourceG.patch b/meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.4/0005-WebKit-small-hack-to-disable-use-of-WebkitWebSourceG.patch similarity index 100% rename from meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.1/0005-WebKit-small-hack-to-disable-use-of-WebkitWebSourceG.patch rename to meta-opendreambox/recipes-qt/qt4/qt4-embedded-4.8.4/0005-WebKit-small-hack-to-disable-use-of-WebkitWebSourceG.patch diff --git a/meta-opendreambox/recipes-qt/qt4/qt4-embedded_4.8.1.bbappend b/meta-opendreambox/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend similarity index 83% rename from meta-opendreambox/recipes-qt/qt4/qt4-embedded_4.8.1.bbappend rename to meta-opendreambox/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend index b15dd392..50015d73 100644 --- a/meta-opendreambox/recipes-qt/qt4/qt4-embedded_4.8.1.bbappend +++ b/meta-opendreambox/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend @@ -1,5 +1,5 @@ DEPENDS := "${@oe_filter_out('^(mysql5|postgresql|sqlite)$', '${DEPENDS}', d)}" -PR .= "-dream8" +PRINC := "${@int(PRINC) + 1}" SRC_URI += "file://0001-Qt-remove-x11-from-npapi-while-keeping-some-basic-fu.patch \ file://0002-Qt-Add-HbbTv-MIME-types.patch \ @@ -10,20 +10,28 @@ SRC_URI += "file://0001-Qt-remove-x11-from-npapi-while-keeping-some-basic-fu.pat FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:" QT_CONFIG_FLAGS += "-nomake demos -nomake docs -nomake examples" +QT_SQL_DRIVER_FLAGS = "-no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite2 -plugin-sql-sqlite -system-sqlite" +QT_QT3SUPPORT = "-no-qt3support" +QT_WEBKIT = "-webkit" +QT_PHONON = "-no-phonon" +QT_DBUS = "-no-qdbus" QT_GLIB_FLAGS = "-no-glib" QT_IMAGEFORMAT_FLAGS += "-no-libmng" -QT_PHONON_FLAGS = "-no-phonon" -QT_QDBUS_FLAGS = "-no-qdbus" -QT_QT3SUPPORT_FLAGS = "-no-qt3support" -QT_SQL_DRIVER_FLAGS = "-no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite2 -plugin-sql-sqlite -system-sqlite" -QT_WEBKIT_FLAGS = "-webkit" - QT_DECORATION_FLAGS = "-plugin-decoration-default -plugin-decoration-styled -plugin-decoration-windows" QT_GFX_DRIVER_FLAGS = "-plugin-gfx-directfb -plugin-gfx-linuxfb -no-gfx-multiscreen -no-gfx-qvfb -no-gfx-transformed -no-gfx-vnc" QT_KBD_DRIVER_FLAGS = "-plugin-kbd-linuxinput -no-kbd-tty -no-kbd-qvfb" QT_MOUSE_DRIVER_FLAGS = "-qt-mouse-linuxinput -plugin-mouse-linuxtp -plugin-mouse-pc -no-mouse-qvfb -plugin-mouse-tslib" +QT_EMBEDDED_EXTRA_FLAGS = " \ + ${QT_GLIB_FLAGS} \ + ${QT_IMAGEFORMAT_FLAGS} \ + ${QT_DECORATION_FLAGS} \ + ${QT_GFX_DRIVER_FLAGS} \ + ${QT_KBD_DRIVER_FLAGS} \ + ${QT_MOUSE_DRIVER_FLAGS} \ +" + SQUASHFS_IMG_PACKAGES = "${PN}-core-sqsh-img:${PN}-webkit-sqsh-img" SQUASHFS_IMG_REPLACES = "libqt-embeddedcore4 libqt-embeddedgui4 libqt-embeddednetwork4:libqt-embeddedwebkit4 \ libqt-embeddedsvg4 qt4-embedded-plugin-imageformat-gif \ -- 2.20.1