sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (7dd9d4535706985474433fa263bc0fcf659347ff)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (7dd9d4535706985474433fa263bc0fcf659347ff)
Date: Wed, 9 Sep 2020 16:56:08 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

dev/null |binary
disk/mmc-utils/DETAILS | 1
libs/libexplain/HISTORY | 4
libs/libexplain/PRE_BUILD | 23 +++
libs/libexplain/patches/02_alpha-fcntl-h.patch | 21 +++
libs/libexplain/patches/03_fsflags-4.5.patch | 33 ++++
libs/libexplain/patches/04_test-t0274a.patch | 28 ++++
libs/libexplain/patches/05_largefile.patch | 38 +++++
libs/libexplain/patches/06_sysctl.patch | 29 ++++
libs/libexplain/patches/07_ustat.patch | 37 +++++
libs/libexplain/patches/09_fix-tests-sed.patch | 37 +++++
libs/libexplain/patches/10_nettstamp-needs-types.patch | 10 +
libs/libexplain/patches/11_sanitize-bison.patch | 110
++++++++++++++++
libs/libexplain/patches/12_gcc-10.patch | 15 ++
libs/libexplain/patches/13_typos.patch | 116
+++++++++++++++++
utils/spice-gtk/DEPENDS | 4
utils/spice-gtk/DETAILS | 4
utils/spice-gtk/HISTORY | 4
18 files changed, 510 insertions(+), 4 deletions(-)

New commits:
commit 7dd9d4535706985474433fa263bc0fcf659347ff
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mmc-utils: Fix missing sourcing of FUNCTIONS in DETAILS

commit 50fa9f0a813edf51058bd9751ffe9f72be4370cd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

WIP libexplain: Fix build against musl + import patches from debian

commit e0fd76b2e52d71273b79947ac8329fc7feea766b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

WIP spice-gtk 0.36

diff --git a/disk/mmc-utils/DETAILS b/disk/mmc-utils/DETAILS
index d831c7d..6414530 100755
--- a/disk/mmc-utils/DETAILS
+++ b/disk/mmc-utils/DETAILS
@@ -1,3 +1,4 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=mmc-utils
VERSION=$(get_scm_version)
SOURCE="$SPELL-git.tar.bz2"
diff --git a/libs/libexplain/HISTORY b/libs/libexplain/HISTORY
index 73e5fcd..e1b1760 100644
--- a/libs/libexplain/HISTORY
+++ b/libs/libexplain/HISTORY
@@ -1,3 +1,7 @@
+2020-09-09 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+ * PRE_BUILD: Fixed build with bison 3.6+
+
2019-06-28 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed typo in SOURCE_DIRECTORY

diff --git a/libs/libexplain/PRE_BUILD b/libs/libexplain/PRE_BUILD
new file mode 100755
index 0000000..fc37312
--- /dev/null
+++ b/libs/libexplain/PRE_BUILD
@@ -0,0 +1,23 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+# Fixes for musl libc
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub &&
+sedit '1i#define __NEED_struct__IO_FILE' libexplain/buffer/errno/vfprintf.c
&&
+# HZ may be missing
+sedit '/^#ifdef ADJ_TICK/a#ifndef HZ\n#define HZ 100\n#endif' \
+ libexplain/buffer/errno/adjtimex.c &&
+# O_EXEC may be the same as O_SEARCH
+sedit '/^#if defined(O_SEARCH)/{s/$/ \&\& (O_SEARCH != O_EXEC)/}' \
+ libexplain/buffer/open_flags.c &&
+# Missing include, needed for struct ppp_idle
+sedit '1i#include <linux/ppp_defs.h>' libexplain/buffer/ppp_idle.c &&
+# Non-constants in musl
+case "$HOST" in
+ *-musl)
+ sedit '/^[ \t]*{ "/{
+ s/, SIGRTMIN/, 35/
+ s/, SIGRTMAX/, (_NSIG-1)/
+ }' libexplain/buffer/signal.c
+ ;;
+esac
diff --git a/libs/libexplain/patches/02_alpha-fcntl-h.patch
b/libs/libexplain/patches/02_alpha-fcntl-h.patch
new file mode 100644
index 0000000..2c0f0d4
--- /dev/null
+++ b/libs/libexplain/patches/02_alpha-fcntl-h.patch
@@ -0,0 +1,21 @@
+Author: Andreas Beckmann <anbe AT debian.org>
+Description: do not special case alpha any longer
+Bug-Debian: https://bugs.debian.org/661440
+
+--- a/libexplain/ac/fcntl.h
++++ b/libexplain/ac/fcntl.h
+@@ -28,14 +28,7 @@
+ #include <libexplain/config.h>
+
+ #ifdef HAVE_FCNTL_H
+-#if defined(__alpha__) && defined(HAVE_LINUX_FCNTL_H)
+-#include <libexplain/ac/linux/types.h> /* Ubuntu Hardy needs this first */
+-/* This is very strange, but numerous tests fail if we use <fcntl.h>
+- because it appears to have several incorrect macro definitions */
+-#include <libexplain/ac/linux/fcntl.h>
+-#else
+ #include <fcntl.h>
+-#endif
+ #else
+ #include <libexplain/ac/sys/file.h>
+ #endif
diff --git a/libs/libexplain/patches/03_fsflags-4.5.patch
b/libs/libexplain/patches/03_fsflags-4.5.patch
new file mode 100644
index 0000000..5a48758
--- /dev/null
+++ b/libs/libexplain/patches/03_fsflags-4.5.patch
@@ -0,0 +1,33 @@
+Description: Update inode flags for Linux 4.5
+ Linux 4.5 updated the list of inode flags including removing some existing
+ flags. This patch fixes the resulting FTBFS by updating the flags list.
+Author: James Cowgill <jcowgill AT debian.org>
+Bug-Debian: https://bugs.debian.org/828853
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libexplain/buffer/file_inode_flags.c
++++ b/libexplain/buffer/file_inode_flags.c
+@@ -44,7 +44,7 @@ explain_buffer_file_inode_flags(explain_
+ { "FS_DIRTY_FL", FS_DIRTY_FL },
+ { "FS_COMPRBLK_FL", FS_COMPRBLK_FL },
+ { "FS_NOCOMP_FL", FS_NOCOMP_FL },
+- { "FS_ECOMPR_FL", FS_ECOMPR_FL },
++ { "FS_ENCRYPT_FL", FS_ENCRYPT_FL },
+ { "FS_BTREE_FL", FS_BTREE_FL },
+ { "FS_INDEX_FL", FS_INDEX_FL },
+ { "FS_IMAGIC_FL", FS_IMAGIC_FL },
+@@ -52,8 +52,13 @@ explain_buffer_file_inode_flags(explain_
+ { "FS_NOTAIL_FL", FS_NOTAIL_FL },
+ { "FS_DIRSYNC_FL", FS_DIRSYNC_FL },
+ { "FS_TOPDIR_FL", FS_TOPDIR_FL },
++ { "FS_HUGE_FILE_FL", FS_HUGE_FILE_FL },
+ { "FS_EXTENT_FL", FS_EXTENT_FL },
+- { "FS_DIRECTIO_FL", FS_DIRECTIO_FL },
++ { "FS_EA_INODE_FL", FS_EA_INODE_FL },
++ { "FS_EOFBLOCKS_FL", FS_EOFBLOCKS_FL },
++ { "FS_NOCOW_FL", FS_NOCOW_FL },
++ { "FS_INLINE_DATA_FL", FS_INLINE_DATA_FL },
++ { "FS_PROJINHERIT_FL", FS_PROJINHERIT_FL },
+ { "FS_RESERVED_FL", FS_RESERVED_FL },
+ };
+
diff --git a/libs/libexplain/patches/04_test-t0274a.patch
b/libs/libexplain/patches/04_test-t0274a.patch
new file mode 100644
index 0000000..8f978af
--- /dev/null
+++ b/libs/libexplain/patches/04_test-t0274a.patch
@@ -0,0 +1,28 @@
+Description: Fix test t0274a.sh on recent kernels
+ As a result of fixing CVE-2015-8543, the behavior of creating a socket with
an
+ invalid protocol changed on recent kernels. Protocol numbers above 255 now
+ return EINVAL. Fix the test by using a known illegal protocol and type
+ combination which will fail with EPROTONOSUPPORT.
+Author: James Cowgill <jcowgill AT debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/02/t0274a.sh
++++ b/test/02/t0274a.sh
+@@ -22,13 +22,13 @@ TEST_SUBJECT="socket EPROTONOSUPPORT"
+ . test_prelude
+
+ cat > test.ok << 'fubar'
+-socket(family = PF_INET, type = SOCK_STREAM, protocol = 32767) failed,
+-Protocol not supported (EPROTONOSUPPORT) because the protocol type or the
+-specified protocol is not supported within this address family
++socket(family = PF_INET, type = SOCK_STREAM, protocol = IPPROTO_RAW)
++failed, Protocol not supported (EPROTONOSUPPORT) because the protocol type
++or the specified protocol is not supported within this address family
+ fubar
+ test $? -eq 0 || no_result
+
+-test_socket af_inet SOCK_STREAM 32767 > test.out 2>&1
++test_socket af_inet SOCK_STREAM IPPROTO_RAW > test.out 2>&1
+ if test $? -ne 1
+ then
+ exho expected to fail
diff --git a/libs/libexplain/patches/05_largefile.patch
b/libs/libexplain/patches/05_largefile.patch
new file mode 100644
index 0000000..5ef79c4
--- /dev/null
+++ b/libs/libexplain/patches/05_largefile.patch
@@ -0,0 +1,38 @@
+Description: Fix handling of O_LARGEFILE on various 64-bit arches
+Author: James Cowgill <jcowgill AT debian.org>
+Bug-Debian: https://bugs.debian.org/775357
+Bug-Debian: https://bugs.debian.org/791347
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libexplain/ac/fcntl.h
++++ b/libexplain/ac/fcntl.h
+@@ -53,12 +53,25 @@
+ #endif
+
+ /*
+- * Even when O_LARGEFILE is not necessary, glibc adds one in for free.
+- * The trouble is, this make things interesting when decoding
+- * flags values returned by the kernel.
++ * On 64-bit linux, fcntl(F_GETFL) always returns O_LARGEFILE even if we
don't
++ * request it. Unfortunately glibc does not expose this value so we have to
++ * handle it ourselves. Also the value changes across arches *sigh*.
++ *
++ * These values were taken from the asm/fcntl.h kernel header for each arch.
++ * We can't include this header because it conflicts with glibc's fcntl.h.
+ */
+ #if defined(__linux__) && (O_LARGEFILE == 0)
+-#define O_LARGEFILE_HIDDEN 0100000
++# if defined(__aarch64__) || defined(__alpha__)
++# define O_LARGEFILE_HIDDEN 0400000
++# elif defined(__mips64)
++# define O_LARGEFILE_HIDDEN 0x2000
++# elif defined(__PPC64__)
++# define O_LARGEFILE_HIDDEN 0200000
++# elif defined(__sparc__) && defined(__arch64__)
++# define O_LARGEFILE_HIDDEN 0x40000
++# else
++# define O_LARGEFILE_HIDDEN 0100000
++# endif
+ #endif
+
+
diff --git a/libs/libexplain/patches/06_sysctl.patch
b/libs/libexplain/patches/06_sysctl.patch
new file mode 100644
index 0000000..3a665a7
--- /dev/null
+++ b/libs/libexplain/patches/06_sysctl.patch
@@ -0,0 +1,29 @@
+Description: Only compile sysctl code if sysctl exists
+ The sysctl syscall is not present on arm64, so disable parts of the code
which
+ require it if it's not present.
+Author: James Cowgill <jcowgill AT debian.org>
+Bug-Debian: https://bugs.debian.org/770819
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libexplain/buffer/enfile.c
++++ b/libexplain/buffer/enfile.c
+@@ -38,7 +38,7 @@ get_maxfile(void)
+ {
+ if (explain_option_dialect_specific())
+ {
+-#ifdef __linux__
++#if defined(__linux__) && defined(SYS__sysctl)
+ /*
+ * In the linux kernel, if get_empty_filp() returns NULL, the open
+ * system call (and others) will return ENFILE.
+--- a/libexplain/buffer/errno/listen.c
++++ b/libexplain/buffer/errno/listen.c
+@@ -72,7 +72,7 @@ append_getsockname(explain_string_buffer
+ static int
+ get_somaxconn(void)
+ {
+-#ifdef __linux__
++#if defined(__linux__) && defined(SYS__sysctl)
+ struct __sysctl_args args;
+ long somaxconn;
+ size_t somaxconn_size = sizeof(somaxconn);
diff --git a/libs/libexplain/patches/07_ustat.patch
b/libs/libexplain/patches/07_ustat.patch
new file mode 100644
index 0000000..2149e44
--- /dev/null
+++ b/libs/libexplain/patches/07_ustat.patch
@@ -0,0 +1,37 @@
+Description: Do not require fully defined struct ustat
+ Fixes ustat related FTBFS on adm64. Since explain_errno_ustat does not
write to
+ the data argument, it's pointless to try and allocate any memory for it
anyway.
+Author: James Cowgill <jcowgill AT debian.org>
+Bug-Debian: https://bugs.debian.org/770819
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/explain/syscall/ustat.c
++++ b/explain/syscall/ustat.c
+@@ -30,26 +30,15 @@
+ #include <explain/syscall/ustat.h>
+
+
+-#ifndef HAVE_USTAT
+-
+-struct ustat
+-{
+- int dummy;
+-};
+-
+-#endif
+-
+-
+ void
+ explain_syscall_ustat(int errnum, int argc, char **argv)
+ {
+ dev_t dev;
+- struct ustat ubuf;
+ struct ustat *ubuf_p;
+ struct stat st;
+
+ dev = 0;
+- ubuf_p = &ubuf;
++ ubuf_p = NULL;
+ switch (argc)
+ {
+ case 2:
diff --git a/libs/libexplain/patches/09_fix-tests-sed.patch
b/libs/libexplain/patches/09_fix-tests-sed.patch
new file mode 100644
index 0000000..0f033d9
--- /dev/null
+++ b/libs/libexplain/patches/09_fix-tests-sed.patch
@@ -0,0 +1,37 @@
+--- libexplain-1.4.D001.orig/test/04/t0461a.sh
++++ libexplain-1.4.D001/test/04/t0461a.sh
+@@ -32,7 +32,7 @@ test $? -eq 0 || fail
+
+ fmt -w 800 test.out.4 > test.out.3
+ test $? -eq 0 || no_result
+-sed -e 's|(42 ".*",|(42,|' test.out.3 > test.out.2
++sed -e 's|(pid = 42 ".*",|(pid = 42,|' test.out.3 > test.out.2
+ test $? -eq 0 || no_result
+ fmt test.out.2 > test.out
+ test $? -eq 0 || no_result
+--- libexplain-1.4.D001.orig/test/04/t0463a.sh
++++ libexplain-1.4.D001/test/04/t0463a.sh
+@@ -32,7 +32,7 @@ test $? -eq 0 || fail
+
+ fmt -w 800 test.out.4 > test.out.3
+ test $? -eq 0 || no_result
+-sed -e 's|(42 ".*",|(42,|' test.out.3 > test.out.2
++sed -e 's|(pid = 42 ".*",|(pid = 42,|' test.out.3 > test.out.2
+ test $? -eq 0 || no_result
+ fmt test.out.2 > test.out
+ test $? -eq 0 || no_result
+--- libexplain-1.4.D001.orig/test/06/t0652a.sh
++++ libexplain-1.4.D001/test/06/t0652a.sh
+@@ -34,9 +34,9 @@ test $? -eq 0 || no_result
+ # There is an alternative result, depending on the testing enviroment,
+ # because stdin may actually be closed.
+ fmt > test.ok.2 << 'fubar'
+-fputs(s = "yuck", fp = stdin) failed, Bad file descriptor (EBADF)
+-because fildes does not refer to an open file; this is more likely to
+-be a software error (a bug) than it is to be a user error
++fputs(s = "yuck", fp = stdin) failed, Bad file descriptor (EBADF) because
++the fildes argument does not refer to an object that is open for writing
++(O_RDONLY | O_LARGEFILE)
+ fubar
+ test $? -eq 0 || no_result
+
diff --git a/libs/libexplain/patches/10_nettstamp-needs-types.patch
b/libs/libexplain/patches/10_nettstamp-needs-types.patch
new file mode 100644
index 0000000..2ee2540
--- /dev/null
+++ b/libs/libexplain/patches/10_nettstamp-needs-types.patch
@@ -0,0 +1,10 @@
+--- a/libexplain/ac/linux/net_tstamp.h
++++ b/libexplain/ac/linux/net_tstamp.h
+@@ -28,6 +28,7 @@
+ #include <libexplain/config.h>
+
+ #ifdef HAVE_LINUX_NET_TSTAMP_H
++#include <sys/types.h> /* clockid_t */
+ #include <linux/net_tstamp.h>
+ #endif
+
diff --git a/libs/libexplain/patches/11_sanitize-bison.patch
b/libs/libexplain/patches/11_sanitize-bison.patch
new file mode 100644
index 0000000..39cb10d
--- /dev/null
+++ b/libs/libexplain/patches/11_sanitize-bison.patch
@@ -0,0 +1,110 @@
+[ismael AT sourcemage.org: Modded]
+
+Author: Andreas Beckmann <anbe AT debian.org>
+Description: sanitize bison usage
+ use
+ %define api.prefix {...}
+ instead of crude
+ sed -e 's/[yY][yY]/.../g'
+
+ Thanks to Akim Demaille for the hint! (#960608)
+
+--- a/codegen/gram.y
++++ b/codegen/gram.y
+@@ -17,6 +17,8 @@
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++%define api.prefix {gram_}
++
+ %{
+
+ #include <libexplain/ac/stdio.h>
+--- a/libexplain/acl_grammar.y
++++ b/libexplain/acl_grammar.y
+@@ -17,6 +17,8 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++%define api.prefix {acl_grammar_}
++
+ %{
+
+ #include <libexplain/ac/ctype.h>
+--- a/libexplain/parse_bits.y
++++ b/libexplain/parse_bits.y
+@@ -17,6 +17,8 @@
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++%define api.prefix {parse_bits_}
++
+ %{
+
+ #include <libexplain/ac/ctype.h>
+--- a/libexplain/printf_format.y
++++ b/libexplain/printf_format.y
+@@ -17,6 +17,8 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++%define api.prefix {printf_format_}
++
+ %{
+
+ #include <libexplain/ac/assert.h>
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -357,9 +357,8 @@ codegen/get_user_name.$(OBJEXT) codegen/
+
+ codegen/gram.yacc.c codegen/gram.yacc.h: codegen/gram.y
+ $(YACC) -d $(YFLAGS) codegen/gram.y
+- sed -e 's/[yY][yY]/gram_/g' -e '/<stdio.h>/d' -e '/<stdlib.h>/d' -e \
++ sed -e '/<stdio.h>/d' -e '/<stdlib.h>/d' -e \
+ '/<stddef.h>/d' y.tab.c > codegen/gram.yacc.c
+- sed -e 's/[yY][yY]/gram_/g' -e 's/Y_TAB_H/codegen_gram_YACC_H/g' \
+- y.tab.h > codegen/gram.yacc.h
++ mv y.tab.h codegen/gram.yacc.h
+ test -f y.output && mv y.output codegen/gram.output || true
+ rm -f y.tab.c y.tab.h y.output || true
+@@ -4016,11 +4016,10 @@ libexplain/acl_get_file_or_die.$(OBJEXT)
+ libexplain/acl_grammar.yacc.c libexplain/acl_grammar.yacc.h: \
+ libexplain/acl_grammar.y
+ $(YACC) -d $(YFLAGS) libexplain/acl_grammar.y
+- sed -e 's/[yY][yY]/acl_grammar_/g' -e '/<stdio.h>/d' -e \
++ sed -e '/<stdio.h>/d' -e \
+ '/<stdlib.h>/d' -e '/<stddef.h>/d' y.tab.c > \
+ libexplain/acl_grammar.yacc.c
+- sed -e 's/[yY][yY]/acl_grammar_/g' -e \
+- 's/Y_TAB_H/libexplain_acl_grammar_YACC_H/g' y.tab.h > \
++ mv y.tab.h \
+ libexplain/acl_grammar.yacc.h
+ test -f y.output && mv y.output libexplain/acl_grammar.output || true
+ rm -f y.tab.c y.tab.h y.output || true
+@@ -31058,10 +31057,9 @@ libexplain/output/warning.$(OBJEXT) libe
+ libexplain/parse_bits.yacc.c libexplain/parse_bits.yacc.h: \
+ libexplain/parse_bits.y
+ $(YACC) -d $(YFLAGS) libexplain/parse_bits.y
+- sed -e 's/[yY][yY]/parse_bits_/g' -e '/<stdio.h>/d' -e
'/<stdlib.h>/d' \
++ sed -e '/<stdio.h>/d' -e '/<stdlib.h>/d' \
+ -e '/<stddef.h>/d' y.tab.c > libexplain/parse_bits.yacc.c
+- sed -e 's/[yY][yY]/parse_bits_/g' -e \
+- 's/Y_TAB_H/libexplain_parse_bits_YACC_H/g' y.tab.h > \
++ mv y.tab.h \
+ libexplain/parse_bits.yacc.h
+ test -f y.output && mv y.output libexplain/parse_bits.output || true
+ rm -f y.tab.c y.tab.h y.output || true
+@@ -31418,11 +31416,10 @@ $(includedir)/libexplain/printf.h: .mkdi
+ libexplain/printf_format.yacc.c libexplain/printf_format.yacc.h: \
+ libexplain/printf_format.y
+ $(YACC) -d $(YFLAGS) libexplain/printf_format.y
+- sed -e 's/[yY][yY]/printf_format_/g' -e '/<stdio.h>/d' -e \
++ sed -e '/<stdio.h>/d' -e \
+ '/<stdlib.h>/d' -e '/<stddef.h>/d' y.tab.c > \
+ libexplain/printf_format.yacc.c
+- sed -e 's/[yY][yY]/printf_format_/g' -e \
+- 's/Y_TAB_H/libexplain_printf_format_YACC_H/g' y.tab.h > \
++ mv y.tab.h \
+ libexplain/printf_format.yacc.h
+ test -f y.output && mv y.output libexplain/printf_format.output ||
true
+ rm -f y.tab.c y.tab.h y.output || true
diff --git a/libs/libexplain/patches/12_gcc-10.patch
b/libs/libexplain/patches/12_gcc-10.patch
new file mode 100644
index 0000000..c12cd7d
--- /dev/null
+++ b/libs/libexplain/patches/12_gcc-10.patch
@@ -0,0 +1,15 @@
+Author: Andreas Beckmann <anbe AT debian.org>
+Description: fix FTBFS with GCC 10
+ GCC 10 defaults to -fno-common
+
+--- a/libexplain/output/stderr.h
++++ b/libexplain/output/stderr.h
+@@ -22,7 +22,7 @@
+
+ #include <libexplain/output.h>
+
+-explain_output_t explain_output_static_stderr;
++extern explain_output_t explain_output_static_stderr;
+
+ #endif /* LIBEXPLAIN_OUTPUT_STDERR_H */
+ /* vim: set ts=8 sw=4 et : */
diff --git a/libs/libexplain/patches/13_typos.patch
b/libs/libexplain/patches/13_typos.patch
new file mode 100644
index 0000000..479bd3c
--- /dev/null
+++ b/libs/libexplain/patches/13_typos.patch
@@ -0,0 +1,116 @@
+[ismael AT sourcemage.org: Stripped-out changes that don't make a difference
+ to the installation]
+
+Author: Andreas Beckmann <anbe AT debian.org>
+Description: fix typos found by Lintian
+
+--- a/libexplain/buffer/errno/acl_set_file.c
++++ b/libexplain/buffer/errno/acl_set_file.c
+@@ -224,7 +224,7 @@ explain_buffer_errno_acl_set_file_explan
+ * new ACL cannot be extended or the file system is out
+ * of file allocation resources.
+ */
+- explain_buffer_enospc(sb, pathname, "pathnme");
++ explain_buffer_enospc(sb, pathname, "pathname");
+ break;
+
+ case ENOTDIR:
+--- a/libexplain/buffer/errno/mount.c
++++ b/libexplain/buffer/errno/mount.c
+@@ -540,7 +540,7 @@ explain_buffer_errno_mount_explanation(e
+ (
+ sb,
+ /* FIXME: i18n */
+- "target is still busy with open files or working diretories
"
++ "target is still busy with open files or working
directories "
+ );
+ return;
+ }
+--- a/libexplain/buffer/errno/read.c
++++ b/libexplain/buffer/errno/read.c
+@@ -159,7 +159,7 @@ explain_buffer_errno_read_explanation(ex
+ (
+ sb,
+ /* FIXME: i18n */
+- "the file desriptor is attached to an object "
++ "the file descriptor is attached to an object "
+ "which is unsuitable for reading; or, the file was "
+ "opened with the O_DIRECT flag, and either the "
+ "address specified in data, the value specified "
+--- a/man/man1/explain.1
++++ b/man/man1/explain.1
+@@ -41,7 +41,7 @@ explain \- explain system call error mes
+ .SH DESCRIPTION
+ The \*(n) command is used to decode an error return read from an
+ \f[I]strace\fP(1) listing, or silimar. Because this is being
+-deciphered in a different process than the orginal, the results
++deciphered in a different process than the original, the results
+ will be less accurate than if the program itself were to use
+ \f[I]libexplain\fP(3).
+ .SS Functions
+--- a/man/man1/explain_lca2010.1
++++ b/man/man1/explain_lca2010.1
+@@ -988,7 +988,7 @@ tries to, you can't open a file in \f[CW
+ .E(
+ open_max = sysconf(_SC_OPEN_MAX);
+ .E)
+-This one wan't so difficult, there is a \f[I]sysconf\fP(3) way of
++This one wasn't so difficult, there is a \f[I]sysconf\fP(3) way of
+ obtaining the limit.
+ .SS ENFILE, Too many open files in system
+ This error occurs when the system limit on the total number of open files
+@@ -1242,7 +1242,7 @@ what \f[I]errno\fP(3) values may be retu
+ \[bu]
+ the cause of each error.
+ .PP
+-Because of the OO nature of function call dispatching withing the
++Because of the OO nature of function call dispatching within the
+ kernel, you need to read \f[I]all\fP sources implementing that
+ \f[I]ioctl\fP(2) request, not just the generic implementation.
+ It is to be expected that different kernels will have different error
+--- a/man/man3/explain.3
++++ b/man/man3/explain.3
+@@ -137,8 +137,8 @@ Default: 0
+ .TP 8n
+ internal\[hy]strerror
+ This option controls the source of
+-system eror message texts.
+-If false, it uses \f[I]streror\P(3) for the text.
++system error message texts.
++If false, it uses \f[I]strerror\P(3) for the text.
+ If true, it uses internal string for the text.
+ This is mostly of use for automated testing, to avoid false negatives
+ induced by inconsistencies across Unix implementations.
+--- a/man/man3/explain_chmod_or_die.3
++++ b/man/man3/explain_chmod_or_die.3
+@@ -31,7 +31,7 @@ explain_chmod_or_die \- change permissio
+ void explain_chmod_or_die(const char *pathname, int mode);
+ .SH DESCRIPTION
+ The explain_chmod_or_die function is used to call the
+-\f[I]chmod\fP(2) system call. On failure an explanation wiil be printed
++\f[I]chmod\fP(2) system call. On failure an explanation will be printed
+ to stderr, obtained from \f[I]explain_chmod\fP(3), and the the
+ process terminates by calling \f[CW]exit(EXIT_FAILURE)\fP.
+ .PP
+--- a/man/man3/explain_lseek.3
++++ b/man/man3/explain_lseek.3
+@@ -233,7 +233,7 @@ value of \f[I]errno\fP.
+ The original fildes, exactly as passed to the \f[I]lseek\fP(2) system call.
+ .TP 8n
+ \f[I]offset\fP
+-The orginal offset,
++The original offset,
+ exactly as passed to the \f[I]lseek\fP(2) system call.
+ .TP 8n
+ \f[I]whence\fP
+--- a/man/man3/explain_write.3
++++ b/man/man3/explain_write.3
+@@ -121,7 +121,7 @@ explained and this function, because man
+ value of \f[I]errno\fP.
+ .TP 8n
+ \f[I]fildes\fP
+-The orginal fildes, exactly as passed to the \f[I]write\fP(2) system call.
++The original fildes, exactly as passed to the \f[I]write\fP(2) system call.
+ .TP 8n
+ \f[I]data\fP
+ The original data, exactly as passed to the \f[I]write\fP(2) system call.
diff --git a/utils/spice-gtk/DEPENDS b/utils/spice-gtk/DEPENDS
index 09bf6e2..7b1d730 100755
--- a/utils/spice-gtk/DEPENDS
+++ b/utils/spice-gtk/DEPENDS
@@ -1,4 +1,4 @@
-depends celt051 &&
+depends opus &&
depends intltool &&
depends SSL &&
depends pixman &&
@@ -9,7 +9,7 @@ depends gtk+${SPICE_GTK_VER}
"--with-gtk=${SPICE_GTK_VER}.0" &&
if [[ "x${SPICE_GTK_AUDIO}" == "xpulse" ]]; then
depends pulseaudio
elif [[ "x${SPICE_GTK_AUDIO}" == "xgstreamer" ]]; then
- depends gstreamer
+ depends gstreamer-1.0
fi &&

optional_depends 'LIBSASL' \
diff --git a/utils/spice-gtk/DETAILS b/utils/spice-gtk/DETAILS
index 77fe0cb..422a42d 100755
--- a/utils/spice-gtk/DETAILS
+++ b/utils/spice-gtk/DETAILS
@@ -1,7 +1,7 @@
SPELL=spice-gtk
- VERSION=0.20
+ VERSION=0.36
SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:2f8fd15e18b902d7ec0bcfae09d189bd26a9eedd72c9e018b201132e454513849821c46746fcb5887ea0ba995d9ff168ee46482ca1d4dbdf7580787a1298e5bf
SOURCE_URL[0]=http://spice-space.org/download/gtk/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://spice-space.org";
diff --git a/utils/spice-gtk/HISTORY b/utils/spice-gtk/HISTORY
index 59a1264..592bd45 100644
--- a/utils/spice-gtk/HISTORY
+++ b/utils/spice-gtk/HISTORY
@@ -1,3 +1,7 @@
+2020-09-07 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.36
+ * DEPENDS: updated dependencies; gstreamer-1.0 + opus
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/utils/spice-gtk/spice-gtk-0.20.tar.bz2.sig
b/utils/spice-gtk/spice-gtk-0.20.tar.bz2.sig
deleted file mode 100644
index be4faaa..0000000
Binary files a/utils/spice-gtk/spice-gtk-0.20.tar.bz2.sig and /dev/null differ

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (7dd9d4535706985474433fa263bc0fcf659347ff), Ismael Luceno, 09/09/2020