From 2ac51ec99b58b50c08ba719a8c7e9dba0330b065 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 28 Feb 2023 11:14:15 +0100 Subject: [PATCH] gnu: qt@5: Update to 5.15.8. * gnu/packages/qt.scm (%qt-version): New variable. (qtbase-5, qt3d-5, qtsvg-5, qtimageformats, qtx11extras, qtxmlpatterns, qtdeclarative-5, qtconnectivity, qtwebsockets-5, qtsensors, qtmultimedia-5, qtwayland-5, qtserialport, qtserialbus, qtwebchannel-5, qtwebglplugin, qtwebview, qtlocation, qttools-5, qtscript, qtquickcontrols-5, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcharts, qtdatavis3d, qtnetworkauth-5, qtremoteobjects, qtspeech, qtwebengine, python-pyqt, python-pyqtwebengine, python-shiboken-2): Update to 5.15.8 by using the new variable. --- gnu/packages/qt.scm | 140 ++++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 69 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7a1d60a2e5..3a80b36da0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Andreas Enge +;;; Copyright © 2013, 2014, 2015, 2023 Andreas Enge ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner @@ -124,6 +124,8 @@ (define-module (gnu packages qt) #:use-module (gnu packages xml) #:use-module (srfi srfi-1)) +(define %qt-version "5.15.8") + (define-public qite (let ((commit "75fb3b6bbd5c6a5a8fc35e08a6efbfb588ed546a") (revision "74")) @@ -336,13 +338,13 @@ (define (qt-urls component version) (define-public qtbase-5 (package (name "qtbase") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "1p2fa94m1y8qzhdfi2d7dck93qh1lgsinibwl1wy92bwmacwfhhc")) + "175ynjndpzsw69vnsq4swykn9f48568ww9b4z3yw7azkqwk13cdz")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch" "qtbase-moc-ignore-gcc-macro.patch" @@ -872,13 +874,13 @@ (define-public qt3d-5 (package (inherit qtbase-5) (name "qt3d") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "1m3y7d58crn0qgfwkimxcggssn2pbs8nj5b9diwns6rwqg4aqk20")))) + "18hbv4l9w0czaxcch6af9130fgs4sf400xp0pfzl81c78fwrkfsb")))) (propagated-inputs `()) (native-inputs (list perl)) (inputs (list mesa qtbase-5 vulkan-headers zlib)) @@ -964,13 +966,13 @@ (define-public qtsvg-5 (package (inherit qtbase-5) (name "qtsvg") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0cdhmhxngv4y7kl5vbcii4l4anbz0hj7dvhlddy1agyl19j9xky4")))) + "0qnmcvp5jap4qq9w7xak66g6fsb48q1lg02rn4lycvnhgwzblbww")))) (propagated-inputs `()) (native-inputs (list perl)) (inputs @@ -1063,13 +1065,13 @@ (define-public qtsvg (define-public qtimageformats (package (inherit qtsvg-5) (name "qtimageformats") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "1xjb2z2h1ajw7z9cwq8djpdvjwalpnmirwcwrlbjqv5r4ghmi82a")) + "0c6fq9zcw5hbkiny56wx2fbm123x14l7habydv6zhvnhn3rhwi31")) (modules '((guix build utils))) (snippet '(begin @@ -1090,13 +1092,13 @@ (define-public qtimageformats (define-public qtx11extras (package (inherit qtsvg-5) (name "qtx11extras") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0wxsrnnkkn68myy211rfz98brs7j3qmx3hmy097vh5avgsmw11bn")))) + "1gzmf0y2byzrgfbing7xk3cwlbk1cyjlhqjbfh8n37y09gg65maf")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1110,13 +1112,13 @@ (define-public qtx11extras (define-public qtxmlpatterns (package (inherit qtsvg-5) (name "qtxmlpatterns") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "065vj1gk5i4cg0f9spksyb9ps4px0vssx262y77aakvw408vfmq5")))) + "1inf7ar32a557faqpwdsmafhz1p6k8hywpw3wbsdjlj74dkgdq35")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) @@ -1138,13 +1140,13 @@ (define-public qtxmlpatterns (define-public qtdeclarative-5 (package (inherit qtsvg-5) (name "qtdeclarative") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0ji5131g7h2mrgxw1wxc5mcvmsn3fbw64j28gzpa25gv3vcnkhaw")))) + "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f) ;TODO: Enable the tests @@ -1315,13 +1317,13 @@ (define-public qtdeclarative (define-public qtconnectivity (package (inherit qtsvg-5) (name "qtconnectivity") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0b2dnxw1rjbp1srhgns148cwl99f50mx29588dal3avv0f73s597")))) + "1j6qgkg77ycwcjxnhh38i9np1z8pjsqrzvfk3zsyq07f6k563fnc")))) (native-inputs (list perl pkg-config qtdeclarative-5)) (inputs @@ -1333,13 +1335,13 @@ (define-public qtconnectivity (define-public qtwebsockets-5 (package (inherit qtsvg-5) (name "qtwebsockets") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0f120rfqnmlffjhrm5jbpipk1qsbzp1a2v3q8gz94hz6n9dqpav6")))) + "12h520lpj2pljgkyq36p1509mw4pxgb76n30d32kg52crjsk34pa")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1395,13 +1397,13 @@ (define-public qtwebsockets (define-public qtsensors (package (inherit qtsvg-5) (name "qtsensors") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0zlhm4js02niibb23rw87wf4ik0gy4ai08fwprnwy7zf4rm1ss3d")))) + "1fdpgbikvxjacyipcyac0czqhv96pvc75dl9cyafslws8m53fm56")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -1424,13 +1426,13 @@ (define-public qtmultimedia-5 (package (inherit qtsvg-5) (name "qtmultimedia") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0q76iy1frcgm85mid17lh4p6gnn04n19n6zklgpv4w3md1ng97xw")) + "1fz0ffpckvbg6qfhab2rrzfnvh4mlalqxcn0kbkd21mi44apjirk")) (modules '((guix build utils))) (snippet '(begin @@ -1562,7 +1564,7 @@ (define-public qtmultimedia (define-public qtwayland-5 (package (inherit qtsvg-5) (name "qtwayland") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) @@ -1571,7 +1573,7 @@ (define-public qtwayland-5 "qtwayland-cleanup-callbacks.patch")) (sha256 (base32 - "0yy8qf9kn15iqsxi2r7jbcsc0vsdyfz7bbxmfn4i9qmz1yvg0jgr")))) + "0aa5jcvvap6qca6imdkhs1mhv5bnaxn466mmpl7x78jx1za7n3ps")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) @@ -1662,13 +1664,13 @@ (define-public qtwayland (define-public qtserialport (package (inherit qtsvg-5) (name "qtserialport") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0xg2djwhrj5jqamawlp75g70nmwbp2ph2hh1pm45s36jkxm0k7al")))) + "04i8pdyml1sw4dkk9vyw2xy5bz3fp6f90fws7ag5y8iizfgs5v2v")))) (native-inputs (list perl)) (inputs (list qtbase-5 eudev)) @@ -1691,13 +1693,13 @@ (define-public qtserialport (define-public qtserialbus (package (inherit qtsvg-5) (name "qtserialbus") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "180gm1jvqfn0h3251zafdd1wd3af00phwaa5qljsbrj6s6ywj79j")))) + "0ws3pjbp4g8f49k8q0qa5hgyisbyk3m7kl8pwzkfws048glvz570")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases '%standard-phases) @@ -1720,13 +1722,13 @@ (define-public qtserialbus (define-public qtwebchannel-5 (package (inherit qtsvg-5) (name "qtwebchannel") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "1w8mcpdqlphgg3a6yfq18liwlj2nkwrafv0n80h242x5l2mk3ljf")))) + "1pfmy6fqis47awjb590r63y13vvsfm0fq70an3ylsknhyq3firgn")))) (native-inputs (list perl qtdeclarative-5 qtwebsockets-5)) (inputs (list qtbase-5)) @@ -1776,13 +1778,13 @@ (define-public qtwebchannel (define-public qtwebglplugin (package (inherit qtsvg-5) (name "qtwebglplugin") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "1m0p4ssykw07lbip2qyv6w34f8ng13bxb63j0w446f5w0492nn9f")))) + "1gvzhgfn55kdp5g11fg5yja5xb6wghx5sfc8vfp8zzpxnak7pbn1")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) @@ -1804,13 +1806,13 @@ (define-public qtwebglplugin (define-public qtwebview (package (inherit qtsvg-5) (name "qtwebview") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0arwaky3jy5ql3z4d8f7k7diidzb1kncdans7pn50hsa1bzacfal")))) + "1b03dzlff840n2i53r105c7sv91ivwzxn7ldpgnhiyrhr897i9kj")))) (native-inputs (list perl)) (inputs @@ -1823,13 +1825,13 @@ (define-public qtwebview (define-public qtlocation (package (inherit qtsvg-5) (name "qtlocation") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0mlhhhcxx3gpr9kh04c6fljxcj50c2j21r0wb9f7d7nk4flip7b2")))) + "0r16qxy0pfpwvna4gpz67jk3qv3qizfd659kc9iwdh8bhz7lpjrw")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f) ; TODO: Enable the tests @@ -1881,13 +1883,13 @@ (define-public qtlottie (define-public qttools-5 (package (inherit qtsvg-5) (name "qttools") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0v7wkzq9i8w3qrw0z8al7lb6clr57lfisyb1fm9cnhi73fvph1vd")))) + "1i79fwsn799x3n3jidp3f4gz9d5vi9gg6p8g8lbswb832gggigm3")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1964,13 +1966,13 @@ (define-public qttranslations (define-public qtscript (package (inherit qtsvg-5) (name "qtscript") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "17yk0p8ci47xlfpllc17arlycng47wrnnskimskzz85bspabc8pm")) + "0rjj1pn0fwdq0qz0nzisxza671ywfrq5cv6iplywfyflh7q4dmcs")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs (list perl qttools-5)) @@ -1984,13 +1986,13 @@ (define-public qtscript (define-public qtquickcontrols-5 (package (inherit qtsvg-5) (name "qtquickcontrols") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0mjw25wcgd2bvjz9rr4qjydb423c63615rcx1vws4jmydqdihssr")))) + "0yp47bpkfckms76vw0hrwnzchy8iak23ih6w9pnwrnjkmbc65drc")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -2004,7 +2006,7 @@ (define-public qtquickcontrols-5 (define-public qtquickcontrols2-5 (package (inherit qtsvg-5) (name "qtquickcontrols2") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) @@ -2031,13 +2033,13 @@ (define-public qtquickcontrols2 (define-public qtgraphicaleffects (package (inherit qtsvg-5) (name "qtgraphicaleffects") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0xznn5zqp6xrqfgl54l8cig9asqf9m2hz0p3ga514rh8spmdazr3")))) + "0wypji8i19kjq18qd92z8kkd3fj2n0d5hgh6xiza96833afvibj9")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -2054,13 +2056,13 @@ (define-public qtgraphicaleffects (define-public qtgamepad (package (inherit qtsvg-5) (name "qtgamepad") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0wa4d8f025hlp4bmdzdy5wcahm9wjg6bkwig8dpw9nrsj3idz5b0")))) + "0vgxprgk7lak209wsg2ljzfkpwgjzscpbxmj5fyvvwm2pbnpspvk")))) (native-inputs (list perl pkg-config)) (inputs @@ -2080,13 +2082,13 @@ (define-public qtgamepad (define-public qtscxml (package (inherit qtsvg-5) (name "qtscxml") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0xf5mqsrw16h8xjglymgfc8qg2qa5bi4fgdl4j3dkhvvpr7vrphp")) + "17j6npvgr8q3lyrqmvfh1n47mkhfzk18r998hcjm2w75xj46km1n")) (modules '((guix build utils))) (snippet '(begin @@ -2139,13 +2141,13 @@ (define-public qtpositioning (define-public qtpurchasing (package (inherit qtsvg-5) (name "qtpurchasing") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "04z6mwzn73gg56hgs7gividinfgndx4kmcnp7w6h3wamrdlkfdx7")))) + "0bjky5ncg9yhz4a63g3jl1r5pa6i09f6g8wgzs591mhybrbmhcw8")))) (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Purchasing module") @@ -2155,13 +2157,13 @@ (define-public qtpurchasing (define-public qtcharts (package (inherit qtsvg-5) (name "qtcharts") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0y051i1837bfybkf8cm7cx8k5wjmbi47pxawaaz6wm0hd2z5b4qi")))) + "1q11ank69l9qw3iks2svr0g2g6pzng9v8p87dpsmjs988f4ysmll")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) @@ -2184,13 +2186,13 @@ (define-public qtcharts (define-public qtdatavis3d (package (inherit qtsvg-5) (name "qtdatavis3d") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0sczwqlc36jdywf7bqxz0hm6mr7fn8p1fsnc33jliiqzn9yrg77x")))) + "1mr2kdshahxrkjs9wlgpr59jbqvyvlax16rlnca4iq00w3v5hrdh")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -2207,13 +2209,13 @@ (define-public qtdatavis3d (define-public qtnetworkauth-5 (package (inherit qtsvg-5) (name "qtnetworkauth") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0c7mz715rlpg0cqgs6s0aszmslyamkhnpamc1iij6i571sj5j2f1")))) + "0fsmpjwkzzy3281shld7gs1gj217smb1f8ai63gdvnkp0jb2fhc5")))) (inputs (list qtbase-5)) (synopsis "Qt Network Authorization module") @@ -2243,13 +2245,13 @@ (define-public qtnetworkauth (define-public qtremoteobjects (package (inherit qtsvg-5) (name "qtremoteobjects") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "1m0xcqlbxsfn0cd4ajin1h3i4l51dajmkw91v0r4a61xi14i0kks")))) + "1bi9yzipyccskda18pf5wis45q8qcxzvvi1slabjzdbvd9wkzj54")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) @@ -2275,13 +2277,13 @@ (define-public qtremoteobjects (define-public qtspeech (package (inherit qtsvg-5) (name "qtspeech") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0xskp9dzjy5nqszygk8gwvjyiylgynx5sq3nk2vi3zwgfdh5jpm4")))) + "1q56lyj7s05sx52j5z6gcs000mni4c7mb7qyq4lfval7c06hw5p6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -2385,14 +2387,14 @@ (define-public qtwebengine-5 (package (inherit qtsvg-5) (name "qtwebengine") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0zahr9w6rqdxwh2whsgk3fhcszs7wa9j95lq4sqi8xzin2wcgl17")) + "1qv15g5anhlfsdwnjxy21vc3zxxm8149vysi774l93iab6mxqmjg")) (modules '((ice-9 ftw) (ice-9 match) (srfi srfi-1) @@ -3221,7 +3223,7 @@ (define-public python-sip-4 (define-public python-pyqt (package (name "python-pyqt") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) @@ -3234,7 +3236,7 @@ (define-public python-pyqt (file-name (string-append "PyQt5-" version ".tar.gz")) (sha256 (base32 - "0aya963kkmbwfwmpd0p6k85y4g7wl5zarjqxxfgir403zalbf4dl")) + "0q53xn1ax2kpfqwxkasby787ryq5a21chmw1p345cp0kp7py71dw")) (patches (search-patches "pyqt-configure.patch")))) (build-system gnu-build-system) (native-inputs @@ -3329,7 +3331,7 @@ (define-public python-pyqt5-sip (define-public python-pyqtwebengine (package (name "python-pyqtwebengine") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) @@ -3999,7 +4001,7 @@ (define-public qcustomplot (define-public python-shiboken-2 (package (name "python-shiboken-2") - (version "5.15.5") + (version %qt-version) (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases" @@ -4008,7 +4010,7 @@ (define-public python-shiboken-2 version ".tar.xz")) (sha256 (base32 - "0cwvw6695215498rsbm2xzkwaxdr3w7zfvy4kc62c01k6pxs881r")))) + "0pbbdypwkn3vrgy8ww207fl8pqq4jv80bck9qz5v9dfyr0166hr3")))) (build-system cmake-build-system) (inputs (list clang-toolchain