From a9b18b730ff2d8ab72ad058cdb2bd04a2b5e7e52 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 15 Aug 2010 18:18:14 +0200 Subject: qt4* removed 44.3 version Signed-off-by: Frans Meulenbroeks --- recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch | 16 -------- .../0006-freetype-host-includes.patch | 23 ----------- .../0007-openssl-host-includes.patch | 23 ----------- .../qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch | 45 ---------------------- recipes/qt4/qt4-embedded_4.4.3.bb | 6 --- recipes/qt4/qt4-tools-native_4.4.3.bb | 21 ---------- recipes/qt4/qt4-x11-free_4.4.3.bb | 6 --- 7 files changed, 140 deletions(-) delete mode 100644 recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch delete mode 100644 recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch delete mode 100644 recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch delete mode 100644 recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch delete mode 100644 recipes/qt4/qt4-embedded_4.4.3.bb delete mode 100644 recipes/qt4/qt4-tools-native_4.4.3.bb delete mode 100644 recipes/qt4/qt4-x11-free_4.4.3.bb (limited to 'recipes') diff --git a/recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch b/recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch deleted file mode 100644 index bb36444f80..0000000000 --- a/recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- /tmp/src.pro 2008-07-08 10:43:30.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.0/src/src.pro 2008-07-08 11:28:24.000000000 +0200 -@@ -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_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/qt4-embedded-4.4.3/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch deleted file mode 100644 index cc8e115fee..0000000000 --- a/recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch +++ /dev/null @@ -1,23 +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(-) - -diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri -index 84974bf..ab9a6f2 100644 ---- a/config.tests/unix/freetype/freetype.pri -+++ b/config.tests/unix/freetype/freetype.pri -@@ -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 - for(p, TRY_INCLUDEPATHS) { - p = $$join(p, "", "", "/freetype2") - exists($$p):INCLUDEPATH *= $$p --- -1.5.0.7 - diff --git a/recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch b/recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch deleted file mode 100644 index 35b71d9694..0000000000 --- a/recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch +++ /dev/null @@ -1,23 +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(-) - -diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri -index 756e5fe..19b4061 100644 ---- a/config.tests/unix/openssl/openssl.pri -+++ b/config.tests/unix/openssl/openssl.pri -@@ -1,5 +1,5 @@ - !cross_compile { -- TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH -+ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH - for(p, TRY_INCLUDEPATHS) { - pp = $$join(p, "", "", "/openssl") - exists($$pp):INCLUDEPATH *= $$p --- -1.5.0.7 - diff --git a/recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch deleted file mode 100644 index b1a443f24c..0000000000 --- a/recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/mkspecs/features/uitools.prf qt-embedded-linux-opensource-src-4.4.3/mkspecs/features/uitools.prf ---- qt-embedded-linux-opensource-src-4.4.3.orig/mkspecs/features/uitools.prf 2008-09-27 11:01:24.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.3/mkspecs/features/uitools.prf 2008-12-11 20:47:10.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 - -diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/lib/lib.pro qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/lib/lib.pro ---- qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/lib/lib.pro 2008-09-27 11:01:29.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/lib/lib.pro 2008-12-11 20:36:40.000000000 +0100 -@@ -58,8 +58,8 @@ - include(shared/shared.pri) - PRECOMPILED_HEADER=lib_pch.h - --include(../components/component.pri) - include(../sharedcomponents.pri) -+include(../components/component.pri) - - target.path=$$[QT_INSTALL_LIBS] - INSTALLS += target -diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/uitools/uitools.pro qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/uitools/uitools.pro ---- qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/uitools/uitools.pro 2008-09-27 11:01:30.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/uitools/uitools.pro 2008-12-11 19:56:34.000000000 +0100 -@@ -1,5 +1,5 @@ - TEMPLATE = lib --TARGET = $$qtLibraryTarget(QtUiTools) -+TARGET = QtUiTools - QT += xml - CONFIG += qt staticlib - DESTDIR = ../../../../lib -@@ -38,3 +38,4 @@ - QMAKE_PKGCONFIG_DESTDIR = pkgconfig - } - -+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end diff --git a/recipes/qt4/qt4-embedded_4.4.3.bb b/recipes/qt4/qt4-embedded_4.4.3.bb deleted file mode 100644 index 53fa0e0e54..0000000000 --- a/recipes/qt4/qt4-embedded_4.4.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qt4-embedded.inc - -PR = "${INC_PR}.2" - -SRC_URI[md5sum] = "9a639aec44a1e4c70040117183d247a3" -SRC_URI[sha256sum] = "05d06b93f95092f1318634fca24f0c2d0a1252c9f1dc2fbb427b07e8ecbb4f39" diff --git a/recipes/qt4/qt4-tools-native_4.4.3.bb b/recipes/qt4/qt4-tools-native_4.4.3.bb deleted file mode 100644 index c7915f303b..0000000000 --- a/recipes/qt4/qt4-tools-native_4.4.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -require qt4-tools-native.inc - -# Older releases have different source archive name, than .inc -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ - file://configure-lflags.patch \ - file://qt-config.patch \ - file://g++.conf \ - file://linux.conf" - -S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" - -EXTRA_OECONF += " -fast" - -do_configure() { - (echo o; echo yes) | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -PR = "${INC_PR}.1" - -SRC_URI[md5sum] = "9a639aec44a1e4c70040117183d247a3" -SRC_URI[sha256sum] = "05d06b93f95092f1318634fca24f0c2d0a1252c9f1dc2fbb427b07e8ecbb4f39" diff --git a/recipes/qt4/qt4-x11-free_4.4.3.bb b/recipes/qt4/qt4-x11-free_4.4.3.bb deleted file mode 100644 index e6627f7b5f..0000000000 --- a/recipes/qt4/qt4-x11-free_4.4.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qt4-x11-free.inc -PR = "${INC_PR}.1" -QT_CONFIG_FLAGS += "-no-tablet" - -SRC_URI[md5sum] = "376c003317c4417326ba2116370227d0" -SRC_URI[sha256sum] = "79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6" -- cgit v1.2.3