[bug#61130] [PATCH 2/2] gnu: wxmaxima: Update to 22.12.0

[bug#61130] [PATCH 2/2] gnu: wxmaxima: Update to 22.12.0

[Andy Tai]

* 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

[bug#61130] [PATCH 1/2] gnu: wxwidgets: Remove configure option

[Andy Tai]

* 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

[bug#61130] [PATCH v2 1/2] gnu: wxwidgets: Remove configure option

[Andy Tai]

* 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

[bug#61130] [PATCH v2 2/2] gnu: wxmaxima: Update to 22.12.0

[Andy Tai]

* 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

bug#61130: [PATCH 2/2] gnu: wxmaxima: Update to 22.12.0

[Guillaume Le Vaillant]

[-- Attachment #1: Type: text/plain, Size: 82 bytes --]

Patches pushed as d6e2b467b88d0f663a941b796b2933ed009fca3f and
following.
Thanks.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]