From f5daa62a4430164c4f9f7c34e8d7c53e37af8875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Fri, 24 Apr 2009 08:43:51 +0200 Subject: qt4: update from 4.5.0 to 4.5.1 --- recipes/qt4/files/4.5.0/0003-no-tools.patch | 18 ---------- .../files/4.5.0/0006-freetype-host-includes.patch | 20 ----------- .../files/4.5.0/0007-openssl-host-includes.patch | 20 ----------- recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch | 34 ------------------ .../4.5.0/0010-no-simpledecoration-example.patch | 9 ----- recipes/qt4/files/4.5.1/0003-no-tools.patch | 18 ++++++++++ .../files/4.5.1/0006-freetype-host-includes.patch | 20 +++++++++++ .../files/4.5.1/0007-openssl-host-includes.patch | 20 +++++++++++ recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch | 34 ++++++++++++++++++ .../4.5.1/0010-no-simpledecoration-example.patch | 9 +++++ recipes/qt4/qt4-embedded_4.5.0.bb | 41 ---------------------- recipes/qt4/qt4-embedded_4.5.1.bb | 40 +++++++++++++++++++++ recipes/qt4/qt4-tools-native_4.5.0.bb | 5 --- recipes/qt4/qt4-tools-native_4.5.1.bb | 4 +++ recipes/qt4/qt4-x11-free_4.5.0.bb | 32 ----------------- recipes/qt4/qt4-x11-free_4.5.1.bb | 32 +++++++++++++++++ 16 files changed, 177 insertions(+), 179 deletions(-) delete mode 100644 recipes/qt4/files/4.5.0/0003-no-tools.patch delete mode 100644 recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch delete mode 100644 recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch delete mode 100644 recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch delete mode 100644 recipes/qt4/files/4.5.0/0010-no-simpledecoration-example.patch create mode 100644 recipes/qt4/files/4.5.1/0003-no-tools.patch create mode 100644 recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch create mode 100644 recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch create mode 100644 recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch create mode 100644 recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch delete mode 100644 recipes/qt4/qt4-embedded_4.5.0.bb create mode 100644 recipes/qt4/qt4-embedded_4.5.1.bb delete mode 100644 recipes/qt4/qt4-tools-native_4.5.0.bb create mode 100644 recipes/qt4/qt4-tools-native_4.5.1.bb delete mode 100644 recipes/qt4/qt4-x11-free_4.5.0.bb create mode 100644 recipes/qt4/qt4-x11-free_4.5.1.bb diff --git a/recipes/qt4/files/4.5.0/0003-no-tools.patch b/recipes/qt4/files/4.5.0/0003-no-tools.patch deleted file mode 100644 index 3829ffcdc5..0000000000 --- a/recipes/qt4/files/4.5.0/0003-no-tools.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: qt-embedded-linux-opensource-src-4.5.0/src/src.pro -=================================================================== ---- qt-embedded-linux-opensource-src-4.5.0.orig/src/src.pro 2009-02-25 22:32:41.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.5.0/src/src.pro 2009-03-26 17:11:07.000000000 +0100 -@@ -6,12 +6,9 @@ - wince*:{ - SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib - } else { -- SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib -+ SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib - contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support - contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus -- !cross_compile { -- contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3 -- } - } - win32:!contains(QT_EDITION, OpenSource|Console): { - SRC_SUBDIRS += src_activeqt diff --git a/recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch b/recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch deleted file mode 100644 index 987c425138..0000000000 --- a/recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch +++ /dev/null @@ -1,20 +0,0 @@ -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/files/4.5.0/0007-openssl-host-includes.patch b/recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch deleted file mode 100644 index 3409cc0bf2..0000000000 --- a/recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch +++ /dev/null @@ -1,20 +0,0 @@ -From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Mon, 4 Jun 2007 14:58:34 +0200 -Subject: [PATCH] openssl host includes - ---- - config.tests/unix/openssl/openssl.pri | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri -=================================================================== ---- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/openssl/openssl.pri 2009-02-25 22:32:32.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri 2009-03-26 17:16:28.000000000 +0100 -@@ -1,5 +1,5 @@ - !cross_compile { -- TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH -+ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH - # LSB doesn't allow using headers from /include or /usr/include - linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH - for(p, TRY_INCLUDEPATHS) { diff --git a/recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch b/recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch deleted file mode 100644 index 3efaff37d3..0000000000 --- a/recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf -=================================================================== ---- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf 2009-02-25 22:32:34.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf 2009-03-26 17:17:27.000000000 +0100 -@@ -2,10 +2,10 @@ - qt:load(qt) - - # Include the correct version of the UiLoader library --QTUITOOLS_LINKAGE = -lQtUiTools -+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 - -Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro -=================================================================== ---- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro 2009-02-25 22:32:42.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro 2009-03-26 17:17:27.000000000 +0100 -@@ -1,5 +1,5 @@ - TEMPLATE = lib --TARGET = $$qtLibraryTarget(QtUiTools) -+TARGET = QtUiTools - QT += xml - CONFIG += qt staticlib - DESTDIR = ../../../../lib -@@ -39,3 +39,4 @@ - QMAKE_PKGCONFIG_REQUIRES += QtXml - } - -+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end diff --git a/recipes/qt4/files/4.5.0/0010-no-simpledecoration-example.patch b/recipes/qt4/files/4.5.0/0010-no-simpledecoration-example.patch deleted file mode 100644 index 070b4ac9c1..0000000000 --- a/recipes/qt4/files/4.5.0/0010-no-simpledecoration-example.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/files/4.5.1/0003-no-tools.patch b/recipes/qt4/files/4.5.1/0003-no-tools.patch new file mode 100644 index 0000000000..3829ffcdc5 --- /dev/null +++ b/recipes/qt4/files/4.5.1/0003-no-tools.patch @@ -0,0 +1,18 @@ +Index: qt-embedded-linux-opensource-src-4.5.0/src/src.pro +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/src/src.pro 2009-02-25 22:32:41.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/src/src.pro 2009-03-26 17:11:07.000000000 +0100 +@@ -6,12 +6,9 @@ + wince*:{ + SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib + } else { +- SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib ++ SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib + contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support + contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus +- !cross_compile { +- contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3 +- } + } + win32:!contains(QT_EDITION, OpenSource|Console): { + SRC_SUBDIRS += src_activeqt diff --git a/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch b/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch new file mode 100644 index 0000000000..987c425138 --- /dev/null +++ b/recipes/qt4/files/4.5.1/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/files/4.5.1/0007-openssl-host-includes.patch b/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch new file mode 100644 index 0000000000..3409cc0bf2 --- /dev/null +++ b/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch @@ -0,0 +1,20 @@ +From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 4 Jun 2007 14:58:34 +0200 +Subject: [PATCH] openssl host includes + +--- + config.tests/unix/openssl/openssl.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/openssl/openssl.pri 2009-02-25 22:32:32.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri 2009-03-26 17:16:28.000000000 +0100 +@@ -1,5 +1,5 @@ + !cross_compile { +- TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH ++ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH + # LSB doesn't allow using headers from /include or /usr/include + linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH + for(p, TRY_INCLUDEPATHS) { diff --git a/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch b/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch new file mode 100644 index 0000000000..3efaff37d3 --- /dev/null +++ b/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch @@ -0,0 +1,34 @@ +Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf 2009-02-25 22:32:34.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf 2009-03-26 17:17:27.000000000 +0100 +@@ -2,10 +2,10 @@ + qt:load(qt) + + # Include the correct version of the UiLoader library +-QTUITOOLS_LINKAGE = -lQtUiTools ++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 + +Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro 2009-02-25 22:32:42.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro 2009-03-26 17:17:27.000000000 +0100 +@@ -1,5 +1,5 @@ + TEMPLATE = lib +-TARGET = $$qtLibraryTarget(QtUiTools) ++TARGET = QtUiTools + QT += xml + CONFIG += qt staticlib + DESTDIR = ../../../../lib +@@ -39,3 +39,4 @@ + QMAKE_PKGCONFIG_REQUIRES += QtXml + } + ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end diff --git a/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch b/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch new file mode 100644 index 0000000000..070b4ac9c1 --- /dev/null +++ b/recipes/qt4/files/4.5.1/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_4.5.0.bb b/recipes/qt4/qt4-embedded_4.5.0.bb deleted file mode 100644 index 35b56de48a..0000000000 --- a/recipes/qt4/qt4-embedded_4.5.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -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" -PR = "r1" -DEFAULT_PREFERENCE = "-1" - -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}" - -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.5.1.bb b/recipes/qt4/qt4-embedded_4.5.1.bb new file mode 100644 index 0000000000..5da55f9c1c --- /dev/null +++ b/recipes/qt4/qt4-embedded_4.5.1.bb @@ -0,0 +1,40 @@ +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" +DEFAULT_PREFERENCE = "-1" + +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}" + +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-tools-native_4.5.0.bb b/recipes/qt4/qt4-tools-native_4.5.0.bb deleted file mode 100644 index ab633149ba..0000000000 --- a/recipes/qt4/qt4-tools-native_4.5.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt4-tools-native.inc -PR = "r1" - -DEFAULT_PREFERENCE = "-1" -TOBUILD := "src/tools/bootstrap ${TOBUILD}" diff --git a/recipes/qt4/qt4-tools-native_4.5.1.bb b/recipes/qt4/qt4-tools-native_4.5.1.bb new file mode 100644 index 0000000000..cadc7357c4 --- /dev/null +++ b/recipes/qt4/qt4-tools-native_4.5.1.bb @@ -0,0 +1,4 @@ +require qt4-tools-native.inc + +DEFAULT_PREFERENCE = "-1" +TOBUILD := "src/tools/bootstrap ${TOBUILD}" diff --git a/recipes/qt4/qt4-x11-free_4.5.0.bb b/recipes/qt4/qt4-x11-free_4.5.0.bb deleted file mode 100644 index 0ffbbc2e09..0000000000 --- a/recipes/qt4/qt4-x11-free_4.5.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." -SECTION = "x11/libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -LICENSE = "GPL LGPL QPL" -DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" -PROVIDES = "qt4x11" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ - 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://g++.conf \ - file://linux.conf \ - " -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - - -QT_CONFIG_FLAGS += "-no-xinerama -no-xkb -no-opengl" -QT_BASE_NAME = "qt4" -QT_BASE_LIB = "libqt" -QT_DIR_NAME = "qt4" -QT_LIBINFIX = "" - -require qt4.inc - -inherit qt4x11 diff --git a/recipes/qt4/qt4-x11-free_4.5.1.bb b/recipes/qt4/qt4-x11-free_4.5.1.bb new file mode 100644 index 0000000000..0ffbbc2e09 --- /dev/null +++ b/recipes/qt4/qt4-x11-free_4.5.1.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." +SECTION = "x11/libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL LGPL QPL" +DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" +PROVIDES = "qt4x11" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ + 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://g++.conf \ + file://linux.conf \ + " +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + + +QT_CONFIG_FLAGS += "-no-xinerama -no-xkb -no-opengl" +QT_BASE_NAME = "qt4" +QT_BASE_LIB = "libqt" +QT_DIR_NAME = "qt4" +QT_LIBINFIX = "" + +require qt4.inc + +inherit qt4x11 -- cgit v1.2.3