mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-31 01:10:08 +00:00
Code Issues Projects Releases Wiki Activity

recipes: remove recipes using or depending on qt4 bbclasses or recipes

Browse Source 
* anki is removed because it runtime depends on python-pyqt, other
  recipes are inheriting one of bbclasses removed from oe-core in:
  commit cb89d2b25b4edb1241bc5426a69a6bc44df9be2c
  Author: Alexander Kanavin <alexander.kanavin@linux.intel.com>
  Date:   Fri Nov 27 15:48:20 2015 +0200

      qt4: remove recipes and classes
* if you're still using one of these recipes add it to meta-qt4 layer

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2016-01-07 15:57:45 +01:00
parent 8700ba3880
commit 2bd11da4b5
49 changed files with 0 additions and 6580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb
-59
View File
@@ -1,59 +0,0 @@
SUMMARY = "Python Qt4 Bindings"
AUTHOR = "Phil Thomson @ riverbank.co.uk"
HOMEPAGE = "http://riverbankcomputing.co.uk"
SECTION = "devel/python"
LICENSE = "GPLv2 & GPLv3 & GPL_EXCEPTION"
LIC_FILES_CHKSUM = "\
file://GPL_EXCEPTION.TXT;md5=b73b0be471db679533dc94781c14af58 \
file://GPL_EXCEPTION_ADDENDUM.TXT;md5=c1e04ec2aa0911061005a801abf81e40 \
file://OPENSOURCE-NOTICE.TXT;md5=6ad9123620cc04a22c394753ad4767d7 \
file://LICENSE.GPL2;md5=577ff65f6653562af318bfc3944b1f20 \
file://LICENSE.GPL3;md5=feee51612c3c1191a1d5f41156fa2c75 \
"
DEPENDS = "sip sip-native qt4-x11-free python"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/pyqt/PyQt-x11-gpl-${PV}.tar.gz \
"
SRC_URI[md5sum] = "997c3e443165a89a559e0d96b061bf70"
SRC_URI[sha256sum] = "853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686"
S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
PARALLEL_MAKE = ""
inherit qmake2 pythonnative python-dir distro_features_check
# depends on qt4-x11-free
REQUIRED_DISTRO_FEATURES = "x11"
DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager"
DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
PYQT_MODULES = "QtCore QtGui QtDeclarative QtNetwork QtSvg QtWebKit"
PYQT_MODULES_aarch64 = "QtCore QtGui QtDeclarative QtNetwork QtSvg"
do_configure() {
echo "py_platform = linux" > pyqt.cfg
echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)" >> pyqt.cfg
echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg
echo "py_pylib_lib = python%(py_major).%(py_minor)mu" >> pyqt.cfg
echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg
echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg
echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt4" >> pyqt.cfg
echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg
echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
echo "qt_shared = True" >> pyqt.cfg
echo "[Qt 4.8]" >> pyqt.cfg
echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
echo yes | python configure-ng.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/qmake2 --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST}
}
do_install() {
oe_runmake install
}
RDEPENDS_${PN} = "python-core python-sip"
FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt4/"
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/"
meta-oe/recipes-extended/anki/anki-0.4.3.inc
-8
View File
@@ -1,8 +0,0 @@
require anki.inc
SRC_URI = "${SOURCEFORGE_MIRROR}/anki/anki-${PV}.tgz"
SRC_URI[md5sum] = "90434860945de4c09d55cdb5dbe984fc"
SRC_URI[sha256sum] = "18a93fb46363ca34963fc2588cadf7415dd799dd647efa681859eb8b1b22f104"
export BUILD_PV := "${PV}"
SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch"
meta-oe/recipes-extended/anki/anki.inc
-9
View File
@@ -1,9 +0,0 @@
DESCRIPTION = "Anki is a program designed to help you remember facts \
(such as words and phrases in a foreign language) \
as easily, quickly and efficiently as possible"
HOMEPAGE = "http://ichi2.net/anki/"
AUTHOR = "Damien Elmes"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
inherit setuptools
meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch
-28
View File
@@ -1,28 +0,0 @@
#
# (C) Michael 'Mickey' Lauer <mlauer@vanille-media.de>
#
Index: anki-0.4.3/setup.py
===================================================================
--- anki-0.4.3.orig/setup.py 2008-02-12 19:17:56.000000000 +0000
+++ anki-0.4.3/setup.py 2008-02-12 19:19:29.000000000 +0000
@@ -3,10 +3,8 @@
from setuptools import setup, find_packages
import sys, os
-import ankiqt
-
setup(name='ankiqt',
- version=ankiqt.appVersion,
+ version=os.environ["BUILD_PV"],
description='An intelligent spaced-repetition memory training program',
long_description="",
# Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
@@ -24,7 +22,7 @@
license='GPLv2',
packages=find_packages(),
include_package_data=True,
- install_requires = 'anki >= ' + ankiqt.appVersion,
+ install_requires = 'anki >= ' + os.environ["BUILD_PV"],
zip_safe=False,
package_data={'ankiqt':
['locale/*/*/*']},
meta-oe/recipes-extended/anki/anki_0.4.3.bb
-4
View File
@@ -1,4 +0,0 @@
require ${PN}-${PV}.inc
RDEPENDS_${PN} = "python-pyqt libanki"
RRECOMMENDS_${PN} = "virtual-japanese-font"
meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch
-14
View File
@@ -1,14 +0,0 @@
--- libanki.orig/setup.py 2008-01-02 13:22:22.000000000 +0100
+++ libanki/setup.py 2012-08-02 11:39:13.604173933 +0200
@@ -3,10 +3,8 @@
from setuptools import setup, find_packages
import sys, os
-import anki
-
setup(name='anki',
- version=anki.version,
+ version=os.environ["BUILD_PV"],
description='An intelligent spaced-repetition memory training library',
long_description="",
# Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
meta-oe/recipes-extended/anki/libanki_0.4.3.bb
-3
View File
@@ -1,3 +0,0 @@
require anki-${PV}.inc
S = "${WORKDIR}/anki-${PV}/libanki"
meta-oe/recipes-extended/sip/sip_4.16.4.bb
-54
View File
@@ -1,54 +0,0 @@
SUMMARY = "SIP is a C++/Python Wrapper Generator"
AUTHOR = "Phil Thompson"
HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
SECTION = "devel"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
DEPENDS_class-target = "qt4-x11-free python"
# riverbankcomputing is upstream, but keeps only latest version, sf usually have few older
#SRC_URI = "http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${PV}.tar.gz"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz"
SRC_URI[md5sum] = "a9840670a064dbf8f63a8f653776fec9"
SRC_URI[sha256sum] = "ceda443fc5e129e67a067e2cd7b73ff037f8b10b50e407baa2b1d9f2199d57f5"
BBCLASSEXTEND = "native"
PACKAGES += "python-sip"
inherit qmake2 python-dir pythonnative distro_features_check
# depends on qt4-x11-free
REQUIRED_DISTRO_FEATURES = "x11"
EXTRA_QMAKEVARS_POST += "CONFIG=console"
export BUILD_SYS
export HOST_SYS
export STAGING_LIBDIR
export STAGING_INCDIR
do_configure_prepend_class-target() {
echo "py_platform = linux" > sip.cfg
echo "py_inc_dir = %(sysroot)/${includedir}/python%(py_major).%(py_minor)" >> sip.cfg
echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg
echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
python configure.py --use-qmake --configuration sip.cfg --sysroot ${STAGING_DIR_HOST}
}
do_configure_prepend_class-native() {
echo "py_platform = linux" > sip.cfg
echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)" >> sip.cfg
echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg
echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
python configure.py --use-qmake --configuration sip.cfg --sysroot ${STAGING_DIR_NATIVE}
}
do_install() {
oe_runmake install
}
FILES_python-${BPN} = "${libdir}/${PYTHON_DIR}/site-packages/"
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"
meta-oe/recipes-navigation/monav/monav/monav.desktop
-10
View File
@@ -1,10 +0,0 @@
[Desktop Entry]
Name=MoNav
Exec=monav
Icon=monav
Terminal=false
Type=Application
Categories=Utility;Geography;
X-MB-SingleInstance=true
StartupNotify=true
Comment=Fast navigation system featuring exact routing.
meta-oe/recipes-navigation/monav/monav/monav.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 21 KiB

meta-oe/recipes-navigation/monav/monav_0.3.bb
-37
View File
@@ -1,37 +0,0 @@
DESCRIPTION = "MoNav is a fast navigation system featuring exact routing with OpenStreetMap data."
HOMEPAGE = "http://code.google.com/p/monav"
SECTION = "x11/applications"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://misc/license_template_christian;md5=d99c9b3bafdde80adee296762376348d"
DEPENDS = "qt-mobility-x11"
PR = "r1"
SRC_URI = "http://monav.googlecode.com/files/${BPN}-${PV}.tar.gz \
file://monav.png \
file://monav.desktop"
SRC_URI[md5sum] = "d048ccef8c6a21e8656aa4af3fcb8329"
SRC_URI[sha256sum] = "5a3bf9e9f7368b81ba8e2f755960082fc42a2e2c78f9de645f99ba293c77ee7f"
inherit qmake2 qt4x11
EXTRA_QMAKEVARS_PRE="CONFIG+="release""
QMAKE_PROFILES="monavclient.pro"
do_install_append() {
install -d ${D}${datadir}/monav
install -d ${D}${datadir}/monav/images
cp -a ${S}/images/* ${D}${datadir}/monav/images
install -d ${D}${datadir}/icons
install -m 0644 ${WORKDIR}/monav.png ${D}${datadir}/icons
install -d ${D}${bindir}
install -m 0755 ${S}/bin/monav ${D}${bindir}/monav
install -d ${D}/${datadir}/applications
install -m 0644 ${WORKDIR}/monav.desktop ${D}/${datadir}/applications
}
FILES_${PN} += "${bindir}/monav ${datadir}/icons/monav.png"
meta-oe/recipes-qt/fingerterm/fingerterm_1.0.2.bb
-43
View File
@@ -1,43 +0,0 @@
DESCRIPTION = "A terminal emulator for Harmattan (Nokia N9/N950) with a custom \
virtual keyboard and usability-enhancing features such as URL grabber, pan \
gestures and customizable shortcut menu. Designed especially to be used with \
screen and irssi."
HOMEPAGE = "http://hqh.unlink.org/harmattan"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SECTION = "qt/app"
inherit qt4x11 pkgconfig
SRC_URI = " \
http://hqh.unlink.org/harmattan/fingerterm-${PV}.tar.gz \
"
SRC_URI[md5sum] = "d53b0f463c025583cd52accf95715448"
SRC_URI[sha256sum] = "c21a07cc411d09739bd7fa248eba2bf96427b3f032382a044b6674dd82d95150"
S = "${WORKDIR}/${BPN}"
FILES_${PN} = " \
${bindir}/${BPN} \
${datadir}/applications/${BPN}.desktop \
${datadir}/pixmaps/${BPN}.png \
"
do_install() {
install -d ${D}${bindir}
install -m 0755 ${S}/${BPN} ${D}${bindir}
sed -i -e '/Exec.*/d' fingerterm.desktop
sed -i -e '/Icon.*/d' fingerterm.desktop
echo 'Exec=${bindir}/${BPN}' >> fingerterm.desktop
echo 'Icon=${BPN}' >> fingerterm.desktop
install -d ${D}${datadir}/applications
install -m 0644 ${S}/${BPN}.desktop ${D}${datadir}/applications
install -d ${D}${datadir}/pixmaps
install -m 0644 ${S}/${BPN}.png ${D}${datadir}/pixmaps
}
meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
-53
View File
@@ -1,53 +0,0 @@
DESCRIPTION = "Qt Library for ConnMan"
HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
SECTION = "qt/lib"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
SRCREV = "80ac184d859ea90c026403f5a520644945a5081a"
PV = "1.0.50+git${SRCPV}"
SRC_URI = "git://github.com/nemomobile/libconnman-qt.git;branch=master"
S = "${WORKDIR}/git"
inherit pkgconfig
EXTRA_QMAKEVARS_PRE += "CONFIG+=notests TARGET_SUFFIX=${QT_DIR_NAME}"
do_configure_prepend() {
# Hack *.pro variables
find ${S}/plugin/*.pro -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';'
find ${S} -iname '*.pro' -exec sed -i -e 's,$$INSTALL_ROOT$$PREFIX/lib,$$INSTALL_ROOT$$PREFIX/${baselib},g' '{}' ';'
}
do_install() {
oe_runmake install INSTALL_ROOT=${D}
}
PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg"
RDEPENDS_${PN} = "connman"
RDEPENDS_${PN}-plugin = "${PN}"
RRECOMMENDS_${PN} = "${PN}-plugin"
FILES_${PN} = " \
${libdir}/libconnman-qt*${SOLIBS} \
"
FILES_${PN}-dev = " \
${includedir}/connman-qt*/* \
${libdir}/libconnman-qt*${SOLIBSDEV} \
${libdir}/libconnman-qt*.prl \
${libdir}/pkgconfig/connman-qt*.pc \
"
FILES_${PN}-plugin = " \
${PLUGINS_TARGET}/qmldir \
${PLUGINS_TARGET}/lib*.so \
"
FILES_${PN}-plugin-dbg = " \
${PLUGINS_TARGET}/.debug \
${PLUGINS_TARGET}/.debug/* \
"
QT_IMPORTS_DIR = "${libdir}/${QT_DIR_NAME}/imports"
# the plugin target needs to be the same as 'target.path' and 'qmldir.path' in ${S}/plugin/plugin.pro
PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/Connman"
meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb
-3
View File
@@ -1,3 +0,0 @@
inherit qt4x11
require libconnman-qt.inc
meta-oe/recipes-qt/libconnman-qt/libconnman-qte/plugin.pro-fix-build-with-custom-target-suffix.patch
-42
View File
@@ -1,42 +0,0 @@
Upstream-Status: Submitted [https://github.com/nemomobile/libconnman-qt/pull/105]
From 48da520b971af69d22e691a0ef6ff1c3ce901f0d Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Tue, 11 Mar 2014 21:55:37 +0100
Subject: [PATCH] plugin.pro: fix build with custom target suffix
This went unnoticed because of a previously installed libconnman-qt4.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
plugin/plugin.pro | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/plugin/plugin.pro b/plugin/plugin.pro
index c9534cf..9cdaa63 100644
--- a/plugin/plugin.pro
+++ b/plugin/plugin.pro
@@ -8,14 +8,18 @@ INCLUDEPATH += ../libconnman-qt
LIBS += -L../libconnman-qt
QT -= gui
+isEmpty(TARGET_SUFFIX) {
+ TARGET_SUFFIX = qt$$QT_MAJOR_VERSION
+}
+
+LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX)
+
equals(QT_MAJOR_VERSION, 4): {
QT += declarative
- LIBS += -lconnman-qt4
}
equals(QT_MAJOR_VERSION, 5): {
QT += qml
- LIBS += -lconnman-qt5
OTHER_FILES += plugin.json qmldirs
}
--
1.8.3.2
meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb
-5
View File
@@ -1,5 +0,0 @@
inherit qt4e
require libconnman-qt.inc
SRC_URI += "file://plugin.pro-fix-build-with-custom-target-suffix.patch"
meta-oe/recipes-qt/libqofono/libqofono_0.4.bb
-84
View File
@@ -1,84 +0,0 @@
SUMMARY = "Qt Library for oFono"
HOMEPAGE = "https://github.com/nemomobile/libqofono"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://README;endline=3;md5=8a15bce3921d1238d9a9f23828612947"
SECTION = "qt/lib"
BRANCH = "master"
PV = "0.4+gitr${SRCPV}"
SRCREV = "05055a4b4a579facd007a0a128696030228e0b88"
inherit qt4x11 pkgconfig
RDEPENDS_${PN} = "ofono"
RDEPENDS_${PN}-plugin = "${PN}"
PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg ${PN}-test"
RRECOMMENDS_${PN} = "${PN}-plugin"
SRC_URI = " \
git://github.com/nemomobile/${BPN}.git;branch=${BRANCH} \
"
S = "${WORKDIR}/git"
QT_IMPORTS_DIR = "${libdir}/qt4/imports"
PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/QOfono"
FILES_${PN} = " \
${libdir}/libqofono${SOLIBS} \
"
FILES_${PN}-dev = " \
${includedir}/qofono/* \
${includedir}/qofono/dbus/* \
${libdir}/libqofono${SOLIBSDEV} \
${libdir}/libqofono.prl \
${libdir}/pkgconfig/qofono.pc \
${datadir}/qt4/mkspecs/features/qofono.prf \
"
FILES_${PN}-plugin = " \
${PLUGINS_TARGET}/qmldir \
${PLUGINS_TARGET}/lib*.so \
"
FILES_${PN}-plugin-dbg = " \
${PLUGINS_TARGET}/.debug \
"
FILES_${PN}-test = " \
/opt/ofonotest/bin/ofonotest \
/opt/ofonotest/qml/ofonotest \
${libdir}/libqofono/tests/tst_qofonotest \
"
FILES_${PN}-dbg += " \
/opt/ofonotest/bin/.debug \
${libdir}/libqofono/tests/.debug \
"
EXTRA_QMAKEVARS_PRE = " \
PREFIX=${prefix} \
"
do_configure_prepend() {
# Hack *.pro variables
find . -iname '*.pro' -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';'
find . -iname '*.pro' -exec sed -i -e 's,$$\[QT_INSTALL_PREFIX\],$$INSTALL_ROOT$$PREFIX,g' '{}' ';'
find . -iname '*.pro' -exec sed -i -e 's,$$INSTALL_ROOT$$PREFIX/lib,$$INSTALL_ROOT$$PREFIX/${baselib},g' '{}' ';'
}
do_install() {
export INSTALL_ROOT=${D}
oe_runmake install
cd ${D}/${datadir}/qt4/mkspecs/features
sed -i -e '/DEPENDPATH.*/d; /INCLUDEPATH.*/d; /LIBS.*/d' ${D}/${datadir}/qt4/mkspecs/features/qofono.prf
# to make it work with the SDK
echo 'DEPENDPATH += $(OE_QMAKE_INCDIR_QT)/../qofono' >> ${D}/${datadir}/qt4/mkspecs/features/qofono.prf
echo 'INCLUDEPATH += $(OE_QMAKE_INCDIR_QT)/../qofono' >> ${D}/${datadir}/qt4/mkspecs/features/qofono.prf
echo 'LIBS += -lqofono' >> ${D}/${datadir}/qt4/mkspecs/features/qofono.prf
}
meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb
-31
View File
@@ -1,31 +0,0 @@
SUMMARY = "The Linux CAN Sniffer - SocketCAN driver"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://../../../modeltest/LICENSE.GPL;md5=34337af480a8c452bfafe22a78fa20cb"
inherit qt4x11
DEPENDS += "qwt libsocketcan"
PV = "0.5+svnr${SRCPV}"
SRCREV = "48"
SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;protocol=https"
S = "${WORKDIR}/qcanobserver/DeviceLib/linux/SocketCAN"
CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN"
do_configure_prepend() {
sed -i s:/usr/include/qwt5/:${STAGING_INCDIR}:g *.pro
}
do_install() {
install -d ${D}${datadir}/qcanobserver/lib
install -m 0755 ${S}/lib* ${D}${datadir}/qcanobserver/lib/
}
FILES_${PN} += "${datadir}/qcanobserver/lib"
FILES_${PN}-dbg += "${datadir}/qcanobserver/lib/.debug"
PNBLACKLIST[qcanobserver-socketcan] ?= "depends on qwt-5 APIs"
meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb
-43
View File
@@ -1,43 +0,0 @@
SUMMARY = "The Linux CAN Sniffer"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://modeltest/LICENSE.GPL;md5=34337af480a8c452bfafe22a78fa20cb"
inherit qt4x11
DEPENDS += "qwt"
PV = "0.5+svnr${SRCPV}"
SRCREV = "48"
SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;protocol=https \
file://0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch \
file://0002-qconsole-writethread-gcc-4.5-fixes.patch \
file://candemo.xml"
S = "${WORKDIR}/qcanobserver/"
CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN"
do_configure_prepend() {
sed -i -e s:/usr/include/qwt5/:${STAGING_INCDIR}:g -e 's:-L/usr/lib/:-L${STAGING_DIR_TARGET}/lib -ldl:g' *.pro
}
do_configure_append() {
sed -i -e s:-L/usr/lib::g Makefile
}
do_install() {
install -d ${D}${datadir}/qcanobserver
install -d ${D}${datadir}/qcanobserver/cfg
install -d ${D}${datadir}/qcanobserver/lib
install -d ${D}${datadir}/qcanobserver/db
install -m 0755 ${S}/QCanObserver ${D}${datadir}/qcanobserver
install -m 0644 ${WORKDIR}/candemo.xml ${D}${datadir}/qcanobserver/db
install -m 0644 ${S}/db/*.xml ${D}${datadir}/qcanobserver/db
}
FILES_${PN}-dbg += "${datadir}/qcanobserver/.debug"
PNBLACKLIST[qcanobserver] ?= "depends on qwt-5 APIs"
meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
-12
View File
@@ -1,12 +0,0 @@
require qconnman.inc
RCONFLICTS_${PN} = "qconnman"
inherit qt4e
PNBLACKLIST[qconnman-e] ?= "BROKEN: doesn't work with B!=S, ls: cannot access *.pro: No such file or directory"
EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
FILES_${PN} += "${datadir}/qconnman/"
meta-oe/recipes-qt/qconnman/qconnman.inc
-15
View File
@@ -1,15 +0,0 @@
DESCRIPTION = "ConnMan management interface done in Qt"
DEPENDS = "connman"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
PR = "r2"
inherit autotools
PV = "0.0+gitr${SRCPV}"
SRCREV = "f976b18c7c5584627224784801803e9fd3ebe0ff"
SRC_URI = "git://github.com/OSSystems/qconnman-ui.git;branch=stable"
S = "${WORKDIR}/git/"
meta-oe/recipes-qt/qconnman/qconnman_git.bb
-10
View File
@@ -1,10 +0,0 @@
require qconnman.inc
RCONFLICTS_${PN} = "qconnman-e"
inherit qt4x11
PNBLACKLIST[qconnman] ?= "BROKEN: doesn't work with B!=S, ls: cannot access *.pro: No such file or directory"
EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
meta-oe/recipes-qt/qextserialport/qextserialport_1.2rc.bb
-54
View File
@@ -1,54 +0,0 @@
SUMMARY = "Qt Ext Serial Port Library"
HOMEPAGE = "http://http://code.google.com/p/qextserialport/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b866a28cda707ec714878bd933f46251"
SECTION = "qt/libs"
# 1.2rc as version will sort lower then 1.2 when it's released
REAL_PV = "1.2rc"
PV = "1.1+${REAL_PV}"
inherit qt4x11 pkgconfig
DEPENDS = "udev"
SRC_URI = " \
http://qextserialport.googlecode.com/files/qextserialport-${REAL_PV}.zip \
"
SRC_URI[md5sum] = "ffa061edb9f64666468d18402eee6108"
SRC_URI[sha256sum] = "9cbee267aac9830f9944bb1d13872e51fba400aa9afe158e64f0fe265a0176bc"
S = "${WORKDIR}/qextserialport-${REAL_PV}"
FILES_${PN} = "${libdir}/libqextserialport${SOLIBS}"
FILES_${PN}-dev = " \
${libdir}/libqextserialport${SOLIBSDEV} \
${libdir}/libqextserialport.prl \
${includedir}/QtExtSerialPort/*.h \
${datadir}/qt4/mkspecs/features/extserialport.prf \
"
FILES_${PN}-dbg += " \
${libdir}/.debug/libqextserialport.so* \
"
do_configure_prepend() {
# based on the documentation, this line make sure we use udev in linux
cd ${S} && echo "linux*:CONFIG += qesp_linux_udev" > .qmake.cache
# Hacking hardcoded qmake variables
find *.pro -exec sed -i -e 's,$$\[QT_INSTALL_HEADERS\],${includedir},g' '{}' ';'
find *.pro -exec sed -i -e 's,$$\[QT_INSTALL_LIBS\],${libdir},g' '{}' ';'
find *.pro -exec sed -i -e 's,$$\[QMAKE_MKSPECS\],${datadir}/qt4/mkspecs/,g' '{}' ';'
}
do_install() {
export INSTALL_ROOT=${D}
oe_runmake install
# This is necessary to make it work with the qt based SDK
cd ${D}/${datadir}/qt4/mkspecs/features && sed -i -e "s|${STAGING_INCDIR_NATIVE}/qt4|\$(OE_QMAKE_INCDIR_QT)/..|" ./extserialport.prf
}
meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb
-54
View File
@@ -1,54 +0,0 @@
SUMMARY = "Lightweight, cross-platform integrated development environment"
HOMEPAGE = "http://qt-project.org/"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LGPL_EXCEPTION.TXT;md5=eb6c371255e1262c55ae9b652a90b528 \
file://LICENSE.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad"
SECTION = "qt/app"
SRC_URI = "http://download.qt-project.org/official_releases/qtcreator/2.8/${PV}/${BP}-src.tar.gz \
file://fix.missing.cpuid.h.patch \
file://qbs_transformer_product.patch"
SRC_URI[md5sum] = "79ef6c6ece0c00035ef744c9d6e3bd3b"
SRC_URI[sha256sum] = "d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9"
S = "${WORKDIR}/${BP}-src"
inherit qt4x11
EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}"
do_install() {
oe_runmake INSTALL_ROOT=${D}${prefix} install
oe_runmake INSTALL_ROOT=${D}${prefix} install_docs
rm -f ${D}${libdir}/qtcreator/lib*.so
}
FILES_${PN} += "${datadir}/icons \
${datadir}/qtcreator \
${libdir}/qtcreator/*"
FILES_${PN}-dbg += "${datadir}/qtcreator/*/*/*/*/.debug \
${libdir}/qtcreator/.debug \
${libdir}/qtcreator/*/*/.debug"
RRECOMMENDS_${PN} += "packagegroup-core-buildessential \
packagegroup-qt-toolchain-target \
qt4-plugin-sqldriver-sqlite \
"
# avoid conflicts with meta-qt5's qt-creator and do install nothing to sysroot
# this does no harm cause nothing depends on qt-creator
sysroot_stage_all() {
}
# the regexp in insane.bbclass doesn't allow this valid path:
# qt-creator-2.8.1: qt-creator: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/libqbs_cpp_scanner.so
# qt-creator: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/libqbs_qt_scanner.so
# qt-creator-dbg: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/.debug/libqbs_cpp_scanner.so
# qt-creator-dbg: found library in wrong location: /usr/share/qtcreator/qbs/lib/qbs/plugins/.debug/libqbs_qt_scanner.so
INSANE_SKIP_${PN} += "libdir"
INSANE_SKIP_${PN}-dbg += "libdir"
RDEPENDS_${PN} += "perl"
# /usr/include/qt4/QtCore/qsharedpointer_impl.h:336:11: error: 'product' may be used uninitialized in this function [-Werror=maybe-uninitialized]
PNBLACKLIST[qt-creator] ?= "BROKEN: fails to build with gcc-5 and conflicts with qt5-creator"
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch
-73
View File
@@ -1,73 +0,0 @@
From de2b568a4f14f38ae26960f543277bd2ac57c9d6 Mon Sep 17 00:00:00 2001
From: Alex <qt-info@nokia.com>
Date: Tue, 10 May 2011 14:54:49 +1000
Subject: [PATCH] fix !embedded usage (doesn't work outside of Qt)
embedded is part of QT_CONFIG and not CONFIG
Task-number: QTMOBILITY-1586
---
Upstream-Status: Backport
https://qt.gitorious.org/qt-mobility/qt-mobility/commit/de2b568a4f14f38ae26960f543277bd2ac57c9d6
EB: refreshed the patch for it to apply properly
plugins/multimedia/gstreamer/gstreamer.pro | 2 +-
src/systeminfo/systeminfo.pro | 6 +++---
tests/auto/auto.pro | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/gstreamer/gstreamer.pro 2013-09-19 10:34:40.880862884 +0200
+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro 2013-09-19 10:35:22.844862550 +0200
@@ -85,7 +85,7 @@
qgstutils.cpp
-!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
+!win32:!contains(QT_CONFIG,embedded):!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
LIBS += -lXv -lX11 -lXext
HEADERS += \
Index: qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/src/systeminfo/systeminfo.pro 2013-09-19 10:34:40.884862884 +0200
+++ qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro 2013-09-19 10:36:05.480862210 +0200
@@ -101,7 +101,7 @@
LIBS += -lblkid
}
- !embedded:!contains(QT_CONFIG,qpa): {
+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): {
LIBS += -lX11 -lXrandr
}
@@ -154,7 +154,7 @@
#for now... udisks
} else {
DEFINES += QT_NO_UDISKS
- !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
}
contains(connman_enabled, yes): {
@@ -165,7 +165,7 @@
}
} else {
DEFINES += QT_NO_NETWORKMANAGER QT_NO_UDISKS QT_NO_CONNMAN
- !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
}
}
Index: qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/tests/auto/auto.pro 2013-09-19 10:34:40.884862884 +0200
+++ qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro 2013-09-19 10:35:22.844862550 +0200
@@ -21,5 +21,5 @@
# which require that the autotest is run on the same machine
# doing the build - i.e. cross-compilation is not allowed.
win32|mac|linux-g++* {
- !embedded:!maemo5:!maemo6:SUBDIRS+=host.pro
+ !contains(QT_CONFIG,embedded):!maemo5:!maemo6:SUBDIRS+=host.pro
}
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch
-34
View File
@@ -1,34 +0,0 @@
Upstream-Status: Submitted [QTMOBILITY-1611]
From b308508b49afa9a129b4e4589c57cd107d1320b8 Mon Sep 17 00:00:00 2001
From: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Date: Fri, 6 May 2011 10:35:11 +1000
Subject: [PATCH] gstvideoconnector: fixed buffers allocation
It should not be necessary, but at least theora video decoder doesn't
iniatilize *buf, while gst_pad_alloc_buffer relies on buf being NULL.
Task-number: QTMOBILITY-1611
Reviewed-by: Michael Goddard
---
plugins/multimedia/gstreamer/gstvideoconnector.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/plugins/multimedia/gstreamer/gstvideoconnector.c b/plugins/multimedia/gstreamer/gstvideoconnector.c
index ddf68e0..9f8ceae 100644
--- a/plugins/multimedia/gstreamer/gstvideoconnector.c
+++ b/plugins/multimedia/gstreamer/gstvideoconnector.c
@@ -186,6 +186,10 @@ gst_video_connector_buffer_alloc (GstPad * pad, guint64 offset, guint size,
GstFlowReturn res = GST_FLOW_OK;
element = GST_VIDEO_CONNECTOR (GST_PAD_PARENT (pad));
+ if (!buf)
+ return GST_FLOW_ERROR;
+ *buf = NULL;
+
GST_OBJECT_LOCK (element);
gst_object_ref(element->srcpad);
GST_OBJECT_UNLOCK (element);
--
1.7.4.1
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
-28
View File
@@ -1,28 +0,0 @@
From 92e0c611f4969c716616d64df64831387e5b1632 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Fri, 16 Mar 2012 10:24:00 +0000
Subject: [PATCH] Remove unnecessary rpaths from qml_device example
These can't be valid in any case.
Upstream-Status: Pending
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
examples/declarative-systeminfo/device/device.pro | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/examples/declarative-systeminfo/device/device.pro b/examples/declarative-systeminfo/device/device.pro
index 698e5fb..05be9b7 100644
--- a/examples/declarative-systeminfo/device/device.pro
+++ b/examples/declarative-systeminfo/device/device.pro
@@ -17,6 +17,3 @@ symbian {
}
RESOURCES += device.qrc
-QMAKE_LFLAGS_DEBUG += "-Wl,-rpath,/home/user/qt/lib"
-QMAKE_LFLAGS_RPATH += "-Wl,-rpath,/home/user/qt/lib"
-QMAKE_LFLAGS_RELEASE += "-Wl,-rpath,/home/user/qt/lib"
--
1.7.5.4
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/fix-compile-error-no-bluez.patch
-338
View File
@@ -1,338 +0,0 @@
From bb05733bd5a685b00f80ddc73a1b7a9a2ba0eb11 Mon Sep 17 00:00:00 2001
From: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
Date: Thu, 12 May 2011 13:07:13 +1000
Subject: [PATCH] Fix compile error if bluez is not installed
Upstream-Status: Backport
Task-number: QTMOBILITY-1576
---
src/connectivity/bluetooth/bluetooth.pri | 1 +
.../bluetooth/qbluetoothdevicediscoveryagent.h | 2 +-
.../bluetooth/qbluetoothdevicediscoveryagent_p.cpp | 2 +-
.../bluetooth/qbluetoothdevicediscoveryagent_p.h | 6 +++---
.../bluetooth/qbluetoothlocaldevice_p.h | 4 ++--
.../bluetooth/qbluetoothservicediscoveryagent.h | 2 +-
.../bluetooth/qbluetoothservicediscoveryagent_p.h | 8 ++++----
.../bluetooth/qbluetoothserviceinfo_p.cpp | 2 +-
.../bluetooth/qbluetoothserviceinfo_p.h | 4 ++--
src/connectivity/bluetooth/ql2capserver.h | 2 +-
src/connectivity/bluetooth/ql2capserver_p.cpp | 2 +-
src/connectivity/bluetooth/ql2capserver_p.h | 6 +++---
src/connectivity/bluetooth/qrfcommserver.h | 2 +-
src/connectivity/bluetooth/qrfcommserver_p.cpp | 2 +-
src/connectivity/bluetooth/qrfcommserver_p.h | 6 +++---
tests/tests.pro | 4 +++-
16 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/connectivity/bluetooth/bluetooth.pri b/src/connectivity/bluetooth/bluetooth.pri
index 717a1ad..4fa2c15 100644
--- a/src/connectivity/bluetooth/bluetooth.pri
+++ b/src/connectivity/bluetooth/bluetooth.pri
@@ -103,6 +103,7 @@ symbian {
}
} else:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {
QT *= dbus
+ DEFINES += QTM_BLUEZ_BLUETOOTH
include(bluez/bluez.pri)
diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
index a95c467..00cfd14 100644
--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
@@ -101,7 +101,7 @@ private:
Q_DECLARE_PRIVATE(QBluetoothDeviceDiscoveryAgent)
QBluetoothDeviceDiscoveryAgentPrivate *d_ptr;
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
Q_PRIVATE_SLOT(d_func(), void _q_deviceFound(const QString &address, const QVariantMap &dict));
Q_PRIVATE_SLOT(d_func(), void _q_propertyChanged(const QString &name, const QDBusVariant &value));
#endif
diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
index 6edbd16..512002d 100644
--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
@@ -69,7 +69,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start()
void QBluetoothDeviceDiscoveryAgentPrivate::stop()
{
}
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void QBluetoothDeviceDiscoveryAgentPrivate::_q_deviceFound(const QString &address,
const QVariantMap &dict)
{
diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
index 0e34e05..700e78d 100644
--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -46,7 +46,7 @@
#include <QVariantMap>
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
class OrgBluezManagerInterface;
class OrgBluezAdapterInterface;
class QDBusVariant;
@@ -80,7 +80,7 @@ public:
QString errorDescription);
#endif
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void _q_deviceFound(const QString &address, const QVariantMap &dict);
void _q_propertyChanged(const QString &name, const QDBusVariant &value);
#endif
@@ -100,7 +100,7 @@ private:
bool pendingCancel;
bool pendingStart;
-#if !defined(QT_NO_DBUS)
+#ifdef QTM_BLUEZ_BLUETOOTH
OrgBluezManagerInterface *manager;
OrgBluezAdapterInterface *adapter;
#endif
diff --git a/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h b/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
index 750c286..381d6b5 100644
--- a/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
@@ -51,7 +51,7 @@
#include <btengsettings.h>
#endif
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
#include <QObject>
#include <QDBusContext>
#include <QDBusObjectPath>
@@ -68,7 +68,7 @@ QTM_BEGIN_NAMESPACE
class QBluetoothAddress;
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
class QBluetoothLocalDevicePrivate : public QObject,
protected QDBusContext
{
diff --git a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
index 6279432..7eeccfc 100644
--- a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
+++ b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
@@ -105,7 +105,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscovered(const QBluetoothDeviceInfo &info))
Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscoveryFinished())
Q_PRIVATE_SLOT(d_func(), void _q_serviceDiscoveryFinished())
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*))
Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*))
#endif
diff --git a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
index 5e7da43..f25c293 100644
--- a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
+++ b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
@@ -53,7 +53,7 @@
#include <btsdp.h>
#endif
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
class OrgBluezManagerInterface;
class OrgBluezAdapterInterface;
class OrgBluezDeviceInterface;
@@ -99,7 +99,7 @@ public:
void _q_deviceDiscoveryFinished();
void _q_deviceDiscovered(const QBluetoothDeviceInfo &info);
void _q_serviceDiscoveryFinished();
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void _q_discoveredServices(QDBusPendingCallWatcher *watcher);
void _q_createdDevice(QDBusPendingCallWatcher *watcher);
#endif
@@ -123,7 +123,7 @@ private:
#ifdef QTM_SYMBIAN_BLUETOOTH
void startL(const QBluetoothAddress &address);
void initL(const QBluetoothAddress &address);
-#elif !defined(QT_NO_DBUS)
+#elif defined(QTM_BLUEZ_BLUETOOTH)
QVariant readAttributeValue(QXmlStreamReader &xml);
#endif
@@ -153,7 +153,7 @@ private:
TSdpAttributeID m_currentAttributeId;
QStack<QVariant> m_stack;
-#elif !defined(QT_NO_DBUS)
+#elif defined(QTM_BLUEZ_BLUETOOTH)
OrgBluezManagerInterface *manager;
OrgBluezAdapterInterface *adapter;
OrgBluezDeviceInterface *device;
diff --git a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
index 814458c..dd96dcc 100644
--- a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
+++ b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
@@ -79,7 +79,7 @@ void QBluetoothServiceInfoPrivate::removeRegisteredAttribute(quint16 attributeId
Q_UNUSED(attributeId);
}
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
bool QBluetoothServiceInfoPrivate::registerService() const
{
return false;
diff --git a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
index 5be7341..8e4254c 100644
--- a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
+++ b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
@@ -72,7 +72,7 @@ public:
bool ensureSdpConnection() const;
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
bool registerService() const;
#endif
@@ -89,7 +89,7 @@ public:
mutable TSdpServRecordHandle serviceRecord;
#endif
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
mutable OrgBluezServiceInterface *service;
mutable quint32 serviceRecord;
mutable bool registered;
diff --git a/src/connectivity/bluetooth/ql2capserver.h b/src/connectivity/bluetooth/ql2capserver.h
index 99c20a5..bed65a3 100644
--- a/src/connectivity/bluetooth/ql2capserver.h
+++ b/src/connectivity/bluetooth/ql2capserver.h
@@ -97,7 +97,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_disconnected())
#endif //QTM_SYMBIAN_BLUETOOTH
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
Q_PRIVATE_SLOT(d_func(), void _q_newConnection())
#endif
diff --git a/src/connectivity/bluetooth/ql2capserver_p.cpp b/src/connectivity/bluetooth/ql2capserver_p.cpp
index 3a2199f..f19977e 100644
--- a/src/connectivity/bluetooth/ql2capserver_p.cpp
+++ b/src/connectivity/bluetooth/ql2capserver_p.cpp
@@ -101,7 +101,7 @@ QBluetooth::SecurityFlags QL2capServer::securityFlags() const
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void QL2capServerPrivate::_q_newConnection()
{
}
diff --git a/src/connectivity/bluetooth/ql2capserver_p.h b/src/connectivity/bluetooth/ql2capserver_p.h
index b5e76d9..2823106 100644
--- a/src/connectivity/bluetooth/ql2capserver_p.h
+++ b/src/connectivity/bluetooth/ql2capserver_p.h
@@ -50,7 +50,7 @@
#include <bt_sock.h>
#endif //QTM_SYMBIAN_BLUETOOTH
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
#endif
@@ -82,7 +82,7 @@ public:
void _q_disconnected();
#endif //QTM_SYMBIAN_BLUETOOTH
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void _q_newConnection();
#endif
@@ -103,7 +103,7 @@ protected:
QL2capServer *q_ptr;
private:
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
QSocketNotifier *socketNotifier;
#endif
};
diff --git a/src/connectivity/bluetooth/qrfcommserver.h b/src/connectivity/bluetooth/qrfcommserver.h
index 3f348dd..7974ba6 100644
--- a/src/connectivity/bluetooth/qrfcommserver.h
+++ b/src/connectivity/bluetooth/qrfcommserver.h
@@ -97,7 +97,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_disconnected())
#endif //QTM_SYMBIAN_BLUETOOTH
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
Q_PRIVATE_SLOT(d_func(), void _q_newConnection())
#endif
};
diff --git a/src/connectivity/bluetooth/qrfcommserver_p.cpp b/src/connectivity/bluetooth/qrfcommserver_p.cpp
index f8145d9..eb14d64 100644
--- a/src/connectivity/bluetooth/qrfcommserver_p.cpp
+++ b/src/connectivity/bluetooth/qrfcommserver_p.cpp
@@ -90,7 +90,7 @@ quint16 QRfcommServer::serverPort() const
}
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void QRfcommServerPrivate::_q_newConnection()
{
}
diff --git a/src/connectivity/bluetooth/qrfcommserver_p.h b/src/connectivity/bluetooth/qrfcommserver_p.h
index da6e28b..af40df7 100644
--- a/src/connectivity/bluetooth/qrfcommserver_p.h
+++ b/src/connectivity/bluetooth/qrfcommserver_p.h
@@ -51,7 +51,7 @@
#include <bt_sock.h>
#endif
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
#endif
@@ -83,7 +83,7 @@ public:
void _q_disconnected();
#endif //QTM_SYMBIAN_BLUETOOTH
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void _q_newConnection();
#endif
@@ -102,7 +102,7 @@ protected:
QRfcommServer *q_ptr;
private:
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
QSocketNotifier *socketNotifier;
#endif
};
diff --git a/tests/tests.pro b/tests/tests.pro
index 2f2c355..4800e5e 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -16,7 +16,9 @@ contains(mobility_modules,systeminfo): SUBDIRS += sysinfo-tester
contains(mobility_modules,connectivity) {
SUBDIRS += nfctestserver
- linux*:!linux-armcc: SUBDIRS += btclient
+ linux*:!linux-armcc:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {
+ SUBDIRS += btclient
+ }
}
symbian {
--
1.7.1
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/fix_metaobjectbuilder_build_err.patch
-4707
View File
File diff suppressed because it is too large Load Diff
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/gcc-scope.patch
-48
View File
@@ -1,48 +0,0 @@
Fixes issues like below
| qaudiooutput_pulse.cpp: In member function 'bool QPulseAudioOutput::open()':
| qaudiooutput_pulse.cpp:255:75: error: '::getpid' has not been declared
| make[3]: *** [../../../build/Debug/qtmedia_pulse/qaudiooutput_pulse.o] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp 2012-03-31 07:26:24.457018348 -0700
+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp 2012-03-31 07:27:53.309022654 -0700
@@ -46,7 +46,7 @@
#include "qaudiodeviceinfo_pulse.h"
#include "qpulseaudioengine.h"
#include "qpulsehelpers.h"
-
+#include <unistd.h>
QT_BEGIN_NAMESPACE
const int PeriodTimeMs = 20;
Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp 2012-03-31 07:29:19.997026831 -0700
+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp 2012-03-31 07:29:39.541027625 -0700
@@ -46,6 +46,7 @@
#include "qaudiodeviceinfo_pulse.h"
#include "qpulseaudioengine.h"
#include "qpulsehelpers.h"
+#include <unistd.h>
QT_BEGIN_NAMESPACE
Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp 2012-03-31 07:33:24.805038719 -0700
+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp 2012-03-31 07:33:46.889039783 -0700
@@ -46,6 +46,7 @@
#include "qaudiodeviceinfo_pulse.h"
#include "qaudiooutput_pulse.h"
#include "qpulsehelpers.h"
+#include <unistd.h>
QT_BEGIN_NAMESPACE
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/qt-mobility-configure.patch
-17
View File
@@ -1,17 +0,0 @@
When building qt-mobility, the qa_configure stage failed because the catalogue /usr/lib
is used in some Makefiles within configure tests. We manually removed this catalogue.
Upstream-Status: Inappropriate [embedded]
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
--- qt-mobility-opensource-src-1.2.0/configure.orig 2011-05-10 10:06:01.000000000 +0200
+++ qt-mobility-opensource-src-1.2.0/configure 2011-11-08 12:34:56.347645968 +0100
@@ -583,6 +583,8 @@
fi
$QMAKE_EXEC $QMKSPEC "$relpath/config.tests/$2/$2.pro" 2>> "$CONFIG_LOG" >> "$CONFIG_LOG"
+ cp Makefile Makefile.old
+ sed -e 's@-L/usr/lib@@' <Makefile.old >Makefile
printf " ."
"$MAKE" clean >> "$CONFIG_LOG"
printf "."
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/qt-mobility-no-opengl.patch
-38
View File
@@ -1,38 +0,0 @@
Upstream-Status: Inappropriate [configuration]
diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro
index 8164fbc..54fd8ad 100644
--- a/examples/declarative-camera/declarative-camera.pro
+++ b/examples/declarative-camera/declarative-camera.pro
@@ -5,10 +5,10 @@ TEMPLATE=app
QT += declarative network
-!maemo5 {
- contains(QT_CONFIG, opengl) {
- QT += opengl
- }
+contains(QT_CONFIG, opengl): !maemo5 {
+ QT += opengl
+} else {
+ DEFINES += QT_NO_OPENGL
}
win32 {
diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro
index 8461beb..eedee2f 100644
--- a/examples/videographicsitem/videographicsitem.pro
+++ b/examples/videographicsitem/videographicsitem.pro
@@ -9,7 +9,11 @@ MOBILITY = multimedia
QMAKE_RPATHDIR += $$DESTDIR
-!symbian:contains(QT_CONFIG, opengl): QT += opengl
+contains(QT_CONFIG, opengl): !symbian {
+ QT += opengl
+} else {
+ DEFINES += QT_NO_OPENGL
+}
HEADERS += videoplayer.h \
videoitem.h
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/qt-mobility-no-xvideo.patch
-26
View File
@@ -1,26 +0,0 @@
QMake pro files don't explicitly define QT_NO_XVIDEO if the
configuration lacks xvideo, but plugins code relies on this define.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Upstream-Status: Inappropriate [configuration]
---
plugins/multimedia/gstreamer/gstreamer.pro | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/plugins/multimedia/gstreamer/gstreamer.pro b/plugins/multimedia/gstreamer/gstreamer.pro
--- a/plugins/multimedia/gstreamer/gstreamer.pro
+++ b/plugins/multimedia/gstreamer/gstreamer.pro
@@ -19,6 +19,10 @@ LIBS += \
-lasound
}
+unix:!contains(QT_CONFIG, xvideo) {
+ DEFINES += QT_NO_XVIDEO
+}
+
CONFIG += link_pkgconfig
PKGCONFIG += \
--
1.8.1.2
meta-oe/recipes-qt/qt-mobility/qt-mobility-embedded_1.2.0.bb
-10
View File
@@ -1,10 +0,0 @@
SUMMARY = "Mobile device API extensions for Qt/Embedded 4.x"
SECTION = "libs"
qtm_embedded := "embedded"
qtm_dir = "qtopia"
qtm_glflags := "-=opengl"
qtm_extra_config := "gstreamer-photography_enabled = no"
inherit qt4e
require qt-mobility_${PV}.inc
meta-oe/recipes-qt/qt-mobility/qt-mobility-x11_1.2.0.bb
-10
View File
@@ -1,10 +0,0 @@
SUMMARY = "Mobile device API extensions for Qt/X11 4.x"
DEPENDS = "libxv libxext"
SECTION = "x11/libs"
qtm_embedded := ""
qtm_dir = "qt4"
qtm_glflags := "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
qtm_extra_config := ""
inherit qt4x11
require qt-mobility_${PV}.inc
meta-oe/recipes-qt/qt-mobility/qt-mobility_1.2.0.inc
-121
View File
@@ -1,121 +0,0 @@
HOMEPAGE = "http://qt-project.org/"
# This creates the dependency on meta-multimedia, which is wrong, but hopefully
# this will be moved to separate meta-qt4 soon
DEPENDS += "gstreamer util-linux alsa-lib gst-plugins-base"
inherit bluetooth
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
# This is all wrong, but nobody cares about qt-mobility anymore
# add bluez5 just to silence:
# qt-mobility-embedded-1.2.0: qt-mobility-embedded: invalid PACKAGECONFIG: bluez5 [invalid-packageconfig]
# qt-mobility-x11-1.2.0: qt-mobility-x11: invalid PACKAGECONFIG: bluez5 [invalid-packageconfig]
# but without --disable options it still autodetects bluez and pulseaudio from sysroot
PACKAGECONFIG[bluez4] = ",,bluez4"
PACKAGECONFIG[bluez5] = ",,bluez5"
PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-mobility-${PV}:"
SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/qt-mobility/qt-mobility-opensource-src-${PV}.tar.gz/ea5db5a8d3dd4709c2926dceda646bd8/qt-mobility-opensource-src-${PV}.tar.gz \
file://qt-mobility-configure.patch \
file://0001-gstvideoconnector-fixed-buffers-allocation.patch \
file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch \
file://qt-mobility-no-opengl.patch \
file://gcc-scope.patch \
file://qt-mobility-no-xvideo.patch \
file://fix_metaobjectbuilder_build_err.patch \
file://0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch \
file://fix-compile-error-no-bluez.patch \
"
SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
PR = "r8"
S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
qtm_bin := "/usr/bin/${qtm_dir}"
qtm_lib := "/usr/lib"
qtm_include := "/usr/include/${qtm_dir}"
qtm_examples := "/usr/bin/${qtm_dir}/examples/QtMobility"
qtm_demos := "/usr/bin/${qtm_dir}/demos/QtMobility"
qtm_plugins := "/usr/lib/${qtm_dir}/plugins/QtMobility"
qtm_data := "/usr/share/${qtm_dir}"
qtm_imports := "/usr/lib/${qtm_dir}/imports"
QTM_MODULES_LIST ?= "bearer contacts gallery location publishsubscribe messaging multimedia \
systeminfo serviceframework sensors versit organizer feedback connectivity"
do_configure_prepend() {
cp qtmobility.pro qtmobility.pro.old
sed -e 's@...QT_INSTALL_DATA.@${qtm_data}@' <qtmobility.pro.old >qtmobility.pro
for NAME in plugins/declarative/*/*.pro
do
cp $NAME $NAME.old
sed -e 's@...QT_INSTALL_IMPORTS.@${qtm_imports}@' <$NAME.old >$NAME
done
cp staticconfig.pri staticconfig.pri.old
echo "include(${STAGING_DATADIR}/${qtm_dir}/mkspecs/qconfig.pri)" >staticconfig.pri
cat staticconfig.pri.old >>staticconfig.pri
cat > features/platformconfig/oe.pri <<EOF
qmf_enabled = no
networkmanager_enabled = no
corewlan_enabled = no
immersion_enabled = no
meegotouchfeedback_enabled = no
maemo-icd_enabled = no
maemo-icd-network-wlan_enabled = no
maemo5-contacts_enabled = no
maemo5-calendar_enabled = no
maemo6-landmarks_enabled = no
bme_enabled = no
bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluez4', 'yes', 'no', d)}
proj_enabled = no
gstreamer-photography_enabled = no
gstreamer-appsrc_enabled = yes
blkid_enabled = yes
pulseaudio_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}
udev_enabled = yes
iphb_enabled = no
nfc_symbian_enabled = no
sensord_enabled = no
geoclue-master_enabled = no
gypsy_enabled = no
${qtm_extra_config}
EOF
./configure -qmake-exec qmake2 -prefix /usr -staticconfig oe -examples -demos -modules "${QTM_MODULES_LIST}"
echo QT_MOBILITY_BIN = ${qtm_bin} >>./config.pri
echo QT_MOBILITY_LIB = ${qtm_lib} >>./config.pri
echo QT_MOBILITY_INCLUDE = ${qtm_include} >>./config.pri
echo QT_MOBILITY_PLUGINS = ${qtm_plugins} >>./config.pri
echo QT_MOBILITY_EXAMPLES = ${qtm_examples} >>./config.pri
echo QT_MOBILITY_DEMOS = ${qtm_demos} >>./config.pri
echo QT_CONFIG ${qtm_glflags} >>./config.pri
echo CONFIG += ${qtm_embedded} >>./config.pri
}
do_install() {
for NAME in */*.prf
do
cp $NAME $NAME.old
sed -e 's@/usr@${STAGING_BINDIR}/..@' <$NAME.old >$NAME
done
oe_runmake install INSTALL_ROOT=${D}
}
PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug \
${qtm_lib}/.debug ${qtm_plugins}/*/.debug ${qtm_imports}/*/.debug \
${qtm_imports}/*/*/.debug ${bindir}/.debug /usr/src/debug"
FILES_${PN} = "${qtm_bin} ${qtm_examples} ${qtm_demos} ${qtm_lib}/*.so.1* ${qtm_plugins} ${qtm_imports}"
FILES_${PN}-dev = "${exec_prefix}"
meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb
-5
View File
@@ -1,5 +0,0 @@
inherit qt4e
require qtserialport.inc
SRCREV = "22e45f0b0f956c025339d72ad53dca57ef684858"
meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch
-34
View File
@@ -1,34 +0,0 @@
Upstream-Status: Pending
diff -urpN qwt-6.0.1_orig/qwtbuild.pri qwt-6.0.1/qwtbuild.pri
--- qwt-6.0.1_orig/qwtbuild.pri 2011-08-02 00:33:53.000000000 +1000
+++ qwt-6.0.1/qwtbuild.pri 2012-08-21 10:27:30.721990849 +1000
@@ -67,3 +67,13 @@ unix {
error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" )
}
}
+
+######################################################################
+# libs for building qwt
+######################################################################
+
+unix {
+ # Some linkers require explicit linking with librt (eg ld.gold)
+ LIBS += -lrt
+}
+
diff -urpN qwt-6.0.1_orig/qwt.prf qwt-6.0.1/qwt.prf
--- qwt-6.0.1_orig/qwt.prf 2011-08-02 00:33:51.000000000 +1000
+++ qwt-6.0.1/qwt.prf 2012-08-21 11:19:49.435240439 +1000
@@ -9,6 +9,11 @@
include ( ./qwtconfig.pri )
+unix {
+
+ LIBS += -lrt
+}
+
contains(QWT_CONFIG, QwtDll) {
DEFINES *= QWT_DLL
meta-oe/recipes-qt/qwt/files/qwt6.patch
-86
View File
@@ -1,86 +0,0 @@
- add support for SUFFIX_STR
---
diff --git a/examples/examples.pri b/examples/examples.pri
index a6911c8..854ce89 100644
--- a/examples/examples.pri
+++ b/examples/examples.pri
@@ -13,9 +13,17 @@ include( $${QWT_ROOT}/qwtbuild.pri )
TEMPLATE = app
+SUFFIX_STR =
+CONFIG(debug, debug|release) {
+ SUFFIX_STR = $${DEBUG_SUFFIX}
+}
+else {
+ SUFFIX_STR = $${RELEASE_SUFFIX}
+}
+
INCLUDEPATH += $${QWT_ROOT}/src
DEPENDPATH += $${QWT_ROOT}/src
-DESTDIR = $${QWT_ROOT}/examples/bin
+DESTDIR = $${QWT_ROOT}/examples/bin$${SUFFIX_STR}
QMAKE_RPATHDIR *= $${QWT_ROOT}/lib
diff --git a/qwtconfig.pri b/qwtconfig.pri
index b0d2110..be119b7 100644
--- a/qwtconfig.pri
+++ b/qwtconfig.pri
@@ -30,6 +30,13 @@ QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
+DEBUG_SUFFIX =
+RELEASE_SUFFIX =
+
+win32 {
+ DEBUG_SUFFIX = d
+}
+
######################################################################
# Designer plugin
######################################################################
diff --git a/src/src.pro b/src/src.pro
index beb7125..ebf8ea6 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -13,8 +13,16 @@ QWT_ROOT = $${PWD}/..
include( $${QWT_ROOT}/qwtconfig.pri )
include( $${QWT_ROOT}/qwtbuild.pri )
+SUFFIX_STR =
+CONFIG(debug, debug|release) {
+ SUFFIX_STR = $${DEBUG_SUFFIX}
+}
+else {
+ SUFFIX_STR = $${RELEASE_SUFFIX}
+}
+
TEMPLATE = lib
-TARGET = $$qtLibraryTarget(qwt)
+TARGET = $$qtLibraryTarget(qwt)$${SUFFIX_STR}
DESTDIR = $${QWT_ROOT}/lib
diff --git a/textengines/mathml/mathml.pro b/textengines/mathml/mathml.pro
index b0ed9f9..403828b 100644
--- a/textengines/mathml/mathml.pro
+++ b/textengines/mathml/mathml.pro
@@ -12,7 +12,15 @@ message(Beside the Qwt license you also have to take care of its license. )
include( $${PWD}/../textengines.pri )
-TARGET = $$qtLibraryTarget(qwtmathml)
+SUFFIX_STR =
+CONFIG(debug, debug|release) {
+ SUFFIX_STR = $${DEBUG_SUFFIX}
+}
+else {
+ SUFFIX_STR = $${RELEASE_SUFFIX}
+}
+
+TARGET = $$qtLibraryTarget(qwtmathml$${SUFFIX_STR})
QT += xml
HEADERS = \
meta-oe/recipes-qt/qwt/qwt-e_6.0.1.bb
-14
View File
@@ -1,14 +0,0 @@
inherit qt4e
require qwt.inc
PR = "r1"
SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
RPROVIDES_${PN}-dev = "libqwt-dev"
# Conflicts with qwt, only one qwt* can be built in world
# | Project ERROR: local build will conflict with sysroots/qemuarm/usr/lib/libqwt.*
EXCLUDE_FROM_WORLD = "1"
meta-oe/recipes-qt/qwt/qwt.inc
-40
View File
@@ -1,40 +0,0 @@
DESCRIPTION = "Qt Widget Extension for Technical Applications"
SECTION = "libs"
# LGPLv2.1 + some exceptions
LICENSE = "QWTv1.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88"
SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \
file://qwt6.patch \
file://qwt6-fix-linking-with-ld-gold.patch"
S = "${WORKDIR}/qwt-${PV}"
do_configure_prepend() {
sed -i -e 's:RELEASE_SUFFIX = :RELEASE_SUFFIX = ${QT_LIBINFIX}:' *.pri
sed -i -e 's:qtAddLibrary(qwt:qtAddLibrary(qwt)${QT_LIBINFIX}:g' *.prf
sed -e 's/# QWT_CONFIG += QwtExamples/QWT_CONFIG += QwtExamples/g' -i qwtconfig.pri
sed -i -e 's:/usr/local/qwt-$$QWT_VERSION:${D}${prefix}:g' ${S}/*.pri
}
do_install() {
oe_runmake -e install
install -d ${D}${datadir}/doc/${PN}
mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/
rmdir ${D}${prefix}/doc
cd ${S}/examples
install -d ${D}/${bindir}
cd bin${QT_LIBINFIX}/
for i in * ; do
cp -pPR ${i} ${D}/${bindir}/${i}${QT_LIBINFIX}
done
install -d ${D}${libdir}/${QT_DIR_NAME}
mv ${D}${prefix}/plugins ${D}${libdir}/${QT_DIR_NAME}
}
PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins "
FILES_${PN}-examples = "${bindir}/*"
FILES_${PN}-features = "${prefix}/features"
FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so"
FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/designer/.debug"
meta-oe/recipes-qt/qwt/qwt_6.0.1.bb
-10
View File
@@ -1,10 +0,0 @@
inherit qt4x11
require qwt.inc
PR = "r1"
SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
RPROVIDES_${PN}-dev = "libqwt-dev"
meta-oe/recipes-support/maliit/maliit-framework/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch
-34
View File
@@ -1,34 +0,0 @@
From 33554f9b3fd493c7e28617fd01466ffa87251f27 Mon Sep 17 00:00:00 2001
From: Samuel Stirtzel <s.stirtzel@googlemail.com>
Date: Wed, 1 Aug 2012 13:21:51 +0200
Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
---
config.pri | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/config.pri b/config.pri
index b037b8c..43409f3 100644
--- a/config.pri
+++ b/config.pri
@@ -161,9 +161,11 @@ contains(QT_MAJOR_VERSION, 4) {
QT_WIDGETS = gui widgets
}
-MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features
-local-install {
- MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX)
+isEmpty(MALIIT_INSTALL_PRF) {
+ MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features
+ local-install {
+ MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX)
+ }
}
defineTest(outputFile) {
--
1.7.9.5
meta-oe/recipes-support/maliit/maliit-framework/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch
-34
View File
@@ -1,34 +0,0 @@
From fb6acbd2af9ed288c1c4f4200fc73d8d9955486a Mon Sep 17 00:00:00 2001
From: Samuel Stirtzel <s.stirtzel@googlemail.com>
Date: Wed, 1 Aug 2012 13:33:10 +0200
Subject: [PATCH] Fix QT_IM_PLUGIN_PATH to allow openembedded to build Maliit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
---
input-context/input-context.pri | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/input-context/input-context.pri b/input-context/input-context.pri
index d94e6a3..d460e70 100644
--- a/input-context/input-context.pri
+++ b/input-context/input-context.pri
@@ -25,8 +25,10 @@ for(OPTION,$$list($$lower($$COV_OPTION))){
QMAKE_CLEAN += $$OBJECTS_DIR/*.gcno $$OBJECTS_DIR/*.gcda
-QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods
-QT_PREFIX = $$[QT_INSTALL_PREFIX]
-local-install {
- QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX)
+isEmpty(QT_IM_PLUGIN_PATH) {
+ QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods
+ QT_PREFIX = $$[QT_INSTALL_PREFIX]
+ local-install {
+ QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX)
+ }
}
--
1.7.9.5
meta-oe/recipes-support/maliit/maliit-framework/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch
-23
View File
@@ -1,23 +0,0 @@
From cc33efdedbec9e9a55e9a0c6756516fd84d42e53 Mon Sep 17 00:00:00 2001
From: Samuel Stirtzel <s.stirtzel@googlemail.com>
Date: Fri, 1 Mar 2013 11:31:41 +0100
Subject: [PATCH] Link to libmaliit-1,0 in inputcontext plugin
Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
---
.../input-context-plugin/input-context-plugin.pro | 2 ++
1 file changed, 2 insertions(+)
diff --git a/input-context/input-context-plugin/input-context-plugin.pro b/input-context/input-context-plugin/input-context-plugin.pro
index eefbe93..296e2fa 100644
--- a/input-context/input-context-plugin/input-context-plugin.pro
+++ b/input-context/input-context-plugin/input-context-plugin.pro
@@ -15,3 +15,5 @@ CONFIG += plugin
INSTALLS += target
target.path += $$QT_IM_PLUGIN_PATH
+
+LIBS += -L../../lib -l"maliit-1.0"
--
1.7.9.5
meta-oe/recipes-support/maliit/maliit-framework/0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch
-33
View File
@@ -1,33 +0,0 @@
From 839e0933f09309a0374aa58cc58439c3a1f157b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 14 May 2013 10:24:48 +0200
Subject: [PATCH] ut_maliit_glib_settings: fix build for glib 2.36
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [code removed upstream]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../ut_maliit_glib_settings.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c b/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c
index 476ba33..09b6261 100644
--- a/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c
+++ b/tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c
@@ -188,8 +188,9 @@ test_settings_manager_emits_disconnected(void)
int
main (int argc, char **argv) {
g_test_init(&argc, &argv, NULL);
+#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init();
-
+#endif
g_test_add_func("/ut_maliit_glib_settings/MaliitSettingsManager/preferred_description_locale/default",
test_preferred_description_locale_default);
g_test_add_func("/ut_maliit_glib_settings/MaliitSettingsManager/preferred_description_locale/set-get-roundtrip",
--
1.7.6.5
meta-oe/recipes-support/maliit/maliit-framework/maliit-server.desktop
-6
View File
@@ -1,6 +0,0 @@
[Desktop Entry]
Name=Maliit server
Exec=/usr/bin/maliit-server
Icon=
Type=Application
Categories=Utility;
meta-oe/recipes-support/maliit/maliit-framework_git.bb
-101
View File
@@ -1,101 +0,0 @@
SUMMARY = "A virtual keyboard for touch-screen based user interfaces"
HOMEPAGE = "https://wiki.maliit.org/Main_Page"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad"
inherit autotools qt4x11 gtk-immodules-cache
PNBLACKLIST[maliit-framework] ?= "BROKEN: Wasn't updated to work with B!=S, maybe incorrectly inherits autotools"
DEPENDS = "libxcomposite dbus gtk+3 gtk+"
SRC_URI = "git://github.com/maliit/framework.git;branch=master \
file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \
file://0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch \
file://0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch \
file://0002-ut_maliit_glib_settings-fix-build-for-glib-2.36.patch \
file://maliit-server.desktop \
"
SRCREV = "750842dec74a9b17dca91ef779c4fc5a43c4d9dc"
PV = "0.92.3+git${SRCPV}"
PR = "r1"
PACKAGES =+ "${PN}-gtk"
GTKIMMODULES_PACKAGES = "${PN}-gtk"
RDEPENDS_${PN} = "qt4-plugin-inputmethod-imsw-multi libqtsvg4"
RRECOMMENDS_${PN} = "maliit-plugins"
FILES_${PN} += "\
${libdir}/maliit/plugins-*/factories/libmaliit-plugins-quick-factory-*.so \
${libdir}/qt4/plugins/inputmethods/*.so \
${datadir}/applications/maliit-server.desktop \
"
FILES_${PN}-dbg += "\
${libdir}/maliit-framework-tests \
${libdir}/gtk-*/*/immodules/.debug \
${libdir}/maliit/plugins-*/factories/.debug \
${libdir}/qt4/plugins/.debug \
${libdir}/qt4/plugins/inputmethods/.debug \
"
FILES_${PN}-dev += "${datadir}/qt4"
FILES_${PN}-gtk +="\
${bindir}/maliit-exampleapp-gtk* \
\
${libdir}/gtk-*/*/immodules/libim-maliit.so\
"
EXTRA_QMAKEVARS_PRE = "\
PREFIX=${prefix} \
LIBDIR=${libdir} \
QT_IM_PLUGIN_PATH=${libdir}/qt4/plugins/inputmethods \
MALIIT_INSTALL_PRF=${datadir}/qt4/mkspecs/features \
SCHEMADIR=${sysconfdir}/gconf/schemas \
CONFIG+=disable-gconf \
CONFIG+=disable-gtk-cache-update \
CONFIG+=local-install \
CONFIG+=nosdk \
"
EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
do_install_append() {
#Fix absolute paths
sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${datadir}/qt4/mkspecs/features/maliit-framework.prf
sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${datadir}/qt4/mkspecs/features/maliit-plugins.prf
install -d ${D}${datadir}/applications
install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications
}
pkg_postinst_${PN} () {
#!/bin/sh
# should run online
if [ "x$D" != "x" ]; then
exit 1
fi
echo "export QT_IM_MODULE=Maliit" >> /etc/xprofile
ln -s /usr/share/applications/maliit-server.desktop /etc/xdg/autostart/maliit-server.desktop
}
pkg_postrm_${PN} () {
#!/bin/sh
# should run online
if [ "x$D" = "x" ]; then
exit 1
fi
if [ -e "/etc/xprofile" ]; then
sed -i -e "g|export QT_IM_MODULE=Maliit|d" /etc/xprofile
fi
rm -f /etc/xdg/autostart/maliit-server.desktop
}
S = "${WORKDIR}/git"
meta-oe/recipes-support/maliit/maliit-plugins_git.bb
-35
View File
@@ -1,35 +0,0 @@
SUMMARY = "Plugins for a virtual keyboard for touch-screen based user interfaces"
HOMEPAGE = "https://wiki.maliit.org/Main_Page"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=f29b21caa8e460097bfad9c026a33621"
inherit autotools qt4x11
PNBLACKLIST[maliit-plugins] ?= "BROKEN: depends on broken maliit-framework"
DEPENDS = "maliit-framework"
RDEPENDS_${PN} += "qt4-plugin-iconengine-svgicon qt4-plugin-imageformat-svg"
SRC_URI = "git://github.com/maliit/plugins.git;branch=master"
SRCREV = "0760e585df494b394df1b887e5138ffef19c481f"
PV = "0.92.3+git${SRCPV}"
EXTRA_QMAKEVARS_PRE = "\
PREFIX=${prefix} \
LIBDIR=${libdir} \
CONFIG+=nodoc \
"
FILES_${PN} += "\
${libdir}/maliit \
${datadir} \
"
FILES_${PN}-dbg += "${libdir}/maliit/plugins-*/.debug"
S= "${WORKDIR}/git"
EXTRA_OEMAKE += "INSTALL_ROOT=${D}"