From 14a84e6f6801ff2d08619d997ca2581b14909afb Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 10:00:08 +0200 Subject: [PATCH 1/3] Remove old and unused qt files --- recipes/qt5/qt5-5.1.1.inc | 10 ---------- recipes/qt5/qtjsbackend_5.1.1.oe | 12 ------------ recipes/qt5/qtjsbackend_5.1.1.oe.sig | 1 - 3 files changed, 23 deletions(-) delete mode 100644 recipes/qt5/qt5-5.1.1.inc delete mode 100644 recipes/qt5/qtjsbackend_5.1.1.oe delete mode 100644 recipes/qt5/qtjsbackend_5.1.1.oe.sig diff --git a/recipes/qt5/qt5-5.1.1.inc b/recipes/qt5/qt5-5.1.1.inc deleted file mode 100644 index 4d26107..0000000 --- a/recipes/qt5/qt5-5.1.1.inc +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2012 O.S. Systems Software LTDA. -# Copyright (C) 2013 Martin Jansa - -LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" - -QT_VERSION ?= "${PV}" - -SRC_URI += " \ - http://download.qt-project.org/official_releases/qt/5.1/${PV}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz" -S = "${SRCDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" diff --git a/recipes/qt5/qtjsbackend_5.1.1.oe b/recipes/qt5/qtjsbackend_5.1.1.oe deleted file mode 100644 index a9b5082..0000000 --- a/recipes/qt5/qtjsbackend_5.1.1.oe +++ /dev/null @@ -1,12 +0,0 @@ -## Recipe for building the qt5 module QtJsbackend. -## -## Recipe for building the Qt Javascript engine backend. -## Note that post qt 5.2, this module is no longer used for -## qtdeclarative, and no longer upgraded. - -LICENSE = "LGPL-2.1 & GPL-3.0" - -inherit qt5module - -require qt5-${PV}.inc -require qt5.inc diff --git a/recipes/qt5/qtjsbackend_5.1.1.oe.sig b/recipes/qt5/qtjsbackend_5.1.1.oe.sig deleted file mode 100644 index 2e64fb3..0000000 --- a/recipes/qt5/qtjsbackend_5.1.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -e13a5ef112bdbe2fb1691d21c52b287a21da614a qtjsbackend-opensource-src-5.1.1.tar.xz From 4f775ef7b73dde7e676502d8b9f6d3c7428465ba Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 10:00:58 +0200 Subject: [PATCH 2/3] Qt4: add missing native dependencies --- recipes/qt4/qmake.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/qt4/qmake.inc b/recipes/qt4/qmake.inc index 8ca6567..b7a1541 100644 --- a/recipes/qt4/qmake.inc +++ b/recipes/qt4/qmake.inc @@ -10,6 +10,7 @@ SRC_URI += " \ file://0021-configure-make-qt4-native-work-with-long-building-pa.patch" DEPENDS:>sdk = "native:qmake_${PV} libz libgcc libm libpthread libdl librt" +DEPENDS:>native = "libz libgcc libm libpthread libdl librt" RDEPENDS:>sdk = "libz libgcc libm libpthread libdl librt" SRC_URI:>sdk += " file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch" From 8a025e5050bc3920f25280279ba609c8ffdda520 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 10:01:55 +0200 Subject: [PATCH 3/3] Remove useless and non-existing class in qmake5 --- classes/qmake5.oeclass | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/qmake5.oeclass b/classes/qmake5.oeclass index 5b3d8d0..768fa0e 100644 --- a/classes/qmake5.oeclass +++ b/classes/qmake5.oeclass @@ -5,7 +5,6 @@ ## needed variables for compilation. inherit qmake5_base -inherit pkgconfig-install QT5TOOLSDEPENDS ?= "native:qmake5_${PV}" CLASS_DEPENDS += "${QT5TOOLSDEPENDS} "