Andy Tai wrote 2 years ago
(address . guix-patches@gnu.org)
CAJsg1E_T7GiANMs3QTeZMQ74Bxoon-HFHUCrXQ+76-FfXXd57A@mail.gmail.com
From 68d5bd7abee816ebaa03819612016550a6200338 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Wed, 18 Jan 2023 07:35:10 -0800
Subject: [PATCH 1/2] gnu: wxwidgets: Reove configure option
* 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(-)
Toggle diff (28 lines)
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"))
--
2.38.1
From 06886185f5206461d2af4f0cbf3373dd6fff4c4c Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Wed, 18 Jan 2023 07:41:56 -0800
Subject: [PATCH 2/2] gnu: wxmaxima: Update to 22.12.0
* gnu/packages/maths.scm (wxmaxima): Update to 22.12.0
---
gnu/packages/maths.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ef747569ae..fda0a317c8 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.38.1