all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 65280@debbugs.gnu.org
Cc: "Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
	"Andreas Enge" <andreas@enge.fr>,
	"Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
	宋文武 <iyzsong@envs.net>
Subject: [bug#65280] [PATCH v2 04/59] gnu: qtbase: Update to 6.5.2.
Date: Wed, 16 Aug 2023 08:10:20 -0400	[thread overview]
Message-ID: <1176b1ea6a93417dbbca2638145e0f74e5e1da47.1692187578.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <cover.1692187578.git.maxim.cournoyer@gmail.com>

* gnu/packages/qt.scm (qtbase): Update to 6.5.2.  Use normal inheritance, not
package/inherit, as the package is distinct and not a variant (it does not use
the same source).
[arguments]: Disable a few newly failing tests in the check phase.  Adjust the
patch-mkspecs phase.
[inputs]: Remove extraneous postgresql replacement.  Add at-spi2-core, libice,
libsm, libxext and xcb-util-cursor.

---

Changes in v2:
- Fix xcb backend by adding missing inputs

 gnu/packages/qt.scm | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a4de003647..03c9256a48 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -581,15 +581,16 @@ (define-public qtbase-5
     (license (list license:lgpl2.1 license:lgpl3))))
 
 (define-public qtbase
-  (package/inherit qtbase-5
+  (package
+    (inherit qtbase-5)
     (name "qtbase")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (inherit (package-source qtbase-5))
               (uri (qt-url name version))
               (sha256
                (base32
-                "19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr"))
+                "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"))
               (modules '((guix build utils)))
               (snippet
                ;; corelib uses bundled harfbuzz, md4, md5, sha3
@@ -742,6 +743,18 @@ (define-public qtbase
                      (list
                       ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE".
                       "tst_moc"
+
+                      ;; The 'tst_qdate' test fails because the current time
+                      ;; is reported as an invalid date (see:
+                      ;; https://bugreports.qt.io/browse/QTBUG-116017).
+                      "tst_qdate"
+
+                      ;; The qgraphicsview and qopenglwidget tests fail with a
+                      ;; segfault for unknown reasons (see:
+                      ;; https://bugreports.qt.io/browse/QTBUG-116018).
+                      "tst_qgraphicsview"
+                      "tst_qopenglwidget"
+
                       ;; The 'test_rcc' test fails on a comparison:
                       ;; <<<<<< actual
                       ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x3,0xe8,
@@ -853,8 +866,7 @@ (define-public qtbase
                              (search-input-file
                               outputs
                               (string-append "lib/qt6/mkspecs/features/" file)))
-                           '("device_config.prf" "moc.prf" "qt_build_config.prf"
-                             "qt_config.prf"))
+                           '("device_config.prf" "moc.prf" "qt_config.prf"))
                     (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
                     (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))))))
     (native-inputs
@@ -863,8 +875,15 @@ (define-public qtbase
                 xvfb-run)))
     (inputs
      (modify-inputs (package-inputs qtbase-5)
-       (prepend bash-minimal coreutils-minimal libxcb md4c)
-       (replace "postgresql" postgresql))) ;use latest postgresql
+       (prepend at-spi2-core
+                bash-minimal
+                coreutils-minimal
+                md4c
+                libice
+                libsm
+                libxcb
+                libxext
+                xcb-util-cursor)))
     (native-search-paths
      (list (search-path-specification
             (variable "QMAKEPATH")
-- 
2.41.0





  parent reply	other threads:[~2023-08-16 12:14 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-14  4:21 [bug#65280] [PATCH 00/26] Refresh Qt 6 packages Maxim Cournoyer
2023-08-16 10:56 ` 宋文武 via Guix-patches via
2023-08-16 12:19   ` [bug#65280] [PATCH v2 00/59] Refresh Qt 5 and " Maxim Cournoyer
2023-08-17 11:56     ` 宋文武 via Guix-patches via
2023-08-17 13:47       ` Maxim Cournoyer
2023-08-16 12:10 ` Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 01/59] gnu: qt: Revert to use individual versions instead of %qt5-version Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 02/59] gnu: qtdeclarative: Disable QML cache to avoid stale cache issues Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 03/59] etc: Add Qt manifests for Qt maintenance Maxim Cournoyer
2023-08-16 12:10   ` Maxim Cournoyer [this message]
2023-08-16 12:10   ` [bug#65280] [PATCH v2 05/59] gnu: qtbase: Enable zstd support Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 06/59] gnu: qt5compat: Update to 6.5.2 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 07/59] gnu: qtsvg: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 08/59] gnu: qtimageformats: Rename variable to qtimageformats-5 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 09/59] gnu: qtimageformats-5: Fix indentation Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 10/59] gnu: Add qtimageformats Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 11/59] gnu: Add qtlanguageserver Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 12/59] gnu: qtdeclarative: Update to 6.5.2 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 13/59] gnu: qtwebsockets: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 14/59] gnu: qtshadertools: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 15/59] gnu: qtmultimedia: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 16/59] gnu: qtwayland: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 17/59] gnu: qtwebchannel: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 18/59] gnu: qtlottie: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 19/59] gnu: qttools: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 20/59] gnu: qttranslations: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 21/59] gnu: qtpositioning: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 22/59] gnu: qtnetworkauth: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 23/59] gnu: qtremoteobjects: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 24/59] gnu: qtwebengine: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 25/59] gnu: Remove qtquickcontrols2 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 26/59] gnu: qt-creator: Update to 11.0.1 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 27/59] gnu: qtbase-5: Update to 5.15.10 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 28/59] gnu: qt3d-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 29/59] gnu: qtsvg-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 30/59] gnu: qtimageformats-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 31/59] gnu: qtx11extras: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 32/59] gnu: qtxmlpatterns: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 33/59] gnu: qtdeclarative-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 34/59] gnu: qtconnectivity: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 35/59] gnu: qtwebsockets-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 36/59] gnu: qtsensors: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 37/59] gnu: qtmultimedia-5: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 38/59] gnu: qtsensors: Shorten line width Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 39/59] gnu: qtmultimedia-5: Shorten maximum " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 40/59] gnu: qtwayland-5: Update to 5.15.10 Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 41/59] gnu: qtserialport: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 42/59] gnu: qtserialbus: " Maxim Cournoyer
2023-08-16 12:10   ` [bug#65280] [PATCH v2 43/59] gnu: qtwebchannel-5: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 44/59] gnu: qtwebglplugin: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 45/59] gnu: qtwebview: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 46/59] gnu: qtlocation: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 47/59] gnu: qttools-5: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 48/59] gnu: qtscript: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 49/59] gnu: qtquickcontrols-5: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 50/59] gnu: qtquickcontrols2-5: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 51/59] gnu: qtgraphicaleffects: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 52/59] gnu: qtgamepad: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 53/59] gnu: qtscxml: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 54/59] gnu: qtpurchasing: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 55/59] gnu: qtcharts: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 56/59] gnu: qtdatavis3d: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 57/59] gnu: qtnetworkauth-5: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 58/59] gnu: qtspeech: " Maxim Cournoyer
2023-08-16 12:11   ` [bug#65280] [PATCH v2 59/59] gnu: qtwebengine-5: " Maxim Cournoyer
2023-08-22 16:36 ` bug#65280: [PATCH 00/26] Refresh Qt 6 packages Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1176b1ea6a93417dbbca2638145e0f74e5e1da47.1692187578.git.maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=65280@debbugs.gnu.org \
    --cc=andreas@enge.fr \
    --cc=iyzsong@envs.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.