bug#65557: closed ([PATCH] gnu: pencil2d: Fix tests.)

[GNU bug Tracking System]

Your message dated Thu, 31 Aug 2023 18:06:27 +0800
with message-id <877cpb7cgs.fsf@envs.net>
and subject line Closing
has caused the debbugs.gnu.org bug report #65557,
regarding [PATCH] gnu: pencil2d: Fix tests.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
65557: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65557
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: pencil2d: Fix tests.
>
>
>
>
> Date: 
>
> Sun, 27 Aug 2023 10:54:41 +0800
>
>
>
>
> From: 宋文武 <iyzsong@member.fsf.org>
>
> * gnu/packages/animation.scm (pencil2d)[arguments]: Use gexps.
> Add fix-tests phase.
> ---
>  gnu/packages/animation.scm | 31 ++++++++++++++++++-------------
>  1 file changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
> index 9691dd0d80..d6bd3fd03d 100644
> --- a/gnu/packages/animation.scm
> +++ b/gnu/packages/animation.scm
> @@ -442,19 +442,24 @@ (define-public pencil2d
>      (inputs
>       (list qtbase-5 qtxmlpatterns qtmultimedia-5 qtsvg-5))
>      (arguments
> -     `(#:phases
> -       (modify-phases %standard-phases
> -         (replace 'configure
> -           (lambda* (#:key inputs outputs #:allow-other-keys)
> -             (let ((out (assoc-ref outputs "out")))
> -               (invoke "qmake" (string-append "PREFIX=" out)))))
> -         (add-after 'install 'wrap-executable
> -           (lambda* (#:key inputs outputs #:allow-other-keys)
> -             (let ((out (assoc-ref outputs "out"))
> -                   (plugin-path (getenv "QT_PLUGIN_PATH")))
> -               (wrap-program (string-append out "/bin/pencil2d")
> -                 `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)))
> -               #t))))))
> +     (list
> +      #:phases
> +      #~(modify-phases %standard-phases
> +          (add-after 'unpack 'fix-tests
> +            (lambda _
> +              ;; Its bundled catch2-2.5.0 fails to build with glibc-2.35.
> +              (copy-file #$(file-append catch2 "/include/catch2/catch.hpp")
> +                         "tests/src/catch.hpp")))
> +          (replace 'configure
> +            (lambda* (#:key inputs outputs #:allow-other-keys)
> +              (let ((out (assoc-ref outputs "out")))
> +                (invoke "qmake" (string-append "PREFIX=" out)))))
> +          (add-after 'install 'wrap-executable
> +            (lambda* (#:key inputs outputs #:allow-other-keys)
> +              (let ((out (assoc-ref outputs "out"))
> +                    (plugin-path (getenv "QT_PLUGIN_PATH")))
> +                (wrap-program (string-append out "/bin/pencil2d")
> +                  `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)))))))))
>      (home-page "https://www.pencil2d.org";)
>      (synopsis "Make 2D hand-drawn animations")
>      (description
>
> base-commit: 28fdf6cc16aee56fdc17a31701b90ace6e512481
> -- 
> 2.41.0
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Closing
>
>
>
>
> Date: 
>
> Thu, 31 Aug 2023 18:06:27 +0800
>
>
>
>
> Pushed now, closing!
>
>
> --- End Message ---