GNU bug report logs - #69791
[PATCH] gnu: wxwidgets: Update to 3.2.4

Previous Next

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

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

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] gnu: wxwidgets: Update to 3.2.4
Date: Wed, 13 Mar 2024 22:47:54 -0700

* 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(-)

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

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

From: Andy Tai <atai <at> atai.org>
To: 69791 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v2] gnu: wxwidgets: Update to 3.2.4
Date: Tue, 16 Apr 2024 00:45:28 -0700

* 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(-)

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

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

From: Andy Tai <atai <at> atai.org>
To: 69791 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v3] gnu: wxwidgets: Update to 3.2.4
Date: Sat, 27 Apr 2024 19:53:43 -0700

* 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(-)

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

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 69791 <at> debbugs.gnu.org
Subject: [PATCH] gnu: wxwidgets: Update to 3.2.4
Date: Mon, 13 May 2024 15:13:21 +0200

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.

-- 
Best regards,
Nicolas Graves

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 69791 <at> debbugs.gnu.org, Andy Tai <atai <at> atai.org>
Cc: alex <at> thuering.biz
Subject: Re: [PATCH] gnu: wxwidgets: Update to 3.2.4
Date: Mon, 13 May 2024 16:18:28 +0200

On 2024-05-13 15:13, Nicolas Graves wrote:

> 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

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 69791 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr, atai <at> atai.org
Subject: [PATCH v4 0/4] gnu: wxwidgets: Update to 3.2.4
Date: Tue, 14 May 2024 21:54:35 +0200

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

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 69791 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr, atai <at> atai.org
Subject: [PATCH v4 1/4] gnu: wxwidgets: Update to 3.2.4
Date: Tue, 14 May 2024 21:54:36 +0200

From: Andy Tai <atai <at> 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(-)

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

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 69791 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr, atai <at> atai.org
Subject: [PATCH v4 2/4] gnu: slade: Update to 3.2.5.
Date: Tue, 14 May 2024 21:54:37 +0200

* 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(-)

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

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 69791 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr, atai <at> atai.org
Subject: [PATCH v4 3/4] gnu: tenacity: Update to 1.3.3.
Date: Tue, 14 May 2024 21:54:38 +0200

* 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(-)

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

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 69791 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr, atai <at> atai.org
Subject: [PATCH v4 4/4] gnu: tenacity: Add support for ebml and matroska
 formats.
Date: Tue, 14 May 2024 21:54:39 +0200

* gnu/packages/audio.scm (tenacity)[inputs]: Add libeml and
libmatroska.

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

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

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

From: Christopher Baines <mail <at> cbaines.net>
To: Nicolas Graves via Guix-patches via <guix-patches <at> gnu.org>
Cc: 69791-done <at> debbugs.gnu.org, Nicolas Graves <ngraves <at> ngraves.fr>,
 atai <at> atai.org
Subject: Re: [bug#69791] [PATCH v4 1/4] gnu: wxwidgets: Update to 3.2.4
Date: Thu, 16 May 2024 08:00:02 +0100

[Message part 1 (text/plain, inline)]

Nicolas Graves via Guix-patches via <guix-patches <at> gnu.org> writes:

> From: Andy Tai <atai <at> 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

[signature.asc (application/pgp-signature, inline)]

Previous Next

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