[bug#72835] [PATCH qt-team 00/38] update qt6 to 6.7.2

[bug#72835] [PATCH qt-team 00/38] update qt6 to 6.7.2

[Zheng Junjie]

Hello! This patchset updates qt6 to 6.7.2.

Zheng Junjie (38):
  gnu: qtbase: Update to 6.7.2.
  gnu: qt5compat: Update to 6.7.2.
  gnu: qtsvg: Update to 6.7.2.
  gnu: qtimageformats: Update to 6.7.2.
  gnu: qtdeclarative: Update to 6.7.2.
  gnu: qtwebsockets: Update to 6.7.2.
  gnu: qtsensors: Update to 6.7.2.
  gnu: qtshadertools: Update to 6.7.2.
  gnu: qtmultimedia: Update to 6.7.2.
  gnu: qtwayland: Update to 6.7.2.
  gnu: qtserialport: Update to 6.7.2.
  gnu: qtwebchannel: Update to 6.7.2.
  gnu: qtlanguageserver: Update to 6.7.2.
  gnu: qtlocation: Update to 6.7.2.
  gnu: qtlottie: Update to 6.7.2.
  gnu: qttools: Update to 6.7.2.
  gnu: qttranslations: Update to 6.7.2.
  gnu: qtscxml: Update to 6.7.2.
  gnu: qtpositioning: Update to 6.7.2.
  gnu: qtremoteobjects: Update to 6.7.2.
  gnu: qtspeech: Update to 6.7.2.
  gnu: qthttpserver: Update to 6.7.2.
  gnu: qt-creator: Update to 14.0.1.
  gnu: qtnetworkauth: Update to 6.7.2.
  gnu: abseil-cpp: Update to 20240722.0.
  gnu: libvpx: Update to 1.14.1.
  gnu: Add re2-next.
  gnu: Add icu4c-75.
  gnu: qtwebengine: Update to 6.7.2.
  gnu: python-shiboken-6: Update to 6.7.2.
  gnu: qtconnectivity: Rename to qtconnectivity-5.
  gnu: Add qtconnectivity.
  gnu: Add python-setuptools-scm-next.
  gnu: python-sip: Update to 6.8.6.
  gnu: python-pyqt6-sip: Update to 13.8.0.
  gnu: python-pyqt-builder: Update to 1.16.4.
  gnu: python-pyqt-6: Update to 6.7.1.
  gnu: python-pyqtwebengine-6: Update to 6.7.0.

 gnu/packages/cpp.scm          |   6 +-
 gnu/packages/icu4c.scm        |  18 +++
 gnu/packages/python-build.scm |  32 +++++
 gnu/packages/qt.scm           | 252 ++++++++++++++++++++--------------
 gnu/packages/regex.scm        |  29 +++-
 gnu/packages/video.scm        |  17 +--
 6 files changed, 233 insertions(+), 121 deletions(-)


base-commit: 0cf4de40a226b8d249c047e6b2792791c8baeb64
-- 
2.45.2

[bug#72835] [PATCH qt-team 01/38] gnu: qtbase: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtbase): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a91bebf358..b301c73704 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -714,13 +714,13 @@ (define-public qtbase
   (package
     (inherit qtbase-5)
     (name "qtbase")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (inherit (package-source qtbase-5))
               (uri (qt-url name version))
               (sha256
                (base32
-                "0qklvzg242ilxw29jd2vsz6s8ni4dpraf4ghfa4dykhc705zv4q4"))
+                "16bmfrjfxjajs6sqg1383ihhfwwf69ihkpnpvsajh5pv21g2mwn5"))
               (modules '((guix build utils)))
               (snippet
                ;; corelib uses bundled harfbuzz, md4, md5, sha3
-- 
2.45.2

[bug#72835] [PATCH qt-team 02/38] gnu: qt5compat: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qt5compat): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b301c73704..0db7467e5b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1181,13 +1181,13 @@ (define-public qt3d-5
 (define-public qt5compat
   (package
     (name "qt5compat")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "02zcrrh6rq5p6bqix5nk2h22rfqdrf4d0h7y4rva5zmbbr7czhk8"))))
+                "00y071p09v91ascxg3llc0yfbx7xs24smcgxckdrnkgwkqcba9l8"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team 03/38] gnu: qtsvg: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtsvg): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0db7467e5b..2441292266 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1279,13 +1279,13 @@ (define-public qtsvg-5
 (define-public qtsvg
   (package
     (name "qtsvg")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1ir57bis27whq7bwqykk1qlxy0522k4ia39brxayjmfadrbixjsa"))))
+                "00ggr84l1h8did6ivprv343rwwcl7j2bbbilxqzmiqsvlf3143gv"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team 04/38] gnu: qtimageformats: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtimageformats): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2441292266..635ef9ef80 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1338,14 +1338,14 @@ (define-public qtimageformats-5
 (define-public qtimageformats
   (package
     (name "qtimageformats")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (inherit (package-source qtimageformats-5))
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0z328i6fix1qdklfbs1w4dsr64zavjj5kzqvzipww0v62xhfm99w"))))
+                "1mp5bi45gcmsds0g2xfjd1mklrijbwfv0hx4s1md2rxfbxwdi8g1"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team 05/38] gnu: qtdeclarative: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtdeclarative): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 635ef9ef80..0811a5f983 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1513,14 +1513,14 @@ (define-public qtdeclarative-5
 (define-public qtdeclarative
   (package
     (name "qtdeclarative")
-    (version "6.6.3")
+    (version "6.7.2")
     ;; TODO: Package 'masm' and unbundle from sources.
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1wwjlwjb3hnlpai4rrrdsm096a6ahb1izs3524r79jpjzhn7n805"))
+                "16drp7yjsm50cvsyww9xk15hzf2csax02vpbv0jx8hlcmyhwnaac"))
               (patches (search-patches "qtdeclarative-disable-qmlcache.patch"))))
     (outputs '("out" "debug"))
     (build-system cmake-build-system)
-- 
2.45.2

[bug#72835] [PATCH qt-team 06/38] gnu: qtwebsockets: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwebsockets): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0811a5f983..25da86daef 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1714,13 +1714,13 @@ (define-public qtwebsockets-5
 (define-public qtwebsockets
   (package
     (name "qtwebsockets")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0dm066lv3n97ril9iyd5xn8j13m6r7xp844aagj6dpclaxv83x0n"))))
+                "0pr13p6inlh2i79yc567w8dp446rh9xvfakq5diwis4wxkv4mpjv"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team 07/38] gnu: qtsensors: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtsensors): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 25da86daef..fd5ddb5ad6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1754,13 +1754,13 @@ (define-public qtsensors
   (package
     (inherit qtsvg)
     (name "qtsensors")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0r9p3lm159pji29vq9kii42jkz4rg15hqh6zlq9442i58a0ayddj"))))
+                "0ndvwra9bssfqw32bk5mbj3zdqgi9zshm0gd0bfd8vn5hz3xxlga"))))
     (native-inputs (list qtdeclarative))
     (inputs (list qtbase))
     (synopsis "Qt Sensors module")
-- 
2.45.2

[bug#72835] [PATCH qt-team 08/38] gnu: qtshadertools: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtshadertools): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index fd5ddb5ad6..cf68107d70 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1848,7 +1848,7 @@ (define-public qtmultimedia-5
 (define-public qtshadertools
   (package
     (name "qtshadertools")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1856,7 +1856,7 @@ (define-public qtshadertools
               ;; sources.
               (sha256
                (base32
-                "1rm17hyhq244zskq3ar3h22qjd5dshy84nnyq1ivhg5k7gb0j2cc"))))
+                "1hbw5xz12frydk787rl6cgfxm2bxlzkxiwcxjjmgq04cmk039ypd"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team 09/38] gnu: qtmultimedia: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtmultimedia): Update to 6.7.2.

Change-Id: I80606a9cb88a554578943d871401f4661bb29158
---
 gnu/packages/qt.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index cf68107d70..5b2450e41f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1877,13 +1877,13 @@ (define-public qtshadertools
 (define-public qtmultimedia
   (package
     (name "qtmultimedia")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1ciswpv8p71j9hwwdhfr5pmsrnizlaijp0dnyc99lk5is8qgh05y"))
+                "1lsiarvag8lr4a1apa466xz56b1znjncy8wz5hyiv6nbb88kby4f"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -1914,9 +1914,12 @@ (define-public qtmultimedia
               ;; RHI backend. Using CPU conversion." (see:
               ;; https://bugreports.qt.io/browse/QTBUG-123749).
               (substitute* "tests/auto/unit/multimedia/CMakeLists.txt"
-                (("add_subdirectory\\(qvideoframecolormanagement\\)") ""))))
+                (("add_subdirectory\\(qvideoframecolormanagement\\)") "")
+                ;; test timeout
+                (("add_subdirectory\\(qmediaplayer_gstreamer\\)") ""))))
           (add-before 'check 'prepare-for-tests
             (lambda _
+              (setenv "HOME" (getcwd))
               (setenv "QT_QPA_PLATFORM" "offscreen")))
           (add-after 'install 'delete-installed-tests
             (lambda _
-- 
2.45.2

[bug#72835] [PATCH qt-team 09/38] gnu: qtmultimedia: Update to 6.7.2.

[Maxim Cournoyer]

Hi Zheng,

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> * gnu/packages/qt.scm (qtmultimedia): Update to 6.7.2.
>
> Change-Id: I80606a9cb88a554578943d871401f4661bb29158
> ---
>  gnu/packages/qt.scm | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index cf68107d70..5b2450e41f 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -1877,13 +1877,13 @@ (define-public qtshadertools
>  (define-public qtmultimedia
>    (package
>      (name "qtmultimedia")
> -    (version "6.6.3")
> +    (version "6.7.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "1ciswpv8p71j9hwwdhfr5pmsrnizlaijp0dnyc99lk5is8qgh05y"))
> +                "1lsiarvag8lr4a1apa466xz56b1znjncy8wz5hyiv6nbb88kby4f"))
>                (modules '((guix build utils)))
>                (snippet
>                 '(begin
> @@ -1914,9 +1914,12 @@ (define-public qtmultimedia
>                ;; RHI backend. Using CPU conversion." (see:
>                ;; https://bugreports.qt.io/browse/QTBUG-123749).
>                (substitute* "tests/auto/unit/multimedia/CMakeLists.txt"
> -                (("add_subdirectory\\(qvideoframecolormanagement\\)") ""))))
> +                (("add_subdirectory\\(qvideoframecolormanagement\\)") "")
> +                ;; test timeout

That's a nitpick, but please do write complete sentences for standalone
comments, e.g. ";; The 'qmediaplayer_gstreamer' test times out."

Thanks for the updates!

-- 
Thanks,
Maxim

[bug#72835] [PATCH qt-team 09/38] gnu: qtmultimedia: Update to 6.7.2.

[Z572]

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

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Hi Zheng,
>
> Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:
>
>> * gnu/packages/qt.scm (qtmultimedia): Update to 6.7.2.
>>
>> Change-Id: I80606a9cb88a554578943d871401f4661bb29158
>> ---
>>  gnu/packages/qt.scm | 9 ++++++---
>>  1 file changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
>> index cf68107d70..5b2450e41f 100644
>> --- a/gnu/packages/qt.scm
>> +++ b/gnu/packages/qt.scm
>> @@ -1877,13 +1877,13 @@ (define-public qtshadertools
>>  (define-public qtmultimedia
>>    (package
>>      (name "qtmultimedia")
>> -    (version "6.6.3")
>> +    (version "6.7.2")
>>      (source (origin
>>                (method url-fetch)
>>                (uri (qt-url name version))
>>                (sha256
>>                 (base32
>> -                "1ciswpv8p71j9hwwdhfr5pmsrnizlaijp0dnyc99lk5is8qgh05y"))
>> +                "1lsiarvag8lr4a1apa466xz56b1znjncy8wz5hyiv6nbb88kby4f"))
>>                (modules '((guix build utils)))
>>                (snippet
>>                 '(begin
>> @@ -1914,9 +1914,12 @@ (define-public qtmultimedia
>>                ;; RHI backend. Using CPU conversion." (see:
>>                ;; https://bugreports.qt.io/browse/QTBUG-123749).
>>                (substitute* "tests/auto/unit/multimedia/CMakeLists.txt"
>> -                (("add_subdirectory\\(qvideoframecolormanagement\\)") ""))))
>> +                (("add_subdirectory\\(qvideoframecolormanagement\\)") "")
>> +                ;; test timeout
>
> That's a nitpick, but please do write complete sentences for standalone
> comments, e.g. ";; The 'qmediaplayer_gstreamer' test times out."

done.

>
> Thanks for the updates!

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

[bug#72835] [PATCH qt-team 10/38] gnu: qtwayland: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwayland): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5b2450e41f..808d88bb90 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2007,13 +2007,13 @@ (define-public qtwayland-5
 (define-public qtwayland
   (package
     (name "qtwayland")
-    (version "6.6.3")
+    (version "6.7.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
-        (base32 "0gamcqpl302wlznfnlcg9vlnnhfpxgjnz05prwc9wpy0xh7wqvm9"))))
+        (base32 "0nwa59g1wk7fkym837pkw312abjb376gx44rpd5d8jv4vphmg852"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
-- 
2.45.2

[bug#72835] [PATCH qt-team 11/38] gnu: qtserialport: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtserialport): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 808d88bb90..3eccd3604e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2093,13 +2093,13 @@ (define-public qtserialport-5
 (define-public qtserialport
   (package
     (name "qtserialport")
-    (version "6.6.3")
+    (version "6.7.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
-        (base32 "0dywalgafvxi2jgdv9dk22hwwd8qsgk5xfybh75n3njmwmwnarg1"))))
+        (base32 "1z5lsgdl4g48fr2kcp7zznv5jyv42xmd4qn6rrxikd8w2v8lrhr1"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases
-- 
2.45.2

[bug#72835] [PATCH qt-team 12/38] gnu: qtwebchannel: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwebchannel): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3eccd3604e..46e212bc4c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2171,13 +2171,13 @@ (define-public qtwebchannel-5
 (define-public qtwebchannel
   (package
     (name "qtwebchannel")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0cwcf4pri901piyj0lvqmks9l84di9rcafnfgrmgg5mls7jjlyvw"))))
+                "072hniyxavz2jjkzh7mrz4g67zf0cngvp4xgdradxrqhgdh9cpdc"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team 13/38] gnu: qtlanguageserver: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtlanguageserver): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 46e212bc4c..efd53628a5 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2255,13 +2255,13 @@ (define-public qtwebview
 (define-public qtlanguageserver
   (package
     (name "qtlanguageserver")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "136gyvkzm6skdv5yhyy4nqhbczfc2mn4nbr9hvpkpljb0awv888h"))))
+                "14hs20738d2ljfb5la8p0lip7qranjnrwl5fwdhs1zs4a5jzwndn"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
-- 
2.45.2

[bug#72835] [PATCH qt-team 14/38] gnu: qtlocation: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtlocation): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index efd53628a5..919eee745b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2305,13 +2305,13 @@ (define-public qtlocation
   (package
     (inherit qtsvg)
     (name "qtlocation")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1l81z3zq1zg015l6qxx4yzssdspw689m9bpzxp23yshaych2kd6p"))))
+                "0pa8ibw490p3433ysni73f0gpz7gvxyl2abh3ygvd28ipxcdlcpj"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg)
        ((#:tests? _ #f) #f)             ; TODO: Enable the tests
-- 
2.45.2

[bug#72835] [PATCH qt-team 15/38] gnu: qtlottie: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtlottie): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 919eee745b..8467c54dee 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2330,13 +2330,13 @@ (define-public qtlocation
 (define-public qtlottie
   (package
     (name "qtlottie")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1d0fjb0080wnd71f50zwal1b504iimln9mpnb3sc5yznmv8gm4cq"))))
+                "03piwc7p0lgqm73rx2kf5ckh986nv9dkssfl47js8lnkb29vrbyr"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team 16/38] gnu: qttools: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qttools): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8467c54dee..6aac40e455 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2394,13 +2394,13 @@ (define-public qttools-5
 (define-public qttools
   (package
     (name "qttools")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1h0vz46mpvzbm5w6sgpk0b3mqkn278l45arhxxk41dwc5n14qvda"))))
+                "0ajbma9lbrb0d048bvg2xl74m833ddv2b9684r3hjcr53fnmbs2q"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team 17/38] gnu: qttranslations: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qttranslations): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6aac40e455..9168c35915 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2434,13 +2434,13 @@ (define-public qttools
 (define-public qttranslations
   (package
     (name "qttranslations")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1kvkrwbgby4i69dpxbxxcv0qbsz69n6icpyr4wcf8qm2r4m5zqqj"))))
+                "1a9cb1br3wqn0rshkgj21hba3r7jx8dbavc3ayfjgdy1bl5phicq"))))
     (build-system cmake-build-system)
     (arguments (list #:tests? #f))
     (native-inputs (list qtbase qttools))
-- 
2.45.2

[bug#72835] [PATCH qt-team 18/38] gnu: qtscxml: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtscxml): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9168c35915..3d553ae5b0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2592,13 +2592,13 @@ (define-public qtscxml-5
 (define-public qtscxml
   (package
     (name "qtscxml")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1dbcw4qnss5rif97gdcimyzl3jqa508yph611dvvhc1xn16nl6qg"))
+                "0vy80npai5ikwlf0ghxf5xj8vq1hi3cdjgddjas2g3yl0qszkv10"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.45.2

[bug#72835] [PATCH qt-team 19/38] gnu: qtpositioning: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtpositioning): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3d553ae5b0..f4f037a37a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2631,13 +2631,13 @@ (define-public qtscxml
 (define-public qtpositioning
   (package
     (name "qtpositioning")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1frzzndsscb6iqschklks2l17ppnjpnx1lq1cypnq3x0598bcdws"))))
+                "073v10z1axmqydrvdka9g69wr117kzhvci9sjr110swgmbq0j002"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team 20/38] gnu: qtremoteobjects: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtremoteobjects): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f4f037a37a..3235cfd7c5 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2774,13 +2774,13 @@ (define-public qtnetworkauth
 (define-public qtremoteobjects
   (package
     (name "qtremoteobjects")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "16bd4zd3yfzlzk087qphphsh8hv38q3a57n1yknvkc5fchzmfzjz"))))
+                "10vlkg5v5hc8fwiw9x06d84z6cs4i5kxm652si3lwvvxma0np40b"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team 21/38] gnu: qtspeech: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtspeech): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3235cfd7c5..abc4aede17 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2836,13 +2836,13 @@ (define-public qtspeech-5
 (define-public qtspeech
   (package
     (name "qtspeech")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1yh3r5zbhgwkjgs7yk6iv2w23766n1i4z8vjkkw5awdixx3gfa76"))))
+                "1khl90m6jd2zg0r0fncdz3r1w2l96vwp6jihpq9rgr730ja7d36c"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases
-- 
2.45.2

[bug#72835] [PATCH qt-team 23/38] gnu: qt-creator: Update to 14.0.1.

[Zheng Junjie]

* gnu/packages/qt.scm (qt-creator): Update to 14.0.1.
[source]: Adjust snippet.
[arguments]<#:phases>: adjust patch-paths phase.

Change-Id: Ideafcf3a7c0ce9c85025472d41fb72527cc4b9fb
---
 gnu/packages/qt.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bf7eaa8546..f322b02d91 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5550,7 +5550,7 @@ (define-public clazy
 (define-public qt-creator
   (package
     (name "qt-creator")
-    (version "12.0.2")
+    (version "14.0.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -5567,13 +5567,17 @@ (define-public qt-creator
                              ;; Marketplace recommends nonfree extensions;
                              ;; remove it.
                              "src/plugins/marketplace"))
+                          (mkdir-p "src/libs/3rdparty/yaml-cpp")
+                          (call-with-output-file "src/libs/3rdparty/yaml-cpp/LICENSE"
+                            (lambda (port)
+                              (const #t)))
                           (substitute* "src/plugins/CMakeLists.txt"
                             (("add_subdirectory\\(marketplace).*") ""))
                           (substitute* "src/plugins/plugins.qbs"
                             ((".*marketplace/marketplace.qbs.*") ""))))
               (sha256
                (base32
-                "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22"))))
+                "0zc9z4zzypqd1q49p4ckwbgxqcnnsc11jgsys6wli1ppmvzmn2zn"))))
     (outputs '("out" "debug"))
     (build-system qt-build-system)
     (arguments
@@ -5623,7 +5627,7 @@ (define-public qt-creator
                              "src/libs/utils/deviceshell.cpp")
                 (("/bin/sh")
                  (search-input-file inputs "bin/sh")))
-              (substitute* "src/libs/utils/process.cpp"
+              (substitute* "src/libs/utils/qtcprocess.cpp"
                 (("/usr/bin/env")
                  (search-input-file inputs "bin/env")))
               (substitute* '("tests/auto/utils/process/tst_process.cpp"
-- 
2.45.2

[bug#72835] [PATCH qt-team 23/38] gnu: qt-creator: Update to 14.0.1.

[Maxim Cournoyer]

Hi,

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> * gnu/packages/qt.scm (qt-creator): Update to 14.0.1.
> [source]: Adjust snippet.
> [arguments]<#:phases>: adjust patch-paths phase.
>
> Change-Id: Ideafcf3a7c0ce9c85025472d41fb72527cc4b9fb
> ---
>  gnu/packages/qt.scm | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index bf7eaa8546..f322b02d91 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -5550,7 +5550,7 @@ (define-public clazy
>  (define-public qt-creator
>    (package
>      (name "qt-creator")
> -    (version "12.0.2")
> +    (version "14.0.1")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -5567,13 +5567,17 @@ (define-public qt-creator
>                               ;; Marketplace recommends nonfree extensions;
>                               ;; remove it.
>                               "src/plugins/marketplace"))
> +                          (mkdir-p "src/libs/3rdparty/yaml-cpp")
> +                          (call-with-output-file "src/libs/3rdparty/yaml-cpp/LICENSE"
> +                            (lambda (port)
> +                              (const #t)))

Why is the above necessary?  An explanatory comment would be nice.

-- 
Thanks,
Maxim

[bug#72835] [PATCH qt-team 23/38] gnu: qt-creator: Update to 14.0.1.

[Maxim Cournoyer]

Hi,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Hi,
>
> Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:
>
>> * gnu/packages/qt.scm (qt-creator): Update to 14.0.1.
>> [source]: Adjust snippet.
>> [arguments]<#:phases>: adjust patch-paths phase.
>>
>> Change-Id: Ideafcf3a7c0ce9c85025472d41fb72527cc4b9fb
>> ---
>>  gnu/packages/qt.scm | 10 +++++++---
>>  1 file changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
>> index bf7eaa8546..f322b02d91 100644
>> --- a/gnu/packages/qt.scm
>> +++ b/gnu/packages/qt.scm
>> @@ -5550,7 +5550,7 @@ (define-public clazy
>>  (define-public qt-creator
>>    (package
>>      (name "qt-creator")
>> -    (version "12.0.2")
>> +    (version "14.0.1")
>>      (source (origin
>>                (method url-fetch)
>>                (uri (string-append
>> @@ -5567,13 +5567,17 @@ (define-public qt-creator
>>                               ;; Marketplace recommends nonfree extensions;
>>                               ;; remove it.
>>                               "src/plugins/marketplace"))
>> +                          (mkdir-p "src/libs/3rdparty/yaml-cpp")
>> +                          (call-with-output-file "src/libs/3rdparty/yaml-cpp/LICENSE"
>> +                            (lambda (port)
>> +                              (const #t)))
>
> Why is the above necessary?  An explanatory comment would be nice.

I think that's my only comment which hasn't been addressed; if you
could, that'd be nice.  Otherwise I've already added my Reviewed-by tag
so feel free to push at your convenience.

-- 
Thanks,
Maxim

[bug#72835] [PATCH qt-team 23/38] gnu: qt-creator: Update to 14.0.1.

[Z572]

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

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Hi,
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>
>> Hi,
>>
>> Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:
>>
>>> * gnu/packages/qt.scm (qt-creator): Update to 14.0.1.
>>> [source]: Adjust snippet.
>>> [arguments]<#:phases>: adjust patch-paths phase.
>>>
>>> Change-Id: Ideafcf3a7c0ce9c85025472d41fb72527cc4b9fb
>>> ---
>>>  gnu/packages/qt.scm | 10 +++++++---
>>>  1 file changed, 7 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
>>> index bf7eaa8546..f322b02d91 100644
>>> --- a/gnu/packages/qt.scm
>>> +++ b/gnu/packages/qt.scm
>>> @@ -5550,7 +5550,7 @@ (define-public clazy
>>>  (define-public qt-creator
>>>    (package
>>>      (name "qt-creator")
>>> -    (version "12.0.2")
>>> +    (version "14.0.1")
>>>      (source (origin
>>>                (method url-fetch)
>>>                (uri (string-append
>>> @@ -5567,13 +5567,17 @@ (define-public qt-creator
>>>                               ;; Marketplace recommends nonfree extensions;
>>>                               ;; remove it.
>>>                               "src/plugins/marketplace"))
>>> +                          (mkdir-p "src/libs/3rdparty/yaml-cpp")
>>> +                          (call-with-output-file "src/libs/3rdparty/yaml-cpp/LICENSE"
>>> +                            (lambda (port)
>>> +                              (const #t)))
>>
>> Why is the above necessary?  An explanatory comment would be nice.
>
> I think that's my only comment which hasn't been addressed; if you
> could, that'd be nice.  Otherwise I've already added my Reviewed-by tag
> so feel free to push at your convenience.

This has been addressed in v2

Sorry I forgot to reply to this.


+                          ;; qt-creator installation attempts to install the
+                          ;; yaml-cpp LICENSE file, but we removed the bundled
+                          ;; yaml-cpp, so create an empty file to allow it to
+                          ;; install properly.

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

[bug#72835] [PATCH qt-team 24/38] gnu: qtnetworkauth: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtnetworkauth): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f322b02d91..494457fb47 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2754,13 +2754,13 @@ (define-public qtnetworkauth-5
 (define-public qtnetworkauth
   (package
     (name "qtnetworkauth")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "153mpg4hv3nclcdrkbzkalg4xf5k6r64fj003b725zyp885s7fax"))))
+                "0w7l5lhhxhg9x1rd66727gwkpzi6l7wmyc0c4qrfp2g5rx7q42bz"))))
     (build-system cmake-build-system)
     (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
     (native-inputs (list perl))
-- 
2.45.2

[bug#72835] [PATCH qt-team 25/38] gnu: abseil-cpp: Update to 20240722.0.

[Zheng Junjie]

* gnu/packages/cpp.scm (abseil-cpp): Update to 20240722.0.

Change-Id: I9dd3ed159b2f2186ca13ffea9c3879ba45a17104
---
 gnu/packages/cpp.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 7dca7a2d02..3e9779efd3 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1502,7 +1502,7 @@ (define-public abseil-cpp
     (package
       (inherit base)
       (name "abseil-cpp")
-      (version "20230802.1")
+      (version "20240722.0")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1511,7 +1511,7 @@ (define-public abseil-cpp
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1ydkkbanrpkp5i814arzsk973kyzhhjhagnp392rq6rrv16apldq"))
+                  "1pmrigimzic2k3ix3l81j2jpfgjgbajz0qbc5s57zljr2w7fjn77"))
                 (patches
                  (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
       (arguments
@@ -1526,7 +1526,7 @@ (define-public abseil-cpp
               (add-before 'check 'set-env-vars
                 (lambda* (#:key inputs #:allow-other-keys)
                  ;; absl_time_test requires this environment variable.
-                 (setenv "TZDIR" (string-append #$(package-source base)
+                 (setenv "TZDIR" (string-append #$(package-source this-package)
                                                 "/absl/time/internal/cctz/testdata/zoneinfo")))))))))))
 
 (define (abseil-cpp-for-c++-standard base version)
-- 
2.45.2

[bug#72835] [PATCH qt-team 26/38] gnu: libvpx: Update to 1.14.1.

[Zheng Junjie]

* gnu/packages/video.scm (libvpx): Update to 1.14.1.
[replacement]: Ungrafts.
(libvpx/fixed): Remove it.

Change-Id: I123caed254e8046751f104cd3a82e4db904de787
---
 gnu/packages/video.scm | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 7d22d2f8f7..50cfe9f81a 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -67,7 +67,7 @@
 ;;; Copyright © 2023 Dominik Delgado Steuter <dds@disroot.org>
 ;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi>
 ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -2907,8 +2907,7 @@ (define-public mpv-mpris
 (define-public libvpx
   (package
     (name "libvpx")
-    (version "1.12.0")
-    (replacement libvpx/fixed)
+    (version "1.14.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2917,7 +2916,7 @@ (define-public libvpx
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm"))
+                "0r6qvc84mflpy1zxz7p8aj7i552cwx957l50akvajxmzij1kpy1x"))
               (patches (search-patches "libvpx-CVE-2016-2818.patch"))))
     (build-system gnu-build-system)
     (arguments
@@ -2947,16 +2946,6 @@ (define-public libvpx
     (license license:bsd-3)
     (home-page "https://www.webmproject.org/")))
 
-(define libvpx/fixed
-  (package
-    (inherit libvpx)
-    (source
-     (origin
-       (inherit (package-source libvpx))
-       (patches (search-patches "libvpx-CVE-2016-2818.patch"
-                                "libvpx-CVE-2023-5217.patch"
-                                "libvpx-CVE-2023-44488.patch"))))))
-
 (define-public orfondl
   (package
     (name "orfondl")
-- 
2.45.2

[bug#72835] [PATCH qt-team 27/38] gnu: Add re2-next.

[Zheng Junjie]

* gnu/packages/regex.scm (re2-next): New Variable.

Change-Id: I5745870605f1ad3ce1733b02e454b758b3cbabfc
---
 gnu/packages/regex.scm | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm
index 639244f37d..d058b096a7 100644
--- a/gnu/packages/regex.scm
+++ b/gnu/packages/regex.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2016, 2020, 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,7 +28,10 @@ (define-module (gnu packages regex)
   #:use-module (guix git-download)
   #:use-module (guix gexp)
   #:use-module (guix build-system gnu)
-  #:use-module (guix utils))
+  #:use-module (guix build-system cmake)
+  #:use-module (guix utils)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages cpp))
 
 (define-public re2
    (package
@@ -60,6 +64,29 @@ (define-public re2
 Python.  It is a C++ library.")
      (license license:bsd-3)))
 
+(define-public re2-next
+  (package
+    (inherit re2)
+    (name "re2")
+    (version "2024-07-02")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/google/re2")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "11q0kz8b3y5ysn58fr62yhib520f9l3grbn8gxr8x5s9k700vq11"))))
+    (build-system cmake-build-system)
+    (arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"
+                                               ;; "-DRE2_USE_ICU=ON"
+                                               #$@(if (%current-target-system)
+                                                      #~("-DRE2_BUILD_TESTING=ON")
+                                                      #~()))))
+    (native-inputs (list googletest))
+    (propagated-inputs (list abseil-cpp))))
+
 (define-public tre
   (package
     (name "tre")
-- 
2.45.2

[bug#72835] [PATCH qt-team 22/38] gnu: qthttpserver: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qthttpserver): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index abc4aede17..bf7eaa8546 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5141,13 +5141,13 @@ (define-public qhexedit
 (define-public qthttpserver
   (package
     (name "qthttpserver")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0dbqx36ywfmqi4nxfi4dl17scj9nkl8sbpb670ffy3nh8pbpib21"))))
+                "11lbfx08yl725w4n8dmvviscixvfkpzx8ijhy74gx0waz6sbjlq3"))))
     (build-system cmake-build-system)
     (inputs (list qtbase qtwebsockets))
     (home-page (package-home-page qtbase))
-- 
2.45.2

[bug#72835] [PATCH qt-team 28/38] gnu: Add icu4c-75.

[Zheng Junjie]

* gnu/packages/icu4c.scm (icu4c-75): New variable.

Change-Id: Ief8063ecbebd12e755fd65a33d8a412f5b36f851
---
 gnu/packages/icu4c.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 6f09fae65c..0ca917305d 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -132,6 +133,23 @@ (define-public icu4c-73
                  "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")
                 (origin-patches (package-source icu4c))))))))
 
+(define-public icu4c-75
+  (package
+    (inherit icu4c)
+    (name "icu4c")
+    (version "75.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/unicode-org/icu/releases/download/release-"
+                    (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
+                    "/icu4c-"
+                    (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
+                    "-src.tgz"))
+              (sha256
+               (base32
+                "1vya31v549pq89kgr02jajwi7gc7qw0mv6n4265pxs6jwkrqv5nb"))))))
+
 (define-public icu4c-70
   (package
     (inherit icu4c)
-- 
2.45.2

[bug#72835] [PATCH qt-team 29/38] gnu: qtwebengine: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwebengine): Update to 6.7.2.
[source]: Adjust preserved-third-party-files.
[inputs]: replace icu4c and re2 with icu4c-75 and re2-next. add fxdiv, fp16.
[arguments]<#:configuration-flags>: Set -DQT_FEATURE_webenginedriver=OFF.
Change-Id: Idbfe2c0b180947c41dabbb55548bbc3aaf217d05

Change-Id: Ib1a9445ca815e2cc065716d408e0d1c5211694c7
---
 gnu/packages/qt.scm | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 494457fb47..0102c0f27c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3336,14 +3336,14 @@ (define-public qtwebengine-5
 (define-public qtwebengine
   (package
     (name "qtwebengine")
-    (version "6.6.3")
+    (version "6.7.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
         (base32
-         "016qvbmdja2abajvsznnjdvblrmzgvs8s2dzlxws30hvna1xqavw"))
+         "1lgz0mj9lw4ii1c8nkbr0ll02xzx8i6n7wvvn21f72sdb5smhxf7"))
        (modules '((ice-9 ftw)
                   (ice-9 match)
                   (srfi srfi-1)
@@ -3378,10 +3378,10 @@ (define-public qtwebengine
                     "third_party/angle/src/common/third_party/xxhash"
                     "third_party/angle/src/third_party/libXNVCtrl" ;Expat
                     "third_party/angle/src/third_party/volk"
-                    "third_party/angle/src/third_party/systeminfo"
                     "third_party/angle/src/third_party/ceval"
                     "third_party/axe-core"
                     "third_party/blink"
+                    "third_party/bidimapper"
                     "third_party/boringssl"
                     "third_party/boringssl/src/third_party/fiat"
                     "third_party/breakpad"
@@ -3405,6 +3405,7 @@ (define-public qtwebengine
                     "third_party/crashpad/crashpad/third_party/lss"
                     "third_party/crashpad/crashpad/third_party/zlib"
                     "third_party/crc32c"
+                    "third_party/d3"
                     "third_party/dav1d"
                     "third_party/dawn"
                     "third_party/dawn/third_party/gn/webgpu-cts"
@@ -3418,7 +3419,6 @@ (define-public qtwebengine
                     "third_party/devtools-frontend/src/front_end/third_party/codemirror"
                     "third_party/devtools-frontend/src/front_end/third_party/codemirror.next"
                     "third_party/devtools-frontend/src/front_end/third_party/diff"
-                    "third_party/devtools-frontend/src/front_end/third_party/i18n"
                     "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat"
                     "third_party/devtools-frontend/src/front_end/third_party/lighthouse"
                     "third_party/devtools-frontend/src/front_end/third_party/lit"
@@ -3428,7 +3428,10 @@ (define-public qtwebengine
                     "third_party/devtools-frontend/src/front_end/third_party/\
 puppeteer/package/lib/esm/third_party/mitt"
                     "third_party/devtools-frontend/src/front_end/third_party/\
+puppeteer/package/lib/esm/third_party/rxjs"
+                    "third_party/devtools-frontend/src/front_end/third_party/\
 vscode.web-custom-data"
+                    "third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay"
                     "third_party/devtools-frontend/src/third_party/pyjson5"
                     "third_party/devtools-frontend/src/front_end/third_party/wasmparser"
                     "third_party/devtools-frontend/src/third_party/typescript"
@@ -3471,6 +3474,7 @@ (define-public qtwebengine
                     "third_party/libaom/source/libaom/third_party/vector"
                     "third_party/libaom/source/libaom/third_party/x86inc"
                     "third_party/libavif"
+                    "third_party/libavifinfo"
                     "third_party/libevent"
                     "third_party/libgav1"
                     "third_party/libjingle_xmpp"
@@ -3505,7 +3509,6 @@ (define-public qtwebengine
                     "third_party/one_euro_filter"
                     "third_party/openscreen" ;BSD-3
                     "third_party/openscreen/src/third_party/tinycbor" ;Expat
-                    "third_party/openscreen/src/third_party/mozilla" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3
                     "third_party/openh264"
                     "third_party/opus/src/include/opus.h"
                     "third_party/opus/src/include/opus_custom.h"
@@ -3522,7 +3525,6 @@ (define-public qtwebengine
                     "third_party/pdfium/third_party/lcms"
                     "third_party/pdfium/third_party/libopenjpeg"
                     "third_party/pdfium/third_party/libtiff"
-                    "third_party/pdfium/third_party/skia_shared"
                     "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
                     "third_party/perfetto"
                     "third_party/perfetto/protos/third_party/chromium"
@@ -3538,6 +3540,7 @@ (define-public qtwebengine
                     "third_party/re2"
                     "third_party/rnnoise"
                     "third_party/ruy" ;ASL2.0
+                    "third_party/selenium-atoms"
                     "third_party/s2cellid" ;ASL2.0
                     "third_party/securemessage" ;ASL2.0
                     "third_party/shell-encryption" ;ASL2.0
@@ -3567,7 +3570,7 @@ (define-public qtwebengine
                     "third_party/vulkan-deps/vulkan-tools"
                     "third_party/vulkan-deps/vulkan-validation-layers"
                     "third_party/vulkan_memory_allocator"
-                    "third_party/web-animations-js"
+                    "third_party/webgpu-cts"
                     "third_party/webrtc"
                     "third_party/webrtc/common_audio/third_party/ooura"
                     "third_party/webrtc/common_audio/third_party/spl_sqrt_floor"
@@ -3583,6 +3586,7 @@ (define-public qtwebengine
                     "third_party/wuffs"
                     "third_party/x11proto"
                     "third_party/xnnpack" ;BSD-3
+                    "third_party/zstd"
                     "third_party/zlib" ;TODO: make pdfium use system version
                     "third_party/zxcvbn-cpp" ;Expat
                     "url/third_party/mozilla"
@@ -3643,6 +3647,10 @@ (define-public qtwebengine
               "-DQT_FEATURE_webengine_pepper_plugins=OFF" ;widevine
               "-DQT_FEATURE_system_ffmpeg=ON"
 
+              ;; when enable, will "RUNPATH validation failed" on
+              ;; lib/qt6/libexec/webenginedriver
+              "-DQT_FEATURE_webenginedriver=OFF"
+
               ;; Do not artificially limit codec support; video decoding is
               ;; done by ffmpeg.
               "-DQT_FEATURE_webengine_proprietary_codecs=ON"
@@ -3720,9 +3728,9 @@ (define-public qtwebengine
             (lambda _
               (invoke "cmake" "--install" ".")))
           (add-after 'install 'delete-installed-tests
-                 (lambda _
-                   (delete-file-recursively
-                    (string-append #$output "/tests")))))))
+            (lambda _
+              (delete-file-recursively
+               (string-append #$output "/tests")))))))
     (native-inputs
      (modify-inputs (package-native-inputs qtwebengine-5)
        (delete "python2" "python2-six")
@@ -3734,8 +3742,10 @@ (define-public qtwebengine
                python-html5lib)))
     (inputs
      (modify-inputs (package-inputs qtwebengine-5)
+       (replace "icu4c" icu4c-75)
+       (replace "re2" re2-next)
        (replace "qtmultimedia" qtmultimedia)
-       (append libxkbfile xkeyboard-config)))
+       (append libxkbfile xkeyboard-config fxdiv fp16)))
     (propagated-inputs
      (modify-inputs (package-propagated-inputs qtwebengine-5)
        (replace "qtbase" qtbase)
-- 
2.45.2

[bug#72835] [PATCH qt-team 29/38] gnu: qtwebengine: Update to 6.7.2.

[Maxim Cournoyer]

Hi,

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> * gnu/packages/qt.scm (qtwebengine): Update to 6.7.2.
> [source]: Adjust preserved-third-party-files.
> [inputs]: replace icu4c and re2 with icu4c-75 and re2-next. add fxdiv, fp16.
> [arguments]<#:configuration-flags>: Set -DQT_FEATURE_webenginedriver=OFF.
> Change-Id: Idbfe2c0b180947c41dabbb55548bbc3aaf217d05
>
> Change-Id: Ib1a9445ca815e2cc065716d408e0d1c5211694c7

[...]

> @@ -3643,6 +3647,10 @@ (define-public qtwebengine
>                "-DQT_FEATURE_webengine_pepper_plugins=OFF" ;widevine
>                "-DQT_FEATURE_system_ffmpeg=ON"
>
> +              ;; when enable, will "RUNPATH validation failed" on
> +              ;; lib/qt6/libexec/webenginedriver
> +              "-DQT_FEATURE_webenginedriver=OFF"
> +

I'd word it more clearly like:

  ;; The webenginedriver feature is disabled, otherwise the RUNPATH
  ;; validation phase fails.

But! Usually this simply requires augmenting the RUNPATH to look not
only under /lib but also e.g. under /lib/qt6/libexec/webenginedriver;
see for example the 'qt-creator' package, which adds an extra rpath to
lib/qtcreator via the CMAKE_SHARED_LINKER_FLAGS CMake option.

>                ;; Do not artificially limit codec support; video decoding is
>                ;; done by ffmpeg.
>                "-DQT_FEATURE_webengine_proprietary_codecs=ON"
> @@ -3720,9 +3728,9 @@ (define-public qtwebengine
>              (lambda _
>                (invoke "cmake" "--install" ".")))
>            (add-after 'install 'delete-installed-tests
> -                 (lambda _
> -                   (delete-file-recursively
> -                    (string-append #$output "/tests")))))))
> +            (lambda _
> +              (delete-file-recursively
> +               (string-append #$output "/tests")))))))
>      (native-inputs
>       (modify-inputs (package-native-inputs qtwebengine-5)
>         (delete "python2" "python2-six")
> @@ -3734,8 +3742,10 @@ (define-public qtwebengine
>                 python-html5lib)))
>      (inputs
>       (modify-inputs (package-inputs qtwebengine-5)
> +       (replace "icu4c" icu4c-75)
> +       (replace "re2" re2-next)
>         (replace "qtmultimedia" qtmultimedia)
> -       (append libxkbfile xkeyboard-config)))
> +       (append libxkbfile xkeyboard-config fxdiv fp16)))

Please keep the input sorted alphabetically, so

> +       (append fp16 fxdiv libxkbfile xkeyboard-config)))


-- 
Thanks,
Maxim

[bug#72835] [PATCH qt-team 29/38] gnu: qtwebengine: Update to 6.7.2.

[Z572]

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

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Hi,
>
> Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:
>
>> * gnu/packages/qt.scm (qtwebengine): Update to 6.7.2.
>> [source]: Adjust preserved-third-party-files.
>> [inputs]: replace icu4c and re2 with icu4c-75 and re2-next. add fxdiv, fp16.
>> [arguments]<#:configuration-flags>: Set -DQT_FEATURE_webenginedriver=OFF.
>> Change-Id: Idbfe2c0b180947c41dabbb55548bbc3aaf217d05
>>
>> Change-Id: Ib1a9445ca815e2cc065716d408e0d1c5211694c7
>
> [...]
>
>> @@ -3643,6 +3647,10 @@ (define-public qtwebengine
>>                "-DQT_FEATURE_webengine_pepper_plugins=OFF" ;widevine
>>                "-DQT_FEATURE_system_ffmpeg=ON"
>>
>> +              ;; when enable, will "RUNPATH validation failed" on
>> +              ;; lib/qt6/libexec/webenginedriver
>> +              "-DQT_FEATURE_webenginedriver=OFF"
>> +
>
> I'd word it more clearly like:
>
>   ;; The webenginedriver feature is disabled, otherwise the RUNPATH
>   ;; validation phase fails.
>
> But! Usually this simply requires augmenting the RUNPATH to look not
> only under /lib but also e.g. under /lib/qt6/libexec/webenginedriver;
> see for example the 'qt-creator' package, which adds an extra rpath to
> lib/qtcreator via the CMAKE_SHARED_LINKER_FLAGS CMake option.

Unfortunately I have tried many methods, but webenginedriver still uses rpath.

>
>>                ;; Do not artificially limit codec support; video decoding is
>>                ;; done by ffmpeg.
>>                "-DQT_FEATURE_webengine_proprietary_codecs=ON"
>> @@ -3720,9 +3728,9 @@ (define-public qtwebengine
>>              (lambda _
>>                (invoke "cmake" "--install" ".")))
>>            (add-after 'install 'delete-installed-tests
>> -                 (lambda _
>> -                   (delete-file-recursively
>> -                    (string-append #$output "/tests")))))))
>> +            (lambda _
>> +              (delete-file-recursively
>> +               (string-append #$output "/tests")))))))
>>      (native-inputs
>>       (modify-inputs (package-native-inputs qtwebengine-5)
>>         (delete "python2" "python2-six")
>> @@ -3734,8 +3742,10 @@ (define-public qtwebengine
>>                 python-html5lib)))
>>      (inputs
>>       (modify-inputs (package-inputs qtwebengine-5)
>> +       (replace "icu4c" icu4c-75)
>> +       (replace "re2" re2-next)
>>         (replace "qtmultimedia" qtmultimedia)
>> -       (append libxkbfile xkeyboard-config)))
>> +       (append libxkbfile xkeyboard-config fxdiv fp16)))
>
> Please keep the input sorted alphabetically, so

have done.

>
>> +       (append fp16 fxdiv libxkbfile xkeyboard-config)))

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

[bug#72835] [PATCH qt-team 29/38] gnu: qtwebengine: Update to 6.7.2.

[Maxim Cournoyer]

Hi,

Z572 <zhengjunjie@iscas.ac.cn> writes:

> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>
>> Hi,
>>
>> Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:
>>
>>> * gnu/packages/qt.scm (qtwebengine): Update to 6.7.2.
>>> [source]: Adjust preserved-third-party-files.
>>> [inputs]: replace icu4c and re2 with icu4c-75 and re2-next. add fxdiv, fp16.
>>> [arguments]<#:configuration-flags>: Set -DQT_FEATURE_webenginedriver=OFF.
>>> Change-Id: Idbfe2c0b180947c41dabbb55548bbc3aaf217d05
>>>
>>> Change-Id: Ib1a9445ca815e2cc065716d408e0d1c5211694c7
>>
>> [...]
>>
>>> @@ -3643,6 +3647,10 @@ (define-public qtwebengine
>>>                "-DQT_FEATURE_webengine_pepper_plugins=OFF" ;widevine
>>>                "-DQT_FEATURE_system_ffmpeg=ON"
>>>
>>> +              ;; when enable, will "RUNPATH validation failed" on
>>> +              ;; lib/qt6/libexec/webenginedriver
>>> +              "-DQT_FEATURE_webenginedriver=OFF"
>>> +
>>
>> I'd word it more clearly like:
>>
>>   ;; The webenginedriver feature is disabled, otherwise the RUNPATH
>>   ;; validation phase fails.
>>
>> But! Usually this simply requires augmenting the RUNPATH to look not
>> only under /lib but also e.g. under /lib/qt6/libexec/webenginedriver;
>> see for example the 'qt-creator' package, which adds an extra rpath to
>> lib/qtcreator via the CMAKE_SHARED_LINKER_FLAGS CMake option.
>
> Unfortunately I have tried many methods, but webenginedriver still uses rpath.

OK, they must do something hard-coded in their CMake files causing that.

>>
>>>                ;; Do not artificially limit codec support; video decoding is
>>>                ;; done by ffmpeg.
>>>                "-DQT_FEATURE_webengine_proprietary_codecs=ON"
>>> @@ -3720,9 +3728,9 @@ (define-public qtwebengine
>>>              (lambda _
>>>                (invoke "cmake" "--install" ".")))
>>>            (add-after 'install 'delete-installed-tests
>>> -                 (lambda _
>>> -                   (delete-file-recursively
>>> -                    (string-append #$output "/tests")))))))
>>> +            (lambda _
>>> +              (delete-file-recursively
>>> +               (string-append #$output "/tests")))))))
>>>      (native-inputs
>>>       (modify-inputs (package-native-inputs qtwebengine-5)
>>>         (delete "python2" "python2-six")
>>> @@ -3734,8 +3742,10 @@ (define-public qtwebengine
>>>                 python-html5lib)))
>>>      (inputs
>>>       (modify-inputs (package-inputs qtwebengine-5)
>>> +       (replace "icu4c" icu4c-75)
>>> +       (replace "re2" re2-next)
>>>         (replace "qtmultimedia" qtmultimedia)
>>> -       (append libxkbfile xkeyboard-config)))
>>> +       (append libxkbfile xkeyboard-config fxdiv fp16)))
>>
>> Please keep the input sorted alphabetically, so
>
> have done.

Thanks!

-- 
Maxim

[bug#72835] [PATCH qt-team 30/38] gnu: python-shiboken-6: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (python-shiboken-6): Update to 6.7.2.

Change-Id: I899a3a966ab35108fe5a6029a4b7f3079c48ae8f
---
 gnu/packages/qt.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0102c0f27c..7067e46040 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4818,7 +4818,7 @@ (define-public python-shiboken-6
   (package
     (inherit python-shiboken-2)
     (name "python-shiboken-6")
-    (version "6.6.2")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://qt/QtForPython/pyside6/PySide6-"
@@ -4826,7 +4826,7 @@ (define-public python-shiboken-6
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1w690jpxrski7c71gx05q5fvl2117lnjj5ih8iwckx3s9mlhnqhl"))))
+                "1iv8wfc5sfx5xr4b3bhbaqagx8qidx5wl1kzvifsmjbqdq6hsars"))))
     (build-system cmake-build-system)
     (inputs
      (modify-inputs (package-inputs python-shiboken-2)
@@ -4846,8 +4846,7 @@ (define-public python-shiboken-6
            "-DCMAKE_SKIP_RPATH=TRUE"
            (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath="
                           #$output "/lib")
-           #$flags))))
-    (properties `((upstream-name . "pyside-setup")))))
+           #$flags))))))
 
 (define-public python-pyside-2
   (package
-- 
2.45.2

[bug#72835] [PATCH qt-team 30/38] gnu: python-shiboken-6: Update to 6.7.2.

[Maxim Cournoyer]

Hi,

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> * gnu/packages/qt.scm (python-shiboken-6): Update to 6.7.2.
>
> Change-Id: I899a3a966ab35108fe5a6029a4b7f3079c48ae8f
> ---
>  gnu/packages/qt.scm | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index 0102c0f27c..7067e46040 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -4818,7 +4818,7 @@ (define-public python-shiboken-6
>    (package
>      (inherit python-shiboken-2)
>      (name "python-shiboken-6")
> -    (version "6.6.2")
> +    (version "6.7.2")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "mirror://qt/QtForPython/pyside6/PySide6-"
> @@ -4826,7 +4826,7 @@ (define-public python-shiboken-6
>                                    version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1w690jpxrski7c71gx05q5fvl2117lnjj5ih8iwckx3s9mlhnqhl"))))
> +                "1iv8wfc5sfx5xr4b3bhbaqagx8qidx5wl1kzvifsmjbqdq6hsars"))))
>      (build-system cmake-build-system)
>      (inputs
>       (modify-inputs (package-inputs python-shiboken-2)
> @@ -4846,8 +4846,7 @@ (define-public python-shiboken-6
>             "-DCMAKE_SKIP_RPATH=TRUE"
>             (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath="
>                            #$output "/lib")
> -           #$flags))))
> -    (properties `((upstream-name . "pyside-setup")))))
> +           #$flags))))))

Is the above property removal intended?  It's not listed in the
changelog commit message.  I doubt CVE databases have dropped the old
name, but I haven't checked.

-- 
Thanks,
Maxim

[bug#72835] [PATCH qt-team 30/38] gnu: python-shiboken-6: Update to 6.7.2.

[Z572]

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

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Hi,
>
> Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:
>
>> * gnu/packages/qt.scm (python-shiboken-6): Update to 6.7.2.
>>
>> Change-Id: I899a3a966ab35108fe5a6029a4b7f3079c48ae8f
>> ---
>>  gnu/packages/qt.scm | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
>> index 0102c0f27c..7067e46040 100644
>> --- a/gnu/packages/qt.scm
>> +++ b/gnu/packages/qt.scm
>> @@ -4818,7 +4818,7 @@ (define-public python-shiboken-6
>>    (package
>>      (inherit python-shiboken-2)
>>      (name "python-shiboken-6")
>> -    (version "6.6.2")
>> +    (version "6.7.2")
>>      (source (origin
>>                (method url-fetch)
>>                (uri (string-append "mirror://qt/QtForPython/pyside6/PySide6-"
>> @@ -4826,7 +4826,7 @@ (define-public python-shiboken-6
>>                                    version ".tar.xz"))
>>                (sha256
>>                 (base32
>> -                "1w690jpxrski7c71gx05q5fvl2117lnjj5ih8iwckx3s9mlhnqhl"))))
>> +                "1iv8wfc5sfx5xr4b3bhbaqagx8qidx5wl1kzvifsmjbqdq6hsars"))))
>>      (build-system cmake-build-system)
>>      (inputs
>>       (modify-inputs (package-inputs python-shiboken-2)
>> @@ -4846,8 +4846,7 @@ (define-public python-shiboken-6
>>             "-DCMAKE_SKIP_RPATH=TRUE"
>>             (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath="
>>                            #$output "/lib")
>> -           #$flags))))
>> -    (properties `((upstream-name . "pyside-setup")))))
>> +           #$flags))))))
>
> Is the above property removal intended?  It's not listed in the
> changelog commit message.  I doubt CVE databases have dropped the old
> name, but I haven't checked.

It seems that guix refresh cannot update to 6.7 if it is currently 6.6,
but it can update to 6.7 if it is 6.5. I added this part back.

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

[bug#72835] [PATCH qt-team 31/38] gnu: qtconnectivity: Rename to qtconnectivity-5.

[Zheng Junjie]

* gnu/packages/qt.scm (qtconnectivity): Rename to qtconnectivity-5.

(python-pyqt)[inputs]: Adjust it.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7067e46040..1956fec57a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1669,7 +1669,7 @@ (define-public qtdeclarative
 integrate QML code with JavaScript and C++.")
     (license (package-license qtbase))))
 
-(define-public qtconnectivity
+(define-public qtconnectivity-5
   (package
     (inherit qtsvg-5)
     (name "qtconnectivity")
@@ -3997,7 +3997,7 @@ (define-public python-pyqt
     (inputs
      `(("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
-       ("qtconnectivity" ,qtconnectivity)
+       ("qtconnectivity-5" ,qtconnectivity-5)
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation-5)
        ("qtmultimedia-5" ,qtmultimedia-5)
-- 
2.45.2

[bug#72835] [PATCH qt-team 32/38] gnu: Add qtconnectivity.

[Zheng Junjie]

* gnu/packages/qt.scm (qtconnectivity): New variable.

Change-Id: Ia2c1d9d260b47cd3a18c9ab5ac7e8f5ea83b7e11
---
 gnu/packages/qt.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1956fec57a..df8759b832 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1688,6 +1688,29 @@ (define-public qtconnectivity-5
     (description "The Qt Connectivity modules provides modules for interacting
 with Bluetooth and NFC.")))
 
+(define-public qtconnectivity
+  (package
+    (inherit qtsvg)
+    (name "qtconnectivity")
+    (version "6.6.3")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "066mf4d6a81ywviwr8bvm1mpm2ykjzysvcc0v2x82h5bl28vl6h9"))))
+    (native-inputs
+     (list perl pkg-config qtdeclarative))
+    (inputs
+     (list bluez qtbase))
+    (arguments (substitute-keyword-arguments (package-arguments qtsvg)
+                 ((#:phases phases)
+                  #~(modify-phases #$phases
+                      (delete 'delete-installed-tests)))))
+    (synopsis "Qt Connectivity module")
+    (description "The Qt Connectivity modules provides modules for interacting
+with Bluetooth and NFC.")))
+
 (define-public qtwebsockets-5
   (package (inherit qtsvg-5)
     (name "qtwebsockets")
-- 
2.45.2

[bug#72835] [PATCH qt-team 32/38] gnu: Add qtconnectivity.

[Maxim Cournoyer]

Hi Zheng,

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> * gnu/packages/qt.scm (qtconnectivity): New variable.
>
> Change-Id: Ia2c1d9d260b47cd3a18c9ab5ac7e8f5ea83b7e11
> ---
>  gnu/packages/qt.scm | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index 1956fec57a..df8759b832 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -1688,6 +1688,29 @@ (define-public qtconnectivity-5
>      (description "The Qt Connectivity modules provides modules for interacting
>  with Bluetooth and NFC.")))
>  
> +(define-public qtconnectivity
> +  (package
> +    (inherit qtsvg)
> +    (name "qtconnectivity")
> +    (version "6.6.3")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (qt-url name version))
> +              (sha256
> +               (base32
> +                "066mf4d6a81ywviwr8bvm1mpm2ykjzysvcc0v2x82h5bl28vl6h9"))))
> +    (native-inputs
> +     (list perl pkg-config qtdeclarative))
> +    (inputs
> +     (list bluez qtbase))
> +    (arguments (substitute-keyword-arguments (package-arguments qtsvg)
> +                 ((#:phases phases)
> +                  #~(modify-phases #$phases
> +                      (delete 'delete-installed-tests)))))
> +    (synopsis "Qt Connectivity module")
> +    (description "The Qt Connectivity modules provides modules for interacting
> +with Bluetooth and NFC.")))

I'm not sure about using inheritance this way; the packages are
unrelated. You'd at least want to ensure propagated-inputs is forced to
'() in case qtsvg had some added in the future.

I think I had refrained from using this style for Qt 6 thus far, as I
found it obfuscated the package definitions for Qt 5.

Could you rewrite it to use the style as used for example by
qtshadertools?  Only the home page and license fields need to be
specified.  So it's one field difference, and better clarity.

Could you please send a v2?

-- 
Thanks,
Maxim

[bug#72835] [PATCH qt-team 32/38] gnu: Add qtconnectivity.

[Z572]

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

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Hi Zheng,
>
> Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:
>
>> * gnu/packages/qt.scm (qtconnectivity): New variable.
>>
>> Change-Id: Ia2c1d9d260b47cd3a18c9ab5ac7e8f5ea83b7e11
>> ---
>>  gnu/packages/qt.scm | 23 +++++++++++++++++++++++
>>  1 file changed, 23 insertions(+)
>>
>> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
>> index 1956fec57a..df8759b832 100644
>> --- a/gnu/packages/qt.scm
>> +++ b/gnu/packages/qt.scm
>> @@ -1688,6 +1688,29 @@ (define-public qtconnectivity-5
>>      (description "The Qt Connectivity modules provides modules for interacting
>>  with Bluetooth and NFC.")))
>>  
>> +(define-public qtconnectivity
>> +  (package
>> +    (inherit qtsvg)
>> +    (name "qtconnectivity")
>> +    (version "6.6.3")
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri (qt-url name version))
>> +              (sha256
>> +               (base32
>> +                "066mf4d6a81ywviwr8bvm1mpm2ykjzysvcc0v2x82h5bl28vl6h9"))))
>> +    (native-inputs
>> +     (list perl pkg-config qtdeclarative))
>> +    (inputs
>> +     (list bluez qtbase))
>> +    (arguments (substitute-keyword-arguments (package-arguments qtsvg)
>> +                 ((#:phases phases)
>> +                  #~(modify-phases #$phases
>> +                      (delete 'delete-installed-tests)))))
>> +    (synopsis "Qt Connectivity module")
>> +    (description "The Qt Connectivity modules provides modules for interacting
>> +with Bluetooth and NFC.")))
>
> I'm not sure about using inheritance this way; the packages are
> unrelated. You'd at least want to ensure propagated-inputs is forced to
> '() in case qtsvg had some added in the future.
>
> I think I had refrained from using this style for Qt 6 thus far, as I
> found it obfuscated the package definitions for Qt 5.
>
> Could you rewrite it to use the style as used for example by
> qtshadertools?  Only the home page and license fields need to be
> specified.  So it's one field difference, and better clarity.
>
> Could you please send a v2?

done.

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

[bug#72835] [PATCH qt-team 33/38] gnu: Add python-setuptools-scm-next.

[Zheng Junjie]

* gnu/packages/python-build.scm (python-setuptools-scm-next): New variable.

Change-Id: Ic6b95ed437f95c25c165de3d51732154e2bd954a
---
 gnu/packages/python-build.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 72da369208..e79336796d 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2022 Garek Dyszel <garekdyszel@disroot.org>
 ;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2024 David Elsing <david.elsing@posteo.net>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -696,6 +697,37 @@ (define-public python-setuptools-scm
 them as the version argument or in a SCM managed file.")
     (license license:expat)))
 
+(define-public python-setuptools-scm-next
+  (package
+    (inherit python-setuptools-scm)
+    (name "python-setuptools-scm")
+    (version "8.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "setuptools_scm" version))
+              (sha256
+               (base32 "19y84rzqwb2rd88bjrlafrhfail2bnk6apaig8xskjviayva3pj2"))))
+    (build-system pyproject-build-system)
+    (arguments (list
+                ;; pyproject-build-system will error handle forms such as
+                ;; "module:object", so we set it.
+                #:build-backend "setuptools.build_meta"
+                #:phases
+                #~(modify-phases %standard-phases
+                    (add-before 'build 'setenv
+                      (lambda _
+                        ;; pyproject-build-system ignore backend-path,
+                        ;; and __import__ ignore GUIX_PYTHONPATH, so set
+                        ;; PYTHONPATH.
+                        (setenv "PYTHONPATH"
+                                (string-append
+                                 (getcwd)
+                                 ":"
+                                 (getcwd) "/src:"
+                                 (getenv "GUIX_PYTHONPATH"))))))
+                #:tests? #f))    ;avoid extra dependencies such as pytest
+    (native-inputs (list python-setuptools))))
+
 (define-public python-editables
   (package
     (name "python-editables")
-- 
2.45.2

[bug#72835] [PATCH qt-team 34/38] gnu: python-sip: Update to 6.8.6.

[Zheng Junjie]

* gnu/packages/qt.scm (python-sip): Update to 6.8.6.
[native-inputs]: Add python-setuptools and python-setuptools-scm-next.
[arguments]: Disable tests.

Change-Id: If063d7194711053a4e65ab513573eb6d593e9446
---
 gnu/packages/qt.scm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index df8759b832..f953a96a74 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3917,24 +3917,26 @@ (define-public pyotherside-for-qt5
 (define-public python-sip
   (package
     (name "python-sip")
-    (version "6.8.3")
+    (version "6.8.6")
     (source
-      (origin
-        (method url-fetch)
-        (uri (list (pypi-uri "sip" version)
-                   (string-append "https://www.riverbankcomputing.com/static/"
-                                  "Downloads/sip/" version
-                                  "/sip-" version ".tar.gz")))
-        (sha256
-         (base32
-          "0b3n237lbggz3b6bfmdsl1m4qgai7qyyj6fmvrmc695v32q4g1c8"))
-        (patches (search-patches "python-sip-include-dirs.patch"))))
+     (origin
+       (method url-fetch)
+       (uri (list (pypi-uri "sip" version)
+                  (string-append "https://www.riverbankcomputing.com/static/"
+                                 "Downloads/sip/" version
+                                 "/sip-" version ".tar.gz")))
+       (sha256
+        (base32
+         "0ykxq0607f2sdwbl5cxbp0y8pl14bsgzc9nhifpxbibfivj5kjbz"))
+       (patches (search-patches "python-sip-include-dirs.patch"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list python-wrapper))
+     (list python-wrapper python-setuptools python-setuptools-scm-next))
     (propagated-inputs
      (list python-tomli
            python-packaging))
+    ;; no test.
+    (arguments (list #:tests? #f))
     (home-page "https://www.riverbankcomputing.com/software/sip/intro")
     (synopsis "Python binding creator for C and C++ libraries")
     (description
-- 
2.45.2

[bug#72835] [PATCH qt-team 35/38] gnu: python-pyqt6-sip: Update to 13.8.0.

[Zheng Junjie]

* gnu/packages/qt.scm (python-pyqt6-sip): Update to 13.8.0.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f953a96a74..bbf7722972 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4128,13 +4128,13 @@ (define-public python-pyqt6-sip
   (package
     (inherit python-pyqt5-sip)
     (name "python-pyqt6-sip")
-    (version "13.6.0")
+    (version "13.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "PyQt6_sip" version))
        (sha256
-        (base32 "0y2pgc1kzskq3q230b5d48izvzy9dl4hkfjpcr7kv53ih1cf31i4"))))
+        (base32 "1m39znwza9yypyd93i5mxd9pbf6zn9qdajczpm953awwdlywyx1g"))))
     (synopsis "Sip module support for PyQt6")
     (description
      "SIP is used to write self contained extension modules, i.e. without a library
-- 
2.45.2

[bug#72835] [PATCH qt-team 36/38] gnu: python-pyqt-builder: Update to 1.16.4.

[Zheng Junjie]

* gnu/packages/qt.scm (python-pyqt-builder): Update to 1.16.4.
[source]: Adjust pypi-url's name.
[build-system]: Switch to pyproject-build-system.
[native-inputs]: Add python-setuptools, python-setuptools-scm-next, and python-wheel.
[arguments]: Disable tests.

Change-Id: I2d1186536e9afb02de68c9fcb5e53d40eafa2ca0
---
 gnu/packages/qt.scm | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bbf7722972..f6c55a1127 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4233,26 +4233,31 @@ (define-public python-pyqtwebengine-6
 
 (define-public python-pyqt-builder
   (package
-   (name "python-pyqt-builder")
-   (version "1.14.1")
-   (source
-    (origin
-     (method url-fetch)
-     (uri (pypi-uri "PyQt-builder" version))
-     (sha256
-      (base32
-       "00m5piryz9l4hp5z1ncaqicsp29kj71akdh4b10432zz18q3xg43"))))
-   (build-system python-build-system)
-   (inputs
-    (list python-sip))
-   (home-page "https://www.riverbankcomputing.com/static/Docs/PyQt-builder/")
-   (synopsis "PEP 517 compliant PyQt build system")
-   (description "PyQt-builder is a tool for generating Python bindings for C++
+    (name "python-pyqt-builder")
+    (version "1.16.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pyqt_builder" version))
+       (sha256
+        (base32
+         "1pxgcqk9qf0qvszllb467v2cmr6ngksfr2caz1a2xgkrwcdf85a5"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-setuptools
+                         python-setuptools-scm-next
+                         python-wheel))
+    (inputs
+     (list python-sip))
+    ;; no tests.
+    (arguments (list #:tests? #f))
+    (home-page "https://www.riverbankcomputing.com/static/Docs/PyQt-builder/")
+    (synopsis "PEP 517 compliant PyQt build system")
+    (description "PyQt-builder is a tool for generating Python bindings for C++
 libraries that use the Qt application framework.  The bindings are built on
 top of the PyQt bindings for Qt.  PyQt-builder is used to build PyQt itself.")
-   ;; Either version 2 or 3, but no other version. See the file
-   ;; 'pyqtbuild/builder.py' in the source distribution for more information.
-   (license (list license:gpl2 license:gpl3))))
+    ;; Either version 2 or 3, but no other version. See the file
+    ;; 'pyqtbuild/builder.py' in the source distribution for more information.
+    (license (list license:gpl2 license:gpl3))))
 
 (define-public python-qtpy
   (package
-- 
2.45.2

[bug#72835] [PATCH qt-team 36/38] gnu: python-pyqt-builder: Update to 1.16.4.

[Maxim Cournoyer]

Hi,

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> * gnu/packages/qt.scm (python-pyqt-builder): Update to 1.16.4.
> [source]: Adjust pypi-url's name.
> [build-system]: Switch to pyproject-build-system.
> [native-inputs]: Add python-setuptools, python-setuptools-scm-next, and python-wheel.
> [arguments]: Disable tests.
>
> Change-Id: I2d1186536e9afb02de68c9fcb5e53d40eafa2ca0

[...]

> +    ;; no tests.
> +    (arguments (list #:tests? #f))

You can use an inline comment, e.g.:

       (arguments (list #:tests? #f))   ;no test suite

(you do not need to make a complete sentence for inline comments)

-- 
Thanks,
Maxim

[bug#72835] [PATCH qt-team 37/38] gnu: python-pyqt-6: Update to 6.7.1.

[Zheng Junjie]

* gnu/packages/qt.scm (python-pyqt-6): Update to 6.7.1.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f6c55a1127..1cf72e5741 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4064,14 +4064,14 @@ (define-public python-pyqt
 (define-public python-pyqt-6
   (package
     (inherit python-pyqt)
-    (version "6.6.1")
+    (version "6.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "PyQt6" version))
        (file-name (string-append "PyQt6-" version ".tar.gz"))
        (sha256
-        (base32 "0y83zm7xd2yspjbhmlkqhgi0ppxqhivx0d8gdz2l4l90kni8l5cz"))))
+        (base32 "1fcwslx32h6ik3nmr8pxk7ijha8y881kk880nadfjqisrlnahwin"))))
     (inputs ;Qt5 dependencies only in python-pyqt:
             ;; (qt)connectivity, location, sensors, serialport, x11extras, xmlpatterns.
             (list python-wrapper
-- 
2.45.2

[bug#72835] [PATCH qt-team 38/38] gnu: python-pyqtwebengine-6: Update to 6.7.0.

[Zheng Junjie]

* gnu/packages/qt.scm (python-pyqtwebengine-6): Update to 6.7.0.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1cf72e5741..91237041ac 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4200,13 +4200,13 @@ (define-public python-pyqtwebengine
 (define-public python-pyqtwebengine-6
   (package
     (inherit python-pyqtwebengine)
-    (version "6.6.0")
+    (version "6.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "PyQt6_WebEngine" version))
        (sha256
-        (base32 "11wlnggs5vi7z465xhmnz664wbaj44ki6mmijbk0kr457x69h2ym"))))
+        (base32 "00ahqmdgyfw21nhymarrskx723fakkkq2s4mvvspbqnrnsnwgvb8"))))
     (native-inputs (list python python-sip python-pyqt-builder
                          ;; qtbase is required for qmake
                          qtbase))
-- 
2.45.2

[bug#72835] [PATCH qt-team 00/38] update qt6 to 6.7.2

[Maxim Cournoyer]

Hi Zheng,

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> Hello! This patchset updates qt6 to 6.7.2.
>
> Zheng Junjie (38):
>   gnu: qtbase: Update to 6.7.2.
>   gnu: qt5compat: Update to 6.7.2.
>   gnu: qtsvg: Update to 6.7.2.
>   gnu: qtimageformats: Update to 6.7.2.
>   gnu: qtdeclarative: Update to 6.7.2.
>   gnu: qtwebsockets: Update to 6.7.2.
>   gnu: qtsensors: Update to 6.7.2.
>   gnu: qtshadertools: Update to 6.7.2.
>   gnu: qtmultimedia: Update to 6.7.2.
>   gnu: qtwayland: Update to 6.7.2.
>   gnu: qtserialport: Update to 6.7.2.
>   gnu: qtwebchannel: Update to 6.7.2.
>   gnu: qtlanguageserver: Update to 6.7.2.
>   gnu: qtlocation: Update to 6.7.2.
>   gnu: qtlottie: Update to 6.7.2.
>   gnu: qttools: Update to 6.7.2.
>   gnu: qttranslations: Update to 6.7.2.
>   gnu: qtscxml: Update to 6.7.2.
>   gnu: qtpositioning: Update to 6.7.2.
>   gnu: qtremoteobjects: Update to 6.7.2.
>   gnu: qtspeech: Update to 6.7.2.
>   gnu: qthttpserver: Update to 6.7.2.
>   gnu: qt-creator: Update to 14.0.1.
>   gnu: qtnetworkauth: Update to 6.7.2.
>   gnu: abseil-cpp: Update to 20240722.0.
>   gnu: libvpx: Update to 1.14.1.
>   gnu: Add re2-next.
>   gnu: Add icu4c-75.
>   gnu: qtwebengine: Update to 6.7.2.
>   gnu: python-shiboken-6: Update to 6.7.2.
>   gnu: qtconnectivity: Rename to qtconnectivity-5.
>   gnu: Add qtconnectivity.
>   gnu: Add python-setuptools-scm-next.
>   gnu: python-sip: Update to 6.8.6.
>   gnu: python-pyqt6-sip: Update to 13.8.0.
>   gnu: python-pyqt-builder: Update to 1.16.4.
>   gnu: python-pyqt-6: Update to 6.7.1.
>   gnu: python-pyqtwebengine-6: Update to 6.7.0.

The update looks straightforward!  I've shared a few comments, which I
hope shouldn't be too difficult to rework into a v2.  Thanks for the
undertaking!

-- 
Thanks,
Maxim

[bug#72835] [PATCH qt-team v2 00/74] update qt{5,6}.

[Zheng Junjie]

pushed to qt-team and CI built fine.

* adjust qtmultimedia comments.
* add qt-creator snippet comment.
* qtconnectivity don't inherit from qtsvg.
* adjust qtwebengine disable webenginedriver comments.
* adjust python-pyqt-builder disable tests comment.

* update qt5* to 5.15.15.
* rename qtcharts to qtcharts-5, and add qtcharts 6.
* clazy update to 1.12.

Zheng Junjie (74):
  gnu: qtbase: Update to 6.7.2.
  gnu: qt5compat: Update to 6.7.2.
  gnu: qtsvg: Update to 6.7.2.
  gnu: qtimageformats: Update to 6.7.2.
  gnu: qtdeclarative: Update to 6.7.2.
  gnu: qtwebsockets: Update to 6.7.2.
  gnu: qtsensors: Update to 6.7.2.
  gnu: qtshadertools: Update to 6.7.2.
  gnu: qtmultimedia: Update to 6.7.2.
  gnu: qtwayland: Update to 6.7.2.
  gnu: qtserialport: Update to 6.7.2.
  gnu: qtwebchannel: Update to 6.7.2.
  gnu: qtlanguageserver: Update to 6.7.2.
  gnu: qtlocation: Update to 6.7.2.
  gnu: qtlottie: Update to 6.7.2.
  gnu: qttools: Update to 6.7.2.
  gnu: qttranslations: Update to 6.7.2.
  gnu: qtscxml: Update to 6.7.2.
  gnu: qtpositioning: Update to 6.7.2.
  gnu: qtremoteobjects: Update to 6.7.2.
  gnu: qtspeech: Update to 6.7.2.
  gnu: qthttpserver: Update to 6.7.2.
  gnu: qt-creator: Update to 14.0.1.
  gnu: qtnetworkauth: Update to 6.7.2.
  gnu: abseil-cpp: Update to 20240722.0.
  gnu: libvpx: Update to 1.14.1.
  gnu: Add re2-next.
  gnu: Add icu4c-75.
  gnu: qtwebengine: Update to 6.7.2.
  gnu: python-shiboken-6: Update to 6.7.2.
  gnu: qtconnectivity: Rename to qtconnectivity-5.
  gnu: Add qtconnectivity.
  gnu: Add python-setuptools-scm-next.
  gnu: python-sip: Update to 6.8.6.
  gnu: python-pyqt6-sip: Update to 13.8.0.
  gnu: python-pyqt-builder: Update to 1.16.4.
  gnu: python-pyqt-6: Update to 6.7.1.
  gnu: python-pyqtwebengine-6: Update to 6.7.0.
  gnu: python-pyqt5-sip: Update to 12.15.0.
  gnu: clazy: Update to 1.12.
  gnu: python-pyqt: Update to 5.15.10.
  gnu: qtcharts: Rename to qtcharts-5.
  gnu: Add qtcharts.
  gnu: qtbase-5: Update to 5.15.15.
  gnu: qt3d-5: Update to 5.15.15.
  gnu: qtsvg-5: Update to 5.15.15.
  gnu: qtimageformats-5: Update to 5.15.15.
  gnu: qtx11extras: Update to 5.15.15.
  gnu: qtxmlpatterns: Update to 5.15.15.
  gnu: qtdeclarative-5: Update to 5.15.15.
  gnu: qtconnectivity-5: Update to 5.15.15.
  gnu: qtwebsockets-5: Update to 5.15.15.
  gnu: qtmultimedia-5: Update to 5.15.15.
  gnu: qtwayland-5: Update to 5.15.15.
  gnu: qtserialport-5: Update to 5.15.15.
  gnu: qtserialbus: Update to 5.15.15.
  gnu: qtwebchannel-5: Update to 5.15.15.
  gnu: qtwebglplugin: Update to 5.15.15.
  gnu: qtwebview: Update to 5.15.15.
  gnu: qtlocation-5: Update to 5.15.15.
  gnu: qttools-5: Update to 5.15.15.
  gnu: qtscript: Update to 5.15.15.
  gnu: qtquickcontrols-5: Update to 5.15.15.
  gnu: qtquickcontrols2-5: Update to 5.15.15.
  gnu: qtgraphicaleffects: Update to 5.15.15.
  gnu: qtgamepad: Update to 5.15.15.
  gnu: qtscxml-5: Update to 5.15.15.
  gnu: qtpurchasing: Update to 5.15.15.
  gnu: qtcharts-5: Update to 5.15.15.
  gnu: qtdatavis3d: Update to 5.15.15.
  gnu: qtnetworkauth-5: Update to 5.15.15.
  gnu: qtspeech-5: Update to 5.15.15.
  gnu: qtvirtualkeyboard-5: Update to 5.15.15.
  gnu: qtwebengine-5: Update to 5.15.15.

 gnu/local.mk                                  |   2 -
 gnu/packages/astronomy.scm                    |   2 +-
 gnu/packages/cpp.scm                          |   6 +-
 gnu/packages/debug.scm                        |   2 +-
 gnu/packages/education.scm                    |   2 +-
 gnu/packages/icu4c.scm                        |  18 +
 gnu/packages/kde-utils.scm                    |   4 +-
 .../patches/libvpx-CVE-2023-44488.patch       | 107 -----
 .../patches/libvpx-CVE-2023-5217.patch        |  99 ----
 gnu/packages/python-build.scm                 |  32 ++
 gnu/packages/qt.scm                           | 447 +++++++++++-------
 gnu/packages/radio.scm                        |   4 +-
 gnu/packages/regex.scm                        |  29 +-
 gnu/packages/video.scm                        |   7 +-
 14 files changed, 367 insertions(+), 394 deletions(-)
 delete mode 100644 gnu/packages/patches/libvpx-CVE-2023-44488.patch
 delete mode 100644 gnu/packages/patches/libvpx-CVE-2023-5217.patch


base-commit: 8dae6b47542b906682f83b06b0478fcbd0776fd6
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 01/74] gnu: qtbase: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtbase): Update to 6.7.2.
[arguments]<#:phases>: Add delete-installed-tests phase.

Change-Id: I22874a0d4bf0be4ae410ad4e6f5c1d72b2e2c3aa
---
 gnu/packages/qt.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 687c20cd90..a48decd8c6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -716,13 +716,13 @@ (define-public qtbase
   (package
     (inherit qtbase-5)
     (name "qtbase")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (inherit (package-source qtbase-5))
               (uri (qt-url name version))
               (sha256
                (base32
-                "0qklvzg242ilxw29jd2vsz6s8ni4dpraf4ghfa4dykhc705zv4q4"))
+                "16bmfrjfxjajs6sqg1383ihhfwwf69ihkpnpvsajh5pv21g2mwn5"))
               (modules '((guix build utils)))
               (snippet
                ;; corelib uses bundled harfbuzz, md4, md5, sha3
@@ -1080,7 +1080,11 @@ (define-public qtbase
                               (string-append "lib/qt6/mkspecs/features/" file)))
                            '("device_config.prf" "moc.prf" "qt_config.prf"))
                     (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
-                    (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))))))
+                    (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))
+            (add-after 'install 'delete-installed-tests
+              (lambda _
+                (delete-file-recursively
+                 (string-append #$output "/tests"))))))))
     (native-inputs
      (modify-inputs (package-native-inputs qtbase-5)
        (prepend tzdata-for-tests
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 02/74] gnu: qt5compat: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qt5compat): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a48decd8c6..10c16045d3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1187,13 +1187,13 @@ (define-public qt3d-5
 (define-public qt5compat
   (package
     (name "qt5compat")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "02zcrrh6rq5p6bqix5nk2h22rfqdrf4d0h7y4rva5zmbbr7czhk8"))))
+                "00y071p09v91ascxg3llc0yfbx7xs24smcgxckdrnkgwkqcba9l8"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 03/74] gnu: qtsvg: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtsvg): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 10c16045d3..19d1edac6c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1285,13 +1285,13 @@ (define-public qtsvg-5
 (define-public qtsvg
   (package
     (name "qtsvg")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1ir57bis27whq7bwqykk1qlxy0522k4ia39brxayjmfadrbixjsa"))))
+                "00ggr84l1h8did6ivprv343rwwcl7j2bbbilxqzmiqsvlf3143gv"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 04/74] gnu: qtimageformats: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtimageformats): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 19d1edac6c..5e938d7c4e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1344,14 +1344,14 @@ (define-public qtimageformats-5
 (define-public qtimageformats
   (package
     (name "qtimageformats")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (inherit (package-source qtimageformats-5))
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0z328i6fix1qdklfbs1w4dsr64zavjj5kzqvzipww0v62xhfm99w"))))
+                "1mp5bi45gcmsds0g2xfjd1mklrijbwfv0hx4s1md2rxfbxwdi8g1"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 05/74] gnu: qtdeclarative: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtdeclarative): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5e938d7c4e..275e84f112 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1519,14 +1519,14 @@ (define-public qtdeclarative-5
 (define-public qtdeclarative
   (package
     (name "qtdeclarative")
-    (version "6.6.3")
+    (version "6.7.2")
     ;; TODO: Package 'masm' and unbundle from sources.
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1wwjlwjb3hnlpai4rrrdsm096a6ahb1izs3524r79jpjzhn7n805"))
+                "16drp7yjsm50cvsyww9xk15hzf2csax02vpbv0jx8hlcmyhwnaac"))
               (patches (search-patches "qtdeclarative-disable-qmlcache.patch"))))
     (outputs '("out" "debug"))
     (build-system cmake-build-system)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 06/74] gnu: qtwebsockets: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwebsockets): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 275e84f112..752518ee0e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1720,13 +1720,13 @@ (define-public qtwebsockets-5
 (define-public qtwebsockets
   (package
     (name "qtwebsockets")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0dm066lv3n97ril9iyd5xn8j13m6r7xp844aagj6dpclaxv83x0n"))))
+                "0pr13p6inlh2i79yc567w8dp446rh9xvfakq5diwis4wxkv4mpjv"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 07/74] gnu: qtsensors: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtsensors): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 752518ee0e..e14e2143cf 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1760,13 +1760,13 @@ (define-public qtsensors
   (package
     (inherit qtsvg)
     (name "qtsensors")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0r9p3lm159pji29vq9kii42jkz4rg15hqh6zlq9442i58a0ayddj"))))
+                "0ndvwra9bssfqw32bk5mbj3zdqgi9zshm0gd0bfd8vn5hz3xxlga"))))
     (native-inputs (list qtdeclarative))
     (inputs (list qtbase))
     (synopsis "Qt Sensors module")
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 08/74] gnu: qtshadertools: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtshadertools): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e14e2143cf..4197f70965 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1854,7 +1854,7 @@ (define-public qtmultimedia-5
 (define-public qtshadertools
   (package
     (name "qtshadertools")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1862,7 +1862,7 @@ (define-public qtshadertools
               ;; sources.
               (sha256
                (base32
-                "1rm17hyhq244zskq3ar3h22qjd5dshy84nnyq1ivhg5k7gb0j2cc"))))
+                "1hbw5xz12frydk787rl6cgfxm2bxlzkxiwcxjjmgq04cmk039ypd"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 09/74] gnu: qtmultimedia: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtmultimedia): Update to 6.7.2.

Change-Id: I80606a9cb88a554578943d871401f4661bb29158
---
 gnu/packages/qt.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4197f70965..c788c665a8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1883,13 +1883,13 @@ (define-public qtshadertools
 (define-public qtmultimedia
   (package
     (name "qtmultimedia")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1ciswpv8p71j9hwwdhfr5pmsrnizlaijp0dnyc99lk5is8qgh05y"))
+                "1lsiarvag8lr4a1apa466xz56b1znjncy8wz5hyiv6nbb88kby4f"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -1920,9 +1920,12 @@ (define-public qtmultimedia
               ;; RHI backend. Using CPU conversion." (see:
               ;; https://bugreports.qt.io/browse/QTBUG-123749).
               (substitute* "tests/auto/unit/multimedia/CMakeLists.txt"
-                (("add_subdirectory\\(qvideoframecolormanagement\\)") ""))))
+                (("add_subdirectory\\(qvideoframecolormanagement\\)") "")
+                ;; The 'qmediaplayer_gstreamer' test times out.
+                (("add_subdirectory\\(qmediaplayer_gstreamer\\)") ""))))
           (add-before 'check 'prepare-for-tests
             (lambda _
+              (setenv "HOME" (getcwd))
               (setenv "QT_QPA_PLATFORM" "offscreen")))
           (add-after 'install 'delete-installed-tests
             (lambda _
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 10/74] gnu: qtwayland: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwayland): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c788c665a8..46bc8107ce 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2013,13 +2013,13 @@ (define-public qtwayland-5
 (define-public qtwayland
   (package
     (name "qtwayland")
-    (version "6.6.3")
+    (version "6.7.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
-        (base32 "0gamcqpl302wlznfnlcg9vlnnhfpxgjnz05prwc9wpy0xh7wqvm9"))))
+        (base32 "0nwa59g1wk7fkym837pkw312abjb376gx44rpd5d8jv4vphmg852"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 11/74] gnu: qtserialport: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtserialport): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 46bc8107ce..cf1d9096cf 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2099,13 +2099,13 @@ (define-public qtserialport-5
 (define-public qtserialport
   (package
     (name "qtserialport")
-    (version "6.6.3")
+    (version "6.7.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
-        (base32 "0dywalgafvxi2jgdv9dk22hwwd8qsgk5xfybh75n3njmwmwnarg1"))))
+        (base32 "1z5lsgdl4g48fr2kcp7zznv5jyv42xmd4qn6rrxikd8w2v8lrhr1"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 12/74] gnu: qtwebchannel: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwebchannel): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index cf1d9096cf..074161dd3b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2177,13 +2177,13 @@ (define-public qtwebchannel-5
 (define-public qtwebchannel
   (package
     (name "qtwebchannel")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0cwcf4pri901piyj0lvqmks9l84di9rcafnfgrmgg5mls7jjlyvw"))))
+                "072hniyxavz2jjkzh7mrz4g67zf0cngvp4xgdradxrqhgdh9cpdc"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 13/74] gnu: qtlanguageserver: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtlanguageserver): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 074161dd3b..f543a26571 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2261,13 +2261,13 @@ (define-public qtwebview
 (define-public qtlanguageserver
   (package
     (name "qtlanguageserver")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "136gyvkzm6skdv5yhyy4nqhbczfc2mn4nbr9hvpkpljb0awv888h"))))
+                "14hs20738d2ljfb5la8p0lip7qranjnrwl5fwdhs1zs4a5jzwndn"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 14/74] gnu: qtlocation: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtlocation): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f543a26571..91efe72f77 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2311,13 +2311,13 @@ (define-public qtlocation
   (package
     (inherit qtsvg)
     (name "qtlocation")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1l81z3zq1zg015l6qxx4yzssdspw689m9bpzxp23yshaych2kd6p"))))
+                "0pa8ibw490p3433ysni73f0gpz7gvxyl2abh3ygvd28ipxcdlcpj"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg)
        ((#:tests? _ #f) #f)             ; TODO: Enable the tests
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 15/74] gnu: qtlottie: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtlottie): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 91efe72f77..dbc06163db 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2336,13 +2336,13 @@ (define-public qtlocation
 (define-public qtlottie
   (package
     (name "qtlottie")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1d0fjb0080wnd71f50zwal1b504iimln9mpnb3sc5yznmv8gm4cq"))))
+                "03piwc7p0lgqm73rx2kf5ckh986nv9dkssfl47js8lnkb29vrbyr"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 16/74] gnu: qttools: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qttools): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index dbc06163db..4a148f4998 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2400,13 +2400,13 @@ (define-public qttools-5
 (define-public qttools
   (package
     (name "qttools")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1h0vz46mpvzbm5w6sgpk0b3mqkn278l45arhxxk41dwc5n14qvda"))))
+                "0ajbma9lbrb0d048bvg2xl74m833ddv2b9684r3hjcr53fnmbs2q"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 17/74] gnu: qttranslations: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qttranslations): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4a148f4998..bb4e6bdf68 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2440,13 +2440,13 @@ (define-public qttools
 (define-public qttranslations
   (package
     (name "qttranslations")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1kvkrwbgby4i69dpxbxxcv0qbsz69n6icpyr4wcf8qm2r4m5zqqj"))))
+                "1a9cb1br3wqn0rshkgj21hba3r7jx8dbavc3ayfjgdy1bl5phicq"))))
     (build-system cmake-build-system)
     (arguments (list #:tests? #f))
     (native-inputs (list qtbase qttools))
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 18/74] gnu: qtscxml: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtscxml): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bb4e6bdf68..89f5e649e7 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2598,13 +2598,13 @@ (define-public qtscxml-5
 (define-public qtscxml
   (package
     (name "qtscxml")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1dbcw4qnss5rif97gdcimyzl3jqa508yph611dvvhc1xn16nl6qg"))
+                "0vy80npai5ikwlf0ghxf5xj8vq1hi3cdjgddjas2g3yl0qszkv10"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 19/74] gnu: qtpositioning: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtpositioning): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 89f5e649e7..757b56cffa 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2637,13 +2637,13 @@ (define-public qtscxml
 (define-public qtpositioning
   (package
     (name "qtpositioning")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1frzzndsscb6iqschklks2l17ppnjpnx1lq1cypnq3x0598bcdws"))))
+                "073v10z1axmqydrvdka9g69wr117kzhvci9sjr110swgmbq0j002"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 20/74] gnu: qtremoteobjects: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtremoteobjects): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 757b56cffa..bcb155b41c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2780,13 +2780,13 @@ (define-public qtnetworkauth
 (define-public qtremoteobjects
   (package
     (name "qtremoteobjects")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "16bd4zd3yfzlzk087qphphsh8hv38q3a57n1yknvkc5fchzmfzjz"))))
+                "10vlkg5v5hc8fwiw9x06d84z6cs4i5kxm652si3lwvvxma0np40b"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 21/74] gnu: qtspeech: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtspeech): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bcb155b41c..bd02f21476 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2842,13 +2842,13 @@ (define-public qtspeech-5
 (define-public qtspeech
   (package
     (name "qtspeech")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1yh3r5zbhgwkjgs7yk6iv2w23766n1i4z8vjkkw5awdixx3gfa76"))))
+                "1khl90m6jd2zg0r0fncdz3r1w2l96vwp6jihpq9rgr730ja7d36c"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 22/74] gnu: qthttpserver: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qthttpserver): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bd02f21476..c8fd0ae5c7 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5147,13 +5147,13 @@ (define-public qhexedit
 (define-public qthttpserver
   (package
     (name "qthttpserver")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0dbqx36ywfmqi4nxfi4dl17scj9nkl8sbpb670ffy3nh8pbpib21"))))
+                "11lbfx08yl725w4n8dmvviscixvfkpzx8ijhy74gx0waz6sbjlq3"))))
     (build-system cmake-build-system)
     (inputs (list qtbase qtwebsockets))
     (home-page (package-home-page qtbase))
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 23/74] gnu: qt-creator: Update to 14.0.1.

[Zheng Junjie]

* gnu/packages/qt.scm (qt-creator): Update to 14.0.1.
[source]: Adjust snippet.
[arguments]<#:phases>: adjust patch-paths phase.

Change-Id: Ideafcf3a7c0ce9c85025472d41fb72527cc4b9fb
---
 gnu/packages/qt.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c8fd0ae5c7..83dc8519a9 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5558,7 +5558,7 @@ (define-public clazy
 (define-public qt-creator
   (package
     (name "qt-creator")
-    (version "12.0.2")
+    (version "14.0.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -5575,13 +5575,21 @@ (define-public qt-creator
                              ;; Marketplace recommends nonfree extensions;
                              ;; remove it.
                              "src/plugins/marketplace"))
+                          ;; qt-creator installation attempts to install the
+                          ;; yaml-cpp LICENSE file, but we removed the bundled
+                          ;; yaml-cpp, so create an empty file to allow it to
+                          ;; install properly.
+                          (mkdir-p "src/libs/3rdparty/yaml-cpp")
+                          (call-with-output-file "src/libs/3rdparty/yaml-cpp/LICENSE"
+                            (lambda (port)
+                              (const #t)))
                           (substitute* "src/plugins/CMakeLists.txt"
                             (("add_subdirectory\\(marketplace).*") ""))
                           (substitute* "src/plugins/plugins.qbs"
                             ((".*marketplace/marketplace.qbs.*") ""))))
               (sha256
                (base32
-                "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22"))))
+                "0zc9z4zzypqd1q49p4ckwbgxqcnnsc11jgsys6wli1ppmvzmn2zn"))))
     (outputs '("out" "debug"))
     (build-system qt-build-system)
     (arguments
@@ -5631,7 +5639,7 @@ (define-public qt-creator
                              "src/libs/utils/deviceshell.cpp")
                 (("/bin/sh")
                  (search-input-file inputs "bin/sh")))
-              (substitute* "src/libs/utils/process.cpp"
+              (substitute* "src/libs/utils/qtcprocess.cpp"
                 (("/usr/bin/env")
                  (search-input-file inputs "bin/env")))
               (substitute* '("tests/auto/utils/process/tst_process.cpp"
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 24/74] gnu: qtnetworkauth: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtnetworkauth): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 83dc8519a9..946f5ff39a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2760,13 +2760,13 @@ (define-public qtnetworkauth-5
 (define-public qtnetworkauth
   (package
     (name "qtnetworkauth")
-    (version "6.6.3")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "153mpg4hv3nclcdrkbzkalg4xf5k6r64fj003b725zyp885s7fax"))))
+                "0w7l5lhhxhg9x1rd66727gwkpzi6l7wmyc0c4qrfp2g5rx7q42bz"))))
     (build-system cmake-build-system)
     (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
     (native-inputs (list perl))
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 25/74] gnu: abseil-cpp: Update to 20240722.0.

[Zheng Junjie]

* gnu/packages/cpp.scm (abseil-cpp): Update to 20240722.0.

Change-Id: I9dd3ed159b2f2186ca13ffea9c3879ba45a17104
---
 gnu/packages/cpp.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index da2cfcab6e..d3a87dc562 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1504,7 +1504,7 @@ (define-public abseil-cpp
     (package
       (inherit base)
       (name "abseil-cpp")
-      (version "20230802.1")
+      (version "20240722.0")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1513,7 +1513,7 @@ (define-public abseil-cpp
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1ydkkbanrpkp5i814arzsk973kyzhhjhagnp392rq6rrv16apldq"))
+                  "1pmrigimzic2k3ix3l81j2jpfgjgbajz0qbc5s57zljr2w7fjn77"))
                 (patches
                  (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
       (arguments
@@ -1528,7 +1528,7 @@ (define-public abseil-cpp
               (add-before 'check 'set-env-vars
                 (lambda* (#:key inputs #:allow-other-keys)
                  ;; absl_time_test requires this environment variable.
-                 (setenv "TZDIR" (string-append #$(package-source base)
+                 (setenv "TZDIR" (string-append #$(package-source this-package)
                                                 "/absl/time/internal/cctz/testdata/zoneinfo")))))))))))
 
 (define (abseil-cpp-for-c++-standard base version)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 26/74] gnu: libvpx: Update to 1.14.1.

[Zheng Junjie]

* gnu/packages/video.scm (libvpx): Update to 1.14.1.
[source]: Remove libvpx-CVE-2023-5217.patch.

* gnu/packages/patches/libvpx-CVE-2023-44488.patch:
* gnu/packages/patches/libvpx-CVE-2023-5217.patch: Remove them.
* gnu/local.mk (dist_patch_DATA): Unregister them.

Change-Id: I123caed254e8046751f104cd3a82e4db904de787
---
 gnu/local.mk                                  |   2 -
 .../patches/libvpx-CVE-2023-44488.patch       | 107 ------------------
 .../patches/libvpx-CVE-2023-5217.patch        |  99 ----------------
 gnu/packages/video.scm                        |   7 +-
 4 files changed, 3 insertions(+), 212 deletions(-)
 delete mode 100644 gnu/packages/patches/libvpx-CVE-2023-44488.patch
 delete mode 100644 gnu/packages/patches/libvpx-CVE-2023-5217.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index fcdf174099..fdb503aa32 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1699,8 +1699,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/libutils-remove-damaging-includes.patch	\
   %D%/packages/patches/libvdpau-va-gl-unbundle.patch		\
   %D%/packages/patches/libvpx-CVE-2016-2818.patch		\
-  %D%/packages/patches/libvpx-CVE-2023-5217.patch		\
-  %D%/packages/patches/libvpx-CVE-2023-44488.patch		\
   %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch	\
   %D%/packages/patches/libwpd-gcc-compat.patch			\
   %D%/packages/patches/libxslt-generated-ids.patch		\
diff --git a/gnu/packages/patches/libvpx-CVE-2023-44488.patch b/gnu/packages/patches/libvpx-CVE-2023-44488.patch
deleted file mode 100644
index 4ebb034eb4..0000000000
--- a/gnu/packages/patches/libvpx-CVE-2023-44488.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From the upstream repo, can be removed after 1.14.1
-https://github.com/webmproject/libvpx/commit/df9fd9d5b7325060b2b921558a1eb20ca7880937.patch
-https://www.openwall.com/lists/oss-security/2023/09/30/4
-
-The test change didn't apply so it was removed from the patch
-
-From df9fd9d5b7325060b2b921558a1eb20ca7880937 Mon Sep 17 00:00:00 2001
-From: Jerome Jiang <jianj@google.com>
-Date: Thu, 30 Jun 2022 13:48:56 -0400
-Subject: [PATCH] Fix bug with smaller width bigger size
-
-Fixed previous patch that clusterfuzz failed on.
-
-Local fuzzing passing overnight.
-
-Bug: webm:1642
-Change-Id: If0e08e72abd2e042efe4dcfac21e4cc51afdfdb9
-(cherry picked from commit 263682c9a29395055f3b3afe2d97be1828a6223f)
----
- test/resize_test.cc          | 11 +++--------
- vp9/common/vp9_alloccommon.c | 13 ++++++-------
- vp9/encoder/vp9_encoder.c    | 27 +++++++++++++++++++++++++--
- 3 files changed, 34 insertions(+), 17 deletions(-)
-
-diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c
-index e53883f621d..9e73e40ea09 100644
---- a/vp9/common/vp9_alloccommon.c
-+++ b/vp9/common/vp9_alloccommon.c
-@@ -135,13 +135,6 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
-     cm->free_mi(cm);
-     if (cm->alloc_mi(cm, new_mi_size)) goto fail;
-   }
--
--  if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
--    // Create the segmentation map structure and set to 0.
--    free_seg_map(cm);
--    if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
--  }
--
-   if (cm->above_context_alloc_cols < cm->mi_cols) {
-     vpx_free(cm->above_context);
-     cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc(
-@@ -156,6 +149,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
-     cm->above_context_alloc_cols = cm->mi_cols;
-   }
- 
-+  if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
-+    // Create the segmentation map structure and set to 0.
-+    free_seg_map(cm);
-+    if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
-+  }
-+
-   if (vp9_alloc_loop_filter(cm)) goto fail;
- 
-   return 0;
-diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
-index b66fdc0bca3..e3850775455 100644
---- a/vp9/encoder/vp9_encoder.c
-+++ b/vp9/encoder/vp9_encoder.c
-@@ -1973,6 +1973,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) {
-   }
- }
- 
-+static void free_copy_partition_data(VP9_COMP *cpi) {
-+  vpx_free(cpi->prev_partition);
-+  cpi->prev_partition = NULL;
-+  vpx_free(cpi->prev_segment_id);
-+  cpi->prev_segment_id = NULL;
-+  vpx_free(cpi->prev_variance_low);
-+  cpi->prev_variance_low = NULL;
-+  vpx_free(cpi->copied_frame_cnt);
-+  cpi->copied_frame_cnt = NULL;
-+}
-+
- void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
-   VP9_COMMON *const cm = &cpi->common;
-   RATE_CONTROL *const rc = &cpi->rc;
-@@ -2052,6 +2063,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
-     new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows);
-     if (cm->mi_alloc_size < new_mi_size) {
-       vp9_free_context_buffers(cm);
-+      vp9_free_pc_tree(&cpi->td);
-+      vpx_free(cpi->mbmi_ext_base);
-       alloc_compressor_data(cpi);
-       realloc_segmentation_maps(cpi);
-       cpi->initial_width = cpi->initial_height = 0;
-@@ -2070,8 +2083,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
-     update_frame_size(cpi);
- 
-   if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) {
--    memset(cpi->consec_zero_mv, 0,
--           cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv));
-+    vpx_free(cpi->consec_zero_mv);
-+    CHECK_MEM_ERROR(
-+        cm, cpi->consec_zero_mv,
-+        vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv)));
-+
-+    vpx_free(cpi->skin_map);
-+    CHECK_MEM_ERROR(
-+        cm, cpi->skin_map,
-+        vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0])));
-+
-+    free_copy_partition_data(cpi);
-+    alloc_copy_partition_data(cpi);
-     if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ)
-       vp9_cyclic_refresh_reset_resize(cpi);
-     rc->rc_1_frame = 0;
diff --git a/gnu/packages/patches/libvpx-CVE-2023-5217.patch b/gnu/packages/patches/libvpx-CVE-2023-5217.patch
deleted file mode 100644
index 2bcb0bcd55..0000000000
--- a/gnu/packages/patches/libvpx-CVE-2023-5217.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Tobias Geerinckx-Rice <me@tobias.gr>
-Date: Sun Sep 24 02:00:00 2023 +0200
-Subject: libvpx: Fix CVE-2023-5217.
-
-These are the changes made to libvpx between Firefox ESR 115.3.0 and
-115.3.1, which claims to fix CVE-2023-5217 and so do we.  The report
-itself is not public.
-
-It consists of the following 2 upstream libvpx commits:
-  af6dedd715f4307669366944cca6e0417b290282
-  3fbd1dca6a4d2dad332a2110d646e4ffef36d590
-which are not yet part of an upstream commit.
-
----
-diff -Naur libvpx.orig/test/encode_api_test.cc libvpx/test/encode_api_test.cc
---- libvpx.orig/test/encode_api_test.cc	1970-01-01 01:00:01.000000000 +0100
-+++ libvpx/test/encode_api_test.cc	2023-09-29 21:00:03.189620452 +0200
-@@ -304,7 +304,6 @@
- 
- void InitCodec(const vpx_codec_iface_t &iface, int width, int height,
-                vpx_codec_ctx_t *enc, vpx_codec_enc_cfg_t *cfg) {
--  ASSERT_EQ(vpx_codec_enc_config_default(&iface, cfg, 0), VPX_CODEC_OK);
-   cfg->g_w = width;
-   cfg->g_h = height;
-   cfg->g_lag_in_frames = 0;
-@@ -342,6 +341,7 @@
-         vpx_codec_ctx_t ctx = {};
-       } enc;
- 
-+      ASSERT_EQ(vpx_codec_enc_config_default(iface, &cfg, 0), VPX_CODEC_OK);
-       EXPECT_NO_FATAL_FAILURE(
-           InitCodec(*iface, kWidth, kHeight, &enc.ctx, &cfg));
-       if (IsVP9(iface)) {
-@@ -353,6 +353,50 @@
- 
-       for (const auto threads : { 1, 4, 8, 6, 2, 1 }) {
-         cfg.g_threads = threads;
-+        EXPECT_NO_FATAL_FAILURE(EncodeWithConfig(cfg, &enc.ctx))
-+            << "iteration: " << i << " threads: " << threads;
-+      }
-+    }
-+  }
-+}
-+
-+TEST(EncodeAPI, ConfigResizeChangeThreadCount) {
-+  constexpr int kInitWidth = 1024;
-+  constexpr int kInitHeight = 1024;
-+
-+  for (const auto *iface : kCodecIfaces) {
-+    SCOPED_TRACE(vpx_codec_iface_name(iface));
-+    for (int i = 0; i < (IsVP9(iface) ? 2 : 1); ++i) {
-+      vpx_codec_enc_cfg_t cfg = {};
-+      struct Encoder {
-+        ~Encoder() { EXPECT_EQ(vpx_codec_destroy(&ctx), VPX_CODEC_OK); }
-+        vpx_codec_ctx_t ctx = {};
-+      } enc;
-+
-+      ASSERT_EQ(vpx_codec_enc_config_default(iface, &cfg, 0), VPX_CODEC_OK);
-+      // Start in threaded mode to ensure resolution and thread related
-+      // allocations are updated correctly across changes in resolution and
-+      // thread counts. See https://crbug.com/1486441.
-+      cfg.g_threads = 4;
-+      EXPECT_NO_FATAL_FAILURE(
-+          InitCodec(*iface, kInitWidth, kInitHeight, &enc.ctx, &cfg));
-+      if (IsVP9(iface)) {
-+        EXPECT_EQ(vpx_codec_control_(&enc.ctx, VP9E_SET_TILE_COLUMNS, 6),
-+                  VPX_CODEC_OK);
-+        EXPECT_EQ(vpx_codec_control_(&enc.ctx, VP9E_SET_ROW_MT, i),
-+                  VPX_CODEC_OK);
-+      }
-+
-+      cfg.g_w = 1000;
-+      cfg.g_h = 608;
-+      EXPECT_EQ(vpx_codec_enc_config_set(&enc.ctx, &cfg), VPX_CODEC_OK)
-+          << vpx_codec_error_detail(&enc.ctx);
-+
-+      cfg.g_w = 16;
-+      cfg.g_h = 720;
-+
-+      for (const auto threads : { 1, 4, 8, 6, 2, 1 }) {
-+        cfg.g_threads = threads;
-         EXPECT_NO_FATAL_FAILURE(EncodeWithConfig(cfg, &enc.ctx))
-             << "iteration: " << i << " threads: " << threads;
-       }
-diff -Naur libvpx.orig/vp8/encoder/onyx_if.c libvpx/vp8/encoder/onyx_if.c
---- libvpx.orig/vp8/encoder/onyx_if.c	1970-01-01 01:00:01.000000000 +0100
-+++ libvpx/vp8/encoder/onyx_if.c	2023-09-29 21:01:44.155476128 +0200
-@@ -1443,6 +1443,11 @@
-   last_h = cpi->oxcf.Height;
-   prev_number_of_layers = cpi->oxcf.number_of_layers;
- 
-+  if (cpi->initial_width) {
-+    // TODO(https://crbug.com/1486441): Allow changing thread counts; the
-+    // allocation is done once in vp8_create_compressor().
-+    oxcf->multi_threaded = cpi->oxcf.multi_threaded;
-+  }
-   cpi->oxcf = *oxcf;
- 
-   switch (cpi->oxcf.Mode) {
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 73e9b31825..6aa4584f27 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2950,7 +2950,7 @@ (define-public mpv-mpris
 (define-public libvpx
   (package
     (name "libvpx")
-    (version "1.12.0")
+    (version "1.14.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2959,9 +2959,8 @@ (define-public libvpx
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm"))
-              (patches (search-patches "libvpx-CVE-2016-2818.patch"
-                                       "libvpx-CVE-2023-5217.patch"))))
+                "0r6qvc84mflpy1zxz7p8aj7i552cwx957l50akvajxmzij1kpy1x"))
+              (patches (search-patches "libvpx-CVE-2016-2818.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list "--enable-shared"
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 27/74] gnu: Add re2-next.

[Zheng Junjie]

* gnu/packages/regex.scm (re2-next): New Variable.

Change-Id: I5745870605f1ad3ce1733b02e454b758b3cbabfc
---
 gnu/packages/regex.scm | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm
index 639244f37d..d058b096a7 100644
--- a/gnu/packages/regex.scm
+++ b/gnu/packages/regex.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2016, 2020, 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,7 +28,10 @@ (define-module (gnu packages regex)
   #:use-module (guix git-download)
   #:use-module (guix gexp)
   #:use-module (guix build-system gnu)
-  #:use-module (guix utils))
+  #:use-module (guix build-system cmake)
+  #:use-module (guix utils)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages cpp))
 
 (define-public re2
    (package
@@ -60,6 +64,29 @@ (define-public re2
 Python.  It is a C++ library.")
      (license license:bsd-3)))
 
+(define-public re2-next
+  (package
+    (inherit re2)
+    (name "re2")
+    (version "2024-07-02")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/google/re2")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "11q0kz8b3y5ysn58fr62yhib520f9l3grbn8gxr8x5s9k700vq11"))))
+    (build-system cmake-build-system)
+    (arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"
+                                               ;; "-DRE2_USE_ICU=ON"
+                                               #$@(if (%current-target-system)
+                                                      #~("-DRE2_BUILD_TESTING=ON")
+                                                      #~()))))
+    (native-inputs (list googletest))
+    (propagated-inputs (list abseil-cpp))))
+
 (define-public tre
   (package
     (name "tre")
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 28/74] gnu: Add icu4c-75.

[Zheng Junjie]

* gnu/packages/icu4c.scm (icu4c-75): New variable.

Change-Id: Ief8063ecbebd12e755fd65a33d8a412f5b36f851
---
 gnu/packages/icu4c.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 6f09fae65c..0ca917305d 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -132,6 +133,23 @@ (define-public icu4c-73
                  "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")
                 (origin-patches (package-source icu4c))))))))
 
+(define-public icu4c-75
+  (package
+    (inherit icu4c)
+    (name "icu4c")
+    (version "75.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/unicode-org/icu/releases/download/release-"
+                    (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
+                    "/icu4c-"
+                    (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
+                    "-src.tgz"))
+              (sha256
+               (base32
+                "1vya31v549pq89kgr02jajwi7gc7qw0mv6n4265pxs6jwkrqv5nb"))))))
+
 (define-public icu4c-70
   (package
     (inherit icu4c)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 29/74] gnu: qtwebengine: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwebengine): Update to 6.7.2.
[source]: Adjust preserved-third-party-files.
[inputs]: replace icu4c and re2 with icu4c-75 and re2-next. add fxdiv, fp16.
[arguments]<#:configuration-flags>: Set -DQT_FEATURE_webenginedriver=OFF.
Change-Id: Idbfe2c0b180947c41dabbb55548bbc3aaf217d05

Change-Id: Ib1a9445ca815e2cc065716d408e0d1c5211694c7
---
 gnu/packages/qt.scm | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 946f5ff39a..1370b91078 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3342,14 +3342,14 @@ (define-public qtwebengine-5
 (define-public qtwebengine
   (package
     (name "qtwebengine")
-    (version "6.6.3")
+    (version "6.7.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
         (base32
-         "016qvbmdja2abajvsznnjdvblrmzgvs8s2dzlxws30hvna1xqavw"))
+         "1lgz0mj9lw4ii1c8nkbr0ll02xzx8i6n7wvvn21f72sdb5smhxf7"))
        (modules '((ice-9 ftw)
                   (ice-9 match)
                   (srfi srfi-1)
@@ -3384,10 +3384,10 @@ (define-public qtwebengine
                     "third_party/angle/src/common/third_party/xxhash"
                     "third_party/angle/src/third_party/libXNVCtrl" ;Expat
                     "third_party/angle/src/third_party/volk"
-                    "third_party/angle/src/third_party/systeminfo"
                     "third_party/angle/src/third_party/ceval"
                     "third_party/axe-core"
                     "third_party/blink"
+                    "third_party/bidimapper"
                     "third_party/boringssl"
                     "third_party/boringssl/src/third_party/fiat"
                     "third_party/breakpad"
@@ -3411,6 +3411,7 @@ (define-public qtwebengine
                     "third_party/crashpad/crashpad/third_party/lss"
                     "third_party/crashpad/crashpad/third_party/zlib"
                     "third_party/crc32c"
+                    "third_party/d3"
                     "third_party/dav1d"
                     "third_party/dawn"
                     "third_party/dawn/third_party/gn/webgpu-cts"
@@ -3424,7 +3425,6 @@ (define-public qtwebengine
                     "third_party/devtools-frontend/src/front_end/third_party/codemirror"
                     "third_party/devtools-frontend/src/front_end/third_party/codemirror.next"
                     "third_party/devtools-frontend/src/front_end/third_party/diff"
-                    "third_party/devtools-frontend/src/front_end/third_party/i18n"
                     "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat"
                     "third_party/devtools-frontend/src/front_end/third_party/lighthouse"
                     "third_party/devtools-frontend/src/front_end/third_party/lit"
@@ -3434,7 +3434,10 @@ (define-public qtwebengine
                     "third_party/devtools-frontend/src/front_end/third_party/\
 puppeteer/package/lib/esm/third_party/mitt"
                     "third_party/devtools-frontend/src/front_end/third_party/\
+puppeteer/package/lib/esm/third_party/rxjs"
+                    "third_party/devtools-frontend/src/front_end/third_party/\
 vscode.web-custom-data"
+                    "third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay"
                     "third_party/devtools-frontend/src/third_party/pyjson5"
                     "third_party/devtools-frontend/src/front_end/third_party/wasmparser"
                     "third_party/devtools-frontend/src/third_party/typescript"
@@ -3477,6 +3480,7 @@ (define-public qtwebengine
                     "third_party/libaom/source/libaom/third_party/vector"
                     "third_party/libaom/source/libaom/third_party/x86inc"
                     "third_party/libavif"
+                    "third_party/libavifinfo"
                     "third_party/libevent"
                     "third_party/libgav1"
                     "third_party/libjingle_xmpp"
@@ -3511,7 +3515,6 @@ (define-public qtwebengine
                     "third_party/one_euro_filter"
                     "third_party/openscreen" ;BSD-3
                     "third_party/openscreen/src/third_party/tinycbor" ;Expat
-                    "third_party/openscreen/src/third_party/mozilla" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3
                     "third_party/openh264"
                     "third_party/opus/src/include/opus.h"
                     "third_party/opus/src/include/opus_custom.h"
@@ -3528,7 +3531,6 @@ (define-public qtwebengine
                     "third_party/pdfium/third_party/lcms"
                     "third_party/pdfium/third_party/libopenjpeg"
                     "third_party/pdfium/third_party/libtiff"
-                    "third_party/pdfium/third_party/skia_shared"
                     "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
                     "third_party/perfetto"
                     "third_party/perfetto/protos/third_party/chromium"
@@ -3544,6 +3546,7 @@ (define-public qtwebengine
                     "third_party/re2"
                     "third_party/rnnoise"
                     "third_party/ruy" ;ASL2.0
+                    "third_party/selenium-atoms"
                     "third_party/s2cellid" ;ASL2.0
                     "third_party/securemessage" ;ASL2.0
                     "third_party/shell-encryption" ;ASL2.0
@@ -3573,7 +3576,7 @@ (define-public qtwebengine
                     "third_party/vulkan-deps/vulkan-tools"
                     "third_party/vulkan-deps/vulkan-validation-layers"
                     "third_party/vulkan_memory_allocator"
-                    "third_party/web-animations-js"
+                    "third_party/webgpu-cts"
                     "third_party/webrtc"
                     "third_party/webrtc/common_audio/third_party/ooura"
                     "third_party/webrtc/common_audio/third_party/spl_sqrt_floor"
@@ -3589,6 +3592,7 @@ (define-public qtwebengine
                     "third_party/wuffs"
                     "third_party/x11proto"
                     "third_party/xnnpack" ;BSD-3
+                    "third_party/zstd"
                     "third_party/zlib" ;TODO: make pdfium use system version
                     "third_party/zxcvbn-cpp" ;Expat
                     "url/third_party/mozilla"
@@ -3649,6 +3653,10 @@ (define-public qtwebengine
               "-DQT_FEATURE_webengine_pepper_plugins=OFF" ;widevine
               "-DQT_FEATURE_system_ffmpeg=ON"
 
+              ;; The webenginedriver feature is disabled, otherwise the RUNPATH
+              ;; validation phase fails.
+              "-DQT_FEATURE_webenginedriver=OFF"
+
               ;; Do not artificially limit codec support; video decoding is
               ;; done by ffmpeg.
               "-DQT_FEATURE_webengine_proprietary_codecs=ON"
@@ -3726,9 +3734,9 @@ (define-public qtwebengine
             (lambda _
               (invoke "cmake" "--install" ".")))
           (add-after 'install 'delete-installed-tests
-                 (lambda _
-                   (delete-file-recursively
-                    (string-append #$output "/tests")))))))
+            (lambda _
+              (delete-file-recursively
+               (string-append #$output "/tests")))))))
     (native-inputs
      (modify-inputs (package-native-inputs qtwebengine-5)
        (delete "python2" "python2-six")
@@ -3740,8 +3748,10 @@ (define-public qtwebengine
                python-html5lib)))
     (inputs
      (modify-inputs (package-inputs qtwebengine-5)
+       (replace "icu4c" icu4c-75)
+       (replace "re2" re2-next)
        (replace "qtmultimedia" qtmultimedia)
-       (append libxkbfile xkeyboard-config)))
+       (append fp16 fxdiv libxkbfile xkeyboard-config)))
     (propagated-inputs
      (modify-inputs (package-propagated-inputs qtwebengine-5)
        (replace "qtbase" qtbase)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 30/74] gnu: python-shiboken-6: Update to 6.7.2.

[Zheng Junjie]

* gnu/packages/qt.scm (python-shiboken-6): Update to 6.7.2.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1370b91078..062cf5f3f4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4824,7 +4824,7 @@ (define-public python-shiboken-6
   (package
     (inherit python-shiboken-2)
     (name "python-shiboken-6")
-    (version "6.6.2")
+    (version "6.7.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://qt/QtForPython/pyside6/PySide6-"
@@ -4832,7 +4832,7 @@ (define-public python-shiboken-6
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1w690jpxrski7c71gx05q5fvl2117lnjj5ih8iwckx3s9mlhnqhl"))))
+                "1iv8wfc5sfx5xr4b3bhbaqagx8qidx5wl1kzvifsmjbqdq6hsars"))))
     (build-system cmake-build-system)
     (inputs
      (modify-inputs (package-inputs python-shiboken-2)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 31/74] gnu: qtconnectivity: Rename to qtconnectivity-5.

[Zheng Junjie]

* gnu/packages/qt.scm (qtconnectivity): Rename to qtconnectivity-5.

(python-pyqt)[inputs]: Adjust it.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 062cf5f3f4..49587da13f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1675,7 +1675,7 @@ (define-public qtdeclarative
 integrate QML code with JavaScript and C++.")
     (license (package-license qtbase))))
 
-(define-public qtconnectivity
+(define-public qtconnectivity-5
   (package
     (inherit qtsvg-5)
     (name "qtconnectivity")
@@ -4003,7 +4003,7 @@ (define-public python-pyqt
     (inputs
      `(("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
-       ("qtconnectivity" ,qtconnectivity)
+       ("qtconnectivity-5" ,qtconnectivity-5)
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation-5)
        ("qtmultimedia-5" ,qtmultimedia-5)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 32/74] gnu: Add qtconnectivity.

[Zheng Junjie]

* gnu/packages/qt.scm (qtconnectivity): New variable.

Change-Id: Ia2c1d9d260b47cd3a18c9ab5ac7e8f5ea83b7e11
---
 gnu/packages/qt.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 49587da13f..1774c69ca4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1694,6 +1694,36 @@ (define-public qtconnectivity-5
     (description "The Qt Connectivity modules provides modules for interacting
 with Bluetooth and NFC.")))
 
+(define-public qtconnectivity
+  (package
+    (name "qtconnectivity")
+    (version "6.7.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "1s08djgzhh5p9ij0hxbrrcx9n7r7f0ba6pr9793mdsgh8ar23lwf"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list perl pkg-config qtdeclarative))
+    (inputs
+     (list bluez qtbase))
+    (arguments
+     (list
+      #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'set-display
+            (lambda _
+              ;; Make Qt render "offscreen", required for tests.
+              (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+    (synopsis "Qt Connectivity module")
+    (description "The Qt Connectivity modules provides modules for interacting
+with Bluetooth and NFC.")
+    (home-page (package-home-page qtbase))
+    (license (package-license qtbase))))
+
 (define-public qtwebsockets-5
   (package (inherit qtsvg-5)
     (name "qtwebsockets")
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 33/74] gnu: Add python-setuptools-scm-next.

[Zheng Junjie]

* gnu/packages/python-build.scm (python-setuptools-scm-next): New variable.

Change-Id: Ic6b95ed437f95c25c165de3d51732154e2bd954a
---
 gnu/packages/python-build.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 5b46272bde..47c9c5a9ff 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2022 Garek Dyszel <garekdyszel@disroot.org>
 ;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2024 David Elsing <david.elsing@posteo.net>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -677,6 +678,37 @@ (define-public python-setuptools-scm
 them as the version argument or in a SCM managed file.")
     (license license:expat)))
 
+(define-public python-setuptools-scm-next
+  (package
+    (inherit python-setuptools-scm)
+    (name "python-setuptools-scm")
+    (version "8.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "setuptools_scm" version))
+              (sha256
+               (base32 "19y84rzqwb2rd88bjrlafrhfail2bnk6apaig8xskjviayva3pj2"))))
+    (build-system pyproject-build-system)
+    (arguments (list
+                ;; pyproject-build-system will error handle forms such as
+                ;; "module:object", so we set it.
+                #:build-backend "setuptools.build_meta"
+                #:phases
+                #~(modify-phases %standard-phases
+                    (add-before 'build 'setenv
+                      (lambda _
+                        ;; pyproject-build-system ignore backend-path,
+                        ;; and __import__ ignore GUIX_PYTHONPATH, so set
+                        ;; PYTHONPATH.
+                        (setenv "PYTHONPATH"
+                                (string-append
+                                 (getcwd)
+                                 ":"
+                                 (getcwd) "/src:"
+                                 (getenv "GUIX_PYTHONPATH"))))))
+                #:tests? #f))    ;avoid extra dependencies such as pytest
+    (native-inputs (list python-setuptools))))
+
 (define-public python-editables
   (package
     (name "python-editables")
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 34/74] gnu: python-sip: Update to 6.8.6.

[Zheng Junjie]

* gnu/packages/qt.scm (python-sip): Update to 6.8.6.
[native-inputs]: Add python-setuptools and python-setuptools-scm-next.
[arguments]: Disable tests.

Change-Id: If063d7194711053a4e65ab513573eb6d593e9446
---
 gnu/packages/qt.scm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1774c69ca4..945d418ec0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3930,24 +3930,26 @@ (define-public pyotherside-for-qt5
 (define-public python-sip
   (package
     (name "python-sip")
-    (version "6.8.3")
+    (version "6.8.6")
     (source
-      (origin
-        (method url-fetch)
-        (uri (list (pypi-uri "sip" version)
-                   (string-append "https://www.riverbankcomputing.com/static/"
-                                  "Downloads/sip/" version
-                                  "/sip-" version ".tar.gz")))
-        (sha256
-         (base32
-          "0b3n237lbggz3b6bfmdsl1m4qgai7qyyj6fmvrmc695v32q4g1c8"))
-        (patches (search-patches "python-sip-include-dirs.patch"))))
+     (origin
+       (method url-fetch)
+       (uri (list (pypi-uri "sip" version)
+                  (string-append "https://www.riverbankcomputing.com/static/"
+                                 "Downloads/sip/" version
+                                 "/sip-" version ".tar.gz")))
+       (sha256
+        (base32
+         "0ykxq0607f2sdwbl5cxbp0y8pl14bsgzc9nhifpxbibfivj5kjbz"))
+       (patches (search-patches "python-sip-include-dirs.patch"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list python-wrapper))
+     (list python-wrapper python-setuptools python-setuptools-scm-next))
     (propagated-inputs
      (list python-tomli
            python-packaging))
+    ;; no test.
+    (arguments (list #:tests? #f))
     (home-page "https://www.riverbankcomputing.com/software/sip/intro")
     (synopsis "Python binding creator for C and C++ libraries")
     (description
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 35/74] gnu: python-pyqt6-sip: Update to 13.8.0.

[Zheng Junjie]

* gnu/packages/qt.scm (python-pyqt6-sip): Update to 13.8.0.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 945d418ec0..bb7efcf3c0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4141,13 +4141,13 @@ (define-public python-pyqt6-sip
   (package
     (inherit python-pyqt5-sip)
     (name "python-pyqt6-sip")
-    (version "13.6.0")
+    (version "13.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "PyQt6_sip" version))
        (sha256
-        (base32 "0y2pgc1kzskq3q230b5d48izvzy9dl4hkfjpcr7kv53ih1cf31i4"))))
+        (base32 "1m39znwza9yypyd93i5mxd9pbf6zn9qdajczpm953awwdlywyx1g"))))
     (synopsis "Sip module support for PyQt6")
     (description
      "SIP is used to write self contained extension modules, i.e. without a library
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 36/74] gnu: python-pyqt-builder: Update to 1.16.4.

[Zheng Junjie]

* gnu/packages/qt.scm (python-pyqt-builder): Update to 1.16.4.
[source]: Adjust pypi-url's name.
[build-system]: Switch to pyproject-build-system.
[native-inputs]: Add python-setuptools, python-setuptools-scm-next, and python-wheel.
[arguments]: Disable tests.

Change-Id: I2d1186536e9afb02de68c9fcb5e53d40eafa2ca0
---
 gnu/packages/qt.scm | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bb7efcf3c0..4b87275a54 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4246,26 +4246,30 @@ (define-public python-pyqtwebengine-6
 
 (define-public python-pyqt-builder
   (package
-   (name "python-pyqt-builder")
-   (version "1.14.1")
-   (source
-    (origin
-     (method url-fetch)
-     (uri (pypi-uri "PyQt-builder" version))
-     (sha256
-      (base32
-       "00m5piryz9l4hp5z1ncaqicsp29kj71akdh4b10432zz18q3xg43"))))
-   (build-system python-build-system)
-   (inputs
-    (list python-sip))
-   (home-page "https://www.riverbankcomputing.com/static/Docs/PyQt-builder/")
-   (synopsis "PEP 517 compliant PyQt build system")
-   (description "PyQt-builder is a tool for generating Python bindings for C++
+    (name "python-pyqt-builder")
+    (version "1.16.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pyqt_builder" version))
+       (sha256
+        (base32
+         "1pxgcqk9qf0qvszllb467v2cmr6ngksfr2caz1a2xgkrwcdf85a5"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-setuptools
+                         python-setuptools-scm-next
+                         python-wheel))
+    (inputs
+     (list python-sip))
+    (arguments (list #:tests? #f))      ; no test suite
+    (home-page "https://www.riverbankcomputing.com/static/Docs/PyQt-builder/")
+    (synopsis "PEP 517 compliant PyQt build system")
+    (description "PyQt-builder is a tool for generating Python bindings for C++
 libraries that use the Qt application framework.  The bindings are built on
 top of the PyQt bindings for Qt.  PyQt-builder is used to build PyQt itself.")
-   ;; Either version 2 or 3, but no other version. See the file
-   ;; 'pyqtbuild/builder.py' in the source distribution for more information.
-   (license (list license:gpl2 license:gpl3))))
+    ;; Either version 2 or 3, but no other version. See the file
+    ;; 'pyqtbuild/builder.py' in the source distribution for more information.
+    (license (list license:gpl2 license:gpl3))))
 
 (define-public python-qtpy
   (package
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 37/74] gnu: python-pyqt-6: Update to 6.7.1.

[Zheng Junjie]

* gnu/packages/qt.scm (python-pyqt-6): Update to 6.7.1.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4b87275a54..f863819172 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4077,14 +4077,14 @@ (define-public python-pyqt
 (define-public python-pyqt-6
   (package
     (inherit python-pyqt)
-    (version "6.6.1")
+    (version "6.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "PyQt6" version))
        (file-name (string-append "PyQt6-" version ".tar.gz"))
        (sha256
-        (base32 "0y83zm7xd2yspjbhmlkqhgi0ppxqhivx0d8gdz2l4l90kni8l5cz"))))
+        (base32 "1fcwslx32h6ik3nmr8pxk7ijha8y881kk880nadfjqisrlnahwin"))))
     (inputs ;Qt5 dependencies only in python-pyqt:
             ;; (qt)connectivity, location, sensors, serialport, x11extras, xmlpatterns.
             (list python-wrapper
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 38/74] gnu: python-pyqtwebengine-6: Update to 6.7.0.

[Zheng Junjie]

* gnu/packages/qt.scm (python-pyqtwebengine-6): Update to 6.7.0.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f863819172..020142f706 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4213,13 +4213,13 @@ (define-public python-pyqtwebengine
 (define-public python-pyqtwebengine-6
   (package
     (inherit python-pyqtwebengine)
-    (version "6.6.0")
+    (version "6.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "PyQt6_WebEngine" version))
        (sha256
-        (base32 "11wlnggs5vi7z465xhmnz664wbaj44ki6mmijbk0kr457x69h2ym"))))
+        (base32 "00ahqmdgyfw21nhymarrskx723fakkkq2s4mvvspbqnrnsnwgvb8"))))
     (native-inputs (list python python-sip python-pyqt-builder
                          ;; qtbase is required for qmake
                          qtbase))
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 39/74] gnu: python-pyqt5-sip: Update to 12.15.0.

[Zheng Junjie]

* gnu/packages/qt.scm (python-pyqt5-sip): Update to 12.15.0.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 020142f706..5cf6e15388 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4121,14 +4121,14 @@ (define-public python-pyqt-6
 (define-public python-pyqt5-sip
   (package
     (name "python-pyqt5-sip")
-    (version "12.11.1")
+    (version "12.15.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "PyQt5_sip" version))
        (sha256
         (base32
-         "0sa3vad8r7qm98k4ngimwjp87bh2f9f2vv19cnzb3vb11zdgplwp"))))
+         "00mpzkm3d2v33klmi2mhyl22img721brr2lzsgcysp1v6v7xygyj"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f)) ;; No test code.
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 40/74] gnu: clazy: Update to 1.12.

[Zheng Junjie]

* gnu/packages/qt.scm (clazy): Update to 1.12.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5cf6e15388..0f2a88d671 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5580,7 +5580,7 @@ (define-public signon-plugin-oauth2
 (define-public clazy
   (package
     (name "clazy")
-    (version "1.11")
+    (version "1.12")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -5589,7 +5589,7 @@ (define-public clazy
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1y0n1jknq566z1rifkgdm1yqb0mw564lp51jidfz7q9w91spijci"))))
+                "1y0g1j9ib1b0likjizw70hibky20gxxirqls6hf4crc214279v0m"))))
     (build-system cmake-build-system)
     (native-inputs (list python))
     (inputs (list clang llvm))
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 41/74] gnu: python-pyqt: Update to 5.15.10.

[Zheng Junjie]

* gnu/packages/qt.scm (python-pyqt): Update to 5.15.10.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0f2a88d671..8065b3b91f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4011,7 +4011,7 @@ (define-public python-sip-4
 (define-public python-pyqt
   (package
     (name "python-pyqt")
-    (version "5.15.9")
+    (version "5.15.10")
     (source
       (origin
         (method url-fetch)
@@ -4024,7 +4024,7 @@ (define-public python-pyqt
         (file-name (string-append "PyQt5-" version ".tar.gz"))
         (sha256
          (base32
-          "1h649rb1afdxskp28x524yp5kd9a97ainh9bd4mkxp4h390fhhfw"))
+          "12l96irlk11diql2ccig8ssd502mbcz13y2k2zwly2min427hsyl"))
         (patches (search-patches "pyqt-configure.patch"))))
     (build-system pyproject-build-system)
     (native-inputs
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 42/74] gnu: qtcharts: Rename to qtcharts-5.

[Zheng Junjie]

* gnu/packages/qt.scm (qtcharts): Rename to ...
(qtcharts-5): ... this.
* gnu/packages/astronomy.scm (stellarium)[inputs]: Adjust accordingly.
* gnu/packages/debug.scm (seer-gdb)[inputs]: Likewise.
* gnu/packages/education.scm (gcompris-qt)[inputs]: Likewise.
* gnu/packages/kde-utils.scm (atelier)[inputs]: Likewise.
(libatcore)[inputs]: Likewise.
* gnu/packages/radio.scm (welle-io)[inputs]: Likewise.
(sdrangel)[inputs]: Likewise.

Change-Id: If9e321be75d0b442355cc96d950de1ea57b364cd
---
 gnu/packages/astronomy.scm | 2 +-
 gnu/packages/debug.scm     | 2 +-
 gnu/packages/education.scm | 2 +-
 gnu/packages/kde-utils.scm | 4 ++--
 gnu/packages/qt.scm        | 2 +-
 gnu/packages/radio.scm     | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 1a25681c1e..1680cf5dd3 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2120,7 +2120,7 @@ (define-public stellarium
            nlopt
            openssl
            qtbase-5
-           qtcharts
+           qtcharts-5
            qtlocation-5
            qtmultimedia-5
            qtpositioning
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index b8ddafaba6..1ca4c585ad 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -996,7 +996,7 @@ (define-public seer-gdb
            (lambda _
              (chdir "src"))))))
     (inputs
-     (list qtbase-5 qtcharts))
+     (list qtbase-5 qtcharts-5))
     (synopsis "GUI frontend for GDB")
     (description "This package provides a frontend to GDB, the GNU debugger.")
     (home-page "https://github.com/epasveer/seer")
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index e2173067f4..ce6ac3ea7d 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -253,7 +253,7 @@ (define-public gcompris-qt
      (list openssl
            python-wrapper
            qtbase-5
-           qtcharts
+           qtcharts-5
            qtdeclarative-5
            qtgraphicaleffects
            qtmultimedia-5
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 807f6fe14d..1cff636844 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -151,7 +151,7 @@ (define-public atelier
                     libatcore
                     qt3d-5
                     qtbase-5
-                    qtcharts
+                    qtcharts-5
                     qtdeclarative-5
                     qtmultimedia-5
                     qtserialport-5))
@@ -743,7 +743,7 @@ (define-public libatcore
                   "1830r6ylpn3l7y2frl8cih5cpjgbkfrib9jq7jklf8aszhlsihf2"))))
       (build-system qt-build-system)
       (native-inputs (list extra-cmake-modules))
-      (inputs (list qtcharts qtdeclarative-5 qtserialport-5))
+      (inputs (list qtcharts-5 qtdeclarative-5 qtserialport-5))
       (home-page "https://invent.kde.org/libraries/atcore")
       (synopsis "Library for connection and management of 3D printers")
       (description
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8065b3b91f..80f5a87f92 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2720,7 +2720,7 @@ (define-public qtpurchasing
     (description "The Qt Purchasing module provides and in-app API for
 purchasing goods and services.")))
 
-(define-public qtcharts
+(define-public qtcharts-5
   (package
     (inherit qtsvg-5)
     (name "qtcharts")
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 45da28b9ae..dd4aab4f7f 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -2380,7 +2380,7 @@ (define-public welle-io
            mpg123
            rtl-sdr
            qtbase-5
-           qtcharts
+           qtcharts-5
            qtdeclarative-5
            qtgraphicaleffects
            qtmultimedia-5
@@ -2668,7 +2668,7 @@ (define-public sdrangel
            opus
            pulseaudio
            qtbase-5
-           qtcharts
+           qtcharts-5
            qtdeclarative-5
            qtgamepad
            qtlocation-5
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 43/74] gnu: Add qtcharts.

[Zheng Junjie]

* gnu/packages/qt.scm (qtcharts): New variable.

Change-Id: Ibce8f69ff358a535e524fa58777ba4457f63255e
---
 gnu/packages/qt.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 80f5a87f92..653b90eb49 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2749,6 +2749,50 @@ (define-public qtcharts-5
 graphs by selecting one of the charts themes.")
     (license license:gpl3)))
 
+(define-public qtcharts
+  (package
+    (name "qtcharts")
+    (version "6.7.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "1nlv4z2rvhrn1f1f7n6qdag7lmkpl3idnj6ph572qzwb8lvs9xh0"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'set-display
+            (lambda _
+              ;; Make Qt render "offscreen", required for tests.
+              (setenv "QT_QPA_PLATFORM" "offscreen")))
+          (add-after 'install 'delete-installed-tests
+            (lambda _
+              (delete-file-recursively (string-append #$output "/tests"))))
+          (delete 'check) ;; move after the install phase
+          (add-after 'install 'check
+            (assoc-ref %standard-phases 'check))
+          (add-before 'check 'set-QML_IMPORT_PATH
+            (lambda _
+              (setenv
+               "QML_IMPORT_PATH"
+               (string-append #$output "/lib/qt6/qml:"
+                              (getenv "QML_IMPORT_PATH"))))))))
+    (native-inputs
+     (list perl pkg-config qtdeclarative))
+    (inputs (list qtbase qtdeclarative))
+    (synopsis "Qt Charts module")
+    (description "The Qt Charts module provides a set of easy to use chart
+components.  It uses the Qt Graphics View Framework, therefore charts can be
+easily integrated to modern user interfaces.  Qt Charts can be used as
+QWidgets, QGraphicsWidget, or QML types.  Users can easily create impressive
+graphs by selecting one of the charts themes.")
+    (home-page (package-home-page qtbase))
+    (license (package-license qtbase))))
+
 (define-public qtdatavis3d
   (package
     (inherit qtsvg-5)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 44/74] gnu: qtbase-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtbase-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 653b90eb49..5d18bc8c6e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -449,13 +449,13 @@ (define (qt-url component version)
 (define-public qtbase-5
   (package
     (name "qtbase")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1fcg3kx5akvj0kqxd99h5lv3kv4pw2cj0makmpvhpw90inqnrl60"))
+                "18bbg5ids7j8vk7mp0bcrik22mafcfq4a2smgjlwnkk9rzz43yg5"))
               ;; Use TZDIR to avoid depending on package "tzdata".
               (patches (search-patches "qtbase-5-use-TZDIR.patch"
                                        "qtbase-moc-ignore-gcc-macro.patch"
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 45/74] gnu: qt3d-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qt3d-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5d18bc8c6e..a94462a890 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1125,13 +1125,13 @@ (define-public qt3d-5
   (package
     (inherit qtbase-5)
     (name "qt3d")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0pwcjm0xxa4f3sg634bv2n61jmn852yr0y6qjvyp8dcvic90cp12"))))
+                "0wyv60qjrk206gg7mcxrh21y6lghbf02akcx7yrdlxmndsq0sh2s"))))
     (propagated-inputs `())
     (native-inputs (list perl))
     (inputs (list mesa qtbase-5 vulkan-headers zlib))
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 46/74] gnu: qtsvg-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtsvg-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a94462a890..b1f656b253 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1217,13 +1217,13 @@ (define-public qtsvg-5
   (package
     (inherit qtbase-5)
     (name "qtsvg")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1s2a00vqq0njwmd34pas7gmmlb9cjjq5dra1s1wpfxlabf1y64yg"))))
+                "0jyh6c5p4ffj7hcr1hzwx5fmkvxqnl5m8ingk582l77v7g2n6ysp"))))
     (propagated-inputs `())
     (native-inputs (list perl))
     (inputs
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 47/74] gnu: qtimageformats-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtimageformats-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b1f656b253..cfab4a7e1c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1317,13 +1317,13 @@ (define-public qtimageformats-5
   (package
     (inherit qtsvg-5)
     (name "qtimageformats")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1cniah8v8y514i68bmwgfi3xn3hzgpywcdnzrv789mk7qi48l92g"))
+                "0ga51fgvyxshjif1r0g8sbghainskhbckj1qb4if6cbx8wb9myir"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 48/74] gnu: qtx11extras: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtx11extras): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index cfab4a7e1c..4b53631022 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1378,13 +1378,13 @@ (define-public qtimageformats
 (define-public qtx11extras
   (package (inherit qtsvg-5)
     (name "qtx11extras")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
              (sha256
               (base32
-               "1x489lw3nx28p9cggdrr9n0l49w9y1mcpni9x91sic6wpyfx3p6p"))))
+               "1xi8y2j6dgl7a041xgy4fmbkyv4y08ifc9lig5zkdyxll3a8gxb0"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 49/74] gnu: qtxmlpatterns: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtxmlpatterns): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4b53631022..f5a88d106e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1444,13 +1444,13 @@ (define-public qxlsx-qt5
 (define-public qtxmlpatterns
   (package (inherit qtsvg-5)
     (name "qtxmlpatterns")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
              (sha256
               (base32
-               "03fss4lssi48d8gdj8inkj4qgmyzxbn7r4bm58ckbh5vl9rpamq3"))))
+               "0gfk92wgm5947dxs7sxsh5srgm33wg76apxxdvw03294bf0hnfdq"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 50/74] gnu: qtdeclarative-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtdeclarative-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f5a88d106e..8451f7d377 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1473,13 +1473,13 @@ (define-public qtdeclarative-5
   (package
     (inherit qtsvg-5)
     (name "qtdeclarative")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1x1xsdlxwpdxzrapk5q0adjwh48c6awd8nj4j51ig6y49hy4r6r3"))
+                "06mc0ik45757zww7wap941cnsvmijba1wk5r5d6d55yag91fspzz"))
               (patches (search-patches "qtdeclarative-5-disable-qmlcache.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 51/74] gnu: qtconnectivity-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtconnectivity-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8451f7d377..85942c1463 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1679,13 +1679,13 @@ (define-public qtconnectivity-5
   (package
     (inherit qtsvg-5)
     (name "qtconnectivity")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1sdrw67djfr8qi5wx3qhg8asq2c6f3v3mal3sms7dp7a2l1irnrz"))))
+                "1c0myr277jvax10yygffvj3qf435bin2a3dk871m7kvfb4hl80bd"))))
     (native-inputs
      (list perl pkg-config qtdeclarative-5))
     (inputs
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 52/74] gnu: qtwebsockets-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwebsockets-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 85942c1463..a1c5a010af 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1727,13 +1727,13 @@ (define-public qtconnectivity
 (define-public qtwebsockets-5
   (package (inherit qtsvg-5)
     (name "qtwebsockets")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
              (sha256
               (base32
-               "12nryr99cixwxc1mnb12sys7bp4xnm39nzq1mf2lajswkvdn559b"))))
+               "0jmsiyaaflh32zg705pilf0hcm82xbq7cx9nd191f6l3ipdbipmd"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 53/74] gnu: qtmultimedia-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtmultimedia-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a1c5a010af..97394698ed 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1839,13 +1839,13 @@ (define-public qtmultimedia-5
   (package
     (inherit qtsvg-5)
     (name "qtmultimedia")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1di99ysjrgklx2jpsl0g0lqr9jh4l4p4a3hpi452qny6isyy01hi"))
+                "1y6pzw9rrcp2v1bxqj1i58k07p7r59fx3sawbv50a3j0s80sid57"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 54/74] gnu: qtwayland-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwayland-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 97394698ed..9d76198b4a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1988,7 +1988,7 @@ (define-public qtwayland-5
   (package
     (inherit qtsvg-5)
     (name "qtwayland")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1996,7 +1996,7 @@ (define-public qtwayland-5
                                        "qtwayland-cleanup-callbacks.patch"))
               (sha256
                (base32
-                "1w9nclz1lfg5haq3m6ihils0kl2n1pqagdyh71ry1m281w8gvly8"))))
+                "0lcvb4acikh9ywgik51c25g1n2wa23mim8m4bihhy71iq9z5f6xx"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 55/74] gnu: qtserialport-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtserialport-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9d76198b4a..8323f8405a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2099,13 +2099,13 @@ (define-public qtserialport-5
   (package
     (inherit qtsvg-5)
     (name "qtserialport")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1zk8y20bqibpvsxi1mqg1ry37xq55yw3m0isij4j9pc58lm4wvzw"))))
+                "164ypljn3knp6n50cfry416mlkwkjgb28wfr07wbbly3fp0zqf35"))))
     (native-inputs (list perl))
     (inputs (list qtbase-5 eudev))
     (arguments
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 56/74] gnu: qtserialbus: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtserialbus): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8323f8405a..f556938239 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2162,13 +2162,13 @@ (define-public qtserialbus
   (package
     (inherit qtsvg-5)
     (name "qtserialbus")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1i7zc5nlp9by0sr6qlls89zqm84sdxl1h4mr30dbxwsvvrqkmhf9"))))
+                "0dsmrxksl8n47p2lz7mw9d3ia7g4aj096c09cqq22f4bg1syvfkb"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases '%standard-phases)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 57/74] gnu: qtwebchannel-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwebchannel-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f556938239..f33dccb6f3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2189,13 +2189,13 @@ (define-public qtserialbus
 (define-public qtwebchannel-5
   (package (inherit qtsvg-5)
     (name "qtwebchannel")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
              (sha256
               (base32
-               "1rgziqprq0xvd57jfvd7ddkcddj3645ldn3xbq3n6w058bw04mz2"))))
+               "1y4c5xj0cxpsadr1fnpxy9f4a664kbc18ipk4rbzf4dwzfsibl20"))))
     (native-inputs (list perl qtdeclarative-5 qtwebsockets-5))
     (inputs (list qtbase-5))
     (synopsis "Web communication library for Qt")
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 58/74] gnu: qtwebglplugin: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwebglplugin): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f33dccb6f3..aa1938d82b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2245,13 +2245,13 @@ (define-public qtwebglplugin
   (package
     (inherit qtsvg-5)
     (name "qtwebglplugin")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "12kcvq5y5rpivxrn0p43gdkk3yysdi7bk904jgd3wk67gl0bda8r"))))
+                "12lxrpxam4dr0qs8g3zcydi4jnpizngxnyvwbi2i7fw2qcgxg6g6"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 59/74] gnu: qtwebview: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwebview): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index aa1938d82b..5211ada880 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2274,13 +2274,13 @@ (define-public qtwebview
   (package
     (inherit qtsvg-5)
     (name "qtwebview")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "00446917v1djh18lqsk1q5bhgfsfyz06q4zvna96xalwvl3ccn14"))))
+                "00xf8yif4vvyi29jnvp7w1m77aliyrfrl2ldgpchh1kgvxjv2rcf"))))
     (native-inputs (list perl))
     (inputs (list qtbase-5 qtdeclarative-5))
     (synopsis "Display web content in a QML application")
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 60/74] gnu: qtlocation-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtlocation-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5211ada880..a895e84494 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2316,13 +2316,13 @@ (define-public qtlocation-5
   (package
     (inherit qtsvg-5)
     (name "qtlocation")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0cvcpf0grwqnk6jxhrwm9xxm3dyc6lqvmb1np7fvkhkzjimx45l8"))))
+                "0ja5rs1z9lx9hns7m1mg1lndl04arhjajqbdg29j446q5xlzkpk2"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)             ; TODO: Enable the tests
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 61/74] gnu: qttools-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qttools-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a895e84494..5ee65a1943 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2399,13 +2399,13 @@ (define-public qttools-5
   (package
     (inherit qtsvg-5)
     (name "qttools")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1bkx2sc5hyldarc7w76ymv7dlcna3ib9r2kp67jdqcf856bnrx36"))))
+                "0a404d7swfl1lm8qcb725157sd9frkgrg2r821cr4v5xqq26g53i"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)           ; TODO: Enable the tests
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 62/74] gnu: qtscript: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtscript): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5ee65a1943..c3ac18649d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2492,13 +2492,13 @@ (define-public qtscript
   (package
     (inherit qtsvg-5)
     (name "qtscript")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0fvhjsn41f6gx7bmvifxl61fdk6mg9lc6wgnwsfz2kyx0r2wsbb4"))
+                "1sy2b0vdj974l4fd2wq3vzr359mnbv5a39im93sgwn35alixnvpd"))
               (patches (search-patches "qtscript-disable-tests.patch"))))
     (native-inputs (list perl qttools-5))
     (inputs (list qtbase-5))
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 63/74] gnu: qtquickcontrols-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtquickcontrols-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c3ac18649d..5a799a031a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2511,13 +2511,13 @@ (define-public qtquickcontrols-5
   (package
     (inherit qtsvg-5)
     (name "qtquickcontrols")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1szgm7d8d2lllq19iyf4ggif933bprgsgmp4wzyg0mwq21rnwsm0"))))
+                "0anf0r7ryj1c3z97kxpkd6qvbn3fg3hcgzy65vnkwm3fbb13095h"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 64/74] gnu: qtquickcontrols2-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtquickcontrols2-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5a799a031a..6e7837b484 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2531,13 +2531,13 @@ (define-public qtquickcontrols2-5
   (package
     (inherit qtsvg-5)
     (name "qtquickcontrols2")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "13pw0ah7ydkl27pvqwdjw8rc3cxgag7jr0a12g1iw0z9zs94r5cp"))))
+                "095pgl962z160lrmsl98bgyin2ycd43s2arwxicd667mamgif5py"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 65/74] gnu: qtgraphicaleffects: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtgraphicaleffects): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6e7837b484..48eadf734b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2552,13 +2552,13 @@ (define-public qtgraphicaleffects
   (package
     (inherit qtsvg-5)
     (name "qtgraphicaleffects")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "01f0glgc74595llfdfmapc3hqw3lqj8lcdmabm0mmnplnabb2b5b"))))
+                "1w7xr8m4mff6l07fh2582f92i4rlpz50w6wc65ic46ldjpifb8q9"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 66/74] gnu: qtgamepad: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtgamepad): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 48eadf734b..cf85bc6726 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2575,13 +2575,13 @@ (define-public qtgamepad
   (package
     (inherit qtsvg-5)
     (name "qtgamepad")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0xkaib238x1lj6agf4gywgy69826zpxqlda361wlchwasyrbw238"))))
+                "0r903y8k2l6y9665jq6h90b5z5h7kvjvb2k5wimpd0mhy8nz5iv4"))))
     (native-inputs (list perl pkg-config))
     (inputs
      (list fontconfig
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 67/74] gnu: qtscxml-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtscxml-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index cf85bc6726..3c9871dd12 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2601,13 +2601,13 @@ (define-public qtscxml-5
   (package
     (inherit qtsvg-5)
     (name "qtscxml")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "10lxvdxdkxr2vldhqdp4bk38r7q9j0jy54lrqw9whnyj3y5wgzzi"))
+                "1j4513c4idcg4mwj1am445dfsqhsnbv2rmj165pvrxmx7ghz0zwf"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 68/74] gnu: qtpurchasing: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtpurchasing): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3c9871dd12..6399ab1ab5 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2708,13 +2708,13 @@ (define-public qtpurchasing
   (package
     (inherit qtsvg-5)
     (name "qtpurchasing")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0gzxzcr9x45nd90481hdbj5shvaax00qjr1kx3lkcp13187pyacb"))))
+                "0i48clv6vzha9m869ylp6a0s6wyqqbil3d6z2qn80dv1j8x45q2r"))))
     (inputs (list qtbase-5 qtdeclarative-5))
     (synopsis "Qt Purchasing module")
     (description "The Qt Purchasing module provides and in-app API for
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 69/74] gnu: qtcharts-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtcharts-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6399ab1ab5..bcbe71e32c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2724,13 +2724,13 @@ (define-public qtcharts-5
   (package
     (inherit qtsvg-5)
     (name "qtcharts")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0ax1qab1ibibk2bbwmlmsni7j4y821jzvcvrr63iz6pcw94vwx6h"))))
+                "0i8arrg9w71xj26wpy4hjgi37a17qbdkw8g1rh80h55r1nw6n9vi"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 70/74] gnu: qtdatavis3d: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtdatavis3d): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bcbe71e32c..3cbdd44a80 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2797,13 +2797,13 @@ (define-public qtdatavis3d
   (package
     (inherit qtsvg-5)
     (name "qtdatavis3d")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1lhy6l0hlm8mc21k7bwzkgnj6nn6x1f0h2imk8wqjjcvb5g605g5"))))
+                "124w3badhqcmwgwsm6phqa7ha4zjh68gh4zv50zbi2j1dwcfqif0"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 71/74] gnu: qtnetworkauth-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtnetworkauth-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3cbdd44a80..f592d7442b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2819,13 +2819,13 @@ (define-public qtdatavis3d
 (define-public qtnetworkauth-5
   (package (inherit qtsvg-5)
     (name "qtnetworkauth")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
              (sha256
               (base32
-               "0qf9dqh7rlbyi3fl7610zb86yqxwaq5m3zvwp2c8w1sa0m8jcili"))))
+               "1w8pjadaxzz7frk77a383ysbavaimzlcm1hc9r7hvb8cwq8zs0r9"))))
     (inputs (list qtbase-5))
     (synopsis "Qt Network Authorization module")
     (description "The Qt Network Authorization module provides an
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 72/74] gnu: qtspeech-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtspeech-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f592d7442b..42efee7fcc 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2892,13 +2892,13 @@ (define-public qtspeech-5
   (package
     (inherit qtsvg-5)
     (name "qtspeech")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1qscnqxnm9yvfa0i6xnz04xrhlxf08v3xkas8ng790camr34pwwa"))))
+                "01dkm3lpg8scajyzlrq69x9xhgwjq14a5rwi49z9q8f42g72a089"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 73/74] gnu: qtvirtualkeyboard-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtvirtualkeyboard-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 42efee7fcc..29d05a565b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2961,13 +2961,13 @@ (define-public qtvirtualkeyboard-5
   (package
     (inherit qtsvg-5)
     (name "qtvirtualkeyboard")
-    (version "5.15.10")
+    (version "5.15.15")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1a1xnk1kmq1k8r1rsa29fq7m3vy2f0fqhy8k46q3ssn32skzlwa5"))))
+                "1511p8j86d896rnbvy7lqzfawzghxczy0w8kfxrhghxcfsrb61y6"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f) ; TODO: pass 2 fail test
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 74/74] gnu: qtwebengine-5: Update to 5.15.15.

[Zheng Junjie]

* gnu/packages/qt.scm (qtwebengine-5): Update to 5.15.15.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 29d05a565b..e6edff59fe 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3083,14 +3083,14 @@ (define-public qtwebengine-5
   (package
     (inherit qtsvg-5)
     (name "qtwebengine")
-    (version "5.15.10")
+    (version "5.15.15")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
         (base32
-         "1rz6vbmr1aydmixayazmpsy7v2naq25l72q1gmvrhf9yf69584q8"))
+         "07z9fn80h0wiagxpanwc8510klzdhivp29z75r45fz88ynw1gni5"))
        (modules '((ice-9 ftw)
                   (ice-9 match)
                   (srfi srfi-1)
-- 
2.45.2

[bug#72835] [PATCH qt-team v2 00/74] update qt{5,6}.

[Maxim Cournoyer]

Hi,

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> pushed to qt-team and CI built fine.
>
> * adjust qtmultimedia comments.
> * add qt-creator snippet comment.
> * qtconnectivity don't inherit from qtsvg.
> * adjust qtwebengine disable webenginedriver comments.
> * adjust python-pyqt-builder disable tests comment.
>
> * update qt5* to 5.15.15.
> * rename qtcharts to qtcharts-5, and add qtcharts 6.
> * clazy update to 1.12.
>
> Zheng Junjie (74):
>   gnu: qtbase: Update to 6.7.2.
>   gnu: qt5compat: Update to 6.7.2.
>   gnu: qtsvg: Update to 6.7.2.
>   gnu: qtimageformats: Update to 6.7.2.
>   gnu: qtdeclarative: Update to 6.7.2.
>   gnu: qtwebsockets: Update to 6.7.2.
>   gnu: qtsensors: Update to 6.7.2.
>   gnu: qtshadertools: Update to 6.7.2.
>   gnu: qtmultimedia: Update to 6.7.2.
>   gnu: qtwayland: Update to 6.7.2.
>   gnu: qtserialport: Update to 6.7.2.
>   gnu: qtwebchannel: Update to 6.7.2.
>   gnu: qtlanguageserver: Update to 6.7.2.
>   gnu: qtlocation: Update to 6.7.2.
>   gnu: qtlottie: Update to 6.7.2.
>   gnu: qttools: Update to 6.7.2.
>   gnu: qttranslations: Update to 6.7.2.
>   gnu: qtscxml: Update to 6.7.2.
>   gnu: qtpositioning: Update to 6.7.2.
>   gnu: qtremoteobjects: Update to 6.7.2.
>   gnu: qtspeech: Update to 6.7.2.
>   gnu: qthttpserver: Update to 6.7.2.
>   gnu: qt-creator: Update to 14.0.1.
>   gnu: qtnetworkauth: Update to 6.7.2.
>   gnu: abseil-cpp: Update to 20240722.0.
>   gnu: libvpx: Update to 1.14.1.
>   gnu: Add re2-next.
>   gnu: Add icu4c-75.
>   gnu: qtwebengine: Update to 6.7.2.
>   gnu: python-shiboken-6: Update to 6.7.2.
>   gnu: qtconnectivity: Rename to qtconnectivity-5.
>   gnu: Add qtconnectivity.
>   gnu: Add python-setuptools-scm-next.
>   gnu: python-sip: Update to 6.8.6.
>   gnu: python-pyqt6-sip: Update to 13.8.0.
>   gnu: python-pyqt-builder: Update to 1.16.4.
>   gnu: python-pyqt-6: Update to 6.7.1.
>   gnu: python-pyqtwebengine-6: Update to 6.7.0.
>   gnu: python-pyqt5-sip: Update to 12.15.0.
>   gnu: clazy: Update to 1.12.
>   gnu: python-pyqt: Update to 5.15.10.
>   gnu: qtcharts: Rename to qtcharts-5.
>   gnu: Add qtcharts.
>   gnu: qtbase-5: Update to 5.15.15.
>   gnu: qt3d-5: Update to 5.15.15.
>   gnu: qtsvg-5: Update to 5.15.15.
>   gnu: qtimageformats-5: Update to 5.15.15.
>   gnu: qtx11extras: Update to 5.15.15.
>   gnu: qtxmlpatterns: Update to 5.15.15.
>   gnu: qtdeclarative-5: Update to 5.15.15.
>   gnu: qtconnectivity-5: Update to 5.15.15.
>   gnu: qtwebsockets-5: Update to 5.15.15.
>   gnu: qtmultimedia-5: Update to 5.15.15.
>   gnu: qtwayland-5: Update to 5.15.15.
>   gnu: qtserialport-5: Update to 5.15.15.
>   gnu: qtserialbus: Update to 5.15.15.
>   gnu: qtwebchannel-5: Update to 5.15.15.
>   gnu: qtwebglplugin: Update to 5.15.15.
>   gnu: qtwebview: Update to 5.15.15.
>   gnu: qtlocation-5: Update to 5.15.15.
>   gnu: qttools-5: Update to 5.15.15.
>   gnu: qtscript: Update to 5.15.15.
>   gnu: qtquickcontrols-5: Update to 5.15.15.
>   gnu: qtquickcontrols2-5: Update to 5.15.15.
>   gnu: qtgraphicaleffects: Update to 5.15.15.
>   gnu: qtgamepad: Update to 5.15.15.
>   gnu: qtscxml-5: Update to 5.15.15.
>   gnu: qtpurchasing: Update to 5.15.15.
>   gnu: qtcharts-5: Update to 5.15.15.
>   gnu: qtdatavis3d: Update to 5.15.15.
>   gnu: qtnetworkauth-5: Update to 5.15.15.
>   gnu: qtspeech-5: Update to 5.15.15.
>   gnu: qtvirtualkeyboard-5: Update to 5.15.15.
>   gnu: qtwebengine-5: Update to 5.15.15.
>
>  gnu/local.mk                                  |   2 -
>  gnu/packages/astronomy.scm                    |   2 +-
>  gnu/packages/cpp.scm                          |   6 +-
>  gnu/packages/debug.scm                        |   2 +-
>  gnu/packages/education.scm                    |   2 +-
>  gnu/packages/icu4c.scm                        |  18 +
>  gnu/packages/kde-utils.scm                    |   4 +-

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

bug#72835: [PATCH qt-team v2 00/74] update qt{5,6}.

[Z572]

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

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Hi,
>
> Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:
>
>> pushed to qt-team and CI built fine.
>>
>> * adjust qtmultimedia comments.
>> * add qt-creator snippet comment.
>> * qtconnectivity don't inherit from qtsvg.
>> * adjust qtwebengine disable webenginedriver comments.
>> * adjust python-pyqt-builder disable tests comment.
>>
>> * update qt5* to 5.15.15.
>> * rename qtcharts to qtcharts-5, and add qtcharts 6.
>> * clazy update to 1.12.
>>
>> Zheng Junjie (74):
>>   gnu: qtbase: Update to 6.7.2.
>>   gnu: qt5compat: Update to 6.7.2.
>>   gnu: qtsvg: Update to 6.7.2.
>>   gnu: qtimageformats: Update to 6.7.2.
>>   gnu: qtdeclarative: Update to 6.7.2.
>>   gnu: qtwebsockets: Update to 6.7.2.
>>   gnu: qtsensors: Update to 6.7.2.
>>   gnu: qtshadertools: Update to 6.7.2.
>>   gnu: qtmultimedia: Update to 6.7.2.
>>   gnu: qtwayland: Update to 6.7.2.
>>   gnu: qtserialport: Update to 6.7.2.
>>   gnu: qtwebchannel: Update to 6.7.2.
>>   gnu: qtlanguageserver: Update to 6.7.2.
>>   gnu: qtlocation: Update to 6.7.2.
>>   gnu: qtlottie: Update to 6.7.2.
>>   gnu: qttools: Update to 6.7.2.
>>   gnu: qttranslations: Update to 6.7.2.
>>   gnu: qtscxml: Update to 6.7.2.
>>   gnu: qtpositioning: Update to 6.7.2.
>>   gnu: qtremoteobjects: Update to 6.7.2.
>>   gnu: qtspeech: Update to 6.7.2.
>>   gnu: qthttpserver: Update to 6.7.2.
>>   gnu: qt-creator: Update to 14.0.1.
>>   gnu: qtnetworkauth: Update to 6.7.2.
>>   gnu: abseil-cpp: Update to 20240722.0.
>>   gnu: libvpx: Update to 1.14.1.
>>   gnu: Add re2-next.
>>   gnu: Add icu4c-75.
>>   gnu: qtwebengine: Update to 6.7.2.
>>   gnu: python-shiboken-6: Update to 6.7.2.
>>   gnu: qtconnectivity: Rename to qtconnectivity-5.
>>   gnu: Add qtconnectivity.
>>   gnu: Add python-setuptools-scm-next.
>>   gnu: python-sip: Update to 6.8.6.
>>   gnu: python-pyqt6-sip: Update to 13.8.0.
>>   gnu: python-pyqt-builder: Update to 1.16.4.
>>   gnu: python-pyqt-6: Update to 6.7.1.
>>   gnu: python-pyqtwebengine-6: Update to 6.7.0.
>>   gnu: python-pyqt5-sip: Update to 12.15.0.
>>   gnu: clazy: Update to 1.12.
>>   gnu: python-pyqt: Update to 5.15.10.
>>   gnu: qtcharts: Rename to qtcharts-5.
>>   gnu: Add qtcharts.
>>   gnu: qtbase-5: Update to 5.15.15.
>>   gnu: qt3d-5: Update to 5.15.15.
>>   gnu: qtsvg-5: Update to 5.15.15.
>>   gnu: qtimageformats-5: Update to 5.15.15.
>>   gnu: qtx11extras: Update to 5.15.15.
>>   gnu: qtxmlpatterns: Update to 5.15.15.
>>   gnu: qtdeclarative-5: Update to 5.15.15.
>>   gnu: qtconnectivity-5: Update to 5.15.15.
>>   gnu: qtwebsockets-5: Update to 5.15.15.
>>   gnu: qtmultimedia-5: Update to 5.15.15.
>>   gnu: qtwayland-5: Update to 5.15.15.
>>   gnu: qtserialport-5: Update to 5.15.15.
>>   gnu: qtserialbus: Update to 5.15.15.
>>   gnu: qtwebchannel-5: Update to 5.15.15.
>>   gnu: qtwebglplugin: Update to 5.15.15.
>>   gnu: qtwebview: Update to 5.15.15.
>>   gnu: qtlocation-5: Update to 5.15.15.
>>   gnu: qttools-5: Update to 5.15.15.
>>   gnu: qtscript: Update to 5.15.15.
>>   gnu: qtquickcontrols-5: Update to 5.15.15.
>>   gnu: qtquickcontrols2-5: Update to 5.15.15.
>>   gnu: qtgraphicaleffects: Update to 5.15.15.
>>   gnu: qtgamepad: Update to 5.15.15.
>>   gnu: qtscxml-5: Update to 5.15.15.
>>   gnu: qtpurchasing: Update to 5.15.15.
>>   gnu: qtcharts-5: Update to 5.15.15.
>>   gnu: qtdatavis3d: Update to 5.15.15.
>>   gnu: qtnetworkauth-5: Update to 5.15.15.
>>   gnu: qtspeech-5: Update to 5.15.15.
>>   gnu: qtvirtualkeyboard-5: Update to 5.15.15.
>>   gnu: qtwebengine-5: Update to 5.15.15.
>>
>>  gnu/local.mk                                  |   2 -
>>  gnu/packages/astronomy.scm                    |   2 +-
>>  gnu/packages/cpp.scm                          |   6 +-
>>  gnu/packages/debug.scm                        |   2 +-
>>  gnu/packages/education.scm                    |   2 +-
>>  gnu/packages/icu4c.scm                        |  18 +
>>  gnu/packages/kde-utils.scm                    |   4 +-
>
> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

Thanks, rebase and re-push to savannah qt-team branch. close.

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