GNU bug report logs - #61130
[PATCH 2/2] gnu: wxmaxima: Update to 22.12.0

Previous Next

Package: guix-patches;

Reported by: Andy Tai <atai <at> atai.org>

Date: Sun, 29 Jan 2023 01:43:01 UTC

Severity: normal

Tags: patch

Done: Guillaume Le Vaillant <glv <at> posteo.net>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 61130 in the body.
You can then email your comments to 61130 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#61130; Package guix-patches. (Sun, 29 Jan 2023 01:43:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Andy Tai <atai <at> atai.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sun, 29 Jan 2023 01:43:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: guix-patches <at> gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH 2/2] gnu: wxmaxima: Update to 22.12.0
Date: Sat, 28 Jan 2023 17:42:43 -0800
* gnu/packages/maths.scm (wxmaxima): Update to 22.12.0
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index d9bc2922c5..ec9cfc1363 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4551,7 +4551,7 @@ (define-public maxima
 (define-public wxmaxima
   (package
     (name "wxmaxima")
-    (version "22.05.0")
+    (version "22.12.0")
     (source
      (origin
        (method git-fetch)
@@ -4560,7 +4560,7 @@ (define-public wxmaxima
              (commit (string-append "Version-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1va56v9dys97yln4m1z3fz3k90lpy8i3kvcq0v1cbg36689aghm5"))))
+        (base32 "12bjadmy2mf7d8v4iszmzckahfcwjzaba8wpbigksh4brvhb4gj5"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("gettext" ,gettext-minimal)))
-- 
2.39.1





Information forwarded to guix-patches <at> gnu.org:
bug#61130; Package guix-patches. (Sun, 29 Jan 2023 01:45:02 GMT) Full text and rfc822 format available.

Message #8 received at 61130 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 61130 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH 1/2] gnu: wxwidgets: Remove configure option
Date: Sat, 28 Jan 2023 17:44:08 -0800
* gnu/packages/wxwidgets.scm (wxwidgets): Remove
configure option that prevented webview option
from being in build and wxconfig feature list
---
 gnu/packages/wxwidgets.scm | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 0183e07c31..0a93c30f26 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -120,20 +120,12 @@ (define-public wxwidgets
                             "--with-sdl"
                             "--enable-gui"
                             "--enable-mediactrl"
-                            "--enable-webview"
-                            "--enable-webviewwebkit")
+                            "--enable-webview")
       #:make-flags
       #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
       #:tests? #f                       ;TODO
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'use-newer-webkit
-            (lambda _
-              ;; XXX: The configure script tests only for an ancient
-              ;; WebKitGTK version.
-              (substitute* "configure"
-                (("webkit2gtk-4\\.0")
-                 "webkit2gtk-4.1"))))
           (add-after 'unpack 'refer-to-inputs
             (lambda* (#:key inputs #:allow-other-keys)
               (let ((catch (search-input-file inputs "include/catch.hpp"))

base-commit: c6ec9c7af9814f84f293f62235eab9d0649751a7
-- 
2.39.1





Information forwarded to guix-patches <at> gnu.org:
bug#61130; Package guix-patches. (Mon, 30 Jan 2023 15:35:03 GMT) Full text and rfc822 format available.

Message #11 received at 61130 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: Simon Tournier <zimon.toutoune <at> gmail.com>
Cc: 60937 <at> debbugs.gnu.org, 609370 <at> debbugs.gnu.org, 61130 <at> debbugs.gnu.org
Subject: Re: [bug#60937] [PATCH v2 1/2] gnu: wxwidgets: Reove configure option
Date: Mon, 30 Jan 2023 07:33:34 -0800
[Message part 1 (text/plain, inline)]
fixed as Issue 61130

61130 <at> debbugs.gnu.org

(I created a new issue so Guix QA can pick it up for testing)

On Mon, Jan 30, 2023 at 4:47 AM Simon Tournier <zimon.toutoune <at> gmail.com>
wrote:

> Hi,
>
> Typo on the commit message.
>
> s/Reove/Remove.
>
>
> Cheers,
> simon
>


-- 
Andy Tai, atai <at> atai.org, Skype: licheng.tai, Line: andy_tai, WeChat:
andytai1010
Year 2023 民國112年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能
[Message part 2 (text/html, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#61130; Package guix-patches. (Thu, 02 Feb 2023 06:40:02 GMT) Full text and rfc822 format available.

Message #14 received at 61130 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 61130 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v2 1/2] gnu: wxwidgets: Remove configure option
Date: Wed,  1 Feb 2023 22:39:40 -0800
* gnu/packages/wxwidgets.scm (wxwidgets): Remove
configure option that prevented webview option
from being in build and wxconfig feature list
---
 gnu/packages/wxwidgets.scm | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 0183e07c31..0a93c30f26 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -120,20 +120,12 @@ (define-public wxwidgets
                             "--with-sdl"
                             "--enable-gui"
                             "--enable-mediactrl"
-                            "--enable-webview"
-                            "--enable-webviewwebkit")
+                            "--enable-webview")
       #:make-flags
       #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
       #:tests? #f                       ;TODO
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'use-newer-webkit
-            (lambda _
-              ;; XXX: The configure script tests only for an ancient
-              ;; WebKitGTK version.
-              (substitute* "configure"
-                (("webkit2gtk-4\\.0")
-                 "webkit2gtk-4.1"))))
           (add-after 'unpack 'refer-to-inputs
             (lambda* (#:key inputs #:allow-other-keys)
               (let ((catch (search-input-file inputs "include/catch.hpp"))

base-commit: 43eed907d22b094c5a9b2931ca5e72caf2b95991
-- 
2.39.1





Information forwarded to guix-patches <at> gnu.org:
bug#61130; Package guix-patches. (Thu, 02 Feb 2023 06:41:03 GMT) Full text and rfc822 format available.

Message #17 received at 61130 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 61130 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v2 2/2] gnu: wxmaxima: Update to 22.12.0
Date: Wed,  1 Feb 2023 22:39:56 -0800
* gnu/packages/maths.scm (wxmaxima): Update to 22.12.0
---
 gnu/packages/maths.scm | 102 +++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 50 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4640237968..d8e6f0fb32 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4551,59 +4551,61 @@ (define-public maxima
 (define-public wxmaxima
   (package
     (name "wxmaxima")
-    (version "22.05.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/wxMaxima-developers/wxmaxima")
-             (commit (string-append "Version-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1va56v9dys97yln4m1z3fz3k90lpy8i3kvcq0v1cbg36689aghm5"))))
+    (version "22.12.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/wxMaxima-developers/wxmaxima")
+                    (commit (string-append "Version-" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "12bjadmy2mf7d8v4iszmzckahfcwjzaba8wpbigksh4brvhb4gj5"))))
     (build-system cmake-build-system)
-    (native-inputs
-     `(("gettext" ,gettext-minimal)))
-    (inputs
-     (list wxwidgets
-           maxima
-           ;; Runtime support.
-           adwaita-icon-theme
-           gtk+
-           shared-mime-info))
+    (native-inputs `(("gettext" ,gettext-minimal)))
+    (inputs (list bash-minimal
+                  wxwidgets
+                  maxima
+                  ;; Runtime support.
+                  adwaita-icon-theme
+                  gtk+
+                  shared-mime-info))
     (arguments
-     `(#:tests? #f                      ; tests fail non-deterministically
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-doc-path
-           (lambda _
-             ;; Don't look in share/doc/wxmaxima-xx.xx.x for the
-             ;; documentation.  Only licensing information is placed there by
-             ;; Guix.
-             (substitute* "src/Dirstructure.cpp"
-               (("/doc/wxmaxima-\\%s") "/doc/wxmaxima"))
-             #t))
-         (add-after 'install 'wrap-program
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (wrap-program (string-append (assoc-ref outputs "out")
-                                          "/bin/wxmaxima")
-               `("PATH" ":" prefix
-                 (,(string-append (assoc-ref inputs "maxima")
-                                  "/bin")))
-               ;; For GtkFileChooserDialog.
-               `("GSETTINGS_SCHEMA_DIR" =
-                 (,(string-append (assoc-ref inputs "gtk+")
-                                  "/share/glib-2.0/schemas")))
-               `("XDG_DATA_DIRS" ":" prefix
-                 (;; Needed by gdk-pixbuf to know supported icon formats.
-                  ,(string-append
-                    (assoc-ref inputs "shared-mime-info") "/share")
-                  ;; The default icon theme of GTK+.
-                  ,(string-append
-                    (assoc-ref inputs "adwaita-icon-theme") "/share"))))
-             #t)))))
+     `(#:tests? #f ;tests fail non-deterministically
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'patch-doc-path
+                    (lambda _
+                      ;; Don't look in share/doc/wxmaxima-xx.xx.x for the
+                      ;; documentation.  Only licensing information is placed there by
+                      ;; Guix.
+                      (substitute* "src/Dirstructure.cpp"
+                        (("/doc/wxmaxima-\\%s")
+                         "/doc/wxmaxima")) #t))
+                  (add-after 'install 'wrap-program
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (wrap-program (string-append (assoc-ref outputs "out")
+                                                   "/bin/wxmaxima")
+                                    `("PATH" ":" prefix
+                                      (,(string-append (assoc-ref inputs
+                                                                  "maxima")
+                                                       "/bin")))
+                                    ;; For GtkFileChooserDialog.
+                                    `("GSETTINGS_SCHEMA_DIR" =
+                                      (,(string-append (assoc-ref inputs
+                                                                  "gtk+")
+                                         "/share/glib-2.0/schemas")))
+                                    `("XDG_DATA_DIRS" ":" prefix
+                                      ( ;Needed by gdk-pixbuf to know supported icon formats.
+                                        ,(string-append (assoc-ref inputs
+                                                         "shared-mime-info")
+                                                        "/share")
+                                       ;; The default icon theme of GTK+.
+                                       ,(string-append (assoc-ref inputs
+                                                        "adwaita-icon-theme")
+                                                       "/share")))) #t)))))
     (home-page "https://wxmaxima-developers.github.io/wxmaxima/")
-    (synopsis "Graphical user interface for the Maxima computer algebra system")
+    (synopsis
+     "Graphical user interface for the Maxima computer algebra system")
     (description
      "wxMaxima is a graphical user interface for the Maxima computer algebra
 system.  It eases the use of Maxima by making most of its commands available
-- 
2.39.1





Reply sent to Guillaume Le Vaillant <glv <at> posteo.net>:
You have taken responsibility. (Wed, 08 Feb 2023 16:14:02 GMT) Full text and rfc822 format available.

Notification sent to Andy Tai <atai <at> atai.org>:
bug acknowledged by developer. (Wed, 08 Feb 2023 16:14:02 GMT) Full text and rfc822 format available.

Message #22 received at 61130-done <at> debbugs.gnu.org (full text, mbox):

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: Andy Tai <atai <at> atai.org>
Cc: 61130-done <at> debbugs.gnu.org
Subject: Re: [bug#61130] [PATCH 2/2] gnu: wxmaxima: Update to 22.12.0
Date: Wed, 08 Feb 2023 16:12:26 +0000
[Message part 1 (text/plain, inline)]
Patches pushed as d6e2b467b88d0f663a941b796b2933ed009fca3f and
following.
Thanks.
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Thu, 09 Mar 2023 12:24:06 GMT) Full text and rfc822 format available.

This bug report was last modified 1 year and 42 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.