Re: [meta-qt5][PATCH] qttranslations: adding recipes for qt specific translations

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 5821 bytes --]

On Thu, Jan 08, 2015 at 12:36:05PM +0100, Martin Jansa wrote:
> On Wed, Jan 07, 2015 at 03:05:15PM -0500, kkelly87 wrote:
> > The meta-qt5 layer is missing a recipe for the qttranslation submodule so qt specific items like
> > the OK or Cancel button had no associated translations. This submission is for master while my previous patch
> >  will work as a backport to dizzy.
> > 
> > Signed-off-by: Kevin Kelly <kaneda18@hotmail.com>
> > ---
> >  recipes-qt/qt5/qttranslations.inc      | 85 ++++++++++++++++++++++++++++++++++
> >  recipes-qt/qt5/qttranslations_5.4.0.bb |  5 ++
> >  recipes-qt/qt5/qttranslations_git.bb   |  4 ++
> >  3 files changed, 94 insertions(+)
> >  create mode 100644 recipes-qt/qt5/qttranslations.inc
> >  create mode 100644 recipes-qt/qt5/qttranslations_5.4.0.bb
> >  create mode 100644 recipes-qt/qt5/qttranslations_git.bb
> > 
> > diff --git a/recipes-qt/qt5/qttranslations.inc b/recipes-qt/qt5/qttranslations.inc
> > new file mode 100644
> > index 0000000..1aca7e2
> > --- /dev/null
> > +++ b/recipes-qt/qt5/qttranslations.inc
> > @@ -0,0 +1,85 @@
> > +require qt5.inc
> > +
> > +DEPENDS += "qtbase"

One more change in master-next.. this needs to have qttools-native
dependency, otherwise fails like this:

| lrelease /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qttranslations/5.4.0-r0/qttranslations-opensource-src-5.4.0/translations/assistant_de.ts
| /bin/sh: /OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/qt5/lrelease: No such file or directory
| Makefile:792: recipe for target 'assistant_de.qm' failed
| make[1]: *** [assistant_de.qm] Error 127

> > +
> > +# older copyright year than what e.g. qtbase is using now
> 
> This comment isn't correct for 5.4, will fix when cherry-picking to
> master-next.
> 
> > +LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
> > +                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
> > +                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6" 
> > +
> > +PACKAGES =. "${PN}-assistant \
> > +             ${PN}-designer \
> > +             ${PN}-linguist \
> > +             ${PN}-qmlviewer \
> > +             ${PN}-qtconnectivity \
> > +             ${PN}-qtmultimedia \
> > +             ${PN}-qtlocation \
> > +             ${PN}-qtdeclarative \
> > +             ${PN}-qtxmlpatterns \
> > +             ${PN}-qtconfig \
> > +             ${PN}-qtquick1 \
> > +             ${PN}-qtscript \
> > +             ${PN}-qtbase \
> > +             ${PN}-qthelp \
> > +             ${PN}-qt \
> > +             "
> > +
> > +FILES_${PN}-assistant = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/assistant_*.qm \
> > +            "
> 
> I've also fixed indentation (to use 4 spaces and " as first character)
> 
> > +
> > +FILES_${PN}-designer = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/designer_*.qm \
> > +            "
> > +
> > +FILES_${PN}-linguist = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/linguist_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qmlviewer = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qmlviewer_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qtconnectivity = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qtconnectivity_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qtmultimedia = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qtmultimedia_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qtlocation = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qtlocation_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qtdeclarative = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qtdeclarative_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qtxmlpatterns = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qtxmlpatterns_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qtconfig = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qtconfig_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qtquick1 = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qtquick1_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qtscript = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qtscript_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qtbase = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qtbase_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qthelp = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
> > +            "
> > +
> > +FILES_${PN}-qt = " \
> > +                ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
> > +            "
> > diff --git a/recipes-qt/qt5/qttranslations_5.4.0.bb b/recipes-qt/qt5/qttranslations_5.4.0.bb
> > new file mode 100644
> > index 0000000..2e3a284
> > --- /dev/null
> > +++ b/recipes-qt/qt5/qttranslations_5.4.0.bb
> > @@ -0,0 +1,5 @@
> > +require qt5-${PV}.inc
> > +require ${PN}.inc
> > +
> > +SRC_URI[md5sum] = "6462eeefae00f048418ed6e4571c4cc9"
> > +SRC_URI[sha256sum] = "aca78d9178481a21a7af8571beb9109b38f0f71ba75cf3b89ddf705962a3f98b"
> > diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
> > new file mode 100644
> > index 0000000..211b211
> > --- /dev/null
> > +++ b/recipes-qt/qt5/qttranslations_git.bb
> > @@ -0,0 +1,4 @@
> > +require qt5-git.inc
> > +require ${PN}.inc
> > +
> > +SRCREV = "3aad4ab4718d4bf952275a07e406e93eb6a22eed"
> 
> This revision isn't in 5.4 branch but from 5.4.0, will change it to
> b9481cffeb41ceb9363b7be850bd9cd172b313be to fix do_fetch.
> 
> Similar changes will be needed in dizzy version.
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]