GNU bug report logs - #58054
[PATCH 0/2] gnu: Add qtwayland, version 6.3.1.

Previous Next

Package: guix-patches;

Reported by: Hilton Chain <hako <at> ultrarare.space>

Date: Sun, 25 Sep 2022 00:34:01 UTC

Severity: normal

Tags: patch

Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#58054; Package guix-patches. (Sun, 25 Sep 2022 00:34:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Hilton Chain <hako <at> ultrarare.space>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sun, 25 Sep 2022 00:34:02 GMT) Full text and rfc822 format available.

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

From: Hilton Chain <hako <at> ultrarare.space>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] gnu: Add qtwayland, version 6.3.1.
Date: Sun, 25 Sep 2022 08:32:48 +0800
Hilton Chain (2):
  gnu: qtwayland: Rename to qtwayland-5.
  gnu: Add qtwayland, version 6.3.1.

 gnu/packages/kde-frameworks.scm |  2 +-
 gnu/packages/kde-plasma.scm     |  2 +-
 gnu/packages/qt.scm             | 53 +++++++++++++++++++++++++++++++--
 gnu/packages/telegram.scm       |  2 +-
 gnu/packages/video.scm          |  2 +-
 5 files changed, 55 insertions(+), 6 deletions(-)


base-commit: b79bdbe2ec12de3058720866290201f3cbf72092
-- 
2.37.3





Information forwarded to guix-patches <at> gnu.org:
bug#58054; Package guix-patches. (Sun, 25 Sep 2022 00:36:02 GMT) Full text and rfc822 format available.

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

From: Hilton Chain <hako <at> ultrarare.space>
To: guix-patches <at> gnu.org
Subject: [PATCH 1/2] gnu: qtwayland: Rename to qtwayland-5.
Date: Sun, 25 Sep 2022 08:34:50 +0800
Automated via:

  git grep -l qtwayland | xargs sed 's/\qtwayland\b/\0-5/g' -i
  git checkout NEWS
---
 gnu/packages/kde-frameworks.scm | 2 +-
 gnu/packages/kde-plasma.scm     | 2 +-
 gnu/packages/qt.scm             | 4 ++--
 gnu/packages/telegram.scm       | 2 +-
 gnu/packages/video.scm          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 738013fdba..62de3e38ad 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1077,7 +1077,7 @@ (define-public kwayland
     (native-inputs
      (list extra-cmake-modules pkg-config))
     (inputs
-     (list qtbase-5 qtwayland wayland wayland-protocols))
+     (list qtbase-5 qtwayland-5 wayland wayland-protocols))
     (arguments
      `(#:tests? #f ; FIXME tests require weston to run
                    ; weston requires wayland flags in mesa
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 39716187fd..064f5f7278 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -177,7 +177,7 @@ (define-public layer-shell-qt
      (list libxkbcommon
            qtbase-5
            qtdeclarative-5
-           qtwayland
+           qtwayland-5
            wayland
            wayland-protocols))
     (home-page "https://invent.kde.org/plasma/layer-shell-qt")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index cb7f72e698..bf978eec50 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -220,7 +220,7 @@ (define-public materialdecoration
        (list cmake-shared extra-cmake-modules pkg-config))
       (inputs
        `(("qtbase" ,qtbase-5)
-         ("qtwayland" ,qtwayland)
+         ("qtwayland" ,qtwayland-5)
          ("wayland" ,wayland)
          ("xkbcommon" ,libxkbcommon)))
       (synopsis "Material Decoration for Qt")
@@ -1450,7 +1450,7 @@ (define-public qtmultimedia
 set of plugins for interacting with pulseaudio and GStreamer.")
     (license (package-license qtbase))))
 
-(define-public qtwayland
+(define-public qtwayland-5
   (package (inherit qtsvg-5)
     (name "qtwayland")
     (version "5.15.2")
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 6c9869f93e..10061059f6 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -588,7 +588,7 @@ (define-public telegram-desktop
            qtsvg-5
            qt5ct
            qtimageformats
-           qtwayland
+           qtwayland-5
            range-v3
            rlottie-for-telegram-desktop
            rnnoise
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index f07fe192ed..98e2f38148 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3385,7 +3385,7 @@ (define-public obs
       qtbase-5
       qtsvg-5
       qtx11extras
-      qtwayland
+      qtwayland-5
       speexdsp
       v4l-utils
       wayland
-- 
2.37.3





Information forwarded to guix-patches <at> gnu.org:
bug#58054; Package guix-patches. (Sun, 25 Sep 2022 00:36:02 GMT) Full text and rfc822 format available.

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

From: Hilton Chain <hako <at> ultrarare.space>
To: guix-patches <at> gnu.org
Subject: [PATCH 2/2] gnu: Add qtwayland, version 6.3.1.
Date: Sun, 25 Sep 2022 08:35:17 +0800
* gnu/packages/qt.scm (qtwayland): New variable.
---
 gnu/packages/qt.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bf978eec50..25b246d7d4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1500,6 +1500,55 @@ (define-public qtwayland-5
     (description "The Qt Wayland module provides the QtWayland client and
 compositor libraries.")))
 
+(define-public qtwayland
+  (package (inherit qtsvg)
+    (name "qtwayland")
+    (version "6.3.1")
+    (source (origin
+             (method url-fetch)
+             (uri (qt-urls name version))
+             (sha256
+              (base32
+               "1w60p1did7awdlzq5k8vnq2ncpskb07cpvz31cbv99bjs6igw53g"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (add-after 'unpack 'disable-failing-tests
+              (lambda _
+                ;; FIXME: tst_seatv4::animatedCursor() fails for no good
+                ;; reason and breaks these two tests.
+                (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp"
+                  (((string-append "QVERIFY\\(!cursorSurface\\(\\)->"
+                                   "m_waitingFrameCallbacks\\.empty\\(\\)\\);"))
+                   "")
+                  (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);")
+                   ""))))
+            (add-before 'check 'set-test-environment
+              (lambda _
+                ;; Do not fail just because /etc/machine-id is missing.
+                (setenv "DBUS_FATAL_WARNINGS" "0")))
+            ;; No such directory anymore.
+            (delete 'delete-installed-tests)))))
+    (native-inputs
+     (list glib perl pkg-config qtdeclarative))
+    (inputs
+     (list fontconfig
+           freetype
+           libx11
+           libxcomposite
+           libxext
+           libxkbcommon
+           libxrender
+           mesa
+           mtdev
+           qtbase
+           vulkan-headers
+           wayland))
+    (synopsis "Qt Wayland module")
+    (description "The Qt Wayland module provides the QtWayland client and
+compositor libraries.")))
+
 (define-public qtserialport
   (package (inherit qtsvg-5)
     (name "qtserialport")
-- 
2.37.3





Information forwarded to guix-patches <at> gnu.org:
bug#58054; Package guix-patches. (Wed, 28 Sep 2022 19:00:02 GMT) Full text and rfc822 format available.

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Hilton Chain <hako <at> ultrarare.space>
Cc: 58054 <at> debbugs.gnu.org
Subject: Re: bug#58054: [PATCH 0/2] gnu: Add qtwayland, version 6.3.1.
Date: Wed, 28 Sep 2022 14:58:54 -0400
Hello Hilton!

Hilton Chain <hako <at> ultrarare.space> writes:

> * gnu/packages/qt.scm (qtwayland): New variable.
> ---
>  gnu/packages/qt.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 49 insertions(+)

Great work!

> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index bf978eec50..25b246d7d4 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -1500,6 +1500,55 @@ (define-public qtwayland-5
>      (description "The Qt Wayland module provides the QtWayland client and
>  compositor libraries.")))
>
> +(define-public qtwayland
> +  (package (inherit qtsvg)

For the qt 6 packages, I tried to not inherit from qtsvg, as while that
can shorten some repetition sometimes, it doesn't really make sense
(qtwayland is not related to qtsvg) and could cause problems down the
line.

> +    (name "qtwayland")
> +    (version "6.3.1")
> +    (source (origin
> +             (method url-fetch)
> +             (uri (qt-urls name version))
> +             (sha256
> +              (base32
> +               "1w60p1did7awdlzq5k8vnq2ncpskb07cpvz31cbv99bjs6igw53g"))))
> +    (arguments
> +     (substitute-keyword-arguments (package-arguments qtsvg)
> +       ((#:phases phases)
> +        #~(modify-phases #$phases
> +            (add-after 'unpack 'disable-failing-tests
> +              (lambda _
> +                ;; FIXME: tst_seatv4::animatedCursor() fails for no good
> +                ;; reason and breaks these two tests.

Please link to the upstream issue, already reported at
https://bugreports.qt.io/browse/QTBUG-78317?jql=text%20~%20%22animatedCursor%22.

> +                (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp"
> +                  (((string-append "QVERIFY\\(!cursorSurface\\(\\)->"
> +                                   "m_waitingFrameCallbacks\\.empty\\(\\)\\);"))
> +                   "")
> +                  (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);")
> +                   ""))))
> +            (add-before 'check 'set-test-environment
> +              (lambda _
> +                ;; Do not fail just because /etc/machine-id is missing.
> +                (setenv "DBUS_FATAL_WARNINGS" "0")))
> +            ;; No such directory anymore.
> +            (delete 'delete-installed-tests)))))

That's unwanted inherited stuff from qtsvg which should be no longer
necessary after removing the inheritance.

> +    (native-inputs
> +     (list glib perl pkg-config qtdeclarative))
> +    (inputs
> +     (list fontconfig
> +           freetype
> +           libx11
> +           libxcomposite
> +           libxext
> +           libxkbcommon
> +           libxrender
> +           mesa
> +           mtdev
> +           qtbase
> +           vulkan-headers
> +           wayland))
> +    (synopsis "Qt Wayland module")
> +    (description "The Qt Wayland module provides the QtWayland client and
> +compositor libraries.")))
> +

Please send a v2 version with the above addressed and it should be good
to merge it!

Thank you,

Maxim





Information forwarded to guix-patches <at> gnu.org:
bug#58054; Package guix-patches. (Thu, 29 Sep 2022 13:53:02 GMT) Full text and rfc822 format available.

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

From: Hilton Chain <hako <at> ultrarare.space>
To: 58054 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH v2 0/2] gnu: Add qtwayland, version 6.3.1.
Date: Thu, 29 Sep 2022 21:52:12 +0800
v1 -> v2: Not inheriting qtsvg.

Hilton Chain (2):
  gnu: qtwayland: Rename to qtwayland-5.
  gnu: Add qtwayland, version 6.3.1.

 gnu/packages/kde-frameworks.scm |  2 +-
 gnu/packages/kde-plasma.scm     |  2 +-
 gnu/packages/qt.scm             | 54 +++++++++++++++++++++++++++++++--
 gnu/packages/telegram.scm       |  2 +-
 gnu/packages/video.scm          |  2 +-
 5 files changed, 56 insertions(+), 6 deletions(-)


base-commit: e6777cfa5eb5e9c36eaf7810b42cac0fbcaa367c
--
2.37.3




Information forwarded to guix-patches <at> gnu.org:
bug#58054; Package guix-patches. (Thu, 29 Sep 2022 13:55:02 GMT) Full text and rfc822 format available.

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

From: Hilton Chain <hako <at> ultrarare.space>
To: 58054 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH v2 1/2] gnu: qtwayland: Rename to qtwayland-5.
Date: Thu, 29 Sep 2022 21:53:35 +0800
Automated via:

  git grep -l qtwayland | xargs sed 's/\qtwayland\b/\0-5/g' -i
  git checkout NEWS
---
 gnu/packages/kde-frameworks.scm | 2 +-
 gnu/packages/kde-plasma.scm     | 2 +-
 gnu/packages/qt.scm             | 4 ++--
 gnu/packages/telegram.scm       | 2 +-
 gnu/packages/video.scm          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 61cbf19bc4..059667ee5d 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1068,7 +1068,7 @@ (define-public kwayland
     (native-inputs
      (list extra-cmake-modules pkg-config))
     (inputs
-     (list qtbase-5 qtwayland wayland wayland-protocols))
+     (list qtbase-5 qtwayland-5 wayland wayland-protocols))
     (arguments
      `(#:tests? #f ; FIXME tests require weston to run
                    ; weston requires wayland flags in mesa
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 39716187fd..064f5f7278 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -177,7 +177,7 @@ (define-public layer-shell-qt
      (list libxkbcommon
            qtbase-5
            qtdeclarative-5
-           qtwayland
+           qtwayland-5
            wayland
            wayland-protocols))
     (home-page "https://invent.kde.org/plasma/layer-shell-qt")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8c94d613d6..f6e5a37472 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -220,7 +220,7 @@ (define-public materialdecoration
        (list cmake-shared extra-cmake-modules pkg-config))
       (inputs
        `(("qtbase" ,qtbase-5)
-         ("qtwayland" ,qtwayland)
+         ("qtwayland" ,qtwayland-5)
          ("wayland" ,wayland)
          ("xkbcommon" ,libxkbcommon)))
       (synopsis "Material Decoration for Qt")
@@ -1450,7 +1450,7 @@ (define-public qtmultimedia
 set of plugins for interacting with pulseaudio and GStreamer.")
     (license (package-license qtbase))))
 
-(define-public qtwayland
+(define-public qtwayland-5
   (package (inherit qtsvg-5)
     (name "qtwayland")
     (version "5.15.2")
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 2df68ccca7..82c9227ba8 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -502,7 +502,7 @@ (define-public telegram-desktop
            qtbase-5
            qtimageformats
            qtsvg-5
-           qtwayland
+           qtwayland-5
            range-v3
            rlottie-for-telegram-desktop
            rnnoise
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 01c9ae186a..ca6148b078 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3385,7 +3385,7 @@ (define-public obs
       qtbase-5
       qtsvg-5
       qtx11extras
-      qtwayland
+      qtwayland-5
       speexdsp
       v4l-utils
       wayland
-- 
2.37.3





Information forwarded to guix-patches <at> gnu.org:
bug#58054; Package guix-patches. (Thu, 29 Sep 2022 13:55:02 GMT) Full text and rfc822 format available.

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

From: Hilton Chain <hako <at> ultrarare.space>
To: 58054 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH v2 2/2] gnu: Add qtwayland, version 6.3.1.
Date: Thu, 29 Sep 2022 21:53:55 +0800
* gnu/packages/qt.scm (qtwayland): New variable.
---
 gnu/packages/qt.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f6e5a37472..6e30980505 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1500,6 +1500,56 @@ (define-public qtwayland-5
     (description "The Qt Wayland module provides the QtWayland client and
 compositor libraries.")))
 
+(define-public qtwayland
+  (package
+    (name "qtwayland")
+    (version "6.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (qt-urls name version))
+       (sha256
+        (base32 "1w60p1did7awdlzq5k8vnq2ncpskb07cpvz31cbv99bjs6igw53g"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'disable-failing-tests
+                 (lambda _
+                   ;; FIXME: tst_seatv4::animatedCursor() fails here.
+                   ;; See also: <https://bugreports.qt.io/browse/QTBUG-78317>
+                   (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp"
+                     (((string-append
+                        "QVERIFY\\(!cursorSurface\\(\\)->"
+                        "m_waitingFrameCallbacks\\.empty\\(\\)\\);")) "")
+                     (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);") ""))))
+               (add-before 'check 'set-test-environment
+                 (lambda _
+                   ;; Do not fail just because /etc/machine-id is missing.
+                   (setenv "DBUS_FATAL_WARNINGS" "0")
+                   ;; Make Qt render "offscreen", required for tests.
+                   (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+    (native-inputs (list glib perl pkg-config qtdeclarative))
+    (inputs
+     (list fontconfig
+           freetype
+           libx11
+           libxcomposite
+           libxext
+           libxkbcommon
+           libxrender
+           mesa
+           mtdev
+           qtbase
+           vulkan-headers
+           wayland))
+    (synopsis "Qt Wayland module")
+    (description "The Qt Wayland module provides the QtWayland client and
+compositor libraries.")
+    (home-page (package-home-page qtbase))
+    (license (package-license qtbase))))
+
 (define-public qtserialport
   (package (inherit qtsvg-5)
     (name "qtserialport")
-- 
2.37.3





Reply sent to Maxim Cournoyer <maxim.cournoyer <at> gmail.com>:
You have taken responsibility. (Fri, 30 Sep 2022 03:32:01 GMT) Full text and rfc822 format available.

Notification sent to Hilton Chain <hako <at> ultrarare.space>:
bug acknowledged by developer. (Fri, 30 Sep 2022 03:32:02 GMT) Full text and rfc822 format available.

Message #28 received at 58054-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Hilton Chain <hako <at> ultrarare.space>
Cc: 58054-done <at> debbugs.gnu.org
Subject: Re: [PATCH v2 2/2] gnu: Add qtwayland, version 6.3.1.
Date: Thu, 29 Sep 2022 23:31:42 -0400
Hi,

Hilton Chain <hako <at> ultrarare.space> writes:

> * gnu/packages/qt.scm (qtwayland): New variable.
> ---
>  gnu/packages/qt.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 50 insertions(+)

Applied both patches, thank you for the rework!

-- 
Maxim




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 28 Oct 2022 11:24:08 GMT) Full text and rfc822 format available.

This bug report was last modified 1 year and 152 days ago.

Previous Next


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