From 64b4b0cf3b062319c2d922576239e579c58c4151 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 13 Oct 2017 07:23:53 +0300 Subject: hunspell: refactor recipe to hunspell-dicts More recent hunspell (1.6.1) is available from meta-openembedded. Use that instead, leaving here a new recipe that only installs updated libreoffice 5.4.2 branch arabic & english dictionaries. Change-Id: I9d1acbed47e00771145682eda08dbbf6c532adbf Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtvirtualkeyboard_git.bbappend | 1 + recipes/hunspell/hunspell-dicts.bb | 57 ++++++++++++++++++++++++++ recipes/hunspell/hunspell_1.3.2.bb | 59 --------------------------- 3 files changed, 58 insertions(+), 59 deletions(-) create mode 100644 recipes/hunspell/hunspell-dicts.bb delete mode 100644 recipes/hunspell/hunspell_1.3.2.bb diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend index 59fb06b..b7368ff 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend @@ -30,3 +30,4 @@ inherit qtquickcompiler PACKAGECONFIG = "lipi-toolkit lang-all hunspell" +RDEPENDS_${PN} += "hunspell-dicts" diff --git a/recipes/hunspell/hunspell-dicts.bb b/recipes/hunspell/hunspell-dicts.bb new file mode 100644 index 0000000..92fd300 --- /dev/null +++ b/recipes/hunspell/hunspell-dicts.bb @@ -0,0 +1,57 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +DESCRIPTION = "Hunspell Dictionaries" + +LICENSE = "GPL-2.0 & (GPL-2.0|LGPL-2.1|MPL-1.1)" +LIC_FILES_CHKSUM = " \ + file://en/license.txt;md5=686e6cb566fd6382c9fcc7a557bf4544 \ + file://ar/COPYING.txt;md5=ccafd10563b9ffba693011bf470062c6 \ +" + +SRC_URI = "git://github.com/libreoffice/dictionaries.git;branch=libreoffice-5-4-2" + +S = "${WORKDIR}/git" + +inherit bin_package + +# using branch libreoffice-5.4.2 for dictionaries +SRCREV = "28016713cf482d2ac466d03e007ce91ddb8b76aa" + +FILES_${PN} = "${datadir}/hunspell" + +do_install() { + install -m 0755 -d ${D}${datadir}/hunspell + + install -m 0755 ${S}/ar/ar.dic ${D}${datadir}/hunspell/ar_EG.dic + install -m 0755 ${S}/ar/ar.aff ${D}${datadir}/hunspell/ar_EG.aff + + install -m 0755 ${S}/en/en_GB.dic ${D}${datadir}/hunspell + install -m 0755 ${S}/en/en_GB.aff ${D}${datadir}/hunspell +} diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb deleted file mode 100644 index e47c9c1..0000000 --- a/recipes/hunspell/hunspell_1.3.2.bb +++ /dev/null @@ -1,59 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -DESCRIPTION = "Hunspell" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://${WORKDIR}/hunspell-${PV}/COPYING;md5=ed3a37b3ba6d6be3e08ab45987cf1b88" - -SRC_URI = "http://downloads.sourceforge.net/hunspell/hunspell-${PV}.tar.gz;name=hunspell \ - git://github.com/libreoffice/dictionaries.git;branch=libreoffice-4-3-2;name=dictionaries \ - " - -SRC_URI[hunspell.md5sum] = "3121aaf3e13e5d88dfff13fb4a5f1ab8" -SRC_URI[hunspell.sha256sum] = "b4edd4a4ee944cb9f485b35473e46b729ed768e9d24da8e78e4c4c6ca56addbd" -# using branch libreoffice-4.3.2 for dictionaries -SRCREV_dictionaries = "aa497b3c345133a1dc180dfb95dd1b3677b92afa" - -PR = "r0" - -inherit autotools gettext - -PACKAGES += "${PN}-dicts" -RRECOMMENDS_${PN} += "${PN}-dicts" -FILES_${PN}-dicts = "${datadir}/hunspell" - -do_install_append() { - install -m 0755 -d ${D}${datadir}/hunspell - - install -m 0755 ${WORKDIR}/git/ar/ar.dic ${D}${datadir}/hunspell/ar_EG.dic - install -m 0755 ${WORKDIR}/git/ar/ar.aff ${D}${datadir}/hunspell/ar_EG.aff - - install -m 0755 ${WORKDIR}/git/en/en_GB.dic ${D}${datadir}/hunspell - install -m 0755 ${WORKDIR}/git/en/en_GB.aff ${D}${datadir}/hunspell -} -- cgit v1.2.3-54-g00ecf