[bug#28330] [PATCH 0/2] Boost 1.65.0.

[bug#28330] [PATCH 0/2] Boost 1.65.0.

[Marius Bakke]

Boost issued a couple of post-release patches for 1.65.0.  See
<http://www.boost.org/users/history/version_1_65_0.html>.  Should we
include them?  I've done that here (but skipped the Windows ones..).

`lint` complained that the patches did not have good file names, even
when explicitly set, so I extended it to check origin-file-names.

Feedback wanted!

Note: MySQL (at least) fails to build against 1.65.0, so we may need
to keep 1.64.0 around.

Marius Bakke (2):
  lint: Check file names of origin patches.
  gnu: boost: Update to 1.65.0.

 gnu/packages/boost.scm | 26 ++++++++++++++++++++++++--
 guix/scripts/lint.scm  |  8 +++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

-- 
2.14.1

[bug#28330] [PATCH 1/2] lint: Check file names of origin patches.

[Marius Bakke]

* guix/scripts/lint.scm (check-patch-file-names): Add case for when PATCH is
an <origin>.
---
 guix/scripts/lint.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index aceafc674..855b6262f 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -561,7 +561,13 @@ patch could not be found."
                       (and=> (string-contains (basename patch)
                                               (package-name package))
                              zero?))
-                     (_  #f))     ;must be an <origin> or something like that.
+                     ((? origin? patch)
+                      (if (string? (origin-file-name patch))
+                          (and=> (string-contains (origin-file-name patch)
+                                                  (package-name package))
+                                 zero?)
+                          #f))
+                     (_  #f))
                    (or (and=> (package-source package) origin-patches)
                        '()))
       (emit-warning
-- 
2.14.1

[bug#28330] [PATCH staging 2/2] gnu: boost: Update to 1.65.0.

[Marius Bakke]

* gnu/packages/boost.scm (%boost-1.65.0-context.patch,
%boost-1.65.0-fiber.patch): New variables.
(boost): Update to 1.65.0.
[source](patches): New field.
---
 gnu/packages/boost.scm | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 4c7308e9d..c0ae8dd19 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -33,19 +33,41 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages shells))
 
+;; Boost provides some fixes for problems found by library maintainers
+;; after the release.  See "known issues" at
+;; <http://www.boost.org/users/history/version_1_65_0.html>
+(define %boost-1.65.0-context.patch
+  (origin
+    (method url-fetch)
+    (uri (string-append "http://www.boost.org/patches/1_65_0/0001-context-"
+                        "function-executed-by-resume_with-has-to-retu.patch"))
+    (file-name "boost-1.65.0-context.patch")
+    (sha256
+     (base32 "12vha10dsyx8m29m1d3np0xh0a2vrqapjd6ha746nqv78zi1nlgd"))))
+
+(define %boost-1.65.0-fiber.patch
+  (origin
+    (method url-fetch)
+    (uri (string-append "http://www.boost.org/patches/1_65_0/0002-fiber-resume_"
+                        "with-requires-tor-return-a-continuation.patch"))
+    (file-name "boost-1.65.0-fiber.patch")
+    (sha256
+     (base32 "05hb1qwzj5y2cyhvdkw4vdg412gkzillrkmsdz470hb3p0jgpjhv"))))
+
 (define-public boost
   (package
     (name "boost")
-    (version "1.64.0")
+    (version "1.65.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "mirror://sourceforge/boost/boost/" version "/boost_"
                     (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
                     ".tar.bz2"))
+              (patches (list %boost-1.65.0-context.patch %boost-1.65.0-fiber.patch))
               (sha256
                (base32
-                "0cikd35xfkpg9nnl76yqqnqxnf3hyfjjww8xjd4akflprsm5rk3v"))))
+                "0b4hz6rciqw7nf49yar271pbfwv94vrk2sjn5af0gyz288kp29pa"))))
     (build-system gnu-build-system)
     (inputs `(("icu4c" ,icu4c)
               ("zlib" ,zlib)))
-- 
2.14.1

[bug#28330] [PATCH staging 2/2] gnu: boost: Update to 1.65.0.

[Ludovic Courtès]

Marius Bakke <mbakke@fastmail.com> skribis:

> * gnu/packages/boost.scm (%boost-1.65.0-context.patch,
> %boost-1.65.0-fiber.patch): New variables.
> (boost): Update to 1.65.0.
> [source](patches): New field.

[...]

> +    (version "1.65.0")

Should we call it “1.65.0.2” to reflect the fact that we’re applying two
fixes?

Otherwise LGTM, thanks!

Ludo’.

[bug#28330] [PATCH 1/2] lint: Check file names of origin patches.

[Ludovic Courtès]

Marius Bakke <mbakke@fastmail.com> skribis:

> * guix/scripts/lint.scm (check-patch-file-names): Add case for when PATCH is
> an <origin>.

LGTM, but could you add a test in tests/lint.scm, next to the various
“patches:” tests?

Thanks,
Ludo’.