Update Qt

DoneSubmitted by Tom.
Details
2 participants
  • Marius Bakke
  • Tom
Owner
unassigned
Severity
normal
T
(address . guix-patches@gnu.org)
2419210.ElGaqSPkdT@peach
This updates all Qt components to their latest versions.
Notice that the qtcanvas3d doens't seem to be shipped after 5.12, so this updated to the latest from that series.
I compiled all components and all finished successfully. Except for the qtwebengine onewhich generates a compile/link error I did not manage to resolve.
This patch should thus be seen as a work-in-progress as it did most of the work and I hope someone can help me finish this.
Additionally, I'm sure some dependencies will need upgrading too.For instance kitemviews 5-63 fails to compile and upstream has 5.69 already...
Thanks
From 7b5810d91da1b906d752cddcd41fbe742e51b5d4 Mon Sep 17 00:00:00 2001From: TomZ <tomz@freedommail.ch>Date: Thu, 23 Apr 2020 00:21:31 +0200Subject: [PATCH] gnu: Qt: update to 5.14.2
* gnu/packages/qt.scm (qtbase, qtsvg, qtimageformats, qtx11extras, qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors, qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel, qtwebglplugin, qtwebview, qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech, qtwebengine): Update to 5.14.2
* gnu/packages/qt.scm (qtcanvas3d): Update to 5.12.8--- gnu/packages/qt.scm | 159 ++++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 86 deletions(-)
Toggle diff (671 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scmindex c9ac750cc5..5d8f106064 100644--- a/gnu/packages/qt.scm+++ b/gnu/packages/qt.scm@@ -340,7 +340,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtbase (package (name "qtbase")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -349,10 +349,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32- "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di"))- ;; Use TZDIR to avoid depending on package "tzdata".- (patches (search-patches "qtbase-use-TZDIR.patch"- "qtbase-QTBUG-81715.patch"))+ "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3@@ -558,14 +555,6 @@ developers using C++ or QML, a CSS & JavaScript like language.") "src/network/kernel/qhostinfo_unix.cpp") (("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\)\\);)" _ a b) (string-append a glibc "/lib/lib" b))))- ;; X11/locale (compose path)- (substitute* "src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp"- ;; Don't search in /usr/…/X11/locale, …- (("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/usr/.*/X11/locale\"\\)\\);" line)- (string-append "// " line))- ;; … but use libx11's path- (("^\\s*(m_possibleLocations.append\\(QStringLiteral\\()X11_PREFIX \"(/.*/X11/locale\"\\)\\);)" _ a b)- (string-append a "\"" (assoc-ref inputs "libx11") b))) ;; libGL (substitute* "src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp" (("^\\s*(QLibrary lib\\(QLatin1String\\(\")(GL\"\\)\\);)" _ a b)@@ -605,7 +594,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -614,7 +603,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32- "1f3vqv3s83gjillhgi0wghyf3825fgy1ffhvkxhdk673shb0kxjb"))))+ "18dmfc8s428fzbk7k5vl3212b25455ayrz7s716nwyiy3ahgmmy7")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs@@ -680,7 +669,7 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -689,7 +678,7 @@ HostData=lib/qt5 version ".tar.xz")) (sha256 (base32- "02zpcbx71dz6xvga07dnzqwdfz9pjmy673n706fj8pxq9zi9xlcv"))+ "132g4rlm61pdcpcrclr1rwpbrxn7va4wjfb021mh8pn1cl0wlgkk")) (modules '((guix build utils))) (snippet '(begin@@ -711,7 +700,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -720,7 +709,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) version ".tar.xz")) (sha256 (base32- "15hb90n47khsp3qnzyjd3mh8gi9qvy07dqdr4qspiww43r5mz293"))))+ "0njlh6d327nll7d8qaqrwr5x15m9yzgyar2j45qigs1f7ah896my")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -735,7 +724,7 @@ from within Qt 5."))) (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -744,7 +733,7 @@ from within Qt 5."))) version ".tar.xz")) (sha256 (base32- "0ys1kf0zdn8gak1ik9p7i7bdyfz2frvklcyz013s9wm1550h20lh"))))+ "1dyg1z4349k04yyzn8xbp4f5qjgm60gz6wgzp80khpilcmk8g6i1")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f) ; TODO: Enable the tests@@ -766,7 +755,7 @@ xmlpatternsvalidator."))) (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -775,7 +764,7 @@ xmlpatternsvalidator."))) version ".tar.xz")) (sha256 (base32- "1gg9xbv8ah4p55ws97brwn0csl0k3j1x6zdknrrsnh7j6nh0bp2w"))))+ "0l0nhc2si6dl9r4s1bs45z90qqigs8jnrsyjjdy38q4pvix63i53")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -784,7 +773,8 @@ xmlpatternsvalidator."))) ("pkg-config" ,pkg-config) ("python" ,python) ("python-wrapper" ,python-wrapper)- ("qtsvg" ,qtsvg)))+ ("qtsvg" ,qtsvg)+ ("vulkan-headers" ,vulkan-headers))) (inputs `(("mesa" ,mesa) ("qtbase" ,qtbase)))@@ -798,7 +788,7 @@ with JavaScript and C++."))) (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -807,7 +797,7 @@ with JavaScript and C++."))) version ".tar.xz")) (sha256 (base32- "06h71pd5w5prh722mcbgmx7l71xvh5xpjrlbg17yblx0n6wlhwb4"))))+ "0a5wzin635b926b8prdwfazgy1vhyf8m6an64wp2lpkp78z7prmb")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config)@@ -822,7 +812,7 @@ with Bluetooth and NFC."))) (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -831,7 +821,7 @@ with Bluetooth and NFC."))) version ".tar.xz")) (sha256 (base32- "05rv52pp5zg4g14zh7c6jc77l426056b8xyr40ps6cpmb0jkrlbg"))))+ "116amx4mnv50k0fpswgpr5x8wjny8nbffrjmld01pzhkhfqn4vph")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -849,7 +839,7 @@ consume data received from the server, or both."))) (define-public qtsensors (package (inherit qtsvg) (name "qtsensors")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -858,7 +848,7 @@ consume data received from the server, or both."))) version ".tar.xz")) (sha256 (base32- "0h77h34rn6cgy5qiqq163pj3bhbka1ydkfgjcx01ns1g9sgym6ib"))))+ "0qccpgbhyg9k4x5nni7xm0pyvaqia3zrcd42cn7ksf5h21lwmkxw")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition@@ -882,7 +872,7 @@ recognition API for devices."))) (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -891,7 +881,7 @@ recognition API for devices."))) version ".tar.xz")) (sha256 (base32- "07fvnjywn3hkrxfbxasmy83jr6jq9lf1grasfwij54hz6y0smg98"))+ "1sczzcvk3c5gczz53yvp8ma6gp8aixk5pcq7wh344c9md3g8xkbs")) (modules '((guix build utils))) (snippet '(begin@@ -933,7 +923,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -942,7 +932,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) version ".tar.xz")) (sha256 (base32- "1ib61zh6jrab3yz592p47ldfgphi4i184kqf14vhwn31akibh6pw"))+ "0al3yypy3fin62n8d1859jh0mn0fbpa161l7f37hgd4gf75365nk")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail@@ -985,7 +975,7 @@ compositor libraries."))) (define-public qtserialport (package (inherit qtsvg) (name "qtserialport")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -994,7 +984,7 @@ compositor libraries."))) version ".tar.xz")) (sha256 (base32- "07vjv3p7n7n5v15wdpi8x5sbnvyjqdh85qfzf9mz8l6ppqp2hk12"))))+ "08ga9a1lwj83872nxablk602z1dq0la6jqsiicvd7m1sfbfpgnd6")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase)@@ -1019,7 +1009,7 @@ interacting with serial ports from within Qt."))) (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1028,7 +1018,7 @@ interacting with serial ports from within Qt."))) version ".tar.xz")) (sha256 (base32- "1bkyk1v7bcq657n88a6675lj55vl9y8v46h4kf27v58yjzgiw842"))))+ "14bahg82jciciqkl74q9hvf3a8kp3pk5v731vp2416k4b8bn4xqb")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport)))@@ -1040,7 +1030,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1049,7 +1039,7 @@ and others."))) version ".tar.xz")) (sha256 (base32- "0xff3fbbpcl0kkq0rg9npj127ycirygicbkxlf0v593sjpjp5bmh"))))+ "0x7q66994pw6cd0f505bmirw1sssqs740zaw8lyqqqr32m2ch7bx")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative)@@ -1064,7 +1054,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1073,7 +1063,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) version ".tar.xz")) (sha256 (base32- "0fswnmhb8fm7wqgzv8cjy1j2sgb5mhx80jl411laawn7bf2ysjg0"))))+ "05rl657848fsprsnabdqb5z363c6drjc32k59223vl351f8ihhgb")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases)@@ -1087,7 +1077,8 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) `(("mesa" ,mesa) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative)- ("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@@ -1099,7 +1090,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview (package (inherit qtsvg) (name "qtwebview")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1108,7 +1099,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) version ".tar.xz")) (sha256 (base32- "1rvvkg6dl34hklllnlzlcffik746f15lzxdnwggc97dmx8n2vy6k"))))+ "0jzzcm7z5njkddzfhmyjz4dbbzq8h93980cci4479zc4xq9r47y6")))) (native-inputs `(("perl" ,perl))) (inputs@@ -1122,7 +1113,7 @@ native APIs where it makes sense."))) (define-public qtlocation (package (inherit qtsvg) (name "qtlocation")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1131,7 +1122,7 @@ native APIs where it makes sense."))) version ".tar.xz")) (sha256 (base32- "07vq4aycayq2bg8yi4awidb25xyvws2ajbnrmad3rnpg1fw0bsfi"))))+ "1k3m8zhbv04yrqvj7jlnh8f9xczdsmla59j9gcwsqvbg76y0hxy3")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1152,7 +1143,7 @@ positioning and geolocation plugins."))) (define-public qttools (package (inherit qtsvg) (name "qttools")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1161,7 +1152,7 @@ positioning and geolocation plugins."))) version ".tar.xz")) (sha256 (base32- "0j1rl368sjknsmwp2f7bwqcb0sx13l3l4dxbm70873si9l8rf2l6"))))+ "1iakl3hlyg51ri1czmis8mmb257b0y1zk2a2knybd3mq69wczc2v")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1180,7 +1171,7 @@ that helps in Qt development."))) (define-public qtscript (package (inherit qtsvg) (name "qtscript")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1204,7 +1195,7 @@ ECMAScript and Qt."))) (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1213,7 +1204,7 @@ ECMAScript and Qt."))) version ".tar.xz")) (sha256 (base32- "1rar337vv0dx52r2gxwiwy1axn0fpy79rka09xizjlxsdg3vnf0h"))))+ "0qa4dlhn3iv9yvaic8hw86v6h8rn9sgq8xjfdaym04pfshfyypfm")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1228,7 +1219,7 @@ can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1237,7 +1228,7 @@ can be used to build complete interfaces in Qt Quick."))) version ".tar.xz")) (sha256 (base32- "0dx2jag6l5a80220fvmf49z1psliqf1ijqx6jsvvzv81mpjjd59s"))))+ "0q0mk2mjlf9ll0gdrdzxy8096s6g9draaqiwrlvdpa7lv14x7xzs")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1253,7 +1244,7 @@ not available."))) (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1262,7 +1253,7 @@ not available."))) version ".tar.xz")) (sha256 (base32- "1knapc14a80cn2f5bbfj7lhq9flr3v0gwjg9ka7xl8y642235w02"))))+ "03xmwhapv0b2qj661iaqqrvhxc7qiid0acrp6rj85824ha2pyyj8")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1280,7 +1271,7 @@ coloring, and many more."))) (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1289,7 +1280,7 @@ coloring, and many more."))) version ".tar.xz")) (sha256 (base32- "150y7bc755l9y8w7nkg3gfw5n6rlj9hhq0ibc9g1xgllpr18qqq7"))))+ "00wd3h465waxdghg2vdhs5pkj0xikwjn88l12477dksm8zdslzgp")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config)))@@ -1310,7 +1301,7 @@ and mobile applications targeting TV-like form factors."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1319,7 +1310,7 @@ and mobile applications targeting TV-like form factors."))) version ".tar.xz")) (sha256 (base32- "1dpvjkvwc3fj86vay8q8vzym73cix7ri2ianx87ck0gqjny51adg"))+ "141pfschv6zmcvvn3pi7f5vb4nf96zpngy80f9bly1sn58syl303")) (modules '((guix build utils))) (snippet '(begin@@ -1341,7 +1332,7 @@ also contains functionality to support data models and executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1350,7 +1341,7 @@ also contains functionality to support data models and executable content."))) version ".tar.xz")) (sha256 (base32- "0xjsn7p629ni68vk4xlw2cvcs53ipcqv1pa4hck0nabddcgcnzkg"))))+ "0lg8x7g7dkf95xwxq8b4yw4ypdz68igkscya96xwbklg3q08gc39")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative)))@@ -1361,7 +1352,7 @@ purchasing goods and services."))) (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d")- (version "5.12.7")+ (version "5.12.8") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1370,7 +1361,7 @@ purchasing goods and services."))) version ".tar.xz")) (sha256 (base32- "0l0c1p6jwz5rygyxslfw7jw3wbd23w5n9zg04aqlh5g15qx52fmn"))+ "1k0j9lvg410268kc0w7qdwsl0syzykxp8r019nzb6rhj0ahys3d3")) (modules '((guix build utils))) (snippet '(begin@@ -1400,7 +1391,7 @@ drawing calls from Qt Quick JavaScript."))) (define-public qtcharts (package (inherit qtsvg) (name "qtcharts")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1409,7 +1400,7 @@ drawing calls from Qt Quick JavaScript."))) version ".tar.xz")) (sha256 (base32- "0pyg2lpxmhf4amj57zihp5ry0y9m39xq5hbcx4hqj78bdm96ah23"))))+ "1drvm15i6n10b6a1acgarig120ppvqh3r6fqqdn8i3blx81m5cmd")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1427,7 +1418,7 @@ selecting one of the charts themes.") (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1436,7 +1427,7 @@ selecting one of the charts themes.") version ".tar.xz")) (sha256 (base32- "09wbv4g29sq5z2fphk2910albr3iv3l14nch3ml77w6drw9mgzq7"))))+ "080fkpxg70m3c697wfnkjhca58b7r1xsqd559jzb21985pdh6g3j")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1454,7 +1445,7 @@ customized by using themes or by adding custom items and labels to them.") (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1463,7 +1454,7 @@ customized by using themes or by adding custom items and labels to them.") version ".tar.xz")) (sha256 (base32- "0sspni7zllhspk70yjj2d0li9r4rs3iflnksj8mvjx2yl9qpryyb"))))+ "0pi6p7bq54kzij2p69cgib7n55k69jsq0yqq09yli645s4ym202g")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases)@@ -1483,7 +1474,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1492,7 +1483,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) version ".tar.xz")) (sha256 (base32- "03qjj7l63wn1zqkmlja9yrnc38rf6b3apnmsn0kw0h61x72awskd"))))+ "1mhlws5w0igf5hw0l90p6dz6k7w16dqfbnk2li0zxdmayk2039m6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases)@@ -1503,6 +1494,10 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (substitute* "tests/auto/qml/qml.pro" (("integration") "# integration") (("usertypes") "# usertypes"))+ ;; disable failing tests+ (substitute* "tests/auto/auto.pro"+ (("integration_multiprocess proxy_multiprocess integration_external restart")+ "integration_multiprocess")) #t)))))) (inputs `(("qtbase" ,qtbase)@@ -1516,7 +1511,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech")- (version "5.12.7")+ (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1525,7 +1520,7 @@ processes or computers."))) version ".tar.xz")) (sha256 (base32- "0q30m9l28zsdzdmny7wjskd2fjfrgh1l595wir6bhwhil95g3i0c"))))+ "1nn6kspbp8hfkz1jhzc1qx1m9z7r1bgkdqgi9n4vl1q25yk8x7jy")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg)@@ -1560,7 +1555,7 @@ message."))) version ".tar.xz")) (sha256 (base32- "1yj6pcj945fpbc7nihav0plxpx8ikylmxjy7wqdv5znslgf59dw3"))+ "0iy9lsl6zxlkca6x2p1506hbj3wmhnaipg23z027wfccbnkxcsg1")) (modules '((ice-9 ftw) (ice-9 match) (srfi srfi-1)@@ -1569,7 +1564,8 @@ message."))) (snippet '(begin (let ((preserved-third-party-files- '("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"@@ -1578,11 +1574,8 @@ message."))) "base/third_party/symbolize" "base/third_party/xdg_mime" "base/third_party/xdg_user_dirs"- "net/third_party/http2" "net/third_party/mozilla_security_manager" "net/third_party/nss"- "net/third_party/spdy"- "net/third_party/quic" "third_party/abseil-cpp" "third_party/angle" "third_party/angle/src/common/third_party/base"@@ -1591,6 +1584,7 @@ message."))) "third_party/blink" "third_party/boringssl" "third_party/boringssl/src/third_party/fiat"+ "third_party/boringssl/src/third_party/sike" "third_party/breakpad" "third_party/brotli" "third_party/ced"@@ -1619,7 +1613,6 @@ message."))) "third_party/libyuv" "third_party/lss" "third_party/markupsafe"- "third_party/mesa" "third_party/metrics_proto" "third_party/modp_b64" "third_party/opus"@@ -1648,7 +1641,6 @@ message."))) "url/third_party/mozilla" "v8/src/third_party/utf8-decoder" "v8/src/third_party/valgrind"- "v8/third_party/antlr4" "v8/third_party/inspector_protocol")) (protected (make-regexp "\\.(gn|gyp)i?$"))) (define preserved-club@@ -1728,11 +1720,6 @@ message."))) "third_party/analytics/google-analytics-bundle.js" (lambda (port) (const #t)))))-- ;; Do not enable support for loading the Widevine DRM plugin.- (substitute* "src/core/config/common.pri"- (("enable_widevine=true")- "enable_widevine=false")) #t))))) (build-system gnu-build-system) (native-inputs-- 2.26.2
T
rebased patch
(address . 40791@debbugs.gnu.org)
12618542.O9o76ZdvQC@peach
This patch incorporates feedback from IRC (many fixlets).
I rebased it onto the core-updates branch.
The webengine fails with an error I fail to understand:
make[3]: Entering directory '/tmp/guix-build-qtwebengine-5.14.2.drv-0/qtwebengine-everywhere-src-5.14.2/src/core'ninja -k1 -j12 -C /tmp/guix-build-qtwebengine-5.14.2.drv-0/qtwebengine-everywhere-src-5.14.2/src/core/release QtWebEngineCoreninja: Entering directory `/tmp/guix-build-qtwebengine-5.14.2.drv-0/qtwebengine-everywhere-src-5.14.2/src/core/release'ninja: error: '../../3rdparty/chromium/third_party/boringssl/linux-x86_64/crypto/third_party/sike/asm/fp-x86_64.S', needed by 'host/obj/third_party/boringssl/boringssl_asm/fp-x86_64.o', missing and no known rule to make it
From 4c90d4de70b3a87cfebf33ef1ef8b07a284ca523 Mon Sep 17 00:00:00 2001From: TomZ <tomz@freedommail.ch>Date: Thu, 23 Apr 2020 00:21:31 +0200Subject: [PATCH] gnu: Qt: update to 5.14.2
* gnu/packages/qt.scm (qtbase, qtsvg, qtimageformats, qtx11extras, qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors, qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel, qtwebglplugin, qtwebview, qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech, qtwebengine): Update to 5.14.2
* gnu/packages/qt.scm (qtcanvas3d): Update to 5.12.8--- gnu/packages/patches/qtbase-use-TZDIR.patch | 4 +- gnu/packages/qt.scm | 178 +++++++++----------- 2 files changed, 85 insertions(+), 97 deletions(-)
Toggle diff (721 lines)diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patchindex 11c737d844..b6c377b133 100644--- 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. Based on a patch fron NixOS. ===================================================================---- qtbase-opensource-src-5.9.4.orig/src/corelib/tools/qtimezoneprivate_tz.cpp-+++ qtbase-opensource-src-5.9.4/src/corelib/tools/qtimezoneprivate_tz.cpp+--- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp++++ 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 need to read directories static QTzTimeZoneHash loadTzTimeZones()diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scmindex 8a57127771..dbea4e2cef 100644--- a/gnu/packages/qt.scm+++ b/gnu/packages/qt.scm@@ -351,7 +351,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtbase (package (name "qtbase")- (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 language.") version ".tar.xz")) (sha256 (base32- "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di"))- ;; Use TZDIR to avoid depending on package "tzdata".+ "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8")) (patches (search-patches "qtbase-use-TZDIR.patch"- "qtbase-moc-ignore-gcc-macro.patch"- "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 language.") "src/network/kernel/qhostinfo_unix.cpp") (("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\)\\);)" _ a b) (string-append a glibc "/lib/lib" b))))- ;; X11/locale (compose path)- (substitute* "src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp"- ;; Don't search in /usr/…/X11/locale, …- (("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/usr/.*/X11/locale\"\\)\\);" line)- (string-append "// " line))- ;; … but use libx11's path- (("^\\s*(m_possibleLocations.append\\(QStringLiteral\\()X11_PREFIX \"(/.*/X11/locale\"\\)\\);)" _ a b)- (string-append a "\"" (assoc-ref inputs "libx11") b))) ;; libGL (substitute* "src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp" (("^\\s*(QLibrary lib\\(QLatin1String\\(\")(GL\"\\)\\);)" _ a b)@@ -617,7 +607,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg")- (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 language.") version ".tar.xz")) (sha256 (base32- "1f3vqv3s83gjillhgi0wghyf3825fgy1ffhvkxhdk673shb0kxjb"))))+ "18dmfc8s428fzbk7k5vl3212b25455ayrz7s716nwyiy3ahgmmy7")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs@@ -692,7 +682,7 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats")- (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=lib/qt5 version ".tar.xz")) (sha256 (base32- "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")- (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- "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")- (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- "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")- (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- "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)- ("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")- (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- "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")- (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- "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")- (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- "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")- (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- "07fvnjywn3hkrxfbxasmy83jr6jq9lf1grasfwij54hz6y0smg98"))+ "1sczzcvk3c5gczz53yvp8ma6gp8aixk5pcq7wh344c9md3g8xkbs")) (modules '((guix build utils))) (snippet '(begin@@ -945,7 +936,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland")- (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 GStreamer."))) version ".tar.xz")) (sha256 (base32- "1ib61zh6jrab3yz592p47ldfgphi4i184kqf14vhwn31akibh6pw"))+ "0al3yypy3fin62n8d1859jh0mn0fbpa161l7f37hgd4gf75365nk")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail@@ -962,17 +953,13 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (delete-file-recursively "examples") #t)))) (arguments- (substitute-keyword-arguments (package-arguments qtsvg)- ((#:phases phases)- `(modify-phases ,phases- (add-before 'check 'set-ld-library-path- ;; <https://lists.gnu.org/archive/html/guix-devel/2017-09/msg00019.html>- ;;- ;; Make the uninstalled libQt5WaylandClient.so.5 available to the- ;; wayland platform plugin.- (lambda _- (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/lib"))- #t))))))+ (substitute-keyword-arguments (package-arguments qtsvg)+ ((#:phases phases)+ `(modify-phases ,phases+ ;; Tests fail due to missing plugin.+ ;; Set https://lists.gnu.org/archive/html/guix-devel/2017-09/msg00019.html+ ;; LD_LIBRARY PATH trick doesn't work anymore, so just disable+ (delete 'check))))) (native-inputs `(("glib" ,glib) ("perl" ,perl)@@ -997,7 +984,7 @@ compositor libraries."))) (define-public qtserialport (package (inherit qtsvg) (name "qtserialport")- (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 +993,7 @@ compositor libraries."))) version ".tar.xz")) (sha256 (base32- "07vjv3p7n7n5v15wdpi8x5sbnvyjqdh85qfzf9mz8l6ppqp2hk12"))))+ "08ga9a1lwj83872nxablk602z1dq0la6jqsiicvd7m1sfbfpgnd6")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase)@@ -1031,7 +1018,7 @@ interacting with serial ports from within Qt."))) (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus")- (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 +1027,7 @@ interacting with serial ports from within Qt."))) version ".tar.xz")) (sha256 (base32- "1bkyk1v7bcq657n88a6675lj55vl9y8v46h4kf27v58yjzgiw842"))))+ "14bahg82jciciqkl74q9hvf3a8kp3pk5v731vp2416k4b8bn4xqb")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport)))@@ -1052,7 +1039,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel")- (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 +1048,7 @@ and others."))) version ".tar.xz")) (sha256 (base32- "0xff3fbbpcl0kkq0rg9npj127ycirygicbkxlf0v593sjpjp5bmh"))))+ "0x7q66994pw6cd0f505bmirw1sssqs740zaw8lyqqqr32m2ch7bx")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative)@@ -1076,7 +1063,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin")- (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 +1072,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) version ".tar.xz")) (sha256 (base32- "0fswnmhb8fm7wqgzv8cjy1j2sgb5mhx80jl411laawn7bf2ysjg0"))))+ "05rl657848fsprsnabdqb5z363c6drjc32k59223vl351f8ihhgb")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases)@@ -1099,7 +1086,8 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) `(("mesa" ,mesa) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative)- ("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 +1099,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview (package (inherit qtsvg) (name "qtwebview")- (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 +1108,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) version ".tar.xz")) (sha256 (base32- "1rvvkg6dl34hklllnlzlcffik746f15lzxdnwggc97dmx8n2vy6k"))))+ "0jzzcm7z5njkddzfhmyjz4dbbzq8h93980cci4479zc4xq9r47y6")))) (native-inputs `(("perl" ,perl))) (inputs@@ -1134,7 +1122,7 @@ native APIs where it makes sense."))) (define-public qtlocation (package (inherit qtsvg) (name "qtlocation")- (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 +1131,7 @@ native APIs where it makes sense."))) version ".tar.xz")) (sha256 (base32- "07vq4aycayq2bg8yi4awidb25xyvws2ajbnrmad3rnpg1fw0bsfi"))))+ "1k3m8zhbv04yrqvj7jlnh8f9xczdsmla59j9gcwsqvbg76y0hxy3")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1164,7 +1152,7 @@ positioning and geolocation plugins."))) (define-public qttools (package (inherit qtsvg) (name "qttools")- (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 +1161,7 @@ positioning and geolocation plugins."))) version ".tar.xz")) (sha256 (base32- "0j1rl368sjknsmwp2f7bwqcb0sx13l3l4dxbm70873si9l8rf2l6"))))+ "1iakl3hlyg51ri1czmis8mmb257b0y1zk2a2knybd3mq69wczc2v")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1192,7 +1180,7 @@ that helps in Qt development."))) (define-public qtscript (package (inherit qtsvg) (name "qtscript")- (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 +1189,7 @@ that helps in Qt development."))) version ".tar.xz")) (sha256 (base32- "06a02230mj4bd8qvjaf2q97grzbj1c1rq36x7236fnhjsikbq7fa"))+ "1zlvg3hc6h70d789g3kv6dxbwswzkskkm00bdgl01grwrdy4izg9")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl)@@ -1216,7 +1204,7 @@ ECMAScript and Qt."))) (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols")- (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 +1213,7 @@ ECMAScript and Qt."))) version ".tar.xz")) (sha256 (base32- "1rar337vv0dx52r2gxwiwy1axn0fpy79rka09xizjlxsdg3vnf0h"))))+ "0qa4dlhn3iv9yvaic8hw86v6h8rn9sgq8xjfdaym04pfshfyypfm")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1240,7 +1228,7 @@ can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2")- (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 +1237,7 @@ can be used to build complete interfaces in Qt Quick."))) version ".tar.xz")) (sha256 (base32- "0dx2jag6l5a80220fvmf49z1psliqf1ijqx6jsvvzv81mpjjd59s"))))+ "0q0mk2mjlf9ll0gdrdzxy8096s6g9draaqiwrlvdpa7lv14x7xzs")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1265,7 +1253,7 @@ not available."))) (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects")- (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 +1262,7 @@ not available."))) version ".tar.xz")) (sha256 (base32- "1knapc14a80cn2f5bbfj7lhq9flr3v0gwjg9ka7xl8y642235w02"))))+ "03xmwhapv0b2qj661iaqqrvhxc7qiid0acrp6rj85824ha2pyyj8")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1292,7 +1280,7 @@ coloring, and many more."))) (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad")- (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 +1289,7 @@ coloring, and many more."))) version ".tar.xz")) (sha256 (base32- "150y7bc755l9y8w7nkg3gfw5n6rlj9hhq0ibc9g1xgllpr18qqq7"))))+ "00wd3h465waxdghg2vdhs5pkj0xikwjn88l12477dksm8zdslzgp")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config)))@@ -1322,7 +1310,7 @@ and mobile applications targeting TV-like form factors."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml")- (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 +1319,7 @@ and mobile applications targeting TV-like form factors."))) version ".tar.xz")) (sha256 (base32- "1dpvjkvwc3fj86vay8q8vzym73cix7ri2ianx87ck0gqjny51adg"))+ "141pfschv6zmcvvn3pi7f5vb4nf96zpngy80f9bly1sn58syl303")) (modules '((guix build utils))) (snippet '(begin@@ -1353,7 +1341,7 @@ also contains functionality to support data models and executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing")- (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 +1350,7 @@ also contains functionality to support data models and executable content."))) version ".tar.xz")) (sha256 (base32- "0xjsn7p629ni68vk4xlw2cvcs53ipcqv1pa4hck0nabddcgcnzkg"))))+ "0lg8x7g7dkf95xwxq8b4yw4ypdz68igkscya96xwbklg3q08gc39")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative)))@@ -1373,7 +1361,7 @@ purchasing goods and services."))) (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d")- (version "5.12.7")+ (version "5.12.8") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/"@@ -1382,7 +1370,7 @@ purchasing goods and services."))) version ".tar.xz")) (sha256 (base32- "0l0c1p6jwz5rygyxslfw7jw3wbd23w5n9zg04aqlh5g15qx52fmn"))+ "1k0j9lvg410268kc0w7qdwsl0syzykxp8r019nzb6rhj0ahys3d3")) (modules '((guix build utils))) (snippet '(begin@@ -1412,7 +1400,7 @@ drawing calls from Qt Quick JavaScript."))) (define-public qtcharts (package (inherit qtsvg) (name "qtcharts")- (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 +1409,7 @@ drawing calls from Qt Quick JavaScript."))) version ".tar.xz")) (sha256 (base32- "0pyg2lpxmhf4amj57zihp5ry0y9m39xq5hbcx4hqj78bdm96ah23"))))+ "1drvm15i6n10b6a1acgarig120ppvqh3r6fqqdn8i3blx81m5cmd")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1439,7 +1427,7 @@ selecting one of the charts themes.") (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d")- (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 +1436,7 @@ selecting one of the charts themes.") version ".tar.xz")) (sha256 (base32- "09wbv4g29sq5z2fphk2910albr3iv3l14nch3ml77w6drw9mgzq7"))))+ "080fkpxg70m3c697wfnkjhca58b7r1xsqd559jzb21985pdh6g3j")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests@@ -1466,7 +1454,7 @@ customized by using themes or by adding custom items and labels to them.") (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth")- (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 +1463,7 @@ customized by using themes or by adding custom items and labels to them.") version ".tar.xz")) (sha256 (base32- "0sspni7zllhspk70yjj2d0li9r4rs3iflnksj8mvjx2yl9qpryyb"))))+ "0pi6p7bq54kzij2p69cgib7n55k69jsq0yqq09yli645s4ym202g")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases)@@ -1495,7 +1483,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects")- (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 +1492,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) version ".tar.xz")) (sha256 (base32- "03qjj7l63wn1zqkmlja9yrnc38rf6b3apnmsn0kw0h61x72awskd"))))+ "1mhlws5w0igf5hw0l90p6dz6k7w16dqfbnk2li0zxdmayk2039m6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases)@@ -1515,6 +1503,10 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (substitute* "tests/auto/qml/qml.pro" (("integration") "# integration") (("usertypes") "# usertypes"))+ ;; disable failing tests+ (substitute* "tests/auto/auto.pro"+ (("integration_multiprocess proxy_multiprocess integration_external restart")+ "integration_multiprocess")) #t)))))) (inputs `(("qtbase" ,qtbase)@@ -1528,7 +1520,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech")- (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 +1529,7 @@ processes or computers."))) version ".tar.xz")) (sha256 (base32- "0q30m9l28zsdzdmny7wjskd2fjfrgh1l595wir6bhwhil95g3i0c"))))+ "1nn6kspbp8hfkz1jhzc1qx1m9z7r1bgkdqgi9n4vl1q25yk8x7jy")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg)@@ -1572,7 +1564,7 @@ message."))) version ".tar.xz")) (sha256 (base32- "1yj6pcj945fpbc7nihav0plxpx8ikylmxjy7wqdv5znslgf59dw3"))+ "0iy9lsl6zxlkca6x2p1506hbj3wmhnaipg23z027wfccbnkxcsg1")) (modules '((ice-9 ftw) (ice-9 match) (srfi srfi-1)@@ -1581,7 +1573,8 @@ message."))) (snippet '(begin (let ((preserved-third-party-files- '("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 +1583,8 @@ message."))) "base/third_party/symbolize" "base/third_party/xdg_mime" "base/third_party/xdg_user_dirs"- "net/third_party/http2" "net/third_party/mozilla_security_manager" "net/third_party/nss"- "net/third_party/spdy"- "net/third_party/quic" "third_party/abseil-cpp" "third_party/angle" "third_party/angle/src/common/third_party/base"@@ -1603,6 +1593,7 @@ message."))) "third_party/blink" "third_party/boringssl" "third_party/boringssl/src/third_party/fiat"+ "third_party/boringssl/src/third_party/sike" "third_party/breakpad" "third_party/brotli" "third_party/ced"@@ -1631,7 +1622,6 @@ message."))) "third_party/libyuv" "third_party/lss" "third_party/markupsafe"- "third_party/mesa" "third_party/metrics_proto" "third_party/modp_b64" "third_party/opus"@@ -1660,7 +1650,6 @@ message."))) "url/third_party/mozilla" "v8/src/third_party/utf8-decoder" "v8/src/third_party/valgrind"- "v8/third_party/antlr4" "v8/third_party/inspector_protocol")) (protected (make-regexp "\\.(gn|gyp)i?$"))) (define preserved-club@@ -1740,9 +1729,8 @@ message."))) "third_party/analytics/google-analytics-bundle.js" (lambda (port) (const #t)))))- ;; Do not enable support for loading the Widevine DRM plugin.- (substitute* "src/core/config/common.pri"+ (substitute* "src/buildtools/config/common.pri" (("enable_widevine=true") "enable_widevine=false")) #t)))))-- 2.26.2
M
M
Marius Bakke wrote on 24 Apr 00:23 +0200
87sggtg7th.fsf@devup.no
Hello Tom!
Thanks a lot for this work.
Tom via Guix-patches via <guix-patches@gnu.org> writes:
Toggle quote (11 lines)> This patch incorporates feedback from IRC (many fixlets).>> I rebased it onto the core-updates branch.>> The webengine fails with an error I fail to understand:>> make[3]: Entering directory '/tmp/guix-build-qtwebengine-5.14.2.drv-0/qtwebengine-everywhere-src-5.14.2/src/core'> ninja -k1 -j12 -C /tmp/guix-build-qtwebengine-5.14.2.drv-0/qtwebengine-everywhere-src-5.14.2/src/core/release QtWebEngineCore> ninja: Entering directory `/tmp/guix-build-qtwebengine-5.14.2.drv-0/qtwebengine-everywhere-src-5.14.2/src/core/release'> ninja: error: '../../3rdparty/chromium/third_party/boringssl/linux-x86_64/crypto/third_party/sike/asm/fp-x86_64.S', needed by 'host/obj/third_party/boringssl/boringssl_asm/fp-x86_64.o', missing and no known rule to make it
This is because QtWebEngine has a whitelist of allowed "third_party"directories. Presumably adding"third_party/boringssl/linux-x86_64/crypto/third_party/sike" to the listsolves it.
Also preserve the related directory below "linux-aarch64" if it exists(I'm guessing from reading commit7f2e852267d3484c3b0a3457ad6f3f9ad4debe6a in Guix). :-)
A few comments on the other patches:
Toggle quote (14 lines)> From 4c90d4de70b3a87cfebf33ef1ef8b07a284ca523 Mon Sep 17 00:00:00 2001> From: TomZ <tomz@freedommail.ch>> Date: Thu, 23 Apr 2020 00:21:31 +0200> Subject: [PATCH] gnu: Qt: update to 5.14.2>> * gnu/packages/qt.scm (qtbase, qtsvg, qtimageformats,> qtx11extras, qtxmlpatterns, qtdeclarative, qtconnectivity,> qtwebsockets, qtsensors, qtmultimedia, qtwayland,> qtserialport, qtserialbus, qtwebchannel, qtwebglplugin,> qtwebview, qtlocation, qttools, qtscript, qtquickcontrols,> qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml,> qtpurchasing, qtcharts, qtdatavis3d, qtnetworkauth,> qtremoteobjects, qtspeech, qtwebengine): Update to 5.14.2
Please also mention the changed [arguments] etc for each of thevariables that contain other changes than just the version bump.
Toggle quote (2 lines)> * gnu/packages/qt.scm (qtcanvas3d): Update to 5.12.8
As nothing depends on this, perhaps we should just remove it? Do youknow if it was merged with some other Qt package?
Toggle quote (55 lines)> diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch> index 11c737d844..b6c377b133 100644> --- 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.> > Based on a patch fron NixOS.> ===================================================================> ---- qtbase-opensource-src-5.9.4.orig/src/corelib/tools/qtimezoneprivate_tz.cpp> -+++ qtbase-opensource-src-5.9.4/src/corelib/tools/qtimezoneprivate_tz.cpp> +--- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp> ++++ 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 need to read directories> static QTzTimeZoneHash loadTzTimeZones()> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm> index 8a57127771..dbea4e2cef 100644> --- a/gnu/packages/qt.scm> +++ b/gnu/packages/qt.scm> @@ -351,7 +351,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")> (define-public qtbase> (package> (name "qtbase")> - (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 language.")> version ".tar.xz"))> (sha256> (base32> - "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di"))> - ;; Use TZDIR to avoid depending on package "tzdata".> + "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8"))> (patches (search-patches "qtbase-use-TZDIR.patch"> - "qtbase-moc-ignore-gcc-macro.patch"> - "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 language.")> "src/network/kernel/qhostinfo_unix.cpp")> (("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\)\\);)" _ a b)> (string-append a glibc "/lib/lib" b))))> - ;; X11/locale (compose path)> - (substitute* "src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp"> - ;; Don't search in /usr/…/X11/locale, …> - (("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/usr/.*/X11/locale\"\\)\\);" line)> - (string-append "// " line))> - ;; … but use libx11's path> - (("^\\s*(m_possibleLocations.append\\(QStringLiteral\\()X11_PREFIX \"(/.*/X11/locale\"\\)\\);)" _ a b)> - (string-append a "\"" (assoc-ref inputs "libx11") b)))
What happened here? Did the Qt build system get smart enough to embedthe libx11 file name by itself?
Toggle quote (11 lines)> (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)> - ("qtsvg" ,qtsvg)))> + ("qtsvg" ,qtsvg)> + ("vulkan-headers" ,vulkan-headers)))
The new input should also be mentioned in the commit message. See thecommit log for examples.
Toggle quote (23 lines)> @@ -962,17 +953,13 @@ set of plugins for interacting with pulseaudio and GStreamer.")))> (delete-file-recursively "examples")> #t))))> (arguments> - (substitute-keyword-arguments (package-arguments qtsvg)> - ((#:phases phases)> - `(modify-phases ,phases> - (add-before 'check 'set-ld-library-path> - ;; <https://lists.gnu.org/archive/html/guix-devel/2017-09/msg00019.html>> - ;;> - ;; Make the uninstalled libQt5WaylandClient.so.5 available to the> - ;; wayland platform plugin.> - (lambda _> - (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/lib"))> - #t))))))> + (substitute-keyword-arguments (package-arguments qtsvg)> + ((#:phases phases)> + `(modify-phases ,phases> + ;; Tests fail due to missing plugin.> + ;; Set https://lists.gnu.org/archive/html/guix-devel/2017-09/msg00019.html> + ;; LD_LIBRARY PATH trick doesn't work anymore, so just disable> + (delete 'check)))))
So the test fails because libQt5WaylandClient.so is missing? Perhaps itwas moved elsewhere? Try building with --keep-failed and inspect thebuild directory, hopefully it's enough to adjust LD_LIBRARY_PATH withthe new library location.
Also, if you must disable tests, use '#:tests? #f' instead of deletingthe check phase.
Toggle quote (8 lines)> @@ -1099,7 +1086,8 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))> `(("mesa" ,mesa)> ("qtbase" ,qtbase)> ("qtdeclarative" ,qtdeclarative)> - ("qtwebsockets" ,qtwebsockets)))> + ("qtwebsockets" ,qtwebsockets)> + ("zlib" ,zlib)))
Add to commit message ^
Toggle quote (9 lines)> @@ -1515,6 +1503,10 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")))> (substitute* "tests/auto/qml/qml.pro"> (("integration") "# integration")> (("usertypes") "# usertypes"))> + ;; disable failing tests> + (substitute* "tests/auto/auto.pro"> + (("integration_multiprocess proxy_multiprocess integration_external restart")> + "integration_multiprocess"))
Indentation is off here. It would be good to comment on why they arefailing. Perhaps just some /bin/sh invokation need patching?
Again, thank you very much for this. You mentioned some KDE packagesfailed with this new Qt, could you try updating them too? It should bea lot easier thanks to the KDE updater: try e.g. './pre-inst-env guixrefresh -t kde -u'. :-)
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6iFWoACgkQoqBt8qM6VPpjXQf/YOAhdZzftrvalGoTos+BrhClMBo5oiY6o9rP4ldTi3q1lvvMl+7tELHlvH81I8dMJv9dNHbQvizoiUb3jLpUL0cu7lXaySRKJrOMKzsrby9FV1A6jXwHGjZqWzA7fc6U/g9qOKgjJoKCKXYnNUWglQf8rEjp0+9ro6GV8M8ogfZLihoMIzs1BjLWe9DdlDuVnXeN0+10ZrovjBl8SmVoPhiIsg79KoLKG1Xafjfa8IfPit33yfQ4Oj2ECjzb5fmNaFuu+MxwEKnjrCDZfL8byTKtF/yeBQYrU4hMzp0ukY4pIJ+6QD0KyJ5FPlYnUtuT/wnT119CoSSFXpa0kk10Yw===8vVL-----END PGP SIGNATURE-----
T
2691858.b7GtGmxQoC@peach
On Friday, 24 April 2020 00:23:38 CEST Marius Bakke wrote:
Toggle quote (20 lines)> > @@ -570,14 +568,6 @@ developers using C++ or QML, a CSS & JavaScript like> > language.") "src/network/kernel/qhostinfo_unix.cpp")> > (("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\)\\);)" _ a b)> > (string-append a glibc "/lib/lib" b))))> > - ;; X11/locale (compose path)> > - (substitute*> > "src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp"> > - ;; Don't search in /usr/…/X11/locale, …> > - > > (("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/usr/.*/X11/local> > e\"\\)\\);" line) - (string-append "// " line))> > - ;; … but use libx11's path> > - > > (("^\\s*(m_possibleLocations.append\\(QStringLiteral\\()X11_PREFIX> > \"(/.*/X11/locale\"\\)\\);)" _ a b) - (string-append a> > "\"" (assoc-ref inputs "libx11") b)))
> What happened here? Did the Qt build system get smart enough to embed> the libx11 file name by itself?
What happened is that the 'generator' directory is no longer there. I don't see any equivalent to what is being substituted. Hence the patch was removed.
I am not sure what the original was trying to accomplish, the current code doesn't seem to do anything with the libx11 file you talk about.
Any way to test if the functionality is what you expect after removal?
T
todays patch
(address . 40791@debbugs.gnu.org)
1819894.BzRgMNaeKi@peach
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 ;)
From 180da08e2b2d17cafab4b92b1074867516a2d6eb Mon Sep 17 00:00:00 2001From: TomZ <tomz@freedommail.ch>Date: Thu, 23 Apr 2020 00:21:31 +0200Subject: [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--- gnu/packages/patches/qtbase-use-TZDIR.patch | 4 +- gnu/packages/qt.scm | 222 ++++++++------------ 2 files changed, 92 insertions(+), 134 deletions(-)
Toggle diff (779 lines)diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patchindex 11c737d844..b6c377b133 100644--- 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. Based on a patch fron NixOS. ===================================================================---- qtbase-opensource-src-5.9.4.orig/src/corelib/tools/qtimezoneprivate_tz.cpp-+++ qtbase-opensource-src-5.9.4/src/corelib/tools/qtimezoneprivate_tz.cpp+--- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp++++ 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 need to read directories static QTzTimeZoneHash loadTzTimeZones()diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scmindex 8a57127771..aa121fbb5f 100644--- a/gnu/packages/qt.scm+++ b/gnu/packages/qt.scm@@ -351,7 +351,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtbase (package (name "qtbase")- (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 language.") version ".tar.xz")) (sha256 (base32- "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di"))- ;; Use TZDIR to avoid depending on package "tzdata".+ "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8")) (patches (search-patches "qtbase-use-TZDIR.patch"- "qtbase-moc-ignore-gcc-macro.patch"- "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 language.") "src/network/kernel/qhostinfo_unix.cpp") (("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\)\\);)" _ a b) (string-append a glibc "/lib/lib" b))))- ;; X11/locale (compose path)- (substitute* "src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp"- ;; Don't search in /usr/…/X11/locale, …- (("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/usr/.*/X11/locale\"\\)\\);" line)- (string-append "// " line))- ;; … but use libx11's path- (("^\\s*(m_possibleLocations.append\\(QStringLiteral\\()X11_PREFIX \"(/.*/X11/locale\"\\)\\);)" _ a b)- (string-append a "\"" (assoc-ref inputs "libx11") b))) ;; libGL (substitute* "src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp" (("^\\s*(QLibrary lib\\(QLatin1String\\(\")(GL\"\\)\\);)" _ a b)@@ -617,7 +607,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg")- (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 language.") version ".tar.xz")) (sha256 (base32- "1f3vqv3s83gjillhgi0wghyf3825fgy1ffhvkxhdk673shb0kxjb"))))+ "18dmfc8s428fzbk7k5vl3212b25455ayrz7s716nwyiy3ahgmmy7")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs@@ -692,7 +682,7 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats")- (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=lib/qt5 version ".tar.xz")) (sha256 (base32- "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")- (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- "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")- (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- "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")- (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- "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)- ("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")- (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- "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")- (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- "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")- (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- "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")- (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- "07fvnjywn3hkrxfbxasmy83jr6jq9lf1grasfwij54hz6y0smg98"))+ "1sczzcvk3c5gczz53yvp8ma6gp8aixk5pcq7wh344c9md3g8xkbs")) (modules '((guix build utils))) (snippet '(begin@@ -945,7 +936,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland")- (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 GStreamer."))) version ".tar.xz")) (sha256 (base32- "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 GStreamer."))) (delete-file-recursively "examples") #t)))) (arguments- (substitute-keyword-arguments (package-arguments qtsvg)- ((#:phases phases)- `(modify-phases ,phases- (add-before 'check 'set-ld-library-path- ;; <https://lists.gnu.org/archive/html/guix-devel/2017-09/msg00019.html>- ;;- ;; Make the uninstalled libQt5WaylandClient.so.5 available to the- ;; wayland platform plugin.- (lambda _- (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/lib"))- #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/msg00019.html+ ((#:tests? _ #f) #f))) (native-inputs `(("glib" ,glib) ("perl" ,perl)@@ -997,7 +981,7 @@ compositor libraries."))) (define-public qtserialport (package (inherit qtsvg) (name "qtserialport")- (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- "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")- (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- "1bkyk1v7bcq657n88a6675lj55vl9y8v46h4kf27v58yjzgiw842"))))+ "14bahg82jciciqkl74q9hvf3a8kp3pk5v731vp2416k4b8bn4xqb")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport)))@@ -1052,7 +1036,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel")- (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- "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")- (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- "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)- ("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 elements"))) (define-public qtwebview (package (inherit qtsvg) (name "qtwebview")- (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 elements"))) version ".tar.xz")) (sha256 (base32- "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")- (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- "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")- (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- "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")- (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- "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")- (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- "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")- (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- "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")- (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- "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")- (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- "150y7bc755l9y8w7nkg3gfw5n6rlj9hhq0ibc9g1xgllpr18qqq7"))))+ "00wd3h465waxdghg2vdhs5pkj0xikwjn88l12477dksm8zdslzgp")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config)))@@ -1322,7 +1307,7 @@ and mobile applications targeting TV-like form factors."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml")- (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 factors."))) version ".tar.xz")) (sha256 (base32- "1dpvjkvwc3fj86vay8q8vzym73cix7ri2ianx87ck0gqjny51adg"))+ "141pfschv6zmcvvn3pi7f5vb4nf96zpngy80f9bly1sn58syl303")) (modules '((guix build utils))) (snippet '(begin@@ -1353,7 +1338,7 @@ also contains functionality to support data models and executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing")- (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 and executable content."))) version ".tar.xz")) (sha256 (base32- "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."))) -(define-public qtcanvas3d- (package (inherit qtsvg)- (name "qtcanvas3d")- (version "5.12.7")- (source (origin- (method url-fetch)- (uri (string-append "https://download.qt.io/official_releases/qt/"- (version-major+minor version) "/" version- "/submodules/" name "-everywhere-src-"- version ".tar.xz"))- (sha256- (base32- "0l0c1p6jwz5rygyxslfw7jw3wbd23w5n9zg04aqlh5g15qx52fmn"))- (modules '((guix build utils)))- (snippet- '(begin- (delete-file-recursively "examples/canvas3d/3rdparty")- #t))))- (arguments- (substitute-keyword-arguments (package-arguments qtsvg)- ;; Building the tests depends on the bundled 3rd party javascript files,- ;; and the test phase fails to import QtCanvas3D, causing the phase to- ;; fail, so we skip building them for now.- ((#:phases phases)- `(modify-phases ,phases- (replace 'configure- (lambda* (#:key outputs #:allow-other-keys)- (let ((out (assoc-ref outputs "out")))- (invoke "qmake" "QT_BUILD_PARTS = libs tools"- (string-append "PREFIX=" out)))))))- ((#:tests? _ #f) #f))) ; TODO: Enable the tests- (native-inputs `())- (inputs- `(("qtbase" ,qtbase)- ("qtdeclarative" ,qtdeclarative)))- (synopsis "Qt Canvas 3D module")- (description "The Qt Canvas 3D module provides a way to make WebGL-like 3D-drawing calls from Qt Quick JavaScript.")))- (define-public qtcharts (package (inherit qtsvg) (name "qtcharts")- (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- "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")- (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- "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")- (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- "0sspni7zllhspk70yjj2d0li9r4rs3iflnksj8mvjx2yl9qpryyb"))))+ "0pi6p7bq54kzij2p69cgib7n55k69jsq0yqq09yli645s4ym202g")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases)@@ -1495,7 +1441,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects")- (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 methods for Qt."))) version ".tar.xz")) (sha256 (base32- "03qjj7l63wn1zqkmlja9yrnc38rf6b3apnmsn0kw0h61x72awskd"))))+ "1mhlws5w0igf5hw0l90p6dz6k7w16dqfbnk2li0zxdmayk2039m6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases)@@ -1515,6 +1461,10 @@ implementation of OAuth and OAuth2 authenticathon methods 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 integration_external restart")+ "integration_multiprocess")) #t)))))) (inputs `(("qtbase" ,qtbase)@@ -1528,7 +1478,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech")- (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- "0q30m9l28zsdzdmny7wjskd2fjfrgh1l595wir6bhwhil95g3i0c"))))+ "1nn6kspbp8hfkz1jhzc1qx1m9z7r1bgkdqgi9n4vl1q25yk8x7jy")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg)@@ -1572,7 +1522,7 @@ message."))) version ".tar.xz")) (sha256 (base32- "1yj6pcj945fpbc7nihav0plxpx8ikylmxjy7wqdv5znslgf59dw3"))+ "0iy9lsl6zxlkca6x2p1506hbj3wmhnaipg23z027wfccbnkxcsg1")) (modules '((ice-9 ftw) (ice-9 match) (srfi srfi-1)@@ -1581,7 +1531,8 @@ message."))) (snippet '(begin (let ((preserved-third-party-files- '("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"- "net/third_party/http2" "net/third_party/mozilla_security_manager" "net/third_party/nss"- "net/third_party/spdy"- "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_party/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"- "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"- "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)))))- ;; Do not enable support for loading the Widevine DRM plugin.- (substitute* "src/core/config/common.pri"+ (substitute* "src/buildtools/config/common.pri" (("enable_widevine=true") "enable_widevine=false")) #t)))))-- 2.26.2
T
Append: KDE upgrade
(address . 40791@debbugs.gnu.org)
2279991.lqa9Gxa31U@peach
I ran the script and fixed several build failures.
Notable failure is kwayland in cmake configure step.I have no idea why.
Would like some assist there.
CMake Error at /gnu/store/j8kh897ak4xn376zcdxdsmjb20c6didx-qtbase-5.14.2/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): Could not find a package configuration file provided by "Qt5WaylandClient"
From 104d648886a9c323eab11f61a916991147864a07 Mon Sep 17 00:00:00 2001From: TomZ <tomz@freedommail.ch>Date: Fri, 24 Apr 2020 22:50:33 +0200Subject: [PATCH] gnu: KDE: update to latest
Fix sonnet.
* gnu/packages/kde-frameworks.scm (sonnet): disable running test that depends on installed languages* gnu/packages/kde-frameworks.scm (kdeinit): fix patch--- gnu/packages/kde-frameworks.scm | 333 +++++++++--------- gnu/packages/kde-plasma.scm | 12 +- gnu/packages/kde.scm | 36 +- .../patches/kinit-kdeinit-extra_libs.patch | 10 +- 4 files changed, 200 insertions(+), 191 deletions(-)
Toggle diff (1714 lines)diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scmindex 0c31709329..c904e6ffb6 100644--- a/gnu/packages/kde-frameworks.scm+++ b/gnu/packages/kde-frameworks.scm@@ -80,7 +80,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -89,7 +89,7 @@ name "-" version ".tar.xz")) (sha256 (base32- "14h7519bfkwzh58lxgxrj5jlfhfnrakhjcm6lmhafnkg5h56m4kr"))))+ "0nc3i150q8zhn1bqkgxw539f21mzhwnxlnx3krh6qnv0x05qxk6s")))) (build-system cmake-build-system) (native-inputs `(("qtbase" ,qtbase))) ; For tests (needs qmake)@@ -224,7 +224,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") (define-public attica (package (name "attica")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -233,7 +233,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32- "0dvsjwl2c3liiicv2m8p1m7hlc3fcapsj5pfirmdm1l38wcayr60"))))+ "0fwxc7krvm40c1zw9s76q27cic7cs0w7dpc2n8j7b64r886775ig")))) (build-system cmake-build-system) (arguments `(#:phases@@ -264,7 +264,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (define-public bluez-qt (package (name "bluez-qt")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -273,7 +273,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32- "179am9czhb9mcirmja5bxjmqil3qg81v56n8rmkkp5q50qpln4dh"))))+ "0k0xp31ni9a6l2l1sjdhib2s3llwdsaj5qfhibkaf2dbck9l7410")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus)@@ -297,7 +297,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -306,7 +306,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") name "-" version ".tar.xz")) (sha256 (base32- "17kil9dlh8w5r29arrjbv47b7jxz45kqzpg06zw3vz70bdgbb995"))))+ "1xw2pzlqz4cx0n6jsdx7nj9iwydy2ykarlqc67cpbb7ajndqr3fk")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -326,7 +326,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -335,7 +335,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") name "-" version ".tar.xz")) (sha256 (base32- "0cwprhpz731bqqhr6vra6lc76k5i4pm3m9j0q21km9wm2djfmk19"))))+ "1dy7x6pms0bq1c2044zjydhbfnab2m9q7f6arzavs836ag9q0n31")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; has no test target@@ -368,7 +368,7 @@ documentation.") (define-public karchive (package (name "karchive")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -377,7 +377,7 @@ documentation.") name "-" version ".tar.xz")) (sha256 (base32- "0ypykybxl9dz57rgsfihx4rfhzhphidypb2f5nwrw1f6vlqkawzs"))))+ "0fd0i89w2lvpnivkng3bfcz25ddb57dpdr0jypdrm43jvgm5b58s")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -402,7 +402,7 @@ GZip format, via a subclass of QIODevice.") (define-public kcalendarcore (package (name "kcalendarcore")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -411,7 +411,7 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32- "1cqqwpd6faz7sd6jrda564xxvwr231b175h2w3ilxx6hvz9yrps3"))))+ "1111rji0c3y8ca6bwyn4hiwh801bdnkaz3lh3gvl6s3nqh4lix2f")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -463,7 +463,7 @@ and the older vCalendar.") (define-public kcodecs (package (name "kcodecs")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -472,7 +472,7 @@ and the older vCalendar.") name "-" version ".tar.xz")) (sha256 (base32- "0w5q37lqdzyl84723kg9sh9xxn2g2wv0xfxpy3218hmc9364s89h"))))+ "0k9k7jdjdv3dh8b6r2gqcdr370qy2cwlhmdbhjwry56pkqvr1fap")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -499,7 +499,7 @@ Internet).") (define-public kconfig (package (name "kconfig")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -508,7 +508,7 @@ Internet).") name "-" version ".tar.xz")) (sha256 (base32- "1ya0fvrrfiw4a5wkydcjpnkkyq3ampxy5h210dm04qim6a9x8rb1"))))+ "0a0y2gh2snpmijg8pzq2df3pbv0d0vyc5xgjpqnab7yl1ypkiz8q")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus)@@ -564,7 +564,7 @@ propagate their changes to their respective configuration files.") (define-public kcoreaddons (package (name "kcoreaddons")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -573,7 +573,7 @@ propagate their changes to their respective configuration files.") name "-" version ".tar.xz")) (sha256 (base32- "1w658wfksxglr0fjpa2p8gmjbvpd2knzhk3byk2s9dwil7i7cvjd"))))+ "0mj8wzjfkb2y6y6wxlpv2ifzx2pbx3mvdyr108nkiqyjbp4kpk79")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -621,7 +621,7 @@ many more.") (define-public kdbusaddons (package (name "kdbusaddons")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -630,7 +630,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32- "11zwr89v0k4m1235rzr39z4cbfdwn5zg34abs62nfnr8vmba62qv"))+ "04a6bqxw57m8zdg923nwid3y1cv3pcvbdhqsh0pk89y67zwph3n8")) (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs@@ -666,7 +666,7 @@ as well as an API to create KDED modules.") (define-public kdnssd (package (name "kdnssd")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -675,7 +675,7 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32- "1bn9c6ii1n6ns478i3lp7yzga7dbcqvdb43rfzmz7gndnmh853gm"))))+ "09cs62kjg65kg527gvax905vkhxi5rzxjimh3ab4jmw85hn2gcnp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -694,7 +694,7 @@ infrastructure.") (define-public kguiaddons (package (name "kguiaddons")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -703,7 +703,7 @@ infrastructure.") name "-" version ".tar.xz")) (sha256 (base32- "0k22kargqxf0j09wzk1x90b526npj8a0210ilk0n1k6spc8xa6mr"))))+ "1h6g326c53y5zck6p2k8vbpj8ismzwsdahq8sg6q924dh1vk467z")))) (build-system qt-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python,@@ -724,7 +724,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (define-public kholidays (package (name "kholidays")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -732,7 +732,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256- (base32 "1035kh0na4hwp4pnsi8p1nd7r114d4bgdnjr0g2hwmy868vx0a67"))))+ (base32 "0n03y06q6b5wasa9hga45mac81pwanhjk38hh9lrxidnv8k5q6lz")))) (build-system cmake-build-system) (arguments `(#:phases@@ -759,7 +759,7 @@ other special events for a geographical region.") (define-public ki18n (package (name "ki18n")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -768,7 +768,7 @@ other special events for a geographical region.") name "-" version ".tar.xz")) (sha256 (base32- "1fdp0bdvqbqzbxynbg3bcdridr8j3qnm9spyrrdg5q95sz99a4s9"))))+ "0p7a9j2hrphazfy2pi0njbj521h9lkriis9ng191s4df8y4ifx3r")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gettext-minimal)@@ -802,7 +802,7 @@ translation scripting.") (define-public kidletime (package (name "kidletime")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -811,7 +811,7 @@ translation scripting.") name "-" version ".tar.xz")) (sha256 (base32- "0zd51lsz23rqwk4lnzs5653sanprgr80p33yk8gmgsihgyfbjv0r"))))+ "1i0mx0xhjk17j7rbxyhz3svv2j645ccfk1g1fqc468n0b76cb3y7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -833,7 +833,7 @@ or user activity.") ;; plasma-framework which is tier 3. (package (name "kirigami")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -842,7 +842,7 @@ or user activity.") "kirigami2-" version ".tar.xz")) (sha256 (base32- "1v76d1xgmi9kkxiwq4y6rzaxs1hwwm95pw490m09rgqhli7180yv"))))+ "0hqlrm3wh11p4kc7ks4n1rd5y3xmvnxa2pfbgdngzicmyvc45xwc")))) (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs@@ -869,7 +869,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (define-public kitemmodels (package (name "kitemmodels")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -878,7 +878,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32- "10bhg0db9gdg2hlc02ngg1i2q7a99862d5973hxqzf620d28p5rd"))))+ "1jwxj15wkwsq23wx8ymjg52bg05l6jsvn43wn1mmvwm2cx9clyx6")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -920,7 +920,7 @@ model to observers (define-public kitemviews (package (name "kitemviews")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -929,7 +929,7 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32- "15h0w16wgj94kxz4vgjb34i3pyx5w1f2npj86j4d2sa0mxxpmqyz"))))+ "0iv91wniygic5axqbll4n9791839d0za5nmbk5hvqspxrmy6j5wy")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -946,7 +946,7 @@ to flat and hierarchical lists.") (define-public kplotting (package (name "kplotting")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -955,7 +955,7 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32- "11kpq34j37c1gsvj5nxhkc31bw8gw2n7nkqsfx87jw9f4v2vhmr9"))))+ "1d91hr1wmvyccis2g4wa416lxwf6s4s7d0g7gls7bq7sf512237v")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -974,7 +974,7 @@ pixel units.") (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -983,7 +983,7 @@ pixel units.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32- "08y0m4wcq1sbxvlga3w72waj5xckh5jra5x7rvnp87dl38qxhacs"))))+ "1y86sw3ishkxlp2wi1s933mk4ld7i6lqvwbrcixm6nha4ipbdxiw")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1023,7 +1023,7 @@ integration with a custom editor as well as a ready-to-use (define-public kwayland (package (name "kwayland")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1032,7 +1032,7 @@ integration with a custom editor as well as a ready-to-use name "-" version ".tar.xz")) (sha256 (base32- "03z8hiw0mrhl3f0y7ypc46ic0w5vlp56prbqbk448jin5hakkkdg"))))+ "11ac13zn55g7psz5rcp856s8y8s82v1dvg49cxnmzvl3iygmjzcp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1063,7 +1063,7 @@ represented by a QPoint or a QSize.") (define-public kwidgetsaddons (package (name "kwidgetsaddons")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1072,7 +1072,7 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32- "1nzgv3v3kyq5jm2b9xri6qjawspr9ycxhskfvj8kkgr46dr35qyc"))))+ "0dxg9v51f07giv7kpihkh34aa2ihdbr8zs9gii7a2cnq2zmkkk2z")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1104,7 +1104,7 @@ configuration pages, message boxes, and password requests.") (define-public kwindowsystem (package (name "kwindowsystem")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1113,7 +1113,7 @@ configuration pages, message boxes, and password requests.") name "-" version ".tar.xz")) (sha256 (base32- "0nbkb8pkrbbp1s892ndzhakzri3qxpw48kibgb0rqz6i0azfxrz8"))))+ "1w6gg522g4x476vywc5k97iaxgnnhxgcafaagmahycgp8cwdfpnq")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1167,7 +1167,7 @@ lower level classes for interaction with the X Windowing System.") (define-public modemmanager-qt (package (name "modemmanager-qt")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1176,7 +1176,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32- "0yv5q71cyyy04051ny5lr7n35pw391gxr6l324n6c0z7kgc560ad"))))+ "0mcdgvp6snaha7i66x6r2a2yvpy0ms7npg362khdi6fcsp5jn7sd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1205,7 +1205,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1214,7 +1214,7 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32- "0ydfz6ikya1h8gg9c716y8lmy45iqnx0gaghkm0vz3c3ckx99l9g"))))+ "1w2r4y58c2a2g0fqivdfc1w9fm6wfx3yhnibp4dj6cbrv66nx0wy")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1244,7 +1244,7 @@ which are used in DBus communication.") (define-public oxygen-icons (package (name "oxygen-icons")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1253,7 +1253,7 @@ which are used in DBus communication.") name "5" "-" version ".tar.xz")) (sha256 (base32- "0rh9bysiisnpz3c92hyba98f58dlmwf9zhbbb4vmab0qvm5d3q9g"))))+ "1vi7pw55mfj1ykw872a89khm8z8afijx8g2y89hrsmx9wbkiagjy")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1269,7 +1269,7 @@ which are used in DBus communication.") (define-public prison (package (name "prison")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch)@@ -1277,7 +1277,7 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256- (base32 "0spkm5j2qmwl374xrbm054rjv4rcqwsz0wl5v2nyrfq2ma4bzzw5"))))+ (base32 "0zl1h8r9gfgx8lm8r4sj8gqbbqj62kjjq30n4h116f959zl93l3r")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -1294,7 +1294,7 @@ provides uniform access to generation of barcodes with data.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1303,7 +1303,7 @@ provides uniform access to generation of barcodes with data.") name "-" version ".tar.xz")) (sha256 (base32- "1sz2735fn5665pyb5v70y2fmw2mkziq83di4h06pwday9vf2r6l5"))))+ "1f9yyry7g6ywf72jnipv8r6d2hl0l5w38mzvwrndk0jbxiwfsw5y")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1328,7 +1328,7 @@ feel.") (define-public solid (package (name "solid")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1337,7 +1337,7 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32- "0i124kyhd1hfnajp0hnqma35ycr3bh60z39gc6byhxb75p59swnl"))))+ "1c4p0rx9cpp4wfms74xgk0y06l92wvzaqcgswah4100avjvkq0qa")))) (build-system cmake-build-system) (arguments `(#:phases@@ -1367,7 +1367,7 @@ system.") (define-public sonnet (package (name "sonnet")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1376,8 +1376,17 @@ system.") name "-" version ".tar.xz")) (sha256 (base32- "0gqxmyxmwn2rs9f8x2z8pfmbx0mvkyh7nalnsmfqkph8f0fja9ig"))))+ "0pixni11aclp55vxc13fpxamwih5bzycgva3iva4rwz5d06xnlv3")))) (build-system qt-build-system)+ (arguments+ `(#:phases+ (modify-phases %standard-phases+ (add-after 'unpack 'delete-broken-tests+ ;; test_autodetect assumes installed dicts+ (lambda _+ (substitute* "autotests/CMakeLists.txt"+ (("test_autodetect") ""))+ #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config)@@ -1396,7 +1405,7 @@ ASpell and HUNSPELL.") (define-public threadweaver (package (name "threadweaver")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1405,7 +1414,7 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32- "0z2906nmamvcg85jip98wq834rjs3nc1qlv3q182gw1cnh4nbdag"))))+ "19rbi89ya0b43y1xsihbic1xdq6znbxcm3rksjrapxwgnk6amclx")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -1426,7 +1435,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (define-public kactivities (package (name "kactivities")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1435,7 +1444,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." name "-" version ".tar.xz")) (sha256 (base32- "03h5r7z2a449hfvaj3zk1n7dhpj49liy5q60fb4nxz4yjkgca27s"))))+ "1fhwd7pi330h4afflf0ch575q2lpwcnkq3jy1jyrpf7vz6hqkipz")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -1471,7 +1480,7 @@ with other frameworks.") (define-public kauth (package (name "kauth")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1480,7 +1489,7 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32- "08gkgmxaxqpavsqdmcgs4i8j63pg5qld7agd58irpw29pgq1fj9c"))))+ "1hhyvwz3xmjjd638bqpjxsrcl30rhsbq2kc2mnyqnr5c6brgikr0")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus)@@ -1518,7 +1527,7 @@ utilities.") (define-public kcompletion (package (name "kcompletion")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1527,7 +1536,7 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32- "10ggypg09acc19gkvxsigfsaq8s5vqv64ada307blpzy8j74bisb"))))+ "050f7k29d3kihs0gwq225bkq0klqrwwllxkhk6iahb15dn90l1q2")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1546,7 +1555,7 @@ integrated it into your application's other widgets.") (define-public kcontacts (package (name "kcontacts")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1555,7 +1564,7 @@ integrated it into your application's other widgets.") name "-" version ".tar.xz")) (sha256 (base32- "0xs5c5l4vck5i6879jax1nf93if02f9hyfkn60l36cxbphnbpw0h"))))+ "1j53fm6dkhxjsbwik384qzalgg964kmh8vrwgbi5zikfnryrzxgw")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1590,7 +1599,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. (define-public kcrash (package (name "kcrash")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1599,7 +1608,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. name "-" version ".tar.xz")) (sha256 (base32- "1xl3bzxfchfafcplil3g07gq1a3fnwx1i40bxp4jfsgb8d8slfwc"))))+ "0h6a1klqjk5x87zmkrr75hv7w6mcqxl1lnln2hfb7kd48wg6gg5n")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -1617,7 +1626,7 @@ application crashes.") (define-public kdoctools (package (name "kdoctools")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1626,7 +1635,7 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32- "1zna9szii2r9agwfqbglk904zzpr3fyrz6x5v2rxrm3c9m110sm4"))))+ "08nmq212icanyg3dk9ky3wl7ykn57h2xgxm5w58zqxxxqqw7yfhp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -1674,7 +1683,7 @@ from DocBook files.") (define-public kfilemetadata (package (name "kfilemetadata")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1683,7 +1692,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32- "11wvddb7nqdyi5rin3xa0p32lmvc62yw47hwcdzc01lkfbxdn050"))))+ "1k80qjazhaw7py0qbsahx0ls420cqh5dza30rxc0ds14nb0cl94v")))) (build-system cmake-build-system) (arguments `(#:phases@@ -1728,7 +1737,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1737,7 +1746,7 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32- "15y339by7jvsbmfqb33s3ain7sfhx3789xy2xjpkh5f2f9v29r2b"))))+ "0s3p1a1b79xcfnyhzs3h82fs1mwg9rdql2brp6ai0vzany0dc10n")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1782,7 +1791,7 @@ formats.") (define-public kjobwidgets (package (name "kjobwidgets")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1791,7 +1800,7 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32- "0pg055ampm69yr1vn03s1ys3p18raj8f5pcg0hg9hb4sjkyrr3pn"))))+ "0ckg5n3gq0gll6mc25r9hxlb9dlsd3v9098rxgndgg7nz4vbc23d")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1810,7 +1819,7 @@ asynchronous jobs.") (define-public knotifications (package (name "knotifications")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1819,7 +1828,7 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32- "1rknfn50kq6ng7gclgg0n4qyhv2grc7xcf3gcax3bbyy46gajsl8"))))+ "05cy4a6s8z4x2z212jdnz2gxc9bb3933k3s9j7c74gqjd4wnfjfl")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -1856,7 +1865,7 @@ covers feedback and persistent events.") (define-public kpackage (package (name "kpackage")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1865,7 +1874,7 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32- "1h57kicsjkisysd2mmd5q9q5m421xqcv3p8vkjlqxkph5sa7y2q5"))+ "06vf8shcvphqpvr6dlx5qd2xmhgjwv1lpfc4jnbcyzb1b7hw8h6p")) ;; Default to: external paths/symlinks can be followed by a ;; package (patches (search-patches "kpackage-allow-external-paths.patch"))))@@ -1917,7 +1926,7 @@ were traditional plugins.") (define-public kpty (package (name "kpty")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1926,7 +1935,7 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32- "10v61016kd1q41n4dwac1nsiixji64i5y501nx0hphpjkjbaklkr"))))+ "0ws35mjksj28kj2l368apfhfwwjsc8qjr0p70dj7fpch50m5xs5j")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -1954,7 +1963,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -1963,7 +1972,7 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32- "0yzq2jxja9wnhz91cyli2mnw32xynnzbf1lr0hk6vi8a1w2mkrzz"))))+ "1zszw65lcjpadvksy384c6vs65xv4pcwfqddjdgfmq33h0r5vbph")))) (build-system cmake-build-system) (arguments `(#:phases@@ -1991,7 +2000,7 @@ gallons).") (define-public syndication (package (name "syndication")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2000,7 +2009,7 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32- "1d0k6x11giylfkr183sm307n4v6rjpwkqp7y9wfhimjrcprwf2g6"))))+ "0blp087q2z8fas3jbbzalaym21sfmw54qig1dshggzwyfk3znf7b")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -2024,7 +2033,7 @@ between feed formats.") (define-public baloo (package (name "baloo")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2033,7 +2042,7 @@ between feed formats.") name "-" version ".tar.xz")) (sha256 (base32- "1qhqv19glg98146cyc7ykq02b5b9m936xcml1w1p8fx32cp2zbch"))))+ "0ny8h3m9i5rgl09svzpvcv05salp40zrkrc26f8vd74jvvm6z6aa")))) (build-system cmake-build-system) (propagated-inputs `(("kcoreaddons" ,kcoreaddons)@@ -2094,7 +2103,7 @@ maintaining an index of the contents of your files.") (define-public kactivities-stats (package (name "kactivities-stats")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2103,7 +2112,7 @@ maintaining an index of the contents of your files.") name "-" version ".tar.xz")) (sha256 (base32- "187fyl92pnkn317pi1pkmf7bv5z6aqdhqa6b8531xgl06gyigy45"))))+ "0xbskam1xmqjdpn9qc0cchzzaap72q3lydx0xlrxxw3kfki1iahb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -2124,7 +2133,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2133,7 +2142,7 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32- "011r2ms57ycz5kma0q35cji4isj0lskrxrambk11jibs1xjdis2v"))))+ "192fcaqkk6m40671jfzg2sf98s5pybimz1vjrh3s6gyydhic7n4v")))) (build-system cmake-build-system) (propagated-inputs `(("kwidgetsaddons" ,kwidgetsaddons)))@@ -2167,7 +2176,7 @@ using the XBEL format.") (define-public kcmutils (package (name "kcmutils")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2176,7 +2185,7 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32- "1q12n9sfgrm2f8bspsl5i9gbv4jwl25w5id9m9rnnr87hck35g68"))))+ "0z8qb44zmpkw8cc5baa0j1ydx74by1qjs94dj5k5wayhcdcna4q2")))) (build-system cmake-build-system) (propagated-inputs `(("kconfigwidgets" ,kconfigwidgets)@@ -2220,7 +2229,7 @@ KCModules can be created with the KConfigWidgets framework.") (define-public kconfigwidgets (package (name "kconfigwidgets")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2229,7 +2238,7 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32- "098xdfvnyz9bdkc6iyq5r2s4vkfdhbrri4015yzbs73j4f2wcxz5"))))+ "0wvlqcwa34i5llvpgzhlycpiv8hiwwlx71gnfai82zsw5b7r7kvg")))) (build-system qt-build-system) (propagated-inputs `(("kauth" ,kauth)@@ -2267,7 +2276,7 @@ their settings.") (define-public kdeclarative (package (name "kdeclarative")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2276,7 +2285,7 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32- "027wnrmr79fxkf4jpdpfhp7smdai2wn9y71l1h4kgqgwfq8anwy8"))))+ "0f3gzw8x7nwmgal7iwcycridyzx6sxv3bxlv04cw7pgrc2k1hrli")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig)@@ -2330,7 +2339,7 @@ that offer bindings to some of the Frameworks.") (define-public kded (package (name "kded")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2339,7 +2348,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32- "0kjr6ff1g6xyas5si9b7zilcqcx4mgfkzfpq2c59fz1wd8q8fl05"))))+ "0dixyqgj15gmk967mjf0bzhiv7wcpbmzxrjc5qzs6fh6b1dncshs")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -2363,7 +2372,7 @@ started on demand.") (define-public kdesignerplugin (package (name "kdesignerplugin")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2372,7 +2381,7 @@ started on demand.") name "-" version ".tar.xz")) (sha256 (base32- "1w7glszd82iyw6kxzmp0568rm3qfadi7vw7gfxg4c15w5ikkvxn9"))))+ "1z9d1zxbkddah6mz6r5lwlackp9yq6kr8n3h5i115afrgijb9xbs")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -2406,7 +2415,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2415,7 +2424,7 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32- "038m0sdpnsy50m3g78sfg7wk26933rh3578qsnapw2cyimx8ypxx"))))+ "119iwp6hvzyh1d1kgghb1y1164srw6nvl5z8nkivs190yxzjb3av")))) (build-system cmake-build-system) (propagated-inputs `(("kpty" ,kpty)))@@ -2437,7 +2446,7 @@ with su and ssh respectively.") (define-public kdewebkit (package (name "kdewebkit")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2446,7 +2455,7 @@ with su and ssh respectively.") name "-" version ".tar.xz")) (sha256 (base32- "1s3bmn1ck7xvc7a6gv7ywv9161hdahiiw20aq88s4qkm2s5wyy6v"))))+ "1lhk24jqcb0q6zhihjabz5fga74nnqg35p5qim7dmjcq4c6dh8hr")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -2470,7 +2479,7 @@ engine WebKit via QtWebKit.") (define-public kemoticons (package (name "kemoticons")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2479,7 +2488,7 @@ engine WebKit via QtWebKit.") name "-" version ".tar.xz")) (sha256 (base32- "0li1lz5kqlczvgq6b2x3nkr0hl96a337ab83fq9wxp5sx440d6sd"))))+ "18ndbrgda5zl6iwximp2n4mky4cm8bfhydbw2hl7isq3aaa5mdcd")))) (build-system cmake-build-system) (propagated-inputs `(("kservice" ,kservice)))@@ -2510,7 +2519,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2519,7 +2528,7 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32- "1xpfvwnrj81mk3di02n37b469gxzmnk89icmcz6wwyk54m86fw76"))))+ "1rq6px65v0sxi1bda940jnz07dk2xj794k0rb810g86wvywbgamx")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -2546,7 +2555,7 @@ window does not need focus for them to be activated.") (define-public kiconthemes (package (name "kiconthemes")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2555,7 +2564,7 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32- "18p4np4chykpy2ck8c76999nh8gdj75hjfakg1pakdqhlash9q6w"))))+ "0cp52ipzh99g9i4sc89s9gd6jr3xg102m9cpncymyhqkkyvn3scw")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -2594,7 +2603,7 @@ in applications using the KDE Frameworks.") (define-public kinit (package (name "kinit")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2603,7 +2612,7 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32- "06p0i9674nzam0f4ac2jrl9pgkycz0lc0kdn24ds2rlh85cqvjwx"))+ "0mnyqypjbpd61iaz631gfin10154rip332vxm52r4z9rrp03vih7")) ;; Use the store paths for other packages and dynamically loaded ;; libs (patches (search-patches "kinit-kdeinit-extra_libs.patch"@@ -2663,7 +2672,7 @@ consumption.") (define-public kio (package (name "kio")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2672,7 +2681,7 @@ consumption.") name "-" version ".tar.xz")) (sha256 (base32- "048gq6j8di6nzsacpr8j40kw6y5607zgwqr21ahcnnb0gd2sly4l"))+ "1rhdlbz68prd7s8fjhg16bvx5f85qq8b19kfaf9mjnxvb1qd7r09")) (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs@@ -2757,7 +2766,7 @@ KIO enabled infrastructure.") (define-public knewstuff (package (name "knewstuff")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2766,7 +2775,7 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32- "0pkm7qapkd9xypmhsjfwlgq0l4nfgya5b23lv3zkci8lrbssaqsv"))))+ "1xcwv36ymgl4yfrnppmw5ab4nbg7hnfcxgz5kkjkmzmvps52z1i1")))) (build-system cmake-build-system) (propagated-inputs `(("attica" ,attica)@@ -2813,7 +2822,7 @@ specification.") (define-public knotifyconfig (package (name "knotifyconfig")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2822,7 +2831,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32- "1d90gsnxy3kqd6f1bkhflrdwwx3w65sw4c7nfpkdxxhlqhzc9zr4"))))+ "17yyp0knp06s76v864qslrwrb67jd5kq6kp8mma138kicn8iy1kd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -2855,7 +2864,7 @@ notifications which can be embedded in your application.") (define-public kparts (package (name "kparts")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2864,7 +2873,7 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32- "0md0349r4mdm2r04p5s3pgm17v4w40r3kz58lzp6qfcw25b969nw"))))+ "03xva5wz3i54a3fs80dnps4smprbz1zpmyi9c2x1djcfqgjbllmq")))) (build-system qt-build-system) (propagated-inputs `(("kio" ,kio)@@ -2899,7 +2908,7 @@ widgets with a user-interface defined in terms of actions.") (define-public kpeople (package (name "kpeople")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2908,7 +2917,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32- "1q2hh2i8hd638p907g0srdxmxm9h2ay91dmhslqzcgwnlhln4gfl"))))+ "15ljr29w4bfgnq7jarq5798a945pqhic78l6wscr050rqy3idjc6")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -2935,7 +2944,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -2944,7 +2953,7 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32- "0gjqwzsg865gha8k7hda28hsrbfzhw9jz610lkqff5713lqbcn5a"))))+ "0q941dv5rs3d95pyrzw1gs9qfzkijhczcp1hwvhik16wb94gzi9m")))) (build-system cmake-build-system) (propagated-inputs `(("plasma-framework" ,plasma-framework)))@@ -3005,7 +3014,7 @@ typed.") (define-public kservice (package (name "kservice")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -3014,7 +3023,7 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32- "1rdapw9wirfq6pyaza0k7sg6q21rv3cfyalpzrwfrk5gkgpqxzwk"))))+ "0xw8sg423jc8zl2glap4n401kqc62gc0ff7y1bh59dxnk3chp669")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig)@@ -3064,7 +3073,7 @@ types or handled by application specific code.") (define-public ktexteditor (package (name "ktexteditor")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -3073,7 +3082,7 @@ types or handled by application specific code.") "ktexteditor-" version ".tar.xz")) (sha256 (base32- "0vfl6rr3624n8v29z07z5c0nh5af5kfg28cnp5ksfvfnssxfzfqa"))))+ "06f2m6wyg53ipzc8fy6b5q0z6kwfcbkh5m7mic7z5dqqscfk0qhn")))) (build-system cmake-build-system) (propagated-inputs `(("kparts" ,kparts)))@@ -3145,7 +3154,7 @@ library.") (define-public ktextwidgets (package (name "ktextwidgets")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -3154,7 +3163,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32- "1qb1mad5bg19xwykzpwk2b3s505ka4jkg0fsi56ri57wq8gv4qha"))))+ "1j9f008h6jgga2xf5bbcwyyspwddihnypprfnl599vgj7cjn29hq")))) (build-system qt-build-system) (propagated-inputs `(("ki18n" ,ki18n)@@ -3185,7 +3194,7 @@ It supports rich text as well as plain text.") (define-public kwallet (package (name "kwallet")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -3194,7 +3203,7 @@ It supports rich text as well as plain text.") name "-" version ".tar.xz")) (sha256 (base32- "1dp3mrgl0h6wqp4wcqpvnvkacwkrrn5lrv6bdl008kx1y594s28g"))))+ "08q83dghsa22qggmwgp1y2bj55g7sw8knj25bwckp2mv7vr8w9cr")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -3227,7 +3236,7 @@ the passwords on KDE work spaces.") (define-public kxmlgui (package (name "kxmlgui")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -3236,7 +3245,7 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32- "0x0mfapgl8w4xal8lamh3v27a9kdb7qyaxdn48gja4x85pkvi87i"))))+ "0mq68lllyqi9lsa0vjvqj030zb8b7dba447i0g5bs7pjbaqdbmn6")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig)@@ -3280,7 +3289,7 @@ descriptions for integrating actions from plugins.") (define-public kxmlrpcclient (package (name "kxmlrpcclient")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -3289,7 +3298,7 @@ descriptions for integrating actions from plugins.") name "-" version ".tar.xz")) (sha256 (base32- "0k82cyxjipqpky7gs0zb5s1bc6jf22d5vwpwyiqjy32da63mc89c"))))+ "0kn7sz2m3scrvihz3y0wypjcrl5il0pfhhvk0p36h099m3vxrqmw")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio)))@@ -3323,7 +3332,7 @@ setUrl, setUserAgent and call.") (define-public plasma-framework (package (name "plasma-framework")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -3332,7 +3341,7 @@ setUrl, setUserAgent and call.") name "-" version ".tar.xz")) (sha256 (base32- "0p0ziqw70lklx59d0nij3p9yi1vdacdfyrrp7zf74iwxd7598hci"))))+ "1l5qza0gxifbzbx9lfbjbdssmr45an6hq5j8xvabmk0nh430m9qn")))) (build-system cmake-build-system) (propagated-inputs `(("kpackage" ,kpackage)@@ -3393,7 +3402,7 @@ script engines.") (define-public purpose (package (name "purpose")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -3402,7 +3411,7 @@ script engines.") name "-" version ".tar.xz")) (sha256 (base32- "1mc5z131z9da6qjhlxqz64ys4fgq38iryna58f8l04x8f9igjn8f"))))+ "0jvkgvihk6004d87zl08c9a2m4driklgyvfnsjmcjzc7mq3331jd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -3459,7 +3468,7 @@ need.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch) (uri (string-append@@ -3468,7 +3477,7 @@ need.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32- "0n8n6lnzswi2q848qy2b4rcvkd0y1dywlk6hdmcnn8dfbxy6b050"))))+ "0l4al285skbv0f5gkwjswk1b0k3vcrc7knlnc92s2p0579qahknz")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -3516,7 +3525,7 @@ workspace.") (define-public kdelibs4support (package (name "kdelibs4support")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch)@@ -3525,7 +3534,7 @@ workspace.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256- (base32 "17mywcmgp1yzdipwwaypbkxiyybk1w0sps50jv1bl0f23ya19mlc"))))+ (base32 "1k7ciyrqg7mrg3nncc1qdvaf885nqwlybfxw41mmi2hj3wn4cq9f")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus)@@ -3632,7 +3641,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (define-public khtml (package (name "khtml")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch)@@ -3641,7 +3650,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256- (base32 "15f77r6dxkkvi2vxvxlwa7qz3whmz229g79bgadiwffmzxja0ywd"))))+ (base32 "07935n4g02arhx2v2v6g3g2q73g5wmrlmy8nc80wn3a9fvchnr9c")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -3683,7 +3692,7 @@ technology and using KJS for JavaScript support.") (define-public kjs (package (name "kjs")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch)@@ -3692,7 +3701,7 @@ technology and using KJS for JavaScript support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256- (base32 "16zsan9c8kba5m70h34y544id7gig2bcbcs4s90s27pckijkkarp"))))+ (base32 "1s7cgksjz6dr4gphlfg1vzminxmm6v6mfl7fr91kcr9hl57lb0sj")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -3716,7 +3725,7 @@ support.") (define-public kjsembed (package (name "kjsembed")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch)@@ -3725,7 +3734,7 @@ support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256- (base32 "00sr6lv1nai2y6aawvqwnx4pbx8pw9b1jrpa0klc014gc42l6i7b"))))+ (base32 "07rmgw9nzqq2gpa1fkfqawvwhcp8adcw196zjd1lhhs1d5438svh")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -3745,7 +3754,7 @@ QObjects, so you can script your applications.") (define-public kmediaplayer (package (name "kmediaplayer")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch)@@ -3754,7 +3763,7 @@ QObjects, so you can script your applications.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256- (base32 "19v53h3lkys3ryrjacrdng9ak91g03b9s986xhnw1r84zy242kdm"))))+ (base32 "0wndw2ciwvyd44j9rpapgijcx3fjxa96vgbhpr9z8d7inxmrl7n0")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -3783,7 +3792,7 @@ KParts instead.") (define-public kross (package (name "kross")- (version "5.63.0")+ (version "5.69.0") (source (origin (method url-fetch)@@ -3792,7 +3801,7 @@ KParts instead.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256- (base32 "0paipgkxbm6vwgqj38rlr37vgmf1rx0cl2mka8zdbndl76ng5hgc"))))+ (base32 "14wgd5xfd824ym47h734hjvdhw8mfskpsx18bfq35pfxjzz71v5c")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scmindex a04b2f0279..da3fa2fa95 100644--- a/gnu/packages/kde-plasma.scm+++ b/gnu/packages/kde-plasma.scm@@ -38,14 +38,14 @@ (define-public kdecoration (package (name "kdecoration")- (version "5.17.0")+ (version "5.18.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kdecoration-" version ".tar.xz")) (sha256 (base32- "0rljpywpaqmar13jijphkpc9k1crma476j9my0d00hfrjil5xlnn"))))+ "1jmdh4pgh5v1bjr9mg5653h20ck4m05p21qdccz75s4g948di8mm")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -62,14 +62,14 @@ manager which re-parents a Client window to a window decoration frame.") (define-public kscreenlocker (package (name "kscreenlocker")- (version "5.17.0")+ (version "5.18.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kscreenlocker-" version ".tar.xz")) (sha256 (base32- "1jzkq5m0hvcpsl7clai33ndiil8gls7ndir3mfcc5l8gv7df2ir0"))))+ "0ywcy6310mgvqmkjjsg633kr40xm4m3v0zxxflv39wc584y0jkla")))) (build-system cmake-build-system) (arguments `(#:phases@@ -125,14 +125,14 @@ manager which re-parents a Client window to a window decoration frame.") (define-public libkscreen (package (name "libkscreen")- (version "5.17.0")+ (version "5.18.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256- (base32 "0znxfqqyyij6i4dp95gf5g4vrhg4jsshgh2k13ldy294kby2mxw0"))))+ (base32 "0dl4yqxglamv33bka0wy6bcc85yihhklyf0r8r5791x04zwpf864")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scmindex 6eb02119a4..aca3843b36 100644--- a/gnu/packages/kde.scm+++ b/gnu/packages/kde.scm@@ -209,7 +209,7 @@ projects.") (define-public kdevelop (package (name "kdevelop")- (version "5.4.6")+ (version "5.5.0") (source (origin (method url-fetch)@@ -217,7 +217,7 @@ projects.") "/" version "/src/kdevelop-" version ".tar.xz")) (sha256- (base32 "01jmrmwbc1hrvq7jdfcc7mxl03q2l6kz57yca2j26xwyvfcfv5sz"))))+ (base32 "0438721v24pim5q0q54ivsws9a679fm7ymrm1nn9g1fv06qsm4d8")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)@@ -328,14 +328,14 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") (define-public kdiagram (package (name "kdiagram")- (version "2.6.1")+ (version "2.7.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/kdiagram/" version "/kdiagram-" version ".tar.xz")) (sha256- (base32 "1c6dbp9gssjrx59z8yxzq1ay56pnw7h28symjrv0gcvhxyjirrxx"))+ (base32 "1pgvf2q8b59hw0jg5ajmj5nrn4q8cgnifpvdd0fynk2ml6zym8k3")) (patches (search-patches "kdiagram-Fix-missing-link-libraries.patch")))) (build-system qt-build-system)@@ -359,7 +359,7 @@ illustrate project schedules.") (define-public krita (package (name "krita")- (version "4.2.7.1")+ (version "4.2.9") (source (origin (method url-fetch) (uri (string-append@@ -367,7 +367,7 @@ illustrate project schedules.") "/krita-" version ".tar.gz")) (sha256 (base32- "0gcwq1w09gmx53i2fir73l222p41299wagvhbvsxwrz0v3crzliy"))))+ "1a3djmjhnvlp8dpiz68s0lwg71nv3ypq592jfgsnm5zlxa0vp1cz")))) (build-system cmake-build-system) (arguments `(#:tests? #f@@ -448,14 +448,14 @@ features include brush stabilizers, brush engines and wrap-around mode.") (define-public libkomparediff2 (package (name "libkomparediff2")- (version "19.08.2")+ (version "19.08.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/applications/" version "/src/libkomparediff2-" version ".tar.xz")) (sha256- (base32 "1mvihd0xpkl8kryf5dvsfgpbgs9af8c9bzq8mmr74gfsvfb8ywy5"))))+ (base32 "0p8j24d0lzylv5crdzak87016ppgph5hiyxkvapda1m8zlb5dfm1")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config)))@@ -480,7 +480,7 @@ used in KDE development tools Kompare and KDevelop.") (define-public qca (package (name "qca")- (version "2.2.1")+ (version "2.3.0") (source (origin (method url-fetch)@@ -488,7 +488,7 @@ used in KDE development tools Kompare and KDevelop.") "/qca-" version ".tar.xz")) (sha256 (base32- "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"))))+ "1mrj748yz1grgzmfbmffgjkpcqiaj1l3m4pbddwcj7dnl50yys0x")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config)))@@ -506,7 +506,7 @@ cards.") (define-public kpmcore (package (name "kpmcore")- (version "4.0.1")+ (version "4.1.0") (source (origin (method url-fetch) (uri (string-append@@ -515,7 +515,7 @@ cards.") name "-" version ".tar.xz")) (sha256 (base32- "1sslkwcj2cyrn7bpjdjdwikp1q8wrsxpsg2sxxd8hsairgy7ygh3"))+ "0jsig7algmab9h0fb09my0axjqzw83zgscamhzl8931lribs6idm")) (patches (search-patches "kpmcore-fix-tests.patch" "kpmcore-remove-broken-test.patch")))) (build-system cmake-build-system)@@ -565,7 +565,7 @@ different notification systems.") (define-public kdeconnect (package (name "kdeconnect")- (version "1.3.5")+ (version "1.4") (source (origin (method url-fetch)@@ -574,7 +574,7 @@ different notification systems.") version ".tar.xz")) (sha256 (base32- "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5"))))+ "06i6spspqpl79x6z2bfvbgd08b3h1pyx5j1xjhd8ifyrm52pkvna")))) (build-system qt-build-system) (arguments `(#:configure-flags '("-DBUILD_TESTING=ON")@@ -620,7 +620,7 @@ communicate with each other. Here's a few things KDE Connect can do: (define-public kqtquickcharts (package (name "kqtquickcharts")- (version "19.08.2")+ (version "19.08.3") (source (origin (method url-fetch)@@ -628,7 +628,7 @@ communicate with each other. Here's a few things KDE Connect can do: version "/src/kqtquickcharts-" version ".tar.xz")) (sha256 (base32- "1yy9fyd8y4g25ljdsbil19qdf4j3mzmzl489sx7rqpm3lfdzjh9k"))))+ "0kwrqm7aa74plqkkyigi6b2hic6dzrygkgb6hsgj35ycrfn4rigi")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)))@@ -645,14 +645,14 @@ charts.") (define-public kcachegrind (package (name "kcachegrind")- (version "19.04.1")+ (version "19.08.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/applications/" version "/src/kcachegrind-" version ".tar.xz")) (sha256 (base32- "1hhsk64yp6q2xh8j269j4wp9y24ggmii861r6gf02mj1mbn2p1jb"))))+ "0sm3085vd79svfql6nqjyrwlknnmdyyvi0yjnmyb09mq7djf1icg")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)diff --git a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch b/gnu/packages/patches/kinit-kdeinit-extra_libs.patchindex c3c4ce1161..1271f3df7d 100644--- a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch+++ b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch@@ -42,12 +42,12 @@ pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch extern "C" { static void secondary_child_handler(int)-@@ -1689,7 +1693,7 @@+@@ -1673,7 +1673,7 @@+ #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) {- const int extrasCount = sizeof(extra_libs) / sizeof(extra_libs[0]);- for (int i = 0; i < extrasCount; i++) {-- const QString extra = findSharedLib(QString::fromLatin1(extra_libs[i]));-+ const QString extra = QString::fromLatin1(extra_libs[i]);+ for (const char *extra_lib : extra_libs) {+- const QString extra = findSharedLib(QString::fromLatin1(extra_lib));++ const QString extra = QString::fromLatin1(extra_lib); if (!extra.isEmpty()) { QLibrary l(extra); l.setLoadHints(QLibrary::ExportExternalSymbolsHint);-- 2.26.2
M
M
Marius Bakke wrote on 2 May 16:23 +0200
Re: [bug#40791] todays patch
87mu6q2z5u.fsf@devup.no
Tom via Guix-patches via <guix-patches@gnu.org> writes:
Toggle quote (6 lines)> 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 ;)
Thanks! I plan to do a proper review on a couple of days, but have onesuggestion for qtwebengine: moving the 'snippet' code into a phaseallows for faster iterations. Still not trivial, but better thanrepacking for every change!
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6tgn0ACgkQoqBt8qM6VPrrbQf/VK5kFbbx2dLbLLNjdXvyN+o2ePdHBE8aeSA0N6Ypunp+fIUUiN0vFuD2DwIICnoiO1WXlr0zTgr3aUZ06JavhTdagK8PokdDdwx0iyC1aaCaDJ5FWauK24dx6pDTwtkpYPXx80ZgQWpKIoGkyOph3r2Mzrc263qMX43lkPraBN4z3QDL1UHPYvPojgge1C+n0zNQDIdeHjSqt0OtHjCrRdI5X5eRQnIyLCRjSzMZABO+8zSN+p9lAc7AuaFTzN9GL7v6VgDOxt5Q8V83h2/dQyN90ubsyxDxRCeZo4LriSzw3GO07V5oOlrkzXH9RumE0RQ6D+b0w5zxL0pnSZkMuw===gH1K-----END PGP SIGNATURE-----
M
M
Marius Bakke wrote on 2 May 16:28 +0200
Re: [bug#40791] Append: KDE upgrade
87k11u2yys.fsf@devup.no
Tom via Guix-patches via <guix-patches@gnu.org> writes:
Toggle quote (7 lines)> I ran the script and fixed several build failures.>> Notable failure is kwayland in cmake configure step.> I have no idea why.>> Would like some assist there.
I wonder if these KDE updates can be applied on the current masterbranch (without the Qt upgrade)? Does the same error occur then?
If it works on 'master', let's merge this first.
Meanwhile, please adjust the commit message to mention all the changedvariables, [arguments], etc.
I will have a deeper look in a couple of days. Thanks!
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6tg3sACgkQoqBt8qM6VPr2tQf8DNwEV2LaulmmC1PP9tgtzOq29iTl6mx7t/vTaBff7kt+YjPNccibwv3XhbcbLJCNTW9cY9YBrQTlRheoQJeuLYR5x0OntiQg+ddZWgx1dWeJ7CEYt8MdjVjWUnUgBTe8fyCTMOia6jU/fIkgEx+IIFkLNSW3N4HLY/lG/OOsumTKKyuvR2COxEbNgrV84xUuWHhlvSVnVb2VN3OxVZtYHrQ0xKdddTVJE12N5lZLzqnuD7Aa57BoZygdbafF7pSF74ryNpSgiSmKTenmTa0EP1UnaLFFnOYYB9y850DSbcOJOYmTGt+XxVvxfqu+bH0mloG5A/KUx3inTuD75+X1IA===pC7c-----END PGP SIGNATURE-----
M
M
Marius Bakke wrote on 2 May 16:29 +0200
87imhe2yx2.fsf@devup.no
Tom via Guix-patches via <guix-patches@gnu.org> writes:
Toggle quote (7 lines)> I ran the script and fixed several build failures.>> Notable failure is kwayland in cmake configure step.> I have no idea why.>> Would like some assist there.
I wonder if these KDE updates can be applied on the current masterbranch (without the Qt upgrade)? Does the same error occur then?
If it works on 'master', let's merge this first.
Meanwhile, please adjust the commit message to mention all the changedvariables, [arguments], etc.
I will have a deeper look in a couple of days. Thanks!
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6tg7kACgkQoqBt8qM6VPqTNwf+JuvDyB+lxqVH4+Kkk55AyA2mWSjePL2UURdioCI4IDzgVNEhNoVX1InPf4jvq4ocYQEnenOPLdFy6f+uOJjmT9TgtGdv0ZH1YpGUNF0bcUjYfeexYVytXQkoEPpsOUJt85orVzWKsiwQtyDv/Ixg7zCVr6tDKeHfz8Ip+j80czUT8kbXJND37gglkPrZYTH02CPjoaSNdM4ZmCQSqIF2ug5xVi296e4LT8QqNaKkbEL3U7OCRfX5pEffELoJVq/RxH0Jeulgb/GTBYMf7e+y6zSz4uaSO5bT/+UJE6fMkbyjUoyyJ2sQREpqGpjaja6WmIfdDlJ4uRZUHNSxA9bt+Q===Sv/2-----END PGP SIGNATURE-----
T
T
Tom Zander wrote on 2 May 22:02 +0200
5410741.DvuYhMxLoT@cherry
The kwayland issue looks like a missing dependency. Likely something that is an input but not a propagated input up the stack.A little tricky as I don't see any 'wayland-client' package.
I postponed upgrading kwayland for now so the rest of the kde upgrades can continue.
Would it be wise to open a new bug for the KDE upgrade, especially since it can be applied on master?
On zaterdag 2 mei 2020 16:29:13 CEST Marius Bakke wrote:
Toggle quote (19 lines)> Tom via Guix-patches via <guix-patches@gnu.org> writes:> > I ran the script and fixed several build failures.> > > > Notable failure is kwayland in cmake configure step.> > I have no idea why.> > > > Would like some assist there.> > I wonder if these KDE updates can be applied on the current master> branch (without the Qt upgrade)? Does the same error occur then?> > If it works on 'master', let's merge this first.> > Meanwhile, please adjust the commit message to mention all the changed> variables, [arguments], etc.> > I will have a deeper look in a couple of days. Thanks!

-- Tom Zander
M
M
Marius Bakke wrote on 18 May 01:26 +0200
87lflqrvm4.fsf@devup.no
Tom via Guix-patches via <guix-patches@gnu.org> writes:
Toggle quote (5 lines)> I ran the script and fixed several build failures.>> Notable failure is kwayland in cmake configure step.> I have no idea why.
Apologies for the delay here! It turns out that KDE cannot be updatedon 'master' because 'extra-cmake-modules' has loads of dependents.
I ended up not using your patch because it failed to apply and lacked acommit message, and because KDE 5.70.0 has since been released. Sorryfor the wasted effort!
The reason kwayland failed to build was because of a missing dependencyon 'qtwayland'.
I pushed a KDE frameworks update to 'staging' in commit5ca251ab4b8dd7dfa948ce8181fc2e82f6de200f.
Now, there are still many other KDE packages that are outdated.Unfortunately the updater misses some because the upstream URL haschanged... If you want more packaging practice here is a goodopportunity, and should be safe for 'master'. ;-)
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl7ByDMACgkQoqBt8qM6VPrHrAf8D5oUMS+mrCBjAQKzdZweAMM/8dDyVoXZ5SHjd+Vgw/fViBeg36VU9ycRnxR+5vvnYXg7Bx82mc5AeeC1ueXNkx34mKiAzvDasptUNkuu9Zmqx4mjb4W7/WhkVRMH0uqhqYPnk2lCYXwEdqGhn+v9ljmfqP79qsj9dAy+ogyarlp49nnxvHHISNX6pHxnzmTGVQZtGX16HtegoxvH6/h/sAfehexH2zeE7sf5c4PmiSvjg2W+pjRIWSc2+tRFmVwj9PiDP5V97q6y79yJHKYND+4OLUOQv11zIQxaOeSW1CgLOvuorJRcl3OK2OLXvEjilpRytvNy4lEPwcZkh0rZzg===qb5U-----END PGP SIGNATURE-----
M
M
Marius Bakke wrote on 18 May 01:37 +0200
Re: [bug#40791] todays patch
87imgurv3p.fsf@devup.no
Hello!
Tom via Guix-patches via <guix-patches@gnu.org> writes:
Toggle quote (6 lines)> 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 ;)
Phew, there was still a _lot_ of dependencies missing. Even withoutrepacking for every iteration it took hours just to collect them all.
Toggle quote (5 lines)> From 180da08e2b2d17cafab4b92b1074867516a2d6eb Mon Sep 17 00:00:00 2001> From: TomZ <tomz@freedommail.ch>> Date: Thu, 23 Apr 2020 00:21:31 +0200> Subject: [PATCH 1/2] gnu: Qt: update to 5.14.2
Please use full sentences in commit messages, i.e. capitalization andfull stops.
Toggle quote (13 lines)> * 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.
Here you meant qtbase-QTBUG-81715.patch.
Toggle quote (6 lines)> 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.
Actually only two failed, with fairly clear error messages. Figuringout how to disable them took some time though.
I did not look very closely into what caused the failures, as one of thefirst hits on a web search was that Debian disables the exact same test:
https://ftp-master.debian.org/new/qtwayland-opensource-src_5.14.2-1.html
So we're in good company, at least. :-)
Toggle quote (4 lines)> Update to 5.14.2>> * gnu/packages/qt.scm (qtwebglplugin):[inputs] add zlib
Nit-pick: colon after the [section].
Toggle quote (3 lines)> Update to 5.14.2>> * gnu/packages/qt.scm (qtremoteobjects): disable some tests that
missing [arguments]
Toggle quote (6 lines)> fail due to missing network.> Update to 5.14.2>> * gnu/packages/qt.scm (qtdeclarative):[inputs] add vulcan-headers> Update to 5.14.2
I fixed these issues and typos for you.
Toggle quote (18 lines)> ---> 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/patches/qtbase-use-TZDIR.patch> index 11c737d844..b6c377b133 100644> --- 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.> > Based on a patch fron NixOS.> ===================================================================> ---- qtbase-opensource-src-5.9.4.orig/src/corelib/tools/qtimezoneprivate_tz.cpp> -+++ qtbase-opensource-src-5.9.4/src/corelib/tools/qtimezoneprivate_tz.cpp> +--- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp> ++++ qtbase-opensource-src-5.15.2/src/corelib/time/qtimezoneprivate_tz.cpp
We both forgot to mention this part in the commit message though!
Toggle quote (23 lines)> @@ -70,7 +70,11 @@> // Parse zone.tab table, assume lists all installed zones, if not will need to read directories> static QTzTimeZoneHash loadTzTimeZones()> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm> index 8a57127771..aa121fbb5f 100644> --- a/gnu/packages/qt.scm> +++ b/gnu/packages/qt.scm> @@ -351,7 +351,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")> (define-public qtbase> (package> (name "qtbase")> - (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 language.")> version ".tar.xz"))> (sha256> (base32> - "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di"))> - ;; Use TZDIR to avoid depending on package "tzdata".
I preserved this comment.
Toggle quote (6 lines)> + "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8"))> (patches (search-patches "qtbase-use-TZDIR.patch"> - "qtbase-moc-ignore-gcc-macro.patch"> - "qtbase-QTBUG-81715.patch"))> + "qtbase-moc-ignore-gcc-macro.patch"))
Remember to delete patches from git as well as gnu/local.mk too. Fixed!
I finally pushed this as 883d0484ddcf3b9f3ff8bd8e6de70627201f2763.
However, qtwebengine is not finished building yet and may still bemissing some dependencies. I'll fix any remaining issues tomorrow.
Thanks a lot for the effort here, and sorry for the delay!
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl7BysoACgkQoqBt8qM6VPo7Vwf+OG55MfYaRuliA+Dde0WoSZo1qGWN5KTAQ3MDfVF6RC0HxM72FpHZL/bvZTlPSPgHxIrTIaoEOZLc2LaOKpWwCJ7cKNH9w/PZffaDTj6xshVYG21BBxhByHcK30iWYqrUUz1rTQa+Bjo6NgeThFkHeo6uVZfpFQ2RPjKvS+awMUCHSUVFIcCJ3Bng6Vtyzc+K8racUJ9aCCRYWXYjNc/BDgpaaxJOAc7fmLaPxq9q1kM1HbPzbB1jH9qWmpQJ66MalzKJY8jfN1ZxlcaS60x9zh3EJqGVOVNO1XJzv7wlSOvapLQWjauSswFZ7hEdkyqCZa98DUEs+y/qOHTPRsvylg===X78+-----END PGP SIGNATURE-----
Closed
?