From ca961b5ec7dd6ade32e719cb01d344c1187a2f46 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 1 Dec 2009 19:02:14 +0100 Subject: qt4: add 4.6.0, WIP --- .../0006-freetype-host-includes.patch | 20 ++++++++++++ .../qt4/qt4-embedded-4.6.0/0008-qt-lib-infix.patch | 32 +++++++++++++++++++ .../0010-no-simpledecoration-example.patch | 9 ++++++ recipes/qt4/qt4-embedded.inc | 2 +- recipes/qt4/qt4-embedded_4.6.0.bb | 31 ++++++++++++++++++ recipes/qt4/qt4-tools-native_4.6.0.bb | 15 +++++++++ .../qt4/qt4-x11-free-4.6.0/0008-qt-lib-infix.patch | 32 +++++++++++++++++++ recipes/qt4/qt4-x11-free_4.6.0.bb | 37 ++++++++++++++++++++++ 8 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 recipes/qt4/qt4-embedded-4.6.0/0006-freetype-host-includes.patch create mode 100644 recipes/qt4/qt4-embedded-4.6.0/0008-qt-lib-infix.patch create mode 100644 recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch create mode 100644 recipes/qt4/qt4-embedded_4.6.0.bb create mode 100644 recipes/qt4/qt4-tools-native_4.6.0.bb create mode 100644 recipes/qt4/qt4-x11-free-4.6.0/0008-qt-lib-infix.patch create mode 100644 recipes/qt4/qt4-x11-free_4.6.0.bb (limited to 'recipes/qt4') diff --git a/recipes/qt4/qt4-embedded-4.6.0/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.6.0/0006-freetype-host-includes.patch new file mode 100644 index 0000000000..987c425138 --- /dev/null +++ b/recipes/qt4/qt4-embedded-4.6.0/0006-freetype-host-includes.patch @@ -0,0 +1,20 @@ +From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 4 Jun 2007 14:48:50 +0200 +Subject: [PATCH] freetype host includes + +--- + config.tests/unix/freetype/freetype.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri 2009-02-25 22:32:32.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri 2009-03-26 17:14:16.000000000 +0100 +@@ -1,5 +1,5 @@ + !cross_compile { +- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH ++ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH + # LSB doesn't allow using headers from /include or /usr/include + linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH + for(p, TRY_INCLUDEPATHS) { diff --git a/recipes/qt4/qt4-embedded-4.6.0/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.6.0/0008-qt-lib-infix.patch new file mode 100644 index 0000000000..61e60a0eb6 --- /dev/null +++ b/recipes/qt4/qt4-embedded-4.6.0/0008-qt-lib-infix.patch @@ -0,0 +1,32 @@ +--- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100 +@@ -3,11 +3,11 @@ + + # Include the correct version of the UiLoader library + symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib +-else: QTUITOOLS_LINKAGE = -lQtUiTools ++else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX} + + CONFIG(debug, debug|release) { +- mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug +- win32: QTUITOOLS_LINKAGE = -lQtUiToolsd ++ mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug ++ win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d + } + LIBS += $$QTUITOOLS_LINKAGE + +--- /tmp/uitools.pro 2009-12-01 18:40:28.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro 2009-12-01 18:59:18.000000000 +0100 +@@ -1,5 +1,5 @@ + TEMPLATE = lib +-TARGET = $$qtLibraryTarget(QtUiTools) ++TARGET = QtUiTools + QT += xml + CONFIG += qt staticlib + DESTDIR = ../../../../lib +@@ -43,3 +43,5 @@ + QMAKE_PKGCONFIG_DESTDIR = pkgconfig + QMAKE_PKGCONFIG_REQUIRES += QtXml + } ++ ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end diff --git a/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch new file mode 100644 index 0000000000..070b4ac9c1 --- /dev/null +++ b/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch @@ -0,0 +1,9 @@ +--- qt-embedded-linux-opensource-src-4.5.0.orig/examples/qws/qws.pro 2009-02-25 22:32:34.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/examples/qws/qws.pro 2009-03-26 19:53:19.000000000 +0100 +@@ -1,5 +1,5 @@ + TEMPLATE = subdirs +-SUBDIRS = framebuffer mousecalibration simpledecoration ++SUBDIRS = framebuffer mousecalibration + + # install + sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 95b770a5a4..11fcd5849b 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -31,7 +31,7 @@ QT_CONFIG_FLAGS += " \ -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \ -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \ -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \ - -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \ + -qt-kbd-tty \ -DQT_KEYPAD_NAVIGATION \ " diff --git a/recipes/qt4/qt4-embedded_4.6.0.bb b/recipes/qt4/qt4-embedded_4.6.0.bb new file mode 100644 index 0000000000..f40d36b774 --- /dev/null +++ b/recipes/qt4/qt4-embedded_4.6.0.bb @@ -0,0 +1,31 @@ +DEFAULT_PREFERENCE = "-1" + +require qt4-embedded.inc + +PR = "${INC_PR}.0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ + file://0001-cross-compile.patch;patch=1 \ + file://0002-fix-resinit-declaration.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0008-qt-lib-infix.patch;patch=1 \ + file://0009-support-2bpp.patch;patch=1 \ + file://fix-config-tests.patch;patch=1 \ + file://g++.conf \ + file://linux.conf \ + " +S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" + +do_configure_prepend() { + sed -i \ + -e /QMAKE_MOC\ /d \ + -e /QMAKE_UIC\ /d \ + -e /QMAKE_UIC3\ /d \ + -e /QMAKE_RCC\ /d \ + ${S}/configure +} + +LICENSE = "LGPLv2.1 GPLv3" +SRC_URI += " \ + file://hack-out-pg_config.patch;patch=1" diff --git a/recipes/qt4/qt4-tools-native_4.6.0.bb b/recipes/qt4/qt4-tools-native_4.6.0.bb new file mode 100644 index 0000000000..48310b1233 --- /dev/null +++ b/recipes/qt4/qt4-tools-native_4.6.0.bb @@ -0,0 +1,15 @@ +DEFAULT_PREFERENCE = "-1" + +require qt4-tools-native.inc +LICENSE = "LGPLv2.1 GPLv3" +PR = "${INC_PR}.0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ + file://configure-lflags.patch;patch=1 \ + file://qt-config.patch;patch=1 \ + file://g++.conf \ + file://linux.conf" + +S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" + +TOBUILD := "src/tools/bootstrap ${TOBUILD}" diff --git a/recipes/qt4/qt4-x11-free-4.6.0/0008-qt-lib-infix.patch b/recipes/qt4/qt4-x11-free-4.6.0/0008-qt-lib-infix.patch new file mode 100644 index 0000000000..61e60a0eb6 --- /dev/null +++ b/recipes/qt4/qt4-x11-free-4.6.0/0008-qt-lib-infix.patch @@ -0,0 +1,32 @@ +--- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100 +@@ -3,11 +3,11 @@ + + # Include the correct version of the UiLoader library + symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib +-else: QTUITOOLS_LINKAGE = -lQtUiTools ++else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX} + + CONFIG(debug, debug|release) { +- mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug +- win32: QTUITOOLS_LINKAGE = -lQtUiToolsd ++ mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug ++ win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d + } + LIBS += $$QTUITOOLS_LINKAGE + +--- /tmp/uitools.pro 2009-12-01 18:40:28.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro 2009-12-01 18:59:18.000000000 +0100 +@@ -1,5 +1,5 @@ + TEMPLATE = lib +-TARGET = $$qtLibraryTarget(QtUiTools) ++TARGET = QtUiTools + QT += xml + CONFIG += qt staticlib + DESTDIR = ../../../../lib +@@ -43,3 +43,5 @@ + QMAKE_PKGCONFIG_DESTDIR = pkgconfig + QMAKE_PKGCONFIG_REQUIRES += QtXml + } ++ ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end diff --git a/recipes/qt4/qt4-x11-free_4.6.0.bb b/recipes/qt4/qt4-x11-free_4.6.0.bb new file mode 100644 index 0000000000..0e39dc9b6e --- /dev/null +++ b/recipes/qt4/qt4-x11-free_4.6.0.bb @@ -0,0 +1,37 @@ +DEFAULT_PREFERENCE = "-1" + +require qt4-x11-free.inc +LICENSE = "LGPLv2.1 GPLv3" +PR = "${INC_PR}.0" + +export MOC = "${OE_QMAKE_MOC}" +export QMAKE_MOC = "${OE_QMAKE_MOC}" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ + file://0001-cross-compile.patch;patch=1 \ + file://0002-fix-resinit-declaration.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0008-qt-lib-infix.patch;patch=1 \ + file://fix-config-tests.patch;patch=1 \ + file://g++.conf \ + file://linux.conf \ +" + +SRC_URI += "file://hack-out-pg_config.patch;patch=1" + +S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" + +QT_CONFIG_FLAGS += " \ + -no-embedded \ + -xrandr " + +do_configure_prepend() { + sed -i \ + -e /QMAKE_MOC\ /d \ + -e /QMAKE_UIC\ /d \ + -e /QMAKE_UIC3\ /d \ + -e /QMAKE_RCC\ /d \ + ${S}/configure +} + -- cgit v1.2.3