From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:40398) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jS5A9-0001Ku-0E for guix-patches@gnu.org; Fri, 24 Apr 2020 16:43:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jS5A6-0002bt-Sq for guix-patches@gnu.org; Fri, 24 Apr 2020 16:43:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jS5A6-0002aD-Bv for guix-patches@gnu.org; Fri, 24 Apr 2020 16:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jS5A6-00076P-8e for guix-patches@gnu.org; Fri, 24 Apr 2020 16:43:02 -0400 Subject: [bug#40791] todays patch References: <2419210.ElGaqSPkdT@peach> In-Reply-To: <2419210.ElGaqSPkdT@peach> Resent-Message-ID: Date: Fri, 24 Apr 2020 22:42:13 +0200 Message-ID: <1819894.BzRgMNaeKi@peach> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart2470548.dfiJUdbmf8" Content-Transfer-Encoding: 7Bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" Reply-to: Tom , Tom via Guix-patches From: Tom via Guix-patches via To: 40791@debbugs.gnu.org This is a multi-part message in MIME format. --nextPart2470548.dfiJUdbmf8 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" This incorporates all suggestions. As each individual missing item in the qtwebengine requires a full rebuild to get one line of error, I've done enough for today. See the amount of lines added ;) --nextPart2470548.dfiJUdbmf8 Content-Disposition: attachment; filename="0001-gnu-Qt-update-to-5.14.2.patch" Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; charset="UTF-8"; name="0001-gnu-Qt-update-to-5.14.2.patch" =46rom 180da08e2b2d17cafab4b92b1074867516a2d6eb Mon Sep 17 00:00:00 2001 =46rom: TomZ Date: Thu, 23 Apr 2020 00:21:31 +0200 Subject: [PATCH 1/2] gnu: Qt: update to 5.14.2 * gnu/packages/qt.scm (qtsvg, qtimageformats, qtx11extras, qtxmlpatterns, qtconnectivity, qtwebsockets, qtsensors, qtmultimedia, qtserialport, qtserialbus, qtwebchannel, qtwebview, qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcharts, qtdatavis3d, qtnetworkauth, qtspeech, qtwebengine): Update to 5.14.2 * gnu/packages/qt.scm (qtcanvas3d): removed. Upstream deprected it. * gnu/packages/qt.scm (qtbase): drop TZDIR patch, patched code no longer exists. Drop X11lib substitute: patched dir no longer exists. Update to 5.14.2 * gnu/packages/qt.scm (qtwayland): disable tests because most of them crash without message. Update to 5.14.2 * gnu/packages/qt.scm (qtwebglplugin):[inputs] add zlib Update to 5.14.2 * gnu/packages/qt.scm (qtremoteobjects): disable some tests that fail due to missing network. Update to 5.14.2 * gnu/packages/qt.scm (qtdeclarative):[inputs] add vulcan-headers Update to 5.14.2 =2D-- gnu/packages/patches/qtbase-use-TZDIR.patch | 4 +- gnu/packages/qt.scm | 222 ++++++++------------ 2 files changed, 92 insertions(+), 134 deletions(-) diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/pat= ches/qtbase-use-TZDIR.patch index 11c737d844..b6c377b133 100644 =2D-- a/gnu/packages/patches/qtbase-use-TZDIR.patch +++ b/gnu/packages/patches/qtbase-use-TZDIR.patch @@ -4,8 +4,8 @@ important to be able to update it fast. =20 Based on a patch fron NixOS. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D--- qtbase-opensource-src-5.9.4.orig/src/corelib/tools/qtimezoneprivate_= tz.cpp =2D+++ qtbase-opensource-src-5.9.4/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz= =2Ecpp ++++ qtbase-opensource-src-5.15.2/src/corelib/time/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ // Parse zone.tab table, assume lists all installed zones, if not will ne= ed to read directories static QTzTimeZoneHash loadTzTimeZones() diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8a57127771..aa121fbb5f 100644 =2D-- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -351,7 +351,7 @@ developers using C++ or QML, a CSS & JavaScript like la= nguage.") (define-public qtbase (package (name "qtbase") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -360,11 +360,9 @@ developers using C++ or QML, a CSS & JavaScript like l= anguage.") version ".tar.xz")) (sha256 (base32 =2D "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di")) =2D ;; Use TZDIR to avoid depending on package "tzdata". + "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8")) (patches (search-patches "qtbase-use-TZDIR.patch" =2D "qtbase-moc-ignore-gcc-macro.patch" =2D "qtbase-QTBUG-81715.patch")) + "qtbase-moc-ignore-gcc-macro.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -570,14 +568,6 @@ developers using C++ or QML, a CSS & JavaScript like l= anguage.") "src/network/kernel/qhostinfo_unix.cpp") (("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\= )\\);)" _ a b) (string-append a glibc "/lib/lib" b)))) =2D ;; X11/locale (compose path) =2D (substitute* "src/plugins/platforminputcontexts/compose/gen= erator/qtablegenerator.cpp" =2D ;; Don't search in /usr/=E2=80=A6/X11/locale, =E2=80=A6 =2D (("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/= usr/.*/X11/locale\"\\)\\);" line) =2D (string-append "// " line)) =2D ;; =E2=80=A6 but use libx11's path =2D (("^\\s*(m_possibleLocations.append\\(QStringLiteral\\()X= 11_PREFIX \"(/.*/X11/locale\"\\)\\);)" _ a b) =2D (string-append a "\"" (assoc-ref inputs "libx11") b))) ;; libGL (substitute* "src/plugins/platforms/xcb/gl_integrations/xcb_g= lx/qglxintegration.cpp" (("^\\s*(QLibrary lib\\(QLatin1String\\(\")(GL\"\\)\\);)" _= a b) @@ -617,7 +607,7 @@ developers using C++ or QML, a CSS & JavaScript like la= nguage.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -626,7 +616,7 @@ developers using C++ or QML, a CSS & JavaScript like la= nguage.") version ".tar.xz")) (sha256 (base32 =2D "1f3vqv3s83gjillhgi0wghyf3825fgy1ffhvkxhdk673shb0kxjb")))) + "18dmfc8s428fzbk7k5vl3212b25455ayrz7s716nwyiy3ahgmmy7")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -692,7 +682,7 @@ HostData=3Dlib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -701,7 +691,7 @@ HostData=3Dlib/qt5 version ".tar.xz")) (sha256 (base32 =2D "02zpcbx71dz6xvga07dnzqwdfz9pjmy673n706fj8pxq9zi9xlcv")) + "132g4rlm61pdcpcrclr1rwpbrxn7va4wjfb021mh8pn1cl0wlgkk")) (modules '((guix build utils))) (snippet '(begin @@ -723,7 +713,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -732,7 +722,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) version ".tar.xz")) (sha256 (base32 =2D "15hb90n47khsp3qnzyjd3mh8gi9qvy07dqdr4qspiww43r5mz293")))) + "0njlh6d327nll7d8qaqrwr5x15m9yzgyar2j45qigs1f7ah896my")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -747,7 +737,7 @@ from within Qt 5."))) (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -756,7 +746,7 @@ from within Qt 5."))) version ".tar.xz")) (sha256 (base32 =2D "0ys1kf0zdn8gak1ik9p7i7bdyfz2frvklcyz013s9wm1550h20lh")))) + "1dyg1z4349k04yyzn8xbp4f5qjgm60gz6wgzp80khpilcmk8g6i1")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f) ; TODO: Enable the tests @@ -778,7 +768,7 @@ xmlpatternsvalidator."))) (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -787,7 +777,7 @@ xmlpatternsvalidator."))) version ".tar.xz")) (sha256 (base32 =2D "1gg9xbv8ah4p55ws97brwn0csl0k3j1x6zdknrrsnh7j6nh0bp2w")))) + "0l0nhc2si6dl9r4s1bs45z90qqigs8jnrsyjjdy38q4pvix63i53")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -796,7 +786,8 @@ xmlpatternsvalidator."))) ("pkg-config" ,pkg-config) ("python" ,python) ("python-wrapper" ,python-wrapper) =2D ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg) + ("vulkan-headers" ,vulkan-headers))) (inputs `(("mesa" ,mesa) ("qtbase" ,qtbase))) @@ -810,7 +801,7 @@ with JavaScript and C++."))) (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -819,7 +810,7 @@ with JavaScript and C++."))) version ".tar.xz")) (sha256 (base32 =2D "06h71pd5w5prh722mcbgmx7l71xvh5xpjrlbg17yblx0n6wlhwb4")))) + "0a5wzin635b926b8prdwfazgy1vhyf8m6an64wp2lpkp78z7prmb")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -834,7 +825,7 @@ with Bluetooth and NFC."))) (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -843,7 +834,7 @@ with Bluetooth and NFC."))) version ".tar.xz")) (sha256 (base32 =2D "05rv52pp5zg4g14zh7c6jc77l426056b8xyr40ps6cpmb0jkrlbg")))) + "116amx4mnv50k0fpswgpr5x8wjny8nbffrjmld01pzhkhfqn4vph")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -861,7 +852,7 @@ consume data received from the server, or both."))) (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -870,7 +861,7 @@ consume data received from the server, or both."))) version ".tar.xz")) (sha256 (base32 =2D "0h77h34rn6cgy5qiqq163pj3bhbka1ydkfgjcx01ns1g9sgym6ib")))) + "0qccpgbhyg9k4x5nni7xm0pyvaqia3zrcd42cn7ksf5h21lwmkxw")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -894,7 +885,7 @@ recognition API for devices."))) (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -903,7 +894,7 @@ recognition API for devices."))) version ".tar.xz")) (sha256 (base32 =2D "07fvnjywn3hkrxfbxasmy83jr6jq9lf1grasfwij54hz6y0smg98")) + "1sczzcvk3c5gczz53yvp8ma6gp8aixk5pcq7wh344c9md3g8xkbs")) (modules '((guix build utils))) (snippet '(begin @@ -945,7 +936,7 @@ set of plugins for interacting with pulseaudio and GStr= eamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -954,7 +945,7 @@ set of plugins for interacting with pulseaudio and GStr= eamer."))) version ".tar.xz")) (sha256 (base32 =2D "1ib61zh6jrab3yz592p47ldfgphi4i184kqf14vhwn31akibh6pw")) + "0al3yypy3fin62n8d1859jh0mn0fbpa161l7f37hgd4gf75365nk")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -962,17 +953,10 @@ set of plugins for interacting with pulseaudio and GS= treamer."))) (delete-file-recursively "examples") #t)))) (arguments =2D (substitute-keyword-arguments (package-arguments qtsvg) =2D ((#:phases phases) =2D `(modify-phases ,phases =2D (add-before 'check 'set-ld-library-path =2D ;; =2D ;; =2D ;; Make the uninstalled libQt5WaylandClient.so.5 available = to the =2D ;; wayland platform plugin. =2D (lambda _ =2D (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/lib")) =2D #t)))))) + (substitute-keyword-arguments (package-arguments qtsvg) + ;; Tests crash all over, not sure why. + ;; Set https://lists.gnu.org/archive/html/guix-devel/2017-09/msg00= 019.html + ((#:tests? _ #f) #f))) (native-inputs `(("glib" ,glib) ("perl" ,perl) @@ -997,7 +981,7 @@ compositor libraries."))) (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1006,7 +990,7 @@ compositor libraries."))) version ".tar.xz")) (sha256 (base32 =2D "07vjv3p7n7n5v15wdpi8x5sbnvyjqdh85qfzf9mz8l6ppqp2hk12")))) + "08ga9a1lwj83872nxablk602z1dq0la6jqsiicvd7m1sfbfpgnd6")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -1031,7 +1015,7 @@ interacting with serial ports from within Qt."))) (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1040,7 +1024,7 @@ interacting with serial ports from within Qt."))) version ".tar.xz")) (sha256 (base32 =2D "1bkyk1v7bcq657n88a6675lj55vl9y8v46h4kf27v58yjzgiw842")))) + "14bahg82jciciqkl74q9hvf3a8kp3pk5v731vp2416k4b8bn4xqb")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1052,7 +1036,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1061,7 +1045,7 @@ and others."))) version ".tar.xz")) (sha256 (base32 =2D "0xff3fbbpcl0kkq0rg9npj127ycirygicbkxlf0v593sjpjp5bmh")))) + "0x7q66994pw6cd0f505bmirw1sssqs740zaw8lyqqqr32m2ch7bx")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1076,7 +1060,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1085,7 +1069,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) version ".tar.xz")) (sha256 (base32 =2D "0fswnmhb8fm7wqgzv8cjy1j2sgb5mhx80jl411laawn7bf2ysjg0")))) + "05rl657848fsprsnabdqb5z363c6drjc32k59223vl351f8ihhgb")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1099,7 +1083,8 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) `(("mesa" ,mesa) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) =2D ("qtwebsockets" ,qtwebsockets))) + ("qtwebsockets" ,qtwebsockets) + ("zlib" ,zlib))) (synopsis "QPA plugin for running an application via a browser using streamed WebGL commands") (description "Qt back end that uses WebGL for rendering. It allows Qt @@ -1111,7 +1096,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas element= s"))) (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1120,7 +1105,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas element= s"))) version ".tar.xz")) (sha256 (base32 =2D "1rvvkg6dl34hklllnlzlcffik746f15lzxdnwggc97dmx8n2vy6k")))) + "0jzzcm7z5njkddzfhmyjz4dbbzq8h93980cci4479zc4xq9r47y6")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1134,7 +1119,7 @@ native APIs where it makes sense."))) (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1143,7 +1128,7 @@ native APIs where it makes sense."))) version ".tar.xz")) (sha256 (base32 =2D "07vq4aycayq2bg8yi4awidb25xyvws2ajbnrmad3rnpg1fw0bsfi")))) + "1k3m8zhbv04yrqvj7jlnh8f9xczdsmla59j9gcwsqvbg76y0hxy3")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1164,7 +1149,7 @@ positioning and geolocation plugins."))) (define-public qttools (package (inherit qtsvg) (name "qttools") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1173,7 +1158,7 @@ positioning and geolocation plugins."))) version ".tar.xz")) (sha256 (base32 =2D "0j1rl368sjknsmwp2f7bwqcb0sx13l3l4dxbm70873si9l8rf2l6")))) + "1iakl3hlyg51ri1czmis8mmb257b0y1zk2a2knybd3mq69wczc2v")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1192,7 +1177,7 @@ that helps in Qt development."))) (define-public qtscript (package (inherit qtsvg) (name "qtscript") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1201,7 +1186,7 @@ that helps in Qt development."))) version ".tar.xz")) (sha256 (base32 =2D "06a02230mj4bd8qvjaf2q97grzbj1c1rq36x7236fnhjsikbq7fa")) + "1zlvg3hc6h70d789g3kv6dxbwswzkskkm00bdgl01grwrdy4izg9")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1216,7 +1201,7 @@ ECMAScript and Qt."))) (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1225,7 +1210,7 @@ ECMAScript and Qt."))) version ".tar.xz")) (sha256 (base32 =2D "1rar337vv0dx52r2gxwiwy1axn0fpy79rka09xizjlxsdg3vnf0h")))) + "0qa4dlhn3iv9yvaic8hw86v6h8rn9sgq8xjfdaym04pfshfyypfm")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1240,7 +1225,7 @@ can be used to build complete interfaces in Qt Quick.= "))) (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1249,7 +1234,7 @@ can be used to build complete interfaces in Qt Quick.= "))) version ".tar.xz")) (sha256 (base32 =2D "0dx2jag6l5a80220fvmf49z1psliqf1ijqx6jsvvzv81mpjjd59s")))) + "0q0mk2mjlf9ll0gdrdzxy8096s6g9draaqiwrlvdpa7lv14x7xzs")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1265,7 +1250,7 @@ not available."))) (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1274,7 +1259,7 @@ not available."))) version ".tar.xz")) (sha256 (base32 =2D "1knapc14a80cn2f5bbfj7lhq9flr3v0gwjg9ka7xl8y642235w02")))) + "03xmwhapv0b2qj661iaqqrvhxc7qiid0acrp6rj85824ha2pyyj8")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1292,7 +1277,7 @@ coloring, and many more."))) (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1301,7 +1286,7 @@ coloring, and many more."))) version ".tar.xz")) (sha256 (base32 =2D "150y7bc755l9y8w7nkg3gfw5n6rlj9hhq0ibc9g1xgllpr18qqq7")))) + "00wd3h465waxdghg2vdhs5pkj0xikwjn88l12477dksm8zdslzgp")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1322,7 +1307,7 @@ and mobile applications targeting TV-like form factor= s."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1331,7 +1316,7 @@ and mobile applications targeting TV-like form factor= s."))) version ".tar.xz")) (sha256 (base32 =2D "1dpvjkvwc3fj86vay8q8vzym73cix7ri2ianx87ck0gqjny51adg")) + "141pfschv6zmcvvn3pi7f5vb4nf96zpngy80f9bly1sn58syl303")) (modules '((guix build utils))) (snippet '(begin @@ -1353,7 +1338,7 @@ also contains functionality to support data models an= d executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1362,7 +1347,7 @@ also contains functionality to support data models an= d executable content."))) version ".tar.xz")) (sha256 (base32 =2D "0xjsn7p629ni68vk4xlw2cvcs53ipcqv1pa4hck0nabddcgcnzkg")))) + "0lg8x7g7dkf95xwxq8b4yw4ypdz68igkscya96xwbklg3q08gc39")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1370,49 +1355,10 @@ also contains functionality to support data models = and executable content."))) (description "The Qt Purchasing module provides and in-app API for purchasing goods and services."))) =20 =2D(define-public qtcanvas3d =2D (package (inherit qtsvg) =2D (name "qtcanvas3d") =2D (version "5.12.7") =2D (source (origin =2D (method url-fetch) =2D (uri (string-append "https://download.qt.io/official_releas= es/qt/" =2D (version-major+minor version) "/" versi= on =2D "/submodules/" name "-everywhere-src-" =2D version ".tar.xz")) =2D (sha256 =2D (base32 =2D "0l0c1p6jwz5rygyxslfw7jw3wbd23w5n9zg04aqlh5g15qx52fmn")) =2D (modules '((guix build utils))) =2D (snippet =2D '(begin =2D (delete-file-recursively "examples/canvas3d/3rdparty") =2D #t)))) =2D (arguments =2D (substitute-keyword-arguments (package-arguments qtsvg) =2D ;; Building the tests depends on the bundled 3rd party javascript = files, =2D ;; and the test phase fails to import QtCanvas3D, causing the phas= e to =2D ;; fail, so we skip building them for now. =2D ((#:phases phases) =2D `(modify-phases ,phases =2D (replace 'configure =2D (lambda* (#:key outputs #:allow-other-keys) =2D (let ((out (assoc-ref outputs "out"))) =2D (invoke "qmake" "QT_BUILD_PARTS =3D libs tools" =2D (string-append "PREFIX=3D" out))))))) =2D ((#:tests? _ #f) #f))) ; TODO: Enable the tests =2D (native-inputs `()) =2D (inputs =2D `(("qtbase" ,qtbase) =2D ("qtdeclarative" ,qtdeclarative))) =2D (synopsis "Qt Canvas 3D module") =2D (description "The Qt Canvas 3D module provides a way to make WebGL-l= ike 3D =2Ddrawing calls from Qt Quick JavaScript."))) =2D (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1421,7 +1367,7 @@ drawing calls from Qt Quick JavaScript."))) version ".tar.xz")) (sha256 (base32 =2D "0pyg2lpxmhf4amj57zihp5ry0y9m39xq5hbcx4hqj78bdm96ah23")))) + "1drvm15i6n10b6a1acgarig120ppvqh3r6fqqdn8i3blx81m5cmd")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1439,7 +1385,7 @@ selecting one of the charts themes.") (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1448,7 +1394,7 @@ selecting one of the charts themes.") version ".tar.xz")) (sha256 (base32 =2D "09wbv4g29sq5z2fphk2910albr3iv3l14nch3ml77w6drw9mgzq7")))) + "080fkpxg70m3c697wfnkjhca58b7r1xsqd559jzb21985pdh6g3j")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1466,7 +1412,7 @@ customized by using themes or by adding custom items = and labels to them.") (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1475,7 +1421,7 @@ customized by using themes or by adding custom items = and labels to them.") version ".tar.xz")) (sha256 (base32 =2D "0sspni7zllhspk70yjj2d0li9r4rs3iflnksj8mvjx2yl9qpryyb")))) + "0pi6p7bq54kzij2p69cgib7n55k69jsq0yqq09yli645s4ym202g")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1495,7 +1441,7 @@ implementation of OAuth and OAuth2 authenticathon met= hods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1504,7 +1450,7 @@ implementation of OAuth and OAuth2 authenticathon met= hods for Qt."))) version ".tar.xz")) (sha256 (base32 =2D "03qjj7l63wn1zqkmlja9yrnc38rf6b3apnmsn0kw0h61x72awskd")))) + "1mhlws5w0igf5hw0l90p6dz6k7w16dqfbnk2li0zxdmayk2039m6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1515,6 +1461,10 @@ implementation of OAuth and OAuth2 authenticathon me= thods for Qt."))) (substitute* "tests/auto/qml/qml.pro" (("integration") "# integration") (("usertypes") "# usertypes")) + ;; disable failing tests: they need network + (substitute* "tests/auto/auto.pro" + (("integration_multiprocess proxy_multiprocess integratio= n_external restart") + "integration_multiprocess")) #t)))))) (inputs `(("qtbase" ,qtbase) @@ -1528,7 +1478,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") =2D (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases= /qt/" @@ -1537,7 +1487,7 @@ processes or computers."))) version ".tar.xz")) (sha256 (base32 =2D "0q30m9l28zsdzdmny7wjskd2fjfrgh1l595wir6bhwhil95g3i0c")))) + "1nn6kspbp8hfkz1jhzc1qx1m9z7r1bgkdqgi9n4vl1q25yk8x7jy")))) =20 (arguments (substitute-keyword-arguments (package-arguments qtsvg) @@ -1572,7 +1522,7 @@ message."))) version ".tar.xz")) (sha256 (base32 =2D "1yj6pcj945fpbc7nihav0plxpx8ikylmxjy7wqdv5znslgf59dw3")) + "0iy9lsl6zxlkca6x2p1506hbj3wmhnaipg23z027wfccbnkxcsg1")) (modules '((ice-9 ftw) (ice-9 match) (srfi srfi-1) @@ -1581,7 +1531,8 @@ message."))) (snippet '(begin (let ((preserved-third-party-files =2D '("base/third_party/dmg_fp" + '("base/third_party/cityhash" + "base/third_party/dmg_fp" "base/third_party/dynamic_annotations" "base/third_party/icu" "base/third_party/libevent" @@ -1590,11 +1541,9 @@ message."))) "base/third_party/symbolize" "base/third_party/xdg_mime" "base/third_party/xdg_user_dirs" =2D "net/third_party/http2" "net/third_party/mozilla_security_manager" "net/third_party/nss" =2D "net/third_party/spdy" =2D "net/third_party/quic" + "net/third_party/quiche" "third_party/abseil-cpp" "third_party/angle" "third_party/angle/src/common/third_party/base" @@ -1603,10 +1552,15 @@ message."))) "third_party/blink" "third_party/boringssl" "third_party/boringssl/src/third_party/fiat" + "third_party/boringssl/src/third_party/sike" + "third_party/boringssl/linux-x86_64/crypto/third_party= /sike" + "third_party/boringssl/linux-aarch64/crypto/third_part= y/sike" "third_party/breakpad" "third_party/brotli" "third_party/ced" + "third_party/cld_3" "third_party/crc32c" + "third_party/dawn" "third_party/ffmpeg" "third_party/googletest" "third_party/hunspell" @@ -1619,6 +1573,7 @@ message."))) "third_party/leveldatabase" "third_party/libaddressinput" "third_party/libjingle_xmpp" + "third_party/libjpeg" "third_party/libpng" "third_party/libsrtp" "third_party/libsync" @@ -1631,11 +1586,11 @@ message."))) "third_party/libyuv" "third_party/lss" "third_party/markupsafe" =2D "third_party/mesa" "third_party/metrics_proto" "third_party/modp_b64" "third_party/opus" "third_party/ots" + "third_party/perfetto" "third_party/ply" "third_party/polymer" "third_party/protobuf" @@ -1648,9 +1603,12 @@ message."))) "third_party/smhasher" "third_party/snappy" "third_party/sqlite" + "third_party/usb_ids" "third_party/usrsctp" "third_party/web-animations-js" "third_party/webrtc" + "third_party/webrtc/rtc_base/third_party/base64" + "third_party/webrtc/rtc_base/third_party/sigslot" "third_party/webrtc_overrides" "third_party/widevine/cdm/widevine_cdm_common.h" "third_party/widevine/cdm/widevine_cdm_version.h" @@ -1660,7 +1618,8 @@ message."))) "url/third_party/mozilla" "v8/src/third_party/utf8-decoder" "v8/src/third_party/valgrind" =2D "v8/third_party/antlr4" + "v8/src/third_party/siphash" + "v8/third_party/v8/builtins" "v8/third_party/inspector_protocol")) (protected (make-regexp "\\.(gn|gyp)i?$"))) (define preserved-club @@ -1740,9 +1699,8 @@ message."))) "third_party/analytics/google-analytics-bundle.js" (lambda (port) (const #t))))) =2D ;; Do not enable support for loading the Widevine DRM plugin. =2D (substitute* "src/core/config/common.pri" + (substitute* "src/buildtools/config/common.pri" (("enable_widevine=3Dtrue") "enable_widevine=3Dfalse")) #t))))) =2D-=20 2.26.2 --nextPart2470548.dfiJUdbmf8--