[PATCH] gnu: wxwidgets: Update to 3.2.4

  • Done
  • quality assurance status badge
Details
3 participants
  • Andy Tai
  • Christopher Baines
  • Nicolas Graves
Owner
unassigned
Submitted by
Andy Tai
Severity
normal

Debbugs page

Andy Tai wrote 12 months ago
(address . guix-patches@gnu.org)(name . Andy Tai)(address . atai@atai.org)
06d2731111e891bc54005bfbcabf7c62a30657f4.1710395239.git.atai@atai.org
* gnu/packages/wxwidgets.scm (wxwidgets): Update to 3.2.4

Change-Id: I06eebd1e23610c87b7f67ae9a8567e0190eb43ed
---
gnu/packages/wxwidgets.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index b9c81472aa..1e5bae27b5 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -66,7 +66,7 @@ (define-module (gnu packages wxwidgets)
(define-public wxwidgets
(package
(name "wxwidgets")
- (version "3.2.3")
+ (version "3.2.4")
(source
(origin
(method url-fetch)
@@ -74,7 +74,7 @@ (define-public wxwidgets
"releases/download/v" version
"/wxWidgets-" version ".tar.bz2"))
(sha256
- (base32 "0ym6s4q1fh1cd6x4nh468i15ivjmw22flsi7c9qkhrz1qxksnw61"))
+ (base32 "0ghkr8wahnw44c6p7zzvc696gmrqc7pxp2bkrcpazdbdf6my2h06"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))

base-commit: 76a3414a1bc500626a9feca013673f994eb51a34
--
2.34.1
Andy Tai wrote 11 months ago
[PATCH v2] gnu: wxwidgets: Update to 3.2.4
(address . 69791@debbugs.gnu.org)(name . Andy Tai)(address . atai@atai.org)
1d5373ffde53bdec94d9d5502daff22e39aa7f21.1713253496.git.atai@atai.org
* gnu/packages/wxwidgets.scm (wxwidgets): Update to 3.2.4

Change-Id: I06eebd1e23610c87b7f67ae9a8567e0190eb43ed
---
gnu/packages/wxwidgets.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index b9c81472aa..1e5bae27b5 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -66,7 +66,7 @@ (define-module (gnu packages wxwidgets)
(define-public wxwidgets
(package
(name "wxwidgets")
- (version "3.2.3")
+ (version "3.2.4")
(source
(origin
(method url-fetch)
@@ -74,7 +74,7 @@ (define-public wxwidgets
"releases/download/v" version
"/wxWidgets-" version ".tar.bz2"))
(sha256
- (base32 "0ym6s4q1fh1cd6x4nh468i15ivjmw22flsi7c9qkhrz1qxksnw61"))
+ (base32 "0ghkr8wahnw44c6p7zzvc696gmrqc7pxp2bkrcpazdbdf6my2h06"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))

base-commit: 4d67912265aa921084040d633238ca30c7dc4199
--
2.34.1
Andy Tai wrote 10 months ago
[PATCH v3] gnu: wxwidgets: Update to 3.2.4
(address . 69791@debbugs.gnu.org)(name . Andy Tai)(address . atai@atai.org)
5d6e5246963d2e893da9cf6b8fbe672c3d1df98a.1714272785.git.atai@atai.org
* gnu/packages/wxwidgets.scm (wxwidgets): Update to 3.2.4

Change-Id: I06eebd1e23610c87b7f67ae9a8567e0190eb43ed
---
gnu/packages/wxwidgets.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index b9c81472aa..1e5bae27b5 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -66,7 +66,7 @@ (define-module (gnu packages wxwidgets)
(define-public wxwidgets
(package
(name "wxwidgets")
- (version "3.2.3")
+ (version "3.2.4")
(source
(origin
(method url-fetch)
@@ -74,7 +74,7 @@ (define-public wxwidgets
"releases/download/v" version
"/wxWidgets-" version ".tar.bz2"))
(sha256
- (base32 "0ym6s4q1fh1cd6x4nh468i15ivjmw22flsi7c9qkhrz1qxksnw61"))
+ (base32 "0ghkr8wahnw44c6p7zzvc696gmrqc7pxp2bkrcpazdbdf6my2h06"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))

base-commit: c81ed0970007810a4662edbc3474f5afc656fe95
--
2.34.1
Nicolas Graves wrote 10 months ago
[PATCH] gnu: wxwidgets: Update to 3.2.4
(address . 69791@debbugs.gnu.org)
87le4d26tq.fsf@ngraves.fr
Hi Andy,

About this patch, QA shows some failures that seem indeed related to
this patch, thus we'll have to address them.

You can find the related failures there :


For instance, Audacity should be updated from 3.3.3 to at least 3.4.2
since they fix the update to wxwidgets 3.2.4 in this last release.

I'm going to take a look if these failures are easy to fix.

--
Best regards,
Nicolas Graves
Nicolas Graves wrote 10 months ago
(address . alex@thuering.biz)
87cypp23t7.fsf@ngraves.fr
On 2024-05-13 15:13, Nicolas Graves wrote:

Toggle quote (14 lines)
> Hi Andy,
>
> About this patch, QA shows some failures that seem indeed related to
> this patch, thus we'll have to address them.
>
> You can find the related failures there :
>
> https://qa.guix.gnu.org/issue/69791/package-changes?aarch64-linux-change=broken&aarch64-linux-change=still-failing&aarch64-linux-change=unknown-to-failing&aarch64-linux-change=new-failing
>
> For instance, Audacity should be updated from 3.3.3 to at least 3.4.2
> since they fix the update to wxwidgets 3.2.4 in this last release.
>
> I'm going to take a look if these failures are easy to fix.

Last commit of DVDStyler cannot still be updated to wxwidgets 3.2.4. We
need either to submit a fix upstream, vendor a fixing patch or keep a
version of wxwidgets for DVDStyler. Its build was already failing for
some reason though, so there's probably more to it than just wxwidgets.

I've a patch coming up to update slade to its latest version which
supports wxwidgets 3.2.4. The latest version of tenacity also
does. Audacity has already been updated.

That leaves us with qgis. I'll try and update it too later tonight.

--
Best regards,
Nicolas Graves
Nicolas Graves wrote 10 months ago
[PATCH v4 0/4] gnu: wxwidgets: Update to 3.2.4
(address . 69791@debbugs.gnu.org)
20240514195727.20570-1-ngraves@ngraves.fr
This patch series also includes some fixes for dependent packages. It
should be enough to get this patch merged.

Andy Tai (1):
gnu: wxwidgets: Update to 3.2.4

Nicolas Graves (3):
gnu: slade: Update to 3.2.5.
gnu: tenacity: Update to 1.3.3.
gnu: tenacity: Add support for ebml and matroska formats.

gnu/packages/audio.scm | 10 +++++++---
gnu/packages/game-development.scm | 8 ++++----
gnu/packages/wxwidgets.scm | 4 ++--
3 files changed, 13 insertions(+), 9 deletions(-)

--
2.41.0
Nicolas Graves wrote 10 months ago
[PATCH v4 1/4] gnu: wxwidgets: Update to 3.2.4
(address . 69791@debbugs.gnu.org)
20240514195727.20570-2-ngraves@ngraves.fr
From: Andy Tai <atai@atai.org>

* gnu/packages/wxwidgets.scm (wxwidgets): Update to 3.2.4

Change-Id: I06eebd1e23610c87b7f67ae9a8567e0190eb43ed
---
gnu/packages/wxwidgets.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index b9c81472aab..1e5bae27b53 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -66,7 +66,7 @@ (define-module (gnu packages wxwidgets)
(define-public wxwidgets
(package
(name "wxwidgets")
- (version "3.2.3")
+ (version "3.2.4")
(source
(origin
(method url-fetch)
@@ -74,7 +74,7 @@ (define-public wxwidgets
"releases/download/v" version
"/wxWidgets-" version ".tar.bz2"))
(sha256
- (base32 "0ym6s4q1fh1cd6x4nh468i15ivjmw22flsi7c9qkhrz1qxksnw61"))
+ (base32 "0ghkr8wahnw44c6p7zzvc696gmrqc7pxp2bkrcpazdbdf6my2h06"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
--
2.41.0
Nicolas Graves wrote 10 months ago
[PATCH v4 2/4] gnu: slade: Update to 3.2.5.
(address . 69791@debbugs.gnu.org)
20240514195727.20570-3-ngraves@ngraves.fr
* gnu/packages/game-development.scm (slade): Update to 3.2.5.
[arguments]<#:configure-flags>: Add flag to build pk3 (otherwise
'install phase fails).
[native-inputs]: Add p7zip.

Change-Id: Ie0e325b9d471311225654257b32b3d24395ceeae
---
gnu/packages/game-development.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (38 lines)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 8fecd959401..12387b254c5 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -580,19 +580,19 @@ (define-public python-xsge
(define-public slade
(package
(name "slade")
- (version "3.2.1")
+ (version "3.2.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sirjuddington/SLADE")
(commit version)))
- (sha256 (base32 "11ab38nv190lpvkdba5r2gckdrk4h15pri0zzslz7zy8qzg5fm18"))
+ (sha256 (base32 "0pmk6gvzi758cy4a1c7qzl8vai5frri6n7wm99b5mh99h3amy6hl"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
(list #:configure-flags
- #~(list "-DWX_GTK3=ON" "-DNO_WEBVIEW=ON"
+ #~(list "-DWX_GTK3=ON" "-DNO_WEBVIEW=ON" "-DBUILD_PK3=ON"
(string-append "-DWITH_WXPATH="
#$(this-package-input "wxwidgets") "/bin")
(string-append "-DwxWidgets_LIBRARIES="
@@ -620,7 +620,7 @@ (define-public slade
sfml
wxwidgets))
(native-inputs
- (list pkg-config which zip))
+ (list pkg-config p7zip which zip))
(home-page "https://slade.mancubus.net")
(synopsis "Doom game data editor")
(description "SLADE3 is a modern editor for Doom-engine based games and
--
2.41.0
Nicolas Graves wrote 10 months ago
[PATCH v4 3/4] gnu: tenacity: Update to 1.3.3.
(address . 69791@debbugs.gnu.org)
20240514195727.20570-4-ngraves@ngraves.fr
* gnu/packages/audio.scm (tenacity): Update to 1.3.3.

Change-Id: I76722d59070be0bd75976b92afefc75f5ad75f91
---
gnu/packages/audio.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (28 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index ee411d54d6b..69179912555 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1049,16 +1049,18 @@ (define-public audacity
(define-public tenacity
(package
(name "tenacity")
- (version "1.3.1")
+ (version "1.3.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://codeberg.org/tenacityteam/tenacity")
- (commit (string-append "v" version))))
+ (commit (string-append "v" version))
+ ;; TODO Unbundle vcpkg when packaged in Guix.
+ (recursive? #t)))
(file-name (git-file-name name version))
(sha256
- (base32 "0qpcih96c97s4b7lmcvqac9ds09j7a7llvm41p926hll5xmjgsy1"))))
+ (base32 "0jqdza1alk524fkrssgkr7gabs44sk9a99914gwfkscvyqly4kai"))))
(build-system cmake-build-system)
(arguments
(list
--
2.41.0
Nicolas Graves wrote 10 months ago
[PATCH v4 4/4] gnu: tenacity: Add support for ebml and matroska formats.
(address . 69791@debbugs.gnu.org)
20240514195727.20570-5-ngraves@ngraves.fr
* gnu/packages/audio.scm (tenacity)[inputs]: Add libeml and
libmatroska.

Change-Id: I40ccef47128197b174dd515eb144eb552507178b
---
gnu/packages/audio.scm | 2 ++
1 file changed, 2 insertions(+)

Toggle diff (15 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 69179912555..d30d561d2f1 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1135,6 +1135,8 @@ (define %configure (assoc-ref %standard-phases 'configure))
sqlite
twolame
vamp
+ libebml
+ libmatroska
libvorbis
lv2
lilv ;for lv2
--
2.41.0
Christopher Baines wrote 10 months ago
Re: [bug#69791] [PATCH v4 1/4] gnu: wxwidgets: Update to 3.2.4
(name . Nicolas Graves via Guix-patches via)(address . guix-patches@gnu.org)
87pltmnswd.fsf@cbaines.net
Nicolas Graves via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (9 lines)
> From: Andy Tai <atai@atai.org>
>
> * gnu/packages/wxwidgets.scm (wxwidgets): Update to 3.2.4
>
> Change-Id: I06eebd1e23610c87b7f67ae9a8567e0190eb43ed
> ---
> gnu/packages/wxwidgets.scm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Thanks both, I removed the slade patch as this was missed and another
commit was pushed, but I've pushed the other three patches to master as
4901f1b60499cf68362fa81e006c4fe633240e04.

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZFrvJfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xdlrw//RwZ4ovQfkPJZdR2BKmr4z9jIwQx2yDBk
ZnZ5o5oj8sZJP+tuGpbeP8G0act+i2ZNXUTe2+j9WUHG2fr32gJSJYWimYcETPkK
KIMq3NJJkfj3jvOW2FyVtGWEltqFSnZbORi/CCIqlfjsGc3SGyy8l99Z2KGNNxTk
Ldr+bD+WBSbt1MAujKo8CnKU7bZ5F30d59rqsO3exoyv8h4m4aEV/p67XWjyfNfe
3qzvSqz+Mdwb/kWXSnQhDC4BgCLSDGNsDtsNh3pGpNLN4iYiYqFpxfri9dhpdb4A
o7F3uTZVOmTIIE/y5w6j3YHlyjJufionM5ymarFIevHOy9BD+D2m9fVhavEIMOPY
ipiv1lPWZ++INdx4M/CK/rLWmHxjRa5GRfRplFJFaLPaQHlZ5zOAS0HZ34hlvcZ+
lYH1qt1TjEyd2iuu6pzICFEPUAHoaqM3G9ewUJFZgVG0DKr2EGldbPKy6FRlE3Wu
QbhORurqdM4pPC5qRHrmqPFytKOBQrmsFtXQsHN2+eBoY20K24gYJqA8GEThZhq8
GyivDoTYAdfn/Oi7kDQctmL86kf/Uy/7wKODtS2sfI9BoCsILJkIvkJjkM+EvkeN
h+e4cFNk5SHhiJBPf5BIsOhpA7Jna4jXCSnXZeaOzZ2WICe7U8OwakgsbAt2d1MS
0sxY+5KGXoU=
=B1pZ
-----END PGP SIGNATURE-----

?
Your comment

This issue is archived.

To comment on this conversation send an email to 69791@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 69791
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help