From ec1b5c59a183ecbaf5774856b8b3228363993fef Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Thu, 1 Sep 2022 17:56:05 +0200 Subject: [PATCH] package/openlayers: bump to version 7.1.0 OpenLayers changed its release format again, only two weeks after the previous change. The good news is, though, that they now ship a single release archive that includes the compiled JavaScript code together with the source code. Furthermore, they ship both code with a single license, which file is part of the archive. Hence, we still do not need to rely on host-nodejs for this package, at least not for this version. Signed-off-by: Thomas Claveirole Signed-off-by: Yann E. MORIN --- package/openlayers/openlayers.hash | 3 ++- package/openlayers/openlayers.mk | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 1c93b9a729..1b3f3cce51 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 8a9fda6e392688c049ebb88fb2c73b5788b4965b625443de4cca7d4688b1fb82 v6.14.1-dist.zip +sha256 37a0e5fde4df3db6e6c11ed0ceb8e20608121afe5f8f7f91cf03990e89a919ca v7.1.0-package.zip +sha256 6c4347b83a8c9feef18d57b18e3b6c44cf901b3c344a4a1fbd837e421555ab8e LICENSE.md diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 4626e7545a..7396e38fb9 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,21 +4,19 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.14.1 -OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip +OPENLAYERS_VERSION = 7.1.0 +OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-package.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause -# There's no separate license file in the archive, only minified files. +OPENLAYERS_LICENSE_FILES = LICENSE.md define OPENLAYERS_EXTRACT_CMDS unzip $(OPENLAYERS_DL_DIR)/$(OPENLAYERS_SOURCE) -d $(@D) - mv $(@D)/v$(OPENLAYERS_VERSION)-dist/* $(@D) - rmdir $(@D)/v$(OPENLAYERS_VERSION)-dist/ endef define OPENLAYERS_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0644 $(@D)/ol.css $(TARGET_DIR)/var/www/ol.css - $(INSTALL) -D -m 0644 $(@D)/ol.js $(TARGET_DIR)/var/www/ol.js + $(INSTALL) -D -m 0644 $(@D)/dist/ol.js $(TARGET_DIR)/var/www/ol.js endef $(eval $(generic-package))