guile: Update to 2.2.3

This commit is contained in:
Alexey Pavlov
2017-12-04 09:07:12 +03:00
parent 5089f500b9
commit ca8530f694
2 changed files with 7 additions and 36 deletions

View File

@@ -1,25 +0,0 @@
commit 886ac3e2abce89bd3f47f957c36bcec16613c509
Author: Ludovic Courtès <ludo@gnu.org>
Date: Sat Apr 22 00:58:10 2017 +0200
SRFI-19: Swap seconds and nanoseconds in 'current-time-monotonic'.
* module/srfi/srfi-19.scm (current-time-monotonic): Swap the 2nd and 3rd
arguments. Fixes a regression introduced in
commit b11e2922c36c4105797c269c7e616535b702698a.
diff --git a/module/srfi/srfi-19.scm b/module/srfi/srfi-19.scm
index c6a55a253..9cf9a2eb5 100644
--- a/module/srfi/srfi-19.scm
+++ b/module/srfi/srfi-19.scm
@@ -336,8 +336,8 @@
;; Guile monotonic and TAI times are the same.
(let ((tai (current-time-tai)))
(make-time time-monotonic
- (time-second tai)
- (time-nanosecond tai))))
+ (time-nanosecond tai)
+ (time-second tai))))
(define (current-time-thread)
(time-error 'current-time 'unsupported-clock-type 'time-thread))

View File

@@ -4,7 +4,7 @@
pkgbase=guile
pkgname=("$pkgbase" "lib${pkgbase}" "lib${pkgbase}-devel")
pkgver=2.2.2
pkgver=2.2.3
pkgrel=1
pkgdesc="a portable, embeddable Scheme implementation written in C"
url="https://www.gnu.org/software/guile/"
@@ -12,25 +12,21 @@ arch=(i686 x86_64)
license=('GPL')
makedepends=('libltdl' 'gmp-devel' 'ncurses-devel' 'libunistring-devel' 'libgc-devel' 'libffi-devel' 'texinfo')
source=("https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"
0001-Swap-seconds-and-nanoseconds-in-current-time-monotonic.patch
0002-Remove-version-in-file-name-of-dynamic-library-guile.patch
0101-In-tests-add-dynamic-link-to-msys-2.0-for-host-type-msys.patch
0002-Remove-version-in-file-name-of-dynamic-library-guile.patch
0101-In-tests-add-dynamic-link-to-msys-2.0-for-host-type-msys.patch
0102-Skip-tests-using-setrlimit-for-MSYS-as-done-for-Cygwin.patch
0103-Activate-test-pthread-create-secondary-for-CYGWIN-MSYS.patch
)
0103-Activate-test-pthread-create-secondary-for-CYGWIN-MSYS.patch
)
options=('!libtool')
sha256sums=('1c91a46197fb1adeba4fd62a25efcf3621c6450be166d7a7062ef6ca7e11f5ab'
'a535dd38a8ffd2ce3335927853d9159a6a7cab57cadd50a70a007e49bfc578f5'
sha256sums=('8353a8849cd7aa77be66af04bd6bf7a6207440d2f8722e46672232bb9f0a4086'
'440d31e6100bf896fcd5d65209da42bfeec43f154fa023fceeae911194ecb15c'
'7b06f92cca1b10f1006f53f27b0ed0c653eaa3a1de3732b69364e28b1b36fd1e'
'31124d7053454eb082a815b8d15249621dfb92aff50400090854d1f47b174f25'
'b66d33a35942c4d4575d169974f91f3e525f6de4fb82e61dc70723e0a43123d6'
)
'b66d33a35942c4d4575d169974f91f3e525f6de4fb82e61dc70723e0a43123d6')
prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
patch -p1 -i ${srcdir}/0001-Swap-seconds-and-nanoseconds-in-current-time-monotonic.patch
patch -p1 -i ${srcdir}/0002-Remove-version-in-file-name-of-dynamic-library-guile.patch
patch -p1 -i ${srcdir}/0101-In-tests-add-dynamic-link-to-msys-2.0-for-host-type-msys.patch