Hello community,
here is the log from the commit of package guile-bytestructures for
openSUSE:Factory checked in at 2019-08-29 17:18:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/guile-bytestructures (Old)
and /work/SRC/openSUSE:Factory/.guile-bytestructures.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guile-bytestructures"
Thu Aug 29 17:18:13 2019 rev:4 rq:726774 version:1.0.6
Changes:
--------
---
/work/SRC/openSUSE:Factory/guile-bytestructures/guile-bytestructures.changes
2019-02-27 15:07:50.570416067 +0100
+++
/work/SRC/openSUSE:Factory/.guile-bytestructures.new.7948/guile-bytestructures.changes
2019-08-29 17:18:15.935359969 +0200
@@ -1,0 +2,7 @@
+Wed Aug 28 14:06:20 UTC 2019 - Jonathan Brielmaier <[email protected]>
+
+- Update to version 1.0.6:
+ * Various R6RS fixes.
+ * Add support for upcoming Guile 3.0.
+
+-------------------------------------------------------------------
Old:
----
v1.0.5.tar.gz
New:
----
v1.0.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ guile-bytestructures.spec ++++++
--- /var/tmp/diff_new_pack.zGzHGi/_old 2019-08-29 17:18:16.807359825 +0200
+++ /var/tmp/diff_new_pack.zGzHGi/_new 2019-08-29 17:18:16.807359825 +0200
@@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: guile-bytestructures
-Version: 1.0.5
+Version: 1.0.6
Release: 0
Summary: Bytestructures for Guile
License: GPL-3.0-only
++++++ v1.0.5.tar.gz -> v1.0.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scheme-bytestructures-1.0.5/Makefile.am
new/scheme-bytestructures-1.0.6/Makefile.am
--- old/scheme-bytestructures-1.0.5/Makefile.am 2019-01-22 01:41:27.000000000
+0100
+++ new/scheme-bytestructures-1.0.6/Makefile.am 2019-06-01 23:02:13.000000000
+0200
@@ -52,3 +52,10 @@
run-tests.body.scm \
run-tests.guile.scm \
run-tests.r7.scm
+
+check:
+ $(top_builddir)/pre-inst-env \
+ $(GUILE) --no-auto-compile \
+ $(top_srcdir)/run-tests.guile.scm
+
+.PHONY: check
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scheme-bytestructures-1.0.5/bytestructures/body/struct.scm
new/scheme-bytestructures-1.0.6/bytestructures/body/struct.scm
--- old/scheme-bytestructures-1.0.5/bytestructures/body/struct.scm
2019-01-22 01:41:27.000000000 +0100
+++ new/scheme-bytestructures-1.0.6/bytestructures/body/struct.scm
2019-06-01 23:02:13.000000000 +0200
@@ -115,7 +115,8 @@
(define alignment (apply max (map field-alignment fields)))
(define size (let* ((field (last %fields))
(end (+ (field-position field) (field-size field))))
- (next-boundary end alignment)))
+ (let-values (((size . _) (next-boundary end alignment)))
+ size)))
(define (unwrapper syntax? bytevector offset index)
(let* ((index (if syntax? (syntax->datum index) index))
(field-entry (assq index field-alist))
@@ -182,7 +183,8 @@
(alignment (apply max (map field-alignment fields)))
(size (let* ((field (last fields))
(end (+ (field-position field) (field-size field))))
- (next-boundary end alignment))))
+ (let-values (((size . _) (next-boundary end alignment)))
+ size))))
(format #t "{\n")
(for-each (lambda (field)
(let ((name (field-name field))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scheme-bytestructures-1.0.5/bytestructures/body/union.scm
new/scheme-bytestructures-1.0.6/bytestructures/body/union.scm
--- old/scheme-bytestructures-1.0.5/bytestructures/body/union.scm
2019-01-22 01:41:27.000000000 +0100
+++ new/scheme-bytestructures-1.0.6/bytestructures/body/union.scm
2019-06-01 23:02:13.000000000 +0200
@@ -49,7 +49,8 @@
(bytestructure-descriptor-size
(field-content field)))
fields))))
- (next-boundary max-element alignment)))
+ (let-values (((size . _) (next-boundary max-element
alignment)))
+ size)))
(define (unwrapper syntax? bytevector offset index)
(let ((index (if syntax? (syntax->datum index) index)))
(values bytevector
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scheme-bytestructures-1.0.5/bytestructures/guile/bytevectors.scm
new/scheme-bytestructures-1.0.6/bytestructures/guile/bytevectors.scm
--- old/scheme-bytestructures-1.0.5/bytestructures/guile/bytevectors.scm
2019-01-22 01:41:27.000000000 +0100
+++ new/scheme-bytestructures-1.0.6/bytestructures/guile/bytevectors.scm
2019-06-01 23:02:13.000000000 +0200
@@ -12,7 +12,7 @@
make-bytevector bytevector-length bytevector=? bytevector-fill!
bytevector-copy!
bytevector-copy
- uniform-array->bytevector
+
bytevector-u8-ref bytevector-s8-ref
bytevector-u8-set! bytevector-s8-set! bytevector->u8-list
u8-list->bytevector
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scheme-bytestructures-1.0.5/bytestructures/r6/bytevectors.scm
new/scheme-bytestructures-1.0.6/bytestructures/r6/bytevectors.scm
--- old/scheme-bytestructures-1.0.5/bytestructures/r6/bytevectors.scm
2019-01-22 01:41:27.000000000 +0100
+++ new/scheme-bytestructures-1.0.6/bytestructures/r6/bytevectors.scm
2019-06-01 23:02:13.000000000 +0200
@@ -7,7 +7,7 @@
make-bytevector bytevector-length bytevector=? bytevector-fill!
(rename (r7rs-bytevector-copy! bytevector-copy!))
(rename (r7rs-bytevector-copy bytevector-copy))
- uniform-array->bytevector
+
bytevector-u8-ref bytevector-s8-ref
bytevector-u8-set! bytevector-s8-set! bytevector->u8-list
u8-list->bytevector
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scheme-bytestructures-1.0.5/bytestructures/r7/base.sld
new/scheme-bytestructures-1.0.6/bytestructures/r7/base.sld
--- old/scheme-bytestructures-1.0.5/bytestructures/r7/base.sld 2019-01-22
01:41:27.000000000 +0100
+++ new/scheme-bytestructures-1.0.6/bytestructures/r7/base.sld 2019-06-01
23:02:13.000000000 +0200
@@ -3,5 +3,9 @@
(scheme base)
(scheme case-lambda)
(bytestructures r7 utils))
+ (cond-expand
+ ((library (rnrs syntax-case))
+ (import (rnrs syntax-case)))
+ (else))
(include-library-declarations "base.exports.sld")
(include "body/base.scm"))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scheme-bytestructures-1.0.5/bytestructures/r7/string.exports.sld
new/scheme-bytestructures-1.0.6/bytestructures/r7/string.exports.sld
--- old/scheme-bytestructures-1.0.5/bytestructures/r7/string.exports.sld
2019-01-22 01:41:27.000000000 +0100
+++ new/scheme-bytestructures-1.0.6/bytestructures/r7/string.exports.sld
2019-06-01 23:02:13.000000000 +0200
@@ -1 +1,7 @@
(export bs:string)
+(cond-expand
+ (r6rs
+ (export bytevector->string string->bytevector
+ ascii utf8 utf16le utf16be utf32le utf32be
+ bytevector-zero!))
+ (else))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scheme-bytestructures-1.0.5/bytestructures/r7/string.sld
new/scheme-bytestructures-1.0.6/bytestructures/r7/string.sld
--- old/scheme-bytestructures-1.0.5/bytestructures/r7/string.sld
2019-01-22 01:41:27.000000000 +0100
+++ new/scheme-bytestructures-1.0.6/bytestructures/r7/string.sld
2019-06-01 23:02:13.000000000 +0200
@@ -1,7 +1,12 @@
(define-library (bytestructures r7 string)
(import
(scheme base)
+ (bytestructures r7 bytevectors)
(bytestructures r7 utils)
(bytestructures r7 base))
+ (cond-expand
+ ((library (rnrs syntax-case))
+ (import (rnrs syntax-case)))
+ (else))
(include-library-declarations "string.exports.sld")
(include "body/string.scm"))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scheme-bytestructures-1.0.5/bytestructures/r7/utils.sld
new/scheme-bytestructures-1.0.6/bytestructures/r7/utils.sld
--- old/scheme-bytestructures-1.0.5/bytestructures/r7/utils.sld 2019-01-22
01:41:27.000000000 +0100
+++ new/scheme-bytestructures-1.0.6/bytestructures/r7/utils.sld 2019-06-01
23:02:13.000000000 +0200
@@ -1,5 +1,9 @@
(define-library (bytestructures r7 utils)
(import (scheme base))
+ (cond-expand
+ ((library (rnrs syntax-case))
+ (import (rnrs syntax-case)))
+ (else))
(export
define-syntax-rule
if-syntax-case
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scheme-bytestructures-1.0.5/configure.ac
new/scheme-bytestructures-1.0.6/configure.ac
--- old/scheme-bytestructures-1.0.5/configure.ac 2019-01-22
01:41:27.000000000 +0100
+++ new/scheme-bytestructures-1.0.6/configure.ac 2019-06-01
23:02:13.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([bytestructures], [1.0.5], [], [],
[https://github.com/TaylanUB/scheme-bytestructures/])
+AC_INIT([bytestructures], [1.0.6], [], [],
[https://github.com/TaylanUB/scheme-bytestructures/])
AC_CONFIG_SRCDIR(bytestructures)
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall -Werror foreign color-tests])
@@ -6,7 +6,7 @@
dnl Enable silent rules by default.
AM_SILENT_RULES([yes])
-GUILE_PKG([2.2 2.0])
+GUILE_PKG([3.0 2.2 2.0])
GUILE_PROGS
AC_CONFIG_FILES([Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scheme-bytestructures-1.0.5/m4/guile.m4
new/scheme-bytestructures-1.0.6/m4/guile.m4
--- old/scheme-bytestructures-1.0.5/m4/guile.m4 2019-01-22 01:41:27.000000000
+0100
+++ new/scheme-bytestructures-1.0.6/m4/guile.m4 2019-06-01 23:02:13.000000000
+0200
@@ -25,7 +25,7 @@
## GUILE_PKG -- find Guile development files
## GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
## GUILE_FLAGS -- set flags for compiling and linking with Guile
-## GUILE_SITE_DIR -- find path to Guile "site" directory
+## GUILE_SITE_DIR -- find path to Guile "site" directories
## GUILE_CHECK -- evaluate Guile Scheme code and capture the return value
## GUILE_MODULE_CHECK -- check feature of a Guile Scheme module
## GUILE_MODULE_AVAILABLE -- check availability of a Guile Scheme module
@@ -61,7 +61,7 @@
#
AC_DEFUN([GUILE_PKG],
[PKG_PROG_PKG_CONFIG
- _guile_versions_to_search="m4_default([$1], [2.0 1.8])"
+ _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
if test -n "$GUILE_EFFECTIVE_VERSION"; then
_guile_tmp=""
for v in $_guile_versions_to_search; do
@@ -154,18 +154,28 @@
AC_SUBST([GUILE_LTLIBS])
])
-# GUILE_SITE_DIR -- find path to Guile "site" directory
+# GUILE_SITE_DIR -- find path to Guile site directories
#
# Usage: GUILE_SITE_DIR
#
-# This looks for Guile's "site" directory, usually something like
-# PREFIX/share/guile/site, and sets var @var{GUILE_SITE} to the path.
-# Note that the var name is different from the macro name.
+# This looks for Guile's "site" directories. The variable @var{GUILE_SITE}
will
+# be set to Guile's "site" directory for Scheme source files (usually something
+# like PREFIX/share/guile/site). @var{GUILE_SITE_CCACHE} will be set to the
+# directory for compiled Scheme files also known as @code{.go} files
+# (usually something like
+# PREFIX/lib/guile/@var{GUILE_EFFECTIVE_VERSION}/site-ccache).
+# @var{GUILE_EXTENSION} will be set to the directory for compiled C extensions
+# (usually something like
+# PREFIX/lib/guile/@var{GUILE_EFFECTIVE_VERSION}/extensions). The latter two
+# are set to blank if the particular version of Guile does not support
+# them. Note that this macro will run the macros @code{GUILE_PKG} and
+# @code{GUILE_PROGS} if they have not already been run.
#
-# The variable is marked for substitution, as by @code{AC_SUBST}.
+# The variables are marked for substitution, as by @code{AC_SUBST}.
#
AC_DEFUN([GUILE_SITE_DIR],
[AC_REQUIRE([GUILE_PKG])
+ AC_REQUIRE([GUILE_PROGS])
AC_MSG_CHECKING(for Guile site directory)
GUILE_SITE=`$PKG_CONFIG --print-errors --variable=sitedir
guile-$GUILE_EFFECTIVE_VERSION`
AC_MSG_RESULT($GUILE_SITE)
@@ -173,6 +183,28 @@
AC_MSG_FAILURE(sitedir not found)
fi
AC_SUBST(GUILE_SITE)
+ AC_MSG_CHECKING([for Guile site-ccache directory using pkgconfig])
+ GUILE_SITE_CCACHE=`$PKG_CONFIG --variable=siteccachedir
guile-$GUILE_EFFECTIVE_VERSION`
+ if test "$GUILE_SITE_CCACHE" = ""; then
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([for Guile site-ccache directory using interpreter])
+ GUILE_SITE_CCACHE=`$GUILE -c "(display (if (defined? '%site-ccache-dir)
(%site-ccache-dir) \"\"))"`
+ if test $? != "0" -o "$GUILE_SITE_CCACHE" = ""; then
+ AC_MSG_RESULT(no)
+ GUILE_SITE_CCACHE=""
+ AC_MSG_WARN([siteccachedir not found])
+ fi
+ fi
+ AC_MSG_RESULT($GUILE_SITE_CCACHE)
+ AC_SUBST([GUILE_SITE_CCACHE])
+ AC_MSG_CHECKING(for Guile extensions directory)
+ GUILE_EXTENSION=`$PKG_CONFIG --print-errors --variable=extensiondir
guile-$GUILE_EFFECTIVE_VERSION`
+ AC_MSG_RESULT($GUILE_EXTENSION)
+ if test "$GUILE_EXTENSION" = ""; then
+ GUILE_EXTENSION=""
+ AC_MSG_WARN(extensiondir not found)
+ fi
+ AC_SUBST(GUILE_EXTENSION)
])
# GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
@@ -181,10 +213,15 @@
#
# This macro looks for programs @code{guile} and @code{guild}, setting
# variables @var{GUILE} and @var{GUILD} to their paths, respectively.
-# If @code{guile} is not found, signal an error.
+# The macro will attempt to find @code{guile} with the suffix of
+# @code{-X.Y}, followed by looking for it with the suffix @code{X.Y}, and
+# then fall back to looking for @code{guile} with no suffix. If
+# @code{guile} is still not found, signal an error. The suffix, if any,
+# that was required to find @code{guile} will be used for @code{guild}
+# as well.
#
# By default, this macro will search for the latest stable version of
-# Guile (e.g. 2.0). x.y or x.y.z versions can be specified. If an older
+# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older
# version is found, the macro will signal an error.
#
# The effective version of the found @code{guile} is set to
@@ -198,16 +235,25 @@
# The variables are marked for substitution, as by @code{AC_SUBST}.
#
AC_DEFUN([GUILE_PROGS],
- [AC_PATH_PROG(GUILE,guile)
- _guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
+ [_guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
if test -z "$_guile_required_version"; then
- _guile_required_version=2.0
+ _guile_required_version=2.2
fi
- if test "$GUILE" = "" ; then
+
+ _guile_candidates=guile
+ _tmp=
+ for v in `echo "$_guile_required_version" | tr . ' '`; do
+ if test -n "$_tmp"; then _tmp=$_tmp.; fi
+ _tmp=$_tmp$v
+ _guile_candidates="guile-$_tmp guile$_tmp $_guile_candidates"
+ done
+
+ AC_PATH_PROGS(GUILE,[$_guile_candidates])
+ if test -z "$GUILE"; then
AC_MSG_ERROR([guile required but not found])
fi
- AC_SUBST(GUILE)
+ _guile_suffix=`echo "$GUILE" | sed -e 's,^.*/guile\(.*\)$,\1,'`
_guile_effective_version=`$GUILE -c "(display (effective-version))"`
if test -z "$GUILE_EFFECTIVE_VERSION"; then
GUILE_EFFECTIVE_VERSION=$_guile_effective_version
@@ -241,20 +287,23 @@
else
as_fn_error $? "Guile $_guile_required_version required, but
$_guile_prog_version found" "$LINENO" 5
fi
+ elif test "$GUILE_EFFECTIVE_VERSION" = "$_major_version.$_minor_version" -a
-z "$_micro_version"; then
+ # Allow prereleases that have the right effective version.
+ true
else
AC_MSG_ERROR([Guile $_guile_required_version required, but
$_guile_prog_version found])
fi
AC_MSG_RESULT([$_guile_prog_version])
- AC_PATH_PROG(GUILD,guild)
+ AC_PATH_PROG(GUILD,[guild$_guile_suffix])
AC_SUBST(GUILD)
- AC_PATH_PROG(GUILE_CONFIG,guile-config)
+ AC_PATH_PROG(GUILE_CONFIG,[guile-config$_guile_suffix])
AC_SUBST(GUILE_CONFIG)
if test -n "$GUILD"; then
GUILE_TOOLS=$GUILD
else
- AC_PATH_PROG(GUILE_TOOLS,guile-tools)
+ AC_PATH_PROG(GUILE_TOOLS,[guile-tools$_guile_suffix])
fi
AC_SUBST(GUILE_TOOLS)
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scheme-bytestructures-1.0.5/run-tests.body.scm
new/scheme-bytestructures-1.0.6/run-tests.body.scm
--- old/scheme-bytestructures-1.0.5/run-tests.body.scm 2019-01-22
01:41:27.000000000 +0100
+++ new/scheme-bytestructures-1.0.6/run-tests.body.scm 2019-06-01
23:02:13.000000000 +0200
@@ -113,7 +113,7 @@
(test-eqv "set" 456 (begin (bytestructure-set! bs 1 456)
(bytestructure-ref bs 1)))
(test-eqv "init" 321
- (let ((bs (bytestructure (bs:vector 3 uint16) #(321 123 321))))
+ (let ((bs (bytestructure (bs:vector 3 uint16) '#(321 123 321))))
(bytestructure-ref bs 2))))
(maybe-skip-syntax
(test-group "syntactic"
@@ -136,7 +136,7 @@
(bytestructure-ref bs 'y)))
(test-eqv "init" 321
(let ((bs (bytestructure (bs:struct `((x ,uint8) (y ,uint16)))
- #(123 321))))
+ '#(123 321))))
(bytestructure-ref bs 'y))))
(maybe-skip-syntax
(test-group "syntactic"
@@ -159,7 +159,7 @@
(bytestructure-ref bs 'y)))
(test-eqv "init" 321
(let ((bs (bytestructure (bs:struct #t `((x ,uint8) (y ,uint16)))
- #(123 321))))
+ '#(123 321))))
(bytestructure-ref bs 'y))))
(maybe-skip-syntax
(test-group "syntactic"
@@ -229,9 +229,10 @@
(bytestructure-set! bs "4321")
(bytestructure-ref bs)))
(test-error "too-long" #t (bytestructure-set! bs "äåãø"))
- (test-equal "123\x00" (begin
- (bytestructure-set! bs "123")
- (bytestructure-ref bs))))
+ (test-equal (string-append "123" (string #\nul))
+ (begin
+ (bytestructure-set! bs "123")
+ (bytestructure-ref bs))))
(test-group "syntactic"
(define-bytestructure-accessors (bs:string 4 'utf8)
unwrapper getter setter)
@@ -241,9 +242,10 @@
(setter bv "4321")
(getter bv)))
(test-error "too-long" #t (setter bv "äåãø"))
- (test-equal "123\x00" (begin
- (setter bv "123")
- (getter bv)))))
+ (test-equal (string-append "123" (string #\nul))
+ (begin
+ (setter bv "123")
+ (getter bv)))))
(let ()
(define-syntax-rule
(test-string-encodings
@@ -263,9 +265,10 @@
(test-error "too-long" #t (bytestructure-set! bs "12345"))
(if <fixed-width?>
(test-error "too-short" #t (bytestructure-set! bs "123"))
- (test-equal "123\x00" (begin
- (bytestructure-set! bs "123")
- (bytestructure-ref bs)))))
+ (test-equal (string-append "123" (string #\nul))
+ (begin
+ (bytestructure-set! bs "123")
+ (bytestructure-ref bs)))))
(test-group "syntactic"
(define-bytestructure-accessors (bs:string <size> '<encoding>)
unwrapper getter setter)
@@ -277,9 +280,10 @@
(test-error "too-long" #t (setter bv "12345"))
(if <fixed-width?>
(test-error "too-short" #t (setter bv "123"))
- (test-equal "123\x00" (begin
- (setter bv "123")
- (getter bv))))))
+ (test-equal (string-append "123" (string #\nul))
+ (begin
+ (setter bv "123")
+ (getter bv))))))
...))
(test-string-encodings
("utf16le" utf16le little 8 #f string->utf16)