From a2380c4ea3d4d22de0d7fe01e42260e43b688275 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 13 Oct 2021 22:49:56 +0200 Subject: [PATCH] package/brltty: bump to version 6.4 - Drop second patch (already in version) - Update hash of README (changes not related to license) https://brltty.app/doc/ChangeLog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...gmprivs_linux.c-fix-build-with-gcc-5.patch | 55 ------------------- package/brltty/brltty.hash | 4 +- package/brltty/brltty.mk | 2 +- 3 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 package/brltty/0002-Programs-pgmprivs_linux.c-fix-build-with-gcc-5.patch diff --git a/package/brltty/0002-Programs-pgmprivs_linux.c-fix-build-with-gcc-5.patch b/package/brltty/0002-Programs-pgmprivs_linux.c-fix-build-with-gcc-5.patch deleted file mode 100644 index 92b5aea21e..0000000000 --- a/package/brltty/0002-Programs-pgmprivs_linux.c-fix-build-with-gcc-5.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 92b3fca2d55757680398b55869214fc2d19e9b71 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 21 Feb 2021 20:47:06 +0100 -Subject: [PATCH] Programs/pgmprivs_linux.c: fix build with gcc < 5 - -Build with gcc < 5 is broken since version 6.2 and -https://github.com/brltty/brltty/commit/8ce262f2c15f10a40d9cbae0b3c88b466970a055: - -./pgmprivs_linux.c: In function 'getPrivilegeParameterNames': -./pgmprivs_linux.c:2220:3: error: array initialized from non-constant array expression - static const char *const names[] = NULL_TERMINATED_STRING_ARRAY( - ^ - -Build was partially fixed since -https://github.com/brltty/brltty/commit/8ae78dd560d00c5074158f90be5ac8dac80183db -but it forgot to update pgmprivs_linux.c - -Fixes: - - http://autobuild.buildroot.org/results/58afeb50a0ecdb8b527d7c9946bcae290b79b055 - -Signed-off-by: Fabrice Fontaine -[yann.morin.1998@free.fr: use an actual backport after upstream merge] -Signed-off-by: Yann E. MORIN ---- - Programs/pgmprivs_linux.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Programs/pgmprivs_linux.c b/Programs/pgmprivs_linux.c -index 56e464a82..7dfabaf9b 100644 ---- a/Programs/pgmprivs_linux.c -+++ b/Programs/pgmprivs_linux.c -@@ -2215,13 +2215,15 @@ typedef enum { - PARM_USER, - } Parameters; - -+ -+static const char *const *const pgmprivs_names = -+ NULL_TERMINATED_STRING_ARRAY( -+ "path", "scfmode", "shell", "user" -+ ); -+ - const char *const * - getPrivilegeParameterNames (void) { -- static const char *const names[] = NULL_TERMINATED_STRING_ARRAY( -- "path", "scfmode", "shell", "user" -- ); -- -- return names; -+ return pgmprivs_names; - } - - const char * --- -2.25.1 - diff --git a/package/brltty/brltty.hash b/package/brltty/brltty.hash index 504b0d802a..cec074d8ce 100644 --- a/package/brltty/brltty.hash +++ b/package/brltty/brltty.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b256df8f86b4d6a597cfe982cc5a7c831915de37cfece683ddb02b2329256a8a brltty-6.3.tar.xz +sha256 bc7573b0d0ab865c36607945b64c209312405571788f3b409397726f6143eaa6 brltty-6.4.tar.xz sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL -sha256 da78e60359a86eeefb6d6e02bc47d386ece10ae45309d998981157c3746724ab README +sha256 429be921e6bf783303a1f94cbb7f29dc4f0839e47efe38150b808f886028f4df README diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index 602750c9b8..9e21018c0a 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -4,7 +4,7 @@ # ################################################################################ -BRLTTY_VERSION = 6.3 +BRLTTY_VERSION = 6.4 BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz BRLTTY_SITE = http://brltty.com/archive BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install