From aa4f2443717b56127f12c3385460547c5f5f2410 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 3 Jun 2009 05:37:11 +0000 Subject: [PATCH] qt4-embedded: reworked directory layout for the next changes. Signed-off-by: Ihar Hrachyshka Acked-by: Tom Rini Acked-by: Denys Dmytriyenko --- .../0003-no-tools.patch | 0 .../0006-freetype-host-includes.patch | 0 .../0007-openssl-host-includes.patch | 0 .../0008-qt-lib-infix.patch | 0 .../0003-no-tools.patch | 0 .../0006-freetype-host-includes.patch | 0 .../0007-openssl-host-includes.patch | 0 .../0008-qt-lib-infix.patch | 0 .../0010-no-simpledecoration-example.patch | 0 recipes/qt4/qt4-embedded.inc | 40 ++++++++++++++++++ recipes/qt4/qt4-embedded_4.4.3.bb | 40 +----------------- recipes/qt4/qt4-embedded_4.5.1.bb | 41 ++----------------- 12 files changed, 46 insertions(+), 75 deletions(-) rename recipes/qt4/{files => qt4-embedded-4.4.3}/0003-no-tools.patch (100%) rename recipes/qt4/{files => qt4-embedded-4.4.3}/0006-freetype-host-includes.patch (100%) rename recipes/qt4/{files => qt4-embedded-4.4.3}/0007-openssl-host-includes.patch (100%) rename recipes/qt4/{files => qt4-embedded-4.4.3}/0008-qt-lib-infix.patch (100%) rename recipes/qt4/{files/4.5.1 => qt4-embedded-4.5.1}/0003-no-tools.patch (100%) rename recipes/qt4/{files/4.5.1 => qt4-embedded-4.5.1}/0006-freetype-host-includes.patch (100%) rename recipes/qt4/{files/4.5.1 => qt4-embedded-4.5.1}/0007-openssl-host-includes.patch (100%) rename recipes/qt4/{files/4.5.1 => qt4-embedded-4.5.1}/0008-qt-lib-infix.patch (100%) rename recipes/qt4/{files/4.5.1 => qt4-embedded-4.5.1}/0010-no-simpledecoration-example.patch (100%) create mode 100644 recipes/qt4/qt4-embedded.inc diff --git a/recipes/qt4/files/0003-no-tools.patch b/recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch similarity index 100% rename from recipes/qt4/files/0003-no-tools.patch rename to recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch diff --git a/recipes/qt4/files/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch similarity index 100% rename from recipes/qt4/files/0006-freetype-host-includes.patch rename to recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch diff --git a/recipes/qt4/files/0007-openssl-host-includes.patch b/recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch similarity index 100% rename from recipes/qt4/files/0007-openssl-host-includes.patch rename to recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch diff --git a/recipes/qt4/files/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch similarity index 100% rename from recipes/qt4/files/0008-qt-lib-infix.patch rename to recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch diff --git a/recipes/qt4/files/4.5.1/0003-no-tools.patch b/recipes/qt4/qt4-embedded-4.5.1/0003-no-tools.patch similarity index 100% rename from recipes/qt4/files/4.5.1/0003-no-tools.patch rename to recipes/qt4/qt4-embedded-4.5.1/0003-no-tools.patch diff --git a/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.5.1/0006-freetype-host-includes.patch similarity index 100% rename from recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch rename to recipes/qt4/qt4-embedded-4.5.1/0006-freetype-host-includes.patch diff --git a/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch b/recipes/qt4/qt4-embedded-4.5.1/0007-openssl-host-includes.patch similarity index 100% rename from recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch rename to recipes/qt4/qt4-embedded-4.5.1/0007-openssl-host-includes.patch diff --git a/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.5.1/0008-qt-lib-infix.patch similarity index 100% rename from recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch rename to recipes/qt4/qt4-embedded-4.5.1/0008-qt-lib-infix.patch diff --git a/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-embedded-4.5.1/0010-no-simpledecoration-example.patch similarity index 100% rename from recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch rename to recipes/qt4/qt4-embedded-4.5.1/0010-no-simpledecoration-example.patch diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc new file mode 100644 index 0000000000..bae52ab9ce --- /dev/null +++ b/recipes/qt4/qt4-embedded.inc @@ -0,0 +1,40 @@ +SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version." +SECTION = "libs" +LICENSE = "GPL QPL" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +DEPENDS += "tslib" +INC_PR = "r11" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ + file://0001-cross-compile.patch;patch=1 \ + file://0002-fix-resinit-declaration.patch;patch=1 \ + file://0003-no-tools.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0007-openssl-host-includes.patch;patch=1 \ + file://0008-qt-lib-infix.patch;patch=1 \ + file://0009-support-2bpp.patch;patch=1 \ + file://g++.conf \ + file://linux.conf \ + " +S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" + +QT_CONFIG_FLAGS += " \ + -qtlibinfix E \ + -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \ + -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \ + -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \ + -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \ + -DQT_KEYPAD_NAVIGATION \ + " + +QT_BASE_NAME = "qt4-embedded" +QT_BASE_LIB = "libqt-embedded" +QT_DIR_NAME = "qtopia" +QT_LIBINFIX="E" + +require qt4.inc + +inherit qt4e + diff --git a/recipes/qt4/qt4-embedded_4.4.3.bb b/recipes/qt4/qt4-embedded_4.4.3.bb index c7685c3770..f5358a069e 100644 --- a/recipes/qt4/qt4-embedded_4.4.3.bb +++ b/recipes/qt4/qt4-embedded_4.4.3.bb @@ -1,39 +1,3 @@ -SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version." -SECTION = "libs" -LICENSE = "GPL QPL" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -DEPENDS += "tslib" -PR = "r11" +include qt4-embedded.inc -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://0003-no-tools.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://0006-freetype-host-includes.patch;patch=1 \ - file://0007-openssl-host-includes.patch;patch=1 \ - file://0008-qt-lib-infix.patch;patch=1 \ - file://0009-support-2bpp.patch;patch=1 \ - file://g++.conf \ - file://linux.conf \ - " -S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" - -QT_CONFIG_FLAGS += " \ - -qtlibinfix E \ - -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \ - -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \ - -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \ - -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \ - -DQT_KEYPAD_NAVIGATION \ - " - -QT_BASE_NAME = "qt4-embedded" -QT_BASE_LIB = "libqt-embedded" -QT_DIR_NAME = "qtopia" -QT_LIBINFIX="E" - -require qt4.inc - -inherit qt4e +PR = "${INC_PR}.1" diff --git a/recipes/qt4/qt4-embedded_4.5.1.bb b/recipes/qt4/qt4-embedded_4.5.1.bb index 3ec4b9aeb5..dff754c68c 100644 --- a/recipes/qt4/qt4-embedded_4.5.1.bb +++ b/recipes/qt4/qt4-embedded_4.5.1.bb @@ -1,39 +1,6 @@ -SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version." -SECTION = "libs" -LICENSE = "GPL LGPL QPL" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -DEPENDS += "tslib" +include qt4-embedded.inc -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://${PV}/0003-no-tools.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://${PV}/0006-freetype-host-includes.patch;patch=1 \ - file://${PV}/0007-openssl-host-includes.patch;patch=1 \ - file://${PV}/0008-qt-lib-infix.patch;patch=1 \ - file://0009-support-2bpp.patch;patch=1 \ - file://${PV}/0010-no-simpledecoration-example.patch;patch=1 \ - file://g++.conf \ - file://linux.conf \ - " -S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" +PR = "${INC_PR}.1" -QT_CONFIG_FLAGS += " \ - -qtlibinfix E \ - -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \ - -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \ - -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \ - -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \ - -DQT_KEYPAD_NAVIGATION \ - " - -QT_BASE_NAME = "qt4-embedded" -QT_BASE_LIB = "libqt-embedded" -QT_DIR_NAME = "qtopia" -QT_LIBINFIX="E" - -require qt4.inc - -inherit qt4e +LICENSE += "LGPL" +SRC_URI += "file://0010-no-simpledecoration-example.patch;patch=1" -- 2.39.5