From 563f0dc52d87742b64729f70e5881b02b2f9db50 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 2 Nov 2017 10:56:11 +0200
Subject: otf-noto: get files from the git repo

The checksum of the zip file changes too often, which always breaks
the build. Change to using the git repo for the files. Unfortunately
the repo is massive (>1Gb), but at least it should not cause build
breaks anymore.

Task-number: QTBUG-64231
Change-Id: Iddfe71c8189caf4e66d78c46e9ca9410b333a8dd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 recipes/fonts/otf-noto.bb     | 54 -------------------------------------------
 recipes/fonts/otf-noto_git.bb | 53 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 54 deletions(-)
 delete mode 100644 recipes/fonts/otf-noto.bb
 create mode 100644 recipes/fonts/otf-noto_git.bb

diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb
deleted file mode 100644
index 1c17d33..0000000
--- a/recipes/fonts/otf-noto.bb
+++ /dev/null
@@ -1,54 +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$
-##
-############################################################################
-
-SUMMARY = "Noto Sans CJK"
-SECTION = "fonts"
-HOMEPAGE = "http://www.google.com/get/noto"
-LICENSE = "OFL-1.1"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE_OFL.txt;md5=55719faa0112708e946b820b24b14097"
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-inherit allarch fontcache
-
-PV = "1.004"
-SRC_URI = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKsc-hinted.zip"
-
-SRC_URI[md5sum] = "539a04d2a14a12096897f84ba046d110"
-SRC_URI[sha256sum] = "c0a77b24ce1964c5d244be7576ada5899d681638e0abd0917e6a661df56e0232"
-
-S = "${WORKDIR}"
-
-do_install() {
-    install -m 0755 -d ${D}${datadir}/fonts/otf/noto
-    install -m 0644 ${WORKDIR}/*.otf ${D}${datadir}/fonts/otf/noto
-}
-
-PACKAGES = "${PN}"
-FILES_${PN} += "${datadir}/fonts/otf/noto"
diff --git a/recipes/fonts/otf-noto_git.bb b/recipes/fonts/otf-noto_git.bb
new file mode 100644
index 0000000..3be53c2
--- /dev/null
+++ b/recipes/fonts/otf-noto_git.bb
@@ -0,0 +1,53 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+
+SUMMARY = "Noto Sans CJK"
+SECTION = "fonts"
+HOMEPAGE = "http://www.google.com/get/noto"
+LICENSE = "OFL-1.1"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=55719faa0112708e946b820b24b14097"
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+inherit allarch fontcache
+
+PV = "1.004"
+SRC_URI = "git://github.com/googlei18n/noto-cjk.git"
+SRCREV = "40d9f5b179a59a06b98373c76bdc3e2119e4e6b2"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+    install -m 0755 -d ${D}${datadir}/fonts/otf/noto
+    install -m 0644 ${S}/NotoSansCJKsc-*.otf ${D}${datadir}/fonts/otf/noto
+    install -m 0644 ${S}/NotoSansMonoCJKsc-*.otf ${D}${datadir}/fonts/otf/noto
+}
+
+PACKAGES = "${PN}"
+FILES_${PN} += "${datadir}/fonts/otf/noto"
-- 
cgit v1.2.3-54-g00ecf