[Buildroot] [PATCH] package/solarus: update license.txt file hash and remove license_gpl.txt hash.

[Buildroot] [PATCH] package/solarus: update license.txt file hash and remove license_gpl.txt hash.

[Romain Naour]

The license.txt file has been updated with Solarus Free Resource Pack URL.

Before version 1.6.0, the archive was downloaded from github and license_gpl.txt
file which is present in the git repository.
Since version 1.6.0, the archive is downloaded from [1] but the license_gpl.txt
file is missing.

This has been reported upstream [2].

[1] http://www.solarus-games.org
[2] https://gitlab.com/solarus-games/solarus/issues/1328

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/solarus/solarus.hash | 3 +--
 package/solarus/solarus.mk   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/solarus/solarus.hash b/package/solarus/solarus.hash
index e4a7a3a6b6..dab8d1a1fa 100644
--- a/package/solarus/solarus.hash
+++ b/package/solarus/solarus.hash
@@ -1,5 +1,4 @@
 # Locally calculated
 sha256 d800fdf388f860732f2d40c8dd635c34fd1c452857f75bf9b3a421e3ef5ee751  solarus-1.6.0-src.tar.gz
 
-sha256 09cb24006b6a3f2698d8851dc5df4f413c1a98e20d4008bffd76ec236f14244d  license.txt
-sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  license_gpl.txt
+sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f  license.txt
diff --git a/package/solarus/solarus.mk b/package/solarus/solarus.mk
index 663ccb173d..d1c49af83f 100644
--- a/package/solarus/solarus.mk
+++ b/package/solarus/solarus.mk
@@ -10,7 +10,7 @@ SOLARUS_SOURCE = solarus-$(SOLARUS_VERSION)-src.tar.gz
 
 SOLARUS_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \
 	CC-BY-SA-3.0 (GUI icons)
-SOLARUS_LICENSE_FILES = license.txt license_gpl.txt
+SOLARUS_LICENSE_FILES = license.txt
 
 # Install libsolarus.so
 SOLARUS_INSTALL_STAGING = YES
-- 
2.14.5

[Buildroot] [PATCH] package/terminology: bump to version 1.3.2

[Romain Naour]

See:
https://sourceforge.net/p/enlightenment/mailman/message/36497308/

This version contain a fix [1] for newer meson (0.49.0) [2]:

[1] https://git.enlightenment.org/apps/terminology.git/commit/?id=80e36857a28bb2a0b0fdd58b0cd86b110a180efc
[2] https://github.com/mesonbuild/meson/issues/3600

This affect terminology build system since data/themes/meson.build
use "in" which is now a reserved keyword.

Fixes:
http://autobuild.buildroot.net/results/6e4/6e445e8f0c973fad58937824452aac9b593b3e8d/build-end.log

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/terminology/terminology.hash | 4 ++--
 package/terminology/terminology.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash
index f341d5c2f7..1e0a85cd23 100644
--- a/package/terminology/terminology.hash
+++ b/package/terminology/terminology.hash
@@ -1,3 +1,3 @@
-# From https://sourceforge.net/p/enlightenment/mailman/message/36317484/
-sha256  ac8673a129ed78ef669a8c04e7a136f5ca95226ce5ef375a451421bac41828c6  terminology-1.2.1.tar.xz
+# From https://sourceforge.net/p/enlightenment/mailman/message/36497308/
+sha256  b5171181da42cc5f384238f71e43302c2c760938f6a8ab931647ccdad4ef94cd  terminology-1.3.2.tar.xz
 sha256  605988548c7a52562d6f64d936a579b53f690e62ca92261b6a440bf9023ff521  COPYING
diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk
index 3d144f8655..c53f6829de 100644
--- a/package/terminology/terminology.mk
+++ b/package/terminology/terminology.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TERMINOLOGY_VERSION = 1.2.1
+TERMINOLOGY_VERSION = 1.3.2
 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz
 TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology
 TERMINOLOGY_LICENSE = BSD-2-Clause
-- 
2.14.5

[Buildroot] [PATCH] package/terminology: bump to version 1.3.2

[Peter Korsgaard]

On Thu, Jan 3, 2019 at 12:10 AM Romain Naour <romain.naour@gmail.com> wrote:
>
> See:
> https://sourceforge.net/p/enlightenment/mailman/message/36497308/
>
> This version contain a fix [1] for newer meson (0.49.0) [2]:
>
> [1] https://git.enlightenment.org/apps/terminology.git/commit/?id=80e36857a28bb2a0b0fdd58b0cd86b110a180efc
> [2] https://github.com/mesonbuild/meson/issues/3600
>
> This affect terminology build system since data/themes/meson.build
> use "in" which is now a reserved keyword.
>
> Fixes:
> http://autobuild.buildroot.net/results/6e4/6e445e8f0c973fad58937824452aac9b593b3e8d/build-end.log
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>

Commited, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH] package/solarus: update license.txt file hash and remove license_gpl.txt hash.

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > The license.txt file has been updated with Solarus Free Resource Pack URL.
 > Before version 1.6.0, the archive was downloaded from github and license_gpl.txt
 > file which is present in the git repository.
 > Since version 1.6.0, the archive is downloaded from [1] but the license_gpl.txt
 > file is missing.

 > This has been reported upstream [2].

 > [1] http://www.solarus-games.org
 > [2] https://gitlab.com/solarus-games/solarus/issues/1328

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard