diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 821eb95c..c023e4fc 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -33,13 +33,8 @@ SRC_URI += "\ | |||
33 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ | 33 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ |
34 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ | 34 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ |
35 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 35 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
36 | file://0018-Fix-compile-issue-with-gcc-9.patch \ | ||
37 | file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ | ||
38 | file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ | ||
39 | file://0023-build-failure-with-clang.patch \ | ||
40 | " | 36 | " |
41 | 37 | ||
42 | |||
43 | # for syncqt | 38 | # for syncqt |
44 | RDEPENDS_${PN}-tools += "perl" | 39 | RDEPENDS_${PN}-tools += "perl" |
45 | 40 | ||
@@ -68,7 +63,7 @@ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f | |||
68 | # separate some parts of PACKAGECONFIG which are often changed | 63 | # separate some parts of PACKAGECONFIG which are often changed |
69 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" | 64 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" |
70 | PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 65 | PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
71 | PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon-evdev', '', d)}" | 66 | PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon', '', d)}" |
72 | PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite accessibility openssl', '', d)}" | 67 | PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite accessibility openssl', '', d)}" |
73 | PACKAGECONFIG_FONTS ?= "" | 68 | PACKAGECONFIG_FONTS ?= "" |
74 | PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" | 69 | PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" |
@@ -144,7 +139,7 @@ PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3" | |||
144 | PACKAGECONFIG[xcb-xinput] = "-xcb-xinput,-no-xcb-xinput,libxcb" | 139 | PACKAGECONFIG[xcb-xinput] = "-xcb-xinput,-no-xcb-xinput,libxcb" |
145 | PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" | 140 | PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" |
146 | PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" | 141 | PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" |
147 | PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config" | 142 | PACKAGECONFIG[xkbcommon] = "-xkbcommon,-no-xkbcommon,libxkbcommon,xkeyboard-config" |
148 | PACKAGECONFIG[evdev] = "-evdev,-no-evdev" | 143 | PACKAGECONFIG[evdev] = "-evdev,-no-evdev" |
149 | PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev" | 144 | PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev" |
150 | # depends on glib | 145 | # depends on glib |
@@ -294,4 +289,4 @@ sed -i \ | |||
294 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 289 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
295 | } | 290 | } |
296 | 291 | ||
297 | SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" | 292 | SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10" |