qt5-native: rename to qtbase-native to avoid confusion
* we also had PROVIDES for qt5-tools-native, this makes it a bit easier to see what is what * drop FILESEXTRAPATHS, not needed after renaming to match BPN with qtbase patches Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
a376cc61ed
commit
5d5ba83cc6
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
inherit qmake5_base
|
inherit qmake5_base
|
||||||
|
|
||||||
QT5TOOLSDEPENDS ?= "qt5-native "
|
QT5TOOLSDEPENDS ?= "qtbase-native "
|
||||||
DEPENDS_prepend = "${QT5TOOLSDEPENDS}"
|
DEPENDS_prepend = "${QT5TOOLSDEPENDS}"
|
||||||
|
|
||||||
export QMAKESPEC = "${STAGING_DATADIR}/qt5/mkspecs/${TARGET_OS}-oe-g++"
|
export QMAKESPEC = "${STAGING_DATADIR}/qt5/mkspecs/${TARGET_OS}-oe-g++"
|
||||||
|
|
|
@ -6,7 +6,7 @@ inherit qmake5_base
|
||||||
ICU = "icu "
|
ICU = "icu "
|
||||||
ICU_powerpc = "pango"
|
ICU_powerpc = "pango"
|
||||||
|
|
||||||
DEPENDS += "qt5-tools-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}"
|
DEPENDS += "virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}"
|
||||||
|
|
||||||
require qt5_arch.inc
|
require qt5_arch.inc
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ DESCRIPTION = "Native version of Qt/[X11|Mac|Embedded]"
|
||||||
DEPENDS = "zlib-native dbus-native"
|
DEPENDS = "zlib-native dbus-native"
|
||||||
SECTION = "libs"
|
SECTION = "libs"
|
||||||
HOMEPAGE = "http://qt-project.org"
|
HOMEPAGE = "http://qt-project.org"
|
||||||
PROVIDES = "qt5-tools-native"
|
|
||||||
|
|
||||||
INC_PR = "r0"
|
INC_PR = "r0"
|
||||||
|
|
||||||
|
@ -10,8 +9,6 @@ inherit native
|
||||||
|
|
||||||
QT_MODULE = "qtbase"
|
QT_MODULE = "qtbase"
|
||||||
|
|
||||||
FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/qtbase:"
|
|
||||||
|
|
||||||
SRC_URI += " \
|
SRC_URI += " \
|
||||||
file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \
|
file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \
|
||||||
file://0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch \
|
file://0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch \
|
|
@ -1,4 +1,4 @@
|
||||||
require qt5-native.inc
|
require ${PN}.inc
|
||||||
require qt5-5.0.0+git.inc
|
require qt5-5.0.0+git.inc
|
||||||
|
|
||||||
PR = "${INC_PR}.0"
|
PR = "${INC_PR}.0"
|
|
@ -3,5 +3,7 @@ require qt5-${PV}.inc
|
||||||
|
|
||||||
PR = "${INC_PR}.0"
|
PR = "${INC_PR}.0"
|
||||||
|
|
||||||
|
SRC_URI += "file://0001-Always-build-uic.patch"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df"
|
SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df"
|
||||||
SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8"
|
SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8"
|
|
@ -8,7 +8,7 @@ SRC_URI += " \
|
||||||
file://qplatformdefs.h \
|
file://qplatformdefs.h \
|
||||||
"
|
"
|
||||||
|
|
||||||
DEPENDS += "qt5-tools-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}"
|
DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}"
|
||||||
|
|
||||||
# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h
|
# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h
|
||||||
# DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus"
|
# DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
LICENSE = "LGPLv2.1"
|
LICENSE = "LGPLv2.1"
|
||||||
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
|
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
|
||||||
|
|
||||||
DEPENDS = "qt5-native"
|
DEPENDS = "qtbase-native"
|
||||||
|
|
||||||
QT_MODULE = "qtjsbackend"
|
QT_MODULE = "qtjsbackend"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue