diff options
Diffstat (limited to 'packages/qt4')
| -rw-r--r-- | packages/qt4/qt-embedded_4.4.0.bb | 5 | ||||
| -rw-r--r-- | packages/qt4/qt_packaging.inc | 8 | ||||
| -rw-r--r-- | packages/qt4/qtopia-core_4.4.0.bb | 6 |
3 files changed, 14 insertions, 5 deletions
diff --git a/packages/qt4/qt-embedded_4.4.0.bb b/packages/qt4/qt-embedded_4.4.0.bb index f7b8ab0267..f83b2516d7 100644 --- a/packages/qt4/qt-embedded_4.4.0.bb +++ b/packages/qt4/qt-embedded_4.4.0.bb @@ -1,6 +1,9 @@ require qtopia-core.inc -PR = "r2" +PROVIDES += "qtopia-core" +RPROVIDES_${PN} = "qtopia-core" + +PR = "r4" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ file://qconfig-oe.h \ diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index a0d4bf8bbc..b291925982 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -137,11 +137,11 @@ FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" python populate_packages_prepend() { translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d) - do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '{PN} translation for %s', extra_depends='' ) + do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' ) phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) - do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '{PN} phrasebook for %s', extra_depends='' ) + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) # Package all the plugins and their -dbg version and create a meta package import os @@ -158,7 +158,7 @@ python populate_packages_prepend() { plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d) dev_packages = [] dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg)) - do_split_packages(d, plugin_dir, glob, plugin_name, '{PN} %s for %%s' % name, extra_depends='', hook=dev_hook) + do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook) # Create a -dbg package as well plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d) packages = bb.data.getVar('PACKAGES',d) @@ -166,7 +166,7 @@ python populate_packages_prepend() { packages = "%s %s-dbg" % (packages, package) file_name = os.path.join(plugin_dir_dbg, os.path.basename(file)) bb.data.setVar("FILES_%s-dbg" % package, file_name, d) - bb.data.setVar("DESCRIPTION_%s-dbg" % package, "{PN} %s for %s" % (name, package), d) + bb.data.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package), d) bb.data.setVar('PACKAGES', packages, d) diff --git a/packages/qt4/qtopia-core_4.4.0.bb b/packages/qt4/qtopia-core_4.4.0.bb new file mode 100644 index 0000000000..71a702b965 --- /dev/null +++ b/packages/qt4/qtopia-core_4.4.0.bb @@ -0,0 +1,6 @@ +#Empty recipe to break a recursive loop +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" + +#keep in sync with qt-embedded_4.4.0.bb +PR = "r4" |