diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebkit.inc')
-rw-r--r-- | recipes-qt/qt5/qtwebkit.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index bdc676be..d9eaabb6 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc | |||
@@ -8,6 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt leveldb" | 9 | DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt leveldb" |
10 | 10 | ||
11 | SRC_URI += "\ | ||
12 | file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ | ||
13 | file://0002-qtwebkit-fix-textrel-x86.patch \ | ||
14 | " | ||
15 | |||
11 | PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors" | 16 | PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors" |
12 | PACKAGECONFIG[gstreamer] = "OE_GSTREAMER_ENABLED,,gstreamer1.0 gstreamer1.0-plugins-base" | 17 | PACKAGECONFIG[gstreamer] = "OE_GSTREAMER_ENABLED,,gstreamer1.0 gstreamer1.0-plugins-base" |
13 | PACKAGECONFIG[gstreamer010] = "OE_GSTREAMER010_ENABLED,,gstreamer gst-plugins-base" | 18 | PACKAGECONFIG[gstreamer010] = "OE_GSTREAMER010_ENABLED,,gstreamer gst-plugins-base" |
@@ -39,8 +44,6 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" | |||
39 | # remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe | 44 | # remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe |
40 | PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " | 45 | PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " |
41 | 46 | ||
42 | SRC_URI += "file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch" | ||
43 | |||
44 | # make sure rb files are used from sysroot, not from host | 47 | # make sure rb files are used from sysroot, not from host |
45 | # ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` | 48 | # ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` |
46 | # we need to replace it too (a bit longer version without importing re) | 49 | # we need to replace it too (a bit longer version without importing re) |