From 3e93b2bdeb449063f9c00aaeba23ec7c4499b138 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 11:35:39 +0300 Subject: gnu: qt: Update to 5.12.4. * gnu/packages/qt.scm (qt, 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, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech): Update to 5.12.4. (qt, qtbase)[source]: Remove xkbcommon from list of directories to remove. (qtbase)[source]: Remove upstreamed patch. (python-sip): Update to 4.19.18. [source]: Update to new source uri. (python-pyqt): Update to 5.12.3. [source]: Update to new source uri. * gnu/packages/patches/qtbase-old-kernel.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/qt.scm | 155 ++++++++++++++++++++++++++-------------------------- 1 file changed, 76 insertions(+), 79 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index daef46faf6..f3e4fa58b1 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -123,7 +123,7 @@ (define-public grantlee (define-public qt (package (name "qt") - (version "5.11.3") + (version "5.12.4") (outputs '("out" "examples")) (source (origin (method url-fetch) @@ -136,7 +136,7 @@ (define-public qt version ".tar.xz")) (sha256 (base32 - "0kgzy32s1fr22fxxfhcyncfryb3qxrznlr737r4y5khk4xj1g545")) + "1q95sjyldm2p5xvqn0f52fin0q5axy982nqd3289jxcqwh75xnl5")) (modules '((guix build utils))) (snippet '(begin @@ -154,7 +154,7 @@ (define-public qt (delete-file-recursively (string-append "qtbase/src/3rdparty/" dir))) (list "double-conversion" "freetype" "harfbuzz-ng" "libpng" "libjpeg" "pcre2" "sqlite" "xcb" - "xkbcommon" "zlib")) + "zlib")) (for-each (lambda (dir) (delete-file-recursively dir)) @@ -513,7 +513,7 @@ (define-public qt-4 (define-public qtbase (package (name "qtbase") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -522,10 +522,9 @@ (define-public qtbase version ".tar.xz")) (sha256 (base32 - "071yc9iz14qs4s8yvrwllyfdzp5yjxsdpvbjxdrf0g5q69vqigy6")) + "158i0apc3i8bbgrk9j1k34y2b03v0kwwv8m7aaaxpxsglppwgyr0")) ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch" - "qtbase-old-kernel.patch")) + (patches (search-patches "qtbase-use-TZDIR.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -534,7 +533,7 @@ (define-public qtbase (for-each delete-file-recursively (list "double-conversion" "freetype" "harfbuzz-ng" "libpng" "libjpeg" "pcre2" "sqlite" "xcb" - "xkbcommon" "zlib")) + "zlib")) #t))))) (build-system gnu-build-system) (propagated-inputs @@ -753,7 +752,7 @@ (define-public qtbase (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -762,7 +761,7 @@ (define-public qtsvg version ".tar.xz")) (sha256 (base32 - "14a4rprbj9f9rhixbk7143xdz34d7d39xh9v2sc1w43q9sf2rsi1")))) + "010drs2dv573fgbswnj83yrdxnj3lbcha4y4xgjm1ikkb98i420i")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -828,7 +827,7 @@ (define-public qtsvg (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -837,7 +836,7 @@ (define-public qtimageformats version ".tar.xz")) (sha256 (base32 - "0zq8igsjyyhxsjr43vpaasrqjw3x0g6rwqf8kaz7y9vs7ny63ch4")) + "1cvv62r28ld5f0ipvahxv81bj8ik2m819x20pln1f3d9xv1jbvid")) (modules '((guix build utils))) (snippet '(begin @@ -859,7 +858,7 @@ (define-public qtimageformats (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -868,7 +867,7 @@ (define-public qtx11extras version ".tar.xz")) (sha256 (base32 - "11fd2mc20qmnyv1vqhaqad2q6m0i4lmkr432rmqvpkgphpkfp7pr")))) + "07mfkfgj02z7fb1swx5nmih3i979kpriwr8jprywl0aamyg01k29")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -883,7 +882,7 @@ (define-public qtx11extras (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -892,7 +891,7 @@ (define-public qtxmlpatterns version ".tar.xz")) (sha256 (base32 - "1vhfvgi39miqsx3iq7c9sii2sykq0yfng69b70i0smr20zihpl4b")))) + "0rjniwgid8ypzfx33di5bprn8r3sk4zcqxa3xp5nb3wlpccigshb")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -912,7 +911,7 @@ (define-public qtxmlpatterns (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -921,7 +920,7 @@ (define-public qtdeclarative version ".tar.xz")) (sha256 (base32 - "1rhsf9bma2zwwpixk2fsg31x7c1pmsk144npypgc9w86swhkc9lf")))) + "19yd38q8r30jjw12wjrf6i8ygi9lk4fg7zil3gc6g787fgnhahb1")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -944,7 +943,7 @@ (define-public qtdeclarative (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -953,7 +952,7 @@ (define-public qtconnectivity version ".tar.xz")) (sha256 (base32 - "0amks3qad31i7cha85kvcaxvlmmgkc3gm4jdkw2p02ixxfygr30l")))) + "1vvkn6k4qiyyrd3m3c7fj6qiq0fw32wvd7sn1zl15blz5cj0b7bl")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -968,7 +967,7 @@ (define-public qtconnectivity (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -977,7 +976,7 @@ (define-public qtwebsockets version ".tar.xz")) (sha256 (base32 - "1ffmapfy68xwwbxbg19ng6b5h8v42cf78s21j7rgq49gm70r0402")))) + "1giaxcvwv0mvxb2iapvdfiz128j0hjw3pi9vzi8irll6yjifswdl")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -995,7 +994,7 @@ (define-public qtwebsockets (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1004,7 +1003,7 @@ (define-public qtsensors version ".tar.xz")) (sha256 (base32 - "0n88c8xi9pbyh7q1pcqv4yjv6nx62abflj8qgfr4qzb0sp8m6mx7")))) + "1af0mv22yqdi93c2r36ajiax1yv89nk8qdj1xgb0h04nlmz3r1wm")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -1028,7 +1027,7 @@ (define-public qtsensors (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1037,7 +1036,7 @@ (define-public qtmultimedia version ".tar.xz")) (sha256 (base32 - "0h9wx86zj20n4xc3qnml0i360x2dc1yd2z2af1flj8fwyzppi03j")) + "0ga26g832i8srpm99bzmxynlgf70zzp5p8vi1fqq096adymmj1vw")) (modules '((guix build utils))) (snippet '(begin @@ -1079,7 +1078,7 @@ (define-public qtmultimedia (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1088,7 +1087,7 @@ (define-public qtwayland version ".tar.xz")) (sha256 (base32 - "1chz4wchgkzd45h143i5hkqg0whcgdbj37gkg7j4kj31whllzjb2")) + "1dz6fj768yn75mn35av0k8925bx15g0qazar9h9qfxljqdcykb9g")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -1131,7 +1130,7 @@ (define-public qtwayland (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1140,7 +1139,7 @@ (define-public qtserialport version ".tar.xz")) (sha256 (base32 - "1nkbfsxzgicwns3k11hhzjxy2hgrigj8xcw2by0jc1j71mnmxi4n")))) + "0fddn217q0cpk6p0c0z4ir4lrvqpbfkmfaw40gqxsbpvm7w7sj5z")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -1165,7 +1164,7 @@ (define-public qtserialport (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1174,7 +1173,7 @@ (define-public qtserialbus version ".tar.xz")) (sha256 (base32 - "0vf12jk1ma0v0dlpliw1x9i04iaik1kjkiaby7gaxm2abprxwr2n")))) + "1z0iccn2lk80qjkvlhv33plgld9q6xnz9s2h0xkkxq9yyh2nkmb9")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1186,7 +1185,7 @@ (define-public qtserialbus (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1195,7 +1194,7 @@ (define-public qtwebchannel version ".tar.xz")) (sha256 (base32 - "1wrdawlqvcw84h8q52mvbjhp1vkd6fhz6c8ijlg9rw0s3fj4y99w")))) + "1dzx7f9aa7zq46d7xhhchp233m4qv7zxdf56w5mshqcyd4dilmxb")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1210,7 +1209,7 @@ (define-public qtwebchannel (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1219,7 +1218,7 @@ (define-public qtwebglplugin version ".tar.xz")) (sha256 (base32 - "0wqz8lycmi7pffzy0pz5960w109lbk4mkbw0l1lh64avl6clq7b9")))) + "0rijdn20bqkx9f73y8pvam1878anaynf6nv0asxjk031jfca0vvm")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1245,7 +1244,7 @@ (define-public qtwebglplugin (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1254,7 +1253,7 @@ (define-public qtwebview version ".tar.xz")) (sha256 (base32 - "1njmn1n03dp4md8cz58cq2z6bsxd8nwlw0238zmavh7px3jzc9kh")))) + "0pasmcr6xdlbgi4gdkkm4w5ba00r71vyibsw7hyx1nadfxmlq90z")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1268,7 +1267,7 @@ (define-public qtwebview (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1277,7 +1276,7 @@ (define-public qtlocation version ".tar.xz")) (sha256 (base32 - "1sq0f41jwmsimv9a1wl2nk5nifjppm5j92rr4n4s7qwnnjjrir2q")))) + "185k53qsaqcv280602p92vaddsfxf4frqk4gp4zsvzkrfsyl0yqj")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1298,7 +1297,7 @@ (define-public qtlocation (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1307,7 +1306,7 @@ (define-public qttools version ".tar.xz")) (sha256 (base32 - "13lzdxxi02yhvx4mflhisl6aqv2fiss5m804cqccd1wvp8dyh1f2")))) + "1dkfpmhpymaagvlybqq7s7bix0gqzsa5zbpfp56wvh59c0w3a3iv")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1326,7 +1325,7 @@ (define-public qttools (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1335,7 +1334,7 @@ (define-public qtscript version ".tar.xz")) (sha256 (base32 - "027cvggbcvwyz76cn1bl1zvqg0nq7iica1b7yx7xyy0hb36g715v")) + "0sibbhq88jni850jw7anwnvmykzm1w5qbjkblbradirqfvkkznvs")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1350,7 +1349,7 @@ (define-public qtscript (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1359,7 +1358,7 @@ (define-public qtquickcontrols version ".tar.xz")) (sha256 (base32 - "0dvmy31qbl76yy0j5y8m7mvnmqyg2c01fmlkn0snvc5h5ah5skjf")))) + "0n4qvafpc828cyc7w931drhxrawgxijzbmr6mh5ppiipad8c5m1j")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1374,7 +1373,7 @@ (define-public qtquickcontrols (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1383,7 +1382,7 @@ (define-public qtquickcontrols2 version ".tar.xz")) (sha256 (base32 - "11nhpb0xckv5jjkqj5szr94c2rvyjwr89ch58hh64nsqaav30mpl")))) + "0c8343k1w6v4k96agp3x0xy3fh49ylbp6h5wwxxpv35w73npwi4s")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1399,7 +1398,7 @@ (define-public qtquickcontrols2 (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1408,7 +1407,7 @@ (define-public qtgraphicaleffects version ".tar.xz")) (sha256 (base32 - "1qjpdzkamf27cg5n1wsf0zk939lcgppgydfjzap9s4fxzj1nkn0l")))) + "0wyzkd5zx9qd3mwynkmxiin0fixaczb76lajhhcl2957iwb8phqb")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1454,7 +1453,7 @@ (define-public qtdeclarative-render2d (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1463,7 +1462,7 @@ (define-public qtgamepad version ".tar.xz")) (sha256 (base32 - "1k222cx18zq48sfna91hmy427qzk2n2xz3dlyz59iyz72k6915g9")))) + "0iacdqa22dgvnp143klpzg5hxffy6fzqi5jn3r6liwhqzc86zpi5")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1484,7 +1483,7 @@ (define-public qtgamepad (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1493,7 +1492,7 @@ (define-public qtscxml version ".tar.xz")) (sha256 (base32 - "1mv8mz36v34dckrzy5r41mq3sqznbalrhndk3avz2154xmkjf5qk")) + "1y6l18df3qj03lr58clsmgn2n38nrf0gr2g5bwkm3081c8mbfvv9")) (modules '((guix build utils))) (snippet '(begin @@ -1515,7 +1514,7 @@ (define-public qtscxml (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1524,7 +1523,7 @@ (define-public qtpurchasing version ".tar.xz")) (sha256 (base32 - "1fd0gxdj5mrh81iwimq1243i3n47sqv9ik8nslahfh0q3dsx7k8n")))) + "0whn45q8dgm7bz5lqxzjfg56xhz2bi3axl50h5nqs3ix0h8s213q")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1535,7 +1534,7 @@ (define-public qtpurchasing (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1544,7 +1543,7 @@ (define-public qtcanvas3d version ".tar.xz")) (sha256 (base32 - "0f110z7cmkzns9k00aa5zhzq2fpybfxkd7gdlwzcbhc8hn20986m")) + "0sbqrpx36x9filb693blwidgdqcxr88h8w5pky97l1rdajmfiq6p")) (modules '((guix build utils))) (snippet '(begin @@ -1574,7 +1573,7 @@ (define-public qtcanvas3d (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1583,7 +1582,7 @@ (define-public qtcharts version ".tar.xz")) (sha256 (base32 - "1p4m1nkbbxlkwmbmasx5r83skzssmlcgfzyvj30x2dyrqkmz7627")))) + "17lwcsbx2n8a19q54za1pipispj68r77vn6d55s88xy31nl6izq6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1601,7 +1600,7 @@ (define-public qtcharts (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1610,7 +1609,7 @@ (define-public qtdatavis3d version ".tar.xz")) (sha256 (base32 - "1kqwr3avcvcyy4i28vjgxk1bsjj9011zr668hsk1zrjxnnwjwdl3")))) + "0nmids4gf6f03byyaav4mq6qhby6bfjzmr4axsm051hc8gmhw5hw")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1628,7 +1627,7 @@ (define-public qtdatavis3d (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1637,7 +1636,7 @@ (define-public qtnetworkauth version ".tar.xz")) (sha256 (base32 - "0dd35698wzg89975vi2ijl2lym495fjizsl03mjixsjnvb1x0q50")))) + "0mdz3pp3vzkz65i0cb62gnh7crng4k1a347yp5yjnnj0p13fn0g5")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1657,7 +1656,7 @@ (define-public qtnetworkauth (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1666,7 +1665,7 @@ (define-public qtremoteobjects version ".tar.xz")) (sha256 (base32 - "1d3jzsxfyjhgb6wj9iv1388bv7j6pi08346nmkm1c1a4iykhc0zp")))) + "04zl2z1vffw7l831ginnv2dks1rn1glw4wc7c3q0pydz59w0rpal")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1690,7 +1689,7 @@ (define-public qtremoteobjects (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1699,7 +1698,7 @@ (define-public qtspeech version ".tar.xz")) (sha256 (base32 - "158p7zqd0vg55gf88jzc3d4f7649ihh80k0m1q46m2yp6fpdjbxr")))) + "1v4h9g4s3xjy2hnf4shk40bnjqnv0jix34glc68kqrpmnc7ndy9g")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1722,16 +1721,15 @@ (define-public qtspeech (define-public python-sip (package (name "python-sip") - (version "4.19.13") + (version "4.19.18") (source (origin (method url-fetch) - (uri - (string-append "mirror://sourceforge/pyqt/sip/" - "sip-" version "/sip-" version ".tar.gz")) + (uri (string-append "https://www.riverbankcomputing.com/static/" + "Downloads/sip/" version "/sip-" version ".tar.gz")) (sha256 (base32 - "0pniq03jk1n5bs90yjihw3s3rsmjd8m89y9zbnymzgwrcl2sflz3")))) + "07kyd56xgbb40ljb022rq82shgxprlbl0z27mpf1b6zd00w8dgf0")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-wrapper))) @@ -1784,17 +1782,16 @@ (define-public python2-sip (define-public python-pyqt (package (name "python-pyqt") - (version "5.11.3") + (version "5.12.3") (source (origin (method url-fetch) - (uri - (string-append "mirror://sourceforge/pyqt/PyQt5/" - "PyQt-" version "/PyQt5_gpl-" - version ".tar.gz")) + (uri (string-append "https://www.riverbankcomputing.com/static/" + "Downloads/PyQt5/" version "/PyQt5_gpl-" + version ".tar.gz")) (sha256 (base32 - "0wqh4srqkcc03rvkwrcshaa028psrq58xkys6npnyhqxc0apvdf9")) + "041155bdzp57jy747p5d59740c55yy3241cy1x2lgcdsvqvzmc0d")) (patches (search-patches "pyqt-configure.patch" "pyqt-public-sip.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 2b8491fbbe818944baf454faf1326034022ac320 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Aug 2019 22:52:06 +0200 Subject: gnu: mariadb: Split into out, lib and dev. * gnu/packages/databases.scm (mariadb): Split into out, lib and dev. (perl-dbd-mysql, python-mysqlclient): Adjust dependencies. * gnu/packages/bioinformatics.scm (kentutils): Adjust dependencies. * gnu/packages/cran.scm (r-rmysql): Adjust dependencies. * gnu/packages/emacs-xyz.scm (emacs-emacsql): Adjust dependencies. * gnu/packages/kodi.scm (kodi): Adjust dependencies. * gnu/packages/qt.scm (qt, qtbase): Adjust dependencies. * gnu/packages/ruby.scm (ruby-mysql2): Adjust dependencies. --- gnu/packages/bioinformatics.scm | 3 ++- gnu/packages/cran.scm | 3 ++- gnu/packages/databases.scm | 57 +++++++++++++++++++++++++++++------------ gnu/packages/emacs-xyz.scm | 3 ++- gnu/packages/kodi.scm | 3 ++- gnu/packages/qt.scm | 6 +++-- gnu/packages/ruby.scm | 3 ++- 7 files changed, 55 insertions(+), 23 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a573ef682f..a8662dc238 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11272,7 +11272,8 @@ (define-public kentutils ("tcsh" ,tcsh) ("perl" ,perl) ("libpng" ,libpng) - ("mariadb" ,mariadb) + ("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("openssl" ,openssl))) (home-page "http://genome.cse.ucsc.edu/index.html") (synopsis "Assorted bioinformatics utilities") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8754f83f72..88453c3faf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2689,7 +2689,8 @@ (define-public r-rmysql (properties `((upstream-name . "RMySQL"))) (build-system r-build-system) (inputs - `(("mariadb" ,mariadb) + `(("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("zlib" ,zlib))) (propagated-inputs `(("r-dbi" ,r-dbi))) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index bb7adf25a6..ca2ca9bda0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -647,9 +647,11 @@ (define-public mariadb (find-files "pcre") (find-files "zlib"))) #t)))) (build-system cmake-build-system) + (outputs '("out" "lib" "dev")) (arguments `(#:configure-flags - '("-DBUILD_CONFIG=mysql_release" + (list + "-DBUILD_CONFIG=mysql_release" ;; Linking with libarchive fails, like this: ;; ld: /gnu/store/...-libarchive-3.2.2/lib/libarchive.a(archive_entry.o): @@ -673,15 +675,26 @@ (define-public mariadb "-DDEFAULT_COLLATION=utf8_general_ci" "-DMYSQL_DATADIR=/var/lib/mysql" "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" - "-DINSTALL_INFODIR=share/mysql/docs" - "-DINSTALL_MANDIR=share/man" + (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "lib")) + (string-append "-DCMAKE_INSTALL_RPATH=" (assoc-ref %outputs "lib") + "/lib") + (string-append "-DINSTALL_INFODIR=" (assoc-ref %outputs "out") + "/share/mysql/docs") + (string-append "-DINSTALL_MANDIR=" (assoc-ref %outputs "out") + "/share/man") + (string-append "-DINSTALL_SCRIPTDIR=" (assoc-ref %outputs "out") "/bin") + (string-append "-DINSTALL_BINDIR=" (assoc-ref %outputs "out") "/bin") + "-DCMAKE_INSTALL_LIBDIR=lib" "-DINSTALL_PLUGINDIR=lib/mysql/plugin" - "-DINSTALL_SCRIPTDIR=bin" - "-DINSTALL_INCLUDEDIR=include/mysql" - "-DINSTALL_DOCREADMEDIR=share/mysql/docs" - "-DINSTALL_SUPPORTFILESDIR=share/mysql/support-files" + (string-append "-DINSTALL_INCLUDEDIR=" (assoc-ref %outputs "dev") + "/include/mysql") + (string-append "-DINSTALL_DOCREADMEDIR=" (assoc-ref %outputs "out") + "/share/mysql/docs") + (string-append "-DINSTALL_DOCDIR=" (assoc-ref %outputs "out") + "/share/mysql/docs") + (string-append "-DINSTALL_SUPPORTFILESDIR=" (assoc-ref %outputs "out") + "/share/mysql/support-files") "-DINSTALL_MYSQLSHAREDIR=share/mysql" - "-DINSTALL_DOCDIR=share/mysql/docs" "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases @@ -764,19 +777,29 @@ (define-public mariadb 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (test (assoc-ref outputs "test"))) + (dev (assoc-ref outputs "dev")) + (lib (assoc-ref outputs "lib"))) (substitute* (string-append out "/bin/mysql_install_db") (("basedir=\"\"") (string-append "basedir=\"" out "\""))) ;; Remove unneeded files for testing. - (with-directory-excursion out + (with-directory-excursion lib (for-each delete-file-recursively - '("data" "mysql-test" "sql-bench" - "share/man/man1/mysql-test-run.pl.1")) - ;; Delete huge and unnecessary executables. - (for-each delete-file (find-files "bin" "(test|embedded)")) + '("data" "mysql-test" "sql-bench")) ;; And static libraries. (for-each delete-file (find-files "lib" "\\.a$"))) + (with-directory-excursion out + (delete-file "share/man/man1/mysql-test-run.pl.1") + ;; Delete huge and unnecessary executables. + (for-each delete-file (find-files "bin" "(test|embedded)"))) + (mkdir-p (string-append dev "/share")) + (mkdir-p (string-append dev "/bin")) + (rename-file (string-append lib "/bin/mysqld") + (string-append out "/bin/mysqld")) + (rename-file (string-append lib "/share/pkgconfig") + (string-append dev "/share/pkgconfig")) + (rename-file (string-append out "/bin/mysql_config") + (string-append dev "/bin/mysql_config")) #t)))))) (native-inputs `(("bison" ,bison) @@ -1544,7 +1567,8 @@ (define-public perl-dbd-mysql #:tests? #f)) (propagated-inputs `(("perl-dbi" ,perl-dbi) - ("mysql" ,mariadb))) + ("mysql" ,mariadb "lib") + ("mysql-dev" ,mariadb "dev"))) (home-page "https://metacpan.org/release/DBD-mysql") (synopsis "DBI MySQL interface") (description "This package provides a MySQL driver for the Perl5 @@ -2662,7 +2686,8 @@ (define-public python-mysqlclient ("mock" ,python-mock) ("py.test" ,python-pytest))) (inputs - `(("mysql" ,mariadb) + `(("mysql" ,mariadb "lib") + ("mysql-dev" ,mariadb "dev") ("libz" ,zlib) ("openssl" ,openssl))) (home-page "https://github.com/PyMySQL/mysqlclient-python") diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1b8ae47fc2..0dfff8146b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11325,7 +11325,8 @@ (define-public emacs-emacsql #t))))) (inputs `(("emacs-minimal" ,emacs-minimal) - ("mariadb" ,mariadb) + ("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("postgresql" ,postgresql))) (propagated-inputs `(("emacs-finalize" ,emacs-finalize) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index a9b5b85a47..fbb153b1f2 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -436,7 +436,8 @@ (define-public kodi ("libxrender" ,libxrender) ("libxslt" ,libxslt) ("lzo" ,lzo) - ("mariadb" ,mariadb) + ("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("openssl" ,openssl) ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b688b405f1..e8eb1ad376 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -224,7 +224,8 @@ (define-public qt ("libxslt" ,libxslt) ("libxtst" ,libxtst) ("mtdev" ,mtdev) - ("mariadb" ,mariadb) + ("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("nss" ,nss) ("openssl" ,openssl) ("postgresql" ,postgresql) @@ -579,7 +580,8 @@ (define-public qtbase ("libxslt" ,libxslt) ("libxtst" ,libxtst) ("mtdev" ,mtdev) - ("mariadb" ,mariadb) + ("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("nss" ,nss) ("openssl" ,openssl) ("pcre2" ,pcre2) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7d736c7c27..21fbd2ecd4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2645,7 +2645,8 @@ (define-public ruby-mysql2 (invoke "rspec")) #t))))) (inputs - `(("mariadb" ,mariadb) + `(("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("zlib" ,zlib))) (native-inputs `(("ruby-rspec" ,ruby-rspec) -- cgit v1.2.3 From 8df9249d8e12423160d4308664b937e118231ae7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 13 Oct 2019 17:03:44 +0300 Subject: gnu: qt: Update to 5.12.5. * gnu/packages/qt.scm (qt, 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, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech): Update to 5.12.5. --- gnu/packages/qt.scm | 128 ++++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 64 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e8eb1ad376..a8b2bb40be 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -129,7 +129,7 @@ (define-public grantlee (define-public qt (package (name "qt") - (version "5.12.4") + (version "5.12.5") (outputs '("out" "examples")) (source (origin (method url-fetch) @@ -142,7 +142,7 @@ (define-public qt version ".tar.xz")) (sha256 (base32 - "1q95sjyldm2p5xvqn0f52fin0q5axy982nqd3289jxcqwh75xnl5")) + "160jr7w39lpd7cwnlbgf5yj8halan7zpnxj2hbwwlrvpvchrwad2")) (modules '((guix build utils))) (snippet '(begin @@ -525,7 +525,7 @@ (define-public qt-4 (define-public qtbase (package (name "qtbase") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -534,7 +534,7 @@ (define-public qtbase version ".tar.xz")) (sha256 (base32 - "158i0apc3i8bbgrk9j1k34y2b03v0kwwv8m7aaaxpxsglppwgyr0")) + "09fnwjyxl4fsvlajkdvizw9spfkxq5mvaqld7mckxnm9ppxvz2pw")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch")) (modules '((guix build utils))) @@ -765,7 +765,7 @@ (define-public qtbase (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -774,7 +774,7 @@ (define-public qtsvg version ".tar.xz")) (sha256 (base32 - "010drs2dv573fgbswnj83yrdxnj3lbcha4y4xgjm1ikkb98i420i")))) + "0h4qcy5l3gzcgqp53nqqa1wlbxqklly402q9m5z1srwzfk7r39vm")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -840,7 +840,7 @@ (define-public qtsvg (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -849,7 +849,7 @@ (define-public qtimageformats version ".tar.xz")) (sha256 (base32 - "1cvv62r28ld5f0ipvahxv81bj8ik2m819x20pln1f3d9xv1jbvid")) + "02hzkrlqk3waiqgbjx7npyb7y85p2ri6p076ppkbjbsl6143j6cz")) (modules '((guix build utils))) (snippet '(begin @@ -871,7 +871,7 @@ (define-public qtimageformats (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -880,7 +880,7 @@ (define-public qtx11extras version ".tar.xz")) (sha256 (base32 - "07mfkfgj02z7fb1swx5nmih3i979kpriwr8jprywl0aamyg01k29")))) + "0s1a0sbnf7d415mkdrihjdybi0vsq5ccwjm6qrw0h14bwkrmlhl9")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -895,7 +895,7 @@ (define-public qtx11extras (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -904,7 +904,7 @@ (define-public qtxmlpatterns version ".tar.xz")) (sha256 (base32 - "0rjniwgid8ypzfx33di5bprn8r3sk4zcqxa3xp5nb3wlpccigshb")))) + "1gdsm12bfg0xg4g09ar26l8zqqqgbk22z522y7q8wyc7gw8dj1dr")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -924,7 +924,7 @@ (define-public qtxmlpatterns (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -933,7 +933,7 @@ (define-public qtdeclarative version ".tar.xz")) (sha256 (base32 - "19yd38q8r30jjw12wjrf6i8ygi9lk4fg7zil3gc6g787fgnhahb1")))) + "144i5crdp9szj0906vs01bhgwvcx29a1pvrf6mp9w9819cyk5i92")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -956,7 +956,7 @@ (define-public qtdeclarative (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -965,7 +965,7 @@ (define-public qtconnectivity version ".tar.xz")) (sha256 (base32 - "1vvkn6k4qiyyrd3m3c7fj6qiq0fw32wvd7sn1zl15blz5cj0b7bl")))) + "12z8ing2bpkk53hgqn0y15j12npqv4sfkpgc2x6prx49srr2rxmx")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -980,7 +980,7 @@ (define-public qtconnectivity (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -989,7 +989,7 @@ (define-public qtwebsockets version ".tar.xz")) (sha256 (base32 - "1giaxcvwv0mvxb2iapvdfiz128j0hjw3pi9vzi8irll6yjifswdl")))) + "0qij55bifdg0ip9kc5ka6f6cl39nnn2bmplrhada23lwqjbycn2x")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1007,7 +1007,7 @@ (define-public qtwebsockets (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1016,7 +1016,7 @@ (define-public qtsensors version ".tar.xz")) (sha256 (base32 - "1af0mv22yqdi93c2r36ajiax1yv89nk8qdj1xgb0h04nlmz3r1wm")))) + "118bra2ik3d2ji7cpy14plz25pl2ch15dpklr0zv4ns7dxq6ma73")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -1040,7 +1040,7 @@ (define-public qtsensors (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1049,7 +1049,7 @@ (define-public qtmultimedia version ".tar.xz")) (sha256 (base32 - "0ga26g832i8srpm99bzmxynlgf70zzp5p8vi1fqq096adymmj1vw")) + "1727wf76nlc6snc9800rky6zz45i240gr8b025j4vwayvkys986m")) (modules '((guix build utils))) (snippet '(begin @@ -1091,7 +1091,7 @@ (define-public qtmultimedia (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1100,7 +1100,7 @@ (define-public qtwayland version ".tar.xz")) (sha256 (base32 - "1dz6fj768yn75mn35av0k8925bx15g0qazar9h9qfxljqdcykb9g")) + "0iiqdwn54y8lsmq3y0w681q6wl0l18g06px1za9iyia9f4k33z99")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -1143,7 +1143,7 @@ (define-public qtwayland (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1152,7 +1152,7 @@ (define-public qtserialport version ".tar.xz")) (sha256 (base32 - "0fddn217q0cpk6p0c0z4ir4lrvqpbfkmfaw40gqxsbpvm7w7sj5z")))) + "0qmq3yppc54vf7xrwyrwk91h6x04w0hf4bnw5b3y5kwyllhh7vzq")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -1177,7 +1177,7 @@ (define-public qtserialport (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1186,7 +1186,7 @@ (define-public qtserialbus version ".tar.xz")) (sha256 (base32 - "1z0iccn2lk80qjkvlhv33plgld9q6xnz9s2h0xkkxq9yyh2nkmb9")))) + "08icq26m8a0pnapwds0mv7haybizchkmqxg0g8r6xi83lxhswx44")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1198,7 +1198,7 @@ (define-public qtserialbus (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1207,7 +1207,7 @@ (define-public qtwebchannel version ".tar.xz")) (sha256 (base32 - "1dzx7f9aa7zq46d7xhhchp233m4qv7zxdf56w5mshqcyd4dilmxb")))) + "1s65nfs4y031vldf7dk7rdjsfi8a0z04w787rwz0bvi20z11l7cz")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1222,7 +1222,7 @@ (define-public qtwebchannel (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1231,7 +1231,7 @@ (define-public qtwebglplugin version ".tar.xz")) (sha256 (base32 - "0rijdn20bqkx9f73y8pvam1878anaynf6nv0asxjk031jfca0vvm")))) + "1xy45djrc4lcnvd5vq3ds2scpzkpcxhsnvmsmgbnvwmnwnrb5hxa")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1257,7 +1257,7 @@ (define-public qtwebglplugin (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1266,7 +1266,7 @@ (define-public qtwebview version ".tar.xz")) (sha256 (base32 - "0pasmcr6xdlbgi4gdkkm4w5ba00r71vyibsw7hyx1nadfxmlq90z")))) + "09ig6dyvzxl499vplmpdd6shvs2mfvbgqx48cgs3hs6d6p1xim56")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1280,7 +1280,7 @@ (define-public qtwebview (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1289,7 +1289,7 @@ (define-public qtlocation version ".tar.xz")) (sha256 (base32 - "185k53qsaqcv280602p92vaddsfxf4frqk4gp4zsvzkrfsyl0yqj")))) + "08h10khklf811bqn143pbkcipfn6nwysxs1mw5bcmi5banbvbj0j")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1310,7 +1310,7 @@ (define-public qtlocation (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1319,7 +1319,7 @@ (define-public qttools version ".tar.xz")) (sha256 (base32 - "1dkfpmhpymaagvlybqq7s7bix0gqzsa5zbpfp56wvh59c0w3a3iv")))) + "09a0siyiny5wgsnyqxi5y7s1n2dc975wn831sryl71a9gc29bq18")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1338,7 +1338,7 @@ (define-public qttools (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1347,7 +1347,7 @@ (define-public qtscript version ".tar.xz")) (sha256 (base32 - "0sibbhq88jni850jw7anwnvmykzm1w5qbjkblbradirqfvkkznvs")) + "1x0x9zr31ic5yki45r48bkmb9w9pvqawppklnws07117x15770q0")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1362,7 +1362,7 @@ (define-public qtscript (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1371,7 +1371,7 @@ (define-public qtquickcontrols version ".tar.xz")) (sha256 (base32 - "0n4qvafpc828cyc7w931drhxrawgxijzbmr6mh5ppiipad8c5m1j")))) + "0n953lnz6gsa8dpa7c93i4qv50jzdyahgs28qxvabnn3vbxsxpj6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1386,7 +1386,7 @@ (define-public qtquickcontrols (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1395,7 +1395,7 @@ (define-public qtquickcontrols2 version ".tar.xz")) (sha256 (base32 - "0c8343k1w6v4k96agp3x0xy3fh49ylbp6h5wwxxpv35w73npwi4s")))) + "13ybd87shs09lpr1rji5k0wik1rmwa8lh78vab5vcva8jb2bsi6p")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1411,7 +1411,7 @@ (define-public qtquickcontrols2 (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1420,7 +1420,7 @@ (define-public qtgraphicaleffects version ".tar.xz")) (sha256 (base32 - "0wyzkd5zx9qd3mwynkmxiin0fixaczb76lajhhcl2957iwb8phqb")))) + "1ba6qr4h16zap9f36dw5qip97s4bv83prncqka043l70w2kxpgdx")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1466,7 +1466,7 @@ (define-public qtdeclarative-render2d (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1475,7 +1475,7 @@ (define-public qtgamepad version ".tar.xz")) (sha256 (base32 - "0iacdqa22dgvnp143klpzg5hxffy6fzqi5jn3r6liwhqzc86zpi5")))) + "0czdmmbjc6zpj213pwwgjh0h2awzmrgkqy5gl5a5vk7p8wfz126y")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1496,7 +1496,7 @@ (define-public qtgamepad (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1505,7 +1505,7 @@ (define-public qtscxml version ".tar.xz")) (sha256 (base32 - "1y6l18df3qj03lr58clsmgn2n38nrf0gr2g5bwkm3081c8mbfvv9")) + "034n97nyz9ymjcxzqchvwr1bllzwav9hjpjkqggygcnd010wf7kg")) (modules '((guix build utils))) (snippet '(begin @@ -1527,7 +1527,7 @@ (define-public qtscxml (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1536,7 +1536,7 @@ (define-public qtpurchasing version ".tar.xz")) (sha256 (base32 - "0whn45q8dgm7bz5lqxzjfg56xhz2bi3axl50h5nqs3ix0h8s213q")))) + "0nv1psq1vsrpvk8y3lqgxl0g1w7ll6nrxhgw9zxg71ykhm4vrkkv")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1547,7 +1547,7 @@ (define-public qtpurchasing (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1556,7 +1556,7 @@ (define-public qtcanvas3d version ".tar.xz")) (sha256 (base32 - "0sbqrpx36x9filb693blwidgdqcxr88h8w5pky97l1rdajmfiq6p")) + "036q2r1disvb8aaiix7p0yn4wwqfq22qnsfkmqvgnnncwdnf0lqm")) (modules '((guix build utils))) (snippet '(begin @@ -1586,7 +1586,7 @@ (define-public qtcanvas3d (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1595,7 +1595,7 @@ (define-public qtcharts version ".tar.xz")) (sha256 (base32 - "17lwcsbx2n8a19q54za1pipispj68r77vn6d55s88xy31nl6izq6")))) + "02361bf59bsnhk0kz767vbg4rbx8qn5z92avcfhh00ds2slk0z2c")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1613,7 +1613,7 @@ (define-public qtcharts (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1622,7 +1622,7 @@ (define-public qtdatavis3d version ".tar.xz")) (sha256 (base32 - "0nmids4gf6f03byyaav4mq6qhby6bfjzmr4axsm051hc8gmhw5hw")))) + "1ws46ijmxmrgg6rmg9mb5sfa2zx4rpjw1f7vqqcgpirhafznbq8x")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1640,7 +1640,7 @@ (define-public qtdatavis3d (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1649,7 +1649,7 @@ (define-public qtnetworkauth version ".tar.xz")) (sha256 (base32 - "0mdz3pp3vzkz65i0cb62gnh7crng4k1a347yp5yjnnj0p13fn0g5")))) + "1wd967sqw0rf8j6wg4qm45rsrzfbg0kcf9j0rrq0qm9h5md4fcq9")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1669,7 +1669,7 @@ (define-public qtnetworkauth (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1678,7 +1678,7 @@ (define-public qtremoteobjects version ".tar.xz")) (sha256 (base32 - "04zl2z1vffw7l831ginnv2dks1rn1glw4wc7c3q0pydz59w0rpal")))) + "1kgarxc63jx12ifgjj8cw2033nm1p0lkxq6762zyy7yxjfpk3wdc")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1702,7 +1702,7 @@ (define-public qtremoteobjects (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1711,7 +1711,7 @@ (define-public qtspeech version ".tar.xz")) (sha256 (base32 - "1v4h9g4s3xjy2hnf4shk40bnjqnv0jix34glc68kqrpmnc7ndy9g")))) + "0nzj6vs56qplym1rr1jbybbpr5jwqhbjqk9igpcj06kd4gbhqk7r")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests -- cgit v1.2.3 From e8062974d5cc598134da4d57ff45970ac431611b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Oct 2019 16:34:15 +0200 Subject: gnu: python-pyqt: Fix runtime error. * gnu/packages/patches/pyqt-unbundled-qt.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/qt.scm (python-pyqt)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/patches/pyqt-unbundled-qt.patch | 19 +++++++++++++++++++ gnu/packages/qt.scm | 1 + 3 files changed, 21 insertions(+) create mode 100644 gnu/packages/patches/pyqt-unbundled-qt.patch (limited to 'gnu/packages/qt.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 1fc916f6b3..7f690598c0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1253,6 +1253,7 @@ dist_patch_DATA = \ %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ %D%/packages/patches/pyqt-configure.patch \ %D%/packages/patches/pyqt-public-sip.patch \ + %D%/packages/patches/pyqt-unbundled-qt.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ %D%/packages/patches/python-2.7-adjust-tests.patch \ %D%/packages/patches/python-2.7-search-paths.patch \ diff --git a/gnu/packages/patches/pyqt-unbundled-qt.patch b/gnu/packages/patches/pyqt-unbundled-qt.patch new file mode 100644 index 0000000000..5c91ed031c --- /dev/null +++ b/gnu/packages/patches/pyqt-unbundled-qt.patch @@ -0,0 +1,19 @@ +Remove test for bundled Qt which breaks dependent applications. This has +been fixed in 5.13. + +Taken from Arch Linux: +https://git.archlinux.org/svntogit/packages.git/tree/trunk/python2-pyqt5-crash-fix.patch?h=packages/pyqt5&id=3e56e11d1fd7b1eac8242ce64c58db2bd9acba20 + +diff -ur PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in +--- PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in 2019-06-25 14:41:02.000000000 +0200 ++++ PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in 2019-07-01 17:06:34.882644535 +0200 +@@ -151,8 +151,4 @@ + // initialised first (at least for Windows) and this is the only way to + // guarantee things are done in the right order. + PyQtSlotProxy::mutex = new QMutex(QMutex::Recursive); +- +- // Load the embedded qt.conf file if there is a bundled copy of Qt. +- if (!qpycore_qt_conf()) +- Py_FatalError("PyQt5.QtCore: Unable to embed qt.conf"); + } + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a8b2bb40be..8928c1ddd4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1806,6 +1806,7 @@ (define-public python-pyqt (base32 "041155bdzp57jy747p5d59740c55yy3241cy1x2lgcdsvqvzmc0d")) (patches (search-patches "pyqt-configure.patch" + "pyqt-unbundled-qt.patch" "pyqt-public-sip.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From ea57bb893eeb7008064d2f511dede616d4bdcbd1 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 5 Nov 2019 21:44:49 +0100 Subject: gnu: grantlee: Fix build for Qt 5.12. Build using gnu++11 standard. * gnu/packages/qt.scm(grantlee)[argument]: New element. --- gnu/packages/qt.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8928c1ddd4..0ef879678f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -100,7 +100,8 @@ (define-public grantlee ("qtscript" ,qtscript))) (build-system cmake-build-system) (arguments - `(#:phases + `(#:configure-flags '("-DCMAKE_CXX_STANDARD=11") + #:phases (modify-phases %standard-phases (add-after 'unpack 'delete-broken-tests (lambda _ -- cgit v1.2.3 From 8bfd7c8beb75ed3838efdf5973b9db5fb3ced68c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 8 Nov 2019 11:14:52 +0100 Subject: gnu: qtwebkit: Use sqlite-with-column-metadata. This needs to be the same variant as for qtbase, otherwise applications might fail if libQt5WebKit is loaded prior to libQt5Sql. * gnu/packages/qt.scm(wtwebkit)[inputs]: Replace sqlite by sqlite-with-column-metadata. --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 0ef879678f..222a0cc867 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2182,7 +2182,7 @@ (define-public qtwebkit ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libwebp" ,libwebp) - ("sqlite" ,sqlite) + ("sqlite" ,sqlite-with-column-metadata) ("fontconfig" ,fontconfig) ("libxrender" ,libxrender) ("qtbase" ,qtbase) -- cgit v1.2.3 From 4ae8180ca669a00ad6050936a1e541f6c3fa321a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 Nov 2019 09:56:20 +0100 Subject: gnu: python-pyqt: Fix output directory for plugins. This defaults to QT_INSTALL_PLUGINS, thus we should use the same sub-directory ($out/lib/qt5/plugins) here. * gnu/packages/qt.scm (python-pyqt)[arguments]{configure}: Change base file name for plugins. --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 241e73d575..c85fa93266 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1615,7 +1615,7 @@ (define-public python-pyqt (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (sip (string-append out "/share/sip")) - (plugins (string-append out "/plugins")) + (plugins (string-append out "/lib/qt5/plugins")) (designer (string-append plugins "/designer")) (qml (string-append plugins "/PyQt5")) (python (assoc-ref inputs "python")) -- cgit v1.2.3 From a59e2dd8cd16655e379abb567baf978c94f3d48e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 19:09:58 +0100 Subject: gnu: qtbase: Use absolute references in .prl files. This fixes . * gnu/packages/qt.scm (qtbase)[arguments]: Add phase 'patch-prl-files'. --- gnu/packages/qt.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 5f4f29a948..2cc44ab831 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -509,6 +509,16 @@ (define-public qtbase (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata) (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)) #t))) + (add-after 'patch-mkspecs 'patch-prl-files + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Insert absolute references to the qtbase libraries because + ;; QT_INSTALL_LIBS does not always resolve correctly, depending + ;; on context. See + (substitute* (find-files (string-append out "/lib") "\\.prl$") + (("\\$\\$\\[QT_INSTALL_LIBS\\]") + (string-append out "/lib"))) + #t))) (add-after 'unpack 'patch-paths ;; Use the absolute paths for dynamically loaded libs, otherwise ;; the lib will be searched in LD_LIBRARY_PATH which typically is -- cgit v1.2.3 From f0de36cba7f9f8a6de3a579034e10516195b97e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 Nov 2019 17:13:10 +0100 Subject: gnu: qtbase: Restore compatibility with old kernels. * gnu/packages/qt.scm (qtbase)[arguments]: Add 'no-feature-renameat2' to the configure flags. --- gnu/packages/qt.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2cc44ab831..b8c0b3f6d2 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -451,6 +451,7 @@ (define-public qtbase ;; kernels that the glibc supports, including the RHEL6 ;; (2.6.32) and RHEL7 (3.10) kernels. "-no-feature-getentropy" ; requires Linux 3.17 + "-no-feature-renameat2" ; requires Linux 3.16 ;; Do not build examples; if desired, these could go ;; into a separate output, but for the time being, we -- cgit v1.2.3 From 6d460e80d1b06fc094374e7ba5c2503f2a897f11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 19:30:56 +0100 Subject: gnu: Qt: Update to 5.12.6 LTS. * 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, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech): Update to 5.12.6. --- gnu/packages/qt.scm | 120 ++++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b8c0b3f6d2..631e060a1e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -325,7 +325,7 @@ (define-public qt-4 (define-public qtbase (package (name "qtbase") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -334,7 +334,7 @@ (define-public qtbase version ".tar.xz")) (sha256 (base32 - "09fnwjyxl4fsvlajkdvizw9spfkxq5mvaqld7mckxnm9ppxvz2pw")) + "09wz7zs1x5mpgs2y4xnl2zv3naqls4sz6v2arwl1fz2dsx4jddba")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch")) (modules '((guix build utils))) @@ -581,7 +581,7 @@ (define-deprecated qt qtbase qtbase) (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -590,7 +590,7 @@ (define-public qtsvg version ".tar.xz")) (sha256 (base32 - "0h4qcy5l3gzcgqp53nqqa1wlbxqklly402q9m5z1srwzfk7r39vm")))) + "13zg5095ffm88dsrybyi075i9zw3yrkibqzvj57an9sq89n3w926")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -656,7 +656,7 @@ (define-public qtsvg (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -665,7 +665,7 @@ (define-public qtimageformats version ".tar.xz")) (sha256 (base32 - "02hzkrlqk3waiqgbjx7npyb7y85p2ri6p076ppkbjbsl6143j6cz")) + "0n3qc5rx7kzb4csmcxaxdm2bqpciz2j2pz2zdfrlpi1ml4liq39k")) (modules '((guix build utils))) (snippet '(begin @@ -687,7 +687,7 @@ (define-public qtimageformats (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -696,7 +696,7 @@ (define-public qtx11extras version ".tar.xz")) (sha256 (base32 - "0s1a0sbnf7d415mkdrihjdybi0vsq5ccwjm6qrw0h14bwkrmlhl9")))) + "0sqx785kb4kfxfl3cmg848dlxlxmfdg8jnfh3rrk8q0iazsr2faz")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -711,7 +711,7 @@ (define-public qtx11extras (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -720,7 +720,7 @@ (define-public qtxmlpatterns version ".tar.xz")) (sha256 (base32 - "1gdsm12bfg0xg4g09ar26l8zqqqgbk22z522y7q8wyc7gw8dj1dr")))) + "1l44476ibb8rv4rf80vbjdc3712lmrl1xcxswa513ip66k47p5vn")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -740,7 +740,7 @@ (define-public qtxmlpatterns (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -749,7 +749,7 @@ (define-public qtdeclarative version ".tar.xz")) (sha256 (base32 - "144i5crdp9szj0906vs01bhgwvcx29a1pvrf6mp9w9819cyk5i92")))) + "1lw6nr26cjdrshin3gq5xwqb0bvslg0ml99cw8rx9wb2anpd3c9l")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -772,7 +772,7 @@ (define-public qtdeclarative (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -781,7 +781,7 @@ (define-public qtconnectivity version ".tar.xz")) (sha256 (base32 - "12z8ing2bpkk53hgqn0y15j12npqv4sfkpgc2x6prx49srr2rxmx")))) + "1ni2x848dxf0c7ilk461vz0z46qis8zv6jxbpyhpbhzdg9rcdw8h")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -796,7 +796,7 @@ (define-public qtconnectivity (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -805,7 +805,7 @@ (define-public qtwebsockets version ".tar.xz")) (sha256 (base32 - "0qij55bifdg0ip9kc5ka6f6cl39nnn2bmplrhada23lwqjbycn2x")))) + "07nnzqhsnb4q8pbka9dk5nxmqinbg9yicag7f4rlq2p6ffmgn2zh")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -823,7 +823,7 @@ (define-public qtwebsockets (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -832,7 +832,7 @@ (define-public qtsensors version ".tar.xz")) (sha256 (base32 - "118bra2ik3d2ji7cpy14plz25pl2ch15dpklr0zv4ns7dxq6ma73")))) + "1x8f55qyix5bsd0hl9rzi56ndyv4h16z2qh8is9nv13jpk0a9nsr")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -856,7 +856,7 @@ (define-public qtsensors (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -865,7 +865,7 @@ (define-public qtmultimedia version ".tar.xz")) (sha256 (base32 - "1727wf76nlc6snc9800rky6zz45i240gr8b025j4vwayvkys986m")) + "0w4mcxmj41b9phwirppn9ws1vxy3sww7prvhhmh0jsnaca4hwn4z")) (modules '((guix build utils))) (snippet '(begin @@ -907,7 +907,7 @@ (define-public qtmultimedia (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -916,7 +916,7 @@ (define-public qtwayland version ".tar.xz")) (sha256 (base32 - "0iiqdwn54y8lsmq3y0w681q6wl0l18g06px1za9iyia9f4k33z99")) + "1i2i4d6qa512njm6gvd1ygcyb5p4d6axciqg9ys380yw9nl6m77s")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -993,7 +993,7 @@ (define-public qtserialport (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1002,7 +1002,7 @@ (define-public qtserialbus version ".tar.xz")) (sha256 (base32 - "08icq26m8a0pnapwds0mv7haybizchkmqxg0g8r6xi83lxhswx44")))) + "1ppmrwshj42lpx21m2gxblrlbigjf10fwg3fk5x5130ih89446q7")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1014,7 +1014,7 @@ (define-public qtserialbus (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1023,7 +1023,7 @@ (define-public qtwebchannel version ".tar.xz")) (sha256 (base32 - "1s65nfs4y031vldf7dk7rdjsfi8a0z04w787rwz0bvi20z11l7cz")))) + "1my8vcsidx9r5wpd1iax8skhp5ac3234g9r7ax04k9z17mqd2i97")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1038,7 +1038,7 @@ (define-public qtwebchannel (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1047,7 +1047,7 @@ (define-public qtwebglplugin version ".tar.xz")) (sha256 (base32 - "1xy45djrc4lcnvd5vq3ds2scpzkpcxhsnvmsmgbnvwmnwnrb5hxa")))) + "1pahdyhinhq1xhsc7lsfprjjpz6fn9vgwqcyi72hc3wzyr98in11")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1073,7 +1073,7 @@ (define-public qtwebglplugin (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1082,7 +1082,7 @@ (define-public qtwebview version ".tar.xz")) (sha256 (base32 - "09ig6dyvzxl499vplmpdd6shvs2mfvbgqx48cgs3hs6d6p1xim56")))) + "0ykjwz3cwv718gvgvnlhq7wia8gllnj3cdzw3amj0rh63hy65h22")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1096,7 +1096,7 @@ (define-public qtwebview (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1105,7 +1105,7 @@ (define-public qtlocation version ".tar.xz")) (sha256 (base32 - "08h10khklf811bqn143pbkcipfn6nwysxs1mw5bcmi5banbvbj0j")))) + "0y12vs6jwiwljdn57jqs1dwi6wfw1l5l95dvj9g93h739p533qks")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1126,7 +1126,7 @@ (define-public qtlocation (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1135,7 +1135,7 @@ (define-public qttools version ".tar.xz")) (sha256 (base32 - "09a0siyiny5wgsnyqxi5y7s1n2dc975wn831sryl71a9gc29bq18")))) + "0xy7sf8w2lln1l59lhrf0kb687avwirrh63izp7509jwi33r2jg9")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1154,7 +1154,7 @@ (define-public qttools (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1163,7 +1163,7 @@ (define-public qtscript version ".tar.xz")) (sha256 (base32 - "1x0x9zr31ic5yki45r48bkmb9w9pvqawppklnws07117x15770q0")) + "0z3p4bb2ddylb7y2xvagjbn7fc5d0ic08cmrrb67h8wf6fnq5051")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1178,7 +1178,7 @@ (define-public qtscript (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1187,7 +1187,7 @@ (define-public qtquickcontrols version ".tar.xz")) (sha256 (base32 - "0n953lnz6gsa8dpa7c93i4qv50jzdyahgs28qxvabnn3vbxsxpj6")))) + "169cvwiav5d538cw81rbdimb1pis0z6fkaxlwhd4z4pzhyhrd3f4")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1202,7 +1202,7 @@ (define-public qtquickcontrols (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1211,7 +1211,7 @@ (define-public qtquickcontrols2 version ".tar.xz")) (sha256 (base32 - "13ybd87shs09lpr1rji5k0wik1rmwa8lh78vab5vcva8jb2bsi6p")))) + "0w5910wblzc7q2llyb7fyfcbmy1fl369c6w5d6r5sh26z490gasw")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1227,7 +1227,7 @@ (define-public qtquickcontrols2 (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1236,7 +1236,7 @@ (define-public qtgraphicaleffects version ".tar.xz")) (sha256 (base32 - "1ba6qr4h16zap9f36dw5qip97s4bv83prncqka043l70w2kxpgdx")))) + "1vvpq34433j94n9yyhh4if4yv51i8xiffpvyn3xgffx14iv35l6y")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1254,7 +1254,7 @@ (define-public qtgraphicaleffects (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1263,7 +1263,7 @@ (define-public qtgamepad version ".tar.xz")) (sha256 (base32 - "0czdmmbjc6zpj213pwwgjh0h2awzmrgkqy5gl5a5vk7p8wfz126y")))) + "1cxkqnhx0baxh3csjl7ar151v0zizf86f4338rr38liwb7rwbsz1")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1284,7 +1284,7 @@ (define-public qtgamepad (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1293,7 +1293,7 @@ (define-public qtscxml version ".tar.xz")) (sha256 (base32 - "034n97nyz9ymjcxzqchvwr1bllzwav9hjpjkqggygcnd010wf7kg")) + "12y6ga7j6xby9rz1c9h17r9ih4i16i1ylr6b4vmrn7svidy87msk")) (modules '((guix build utils))) (snippet '(begin @@ -1315,7 +1315,7 @@ (define-public qtscxml (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1324,7 +1324,7 @@ (define-public qtpurchasing version ".tar.xz")) (sha256 (base32 - "0nv1psq1vsrpvk8y3lqgxl0g1w7ll6nrxhgw9zxg71ykhm4vrkkv")))) + "1kbhmzrw612yb4brxi3fwslil31j31vm0zqpb52vcma7vbivg80z")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1335,7 +1335,7 @@ (define-public qtpurchasing (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1344,7 +1344,7 @@ (define-public qtcanvas3d version ".tar.xz")) (sha256 (base32 - "036q2r1disvb8aaiix7p0yn4wwqfq22qnsfkmqvgnnncwdnf0lqm")) + "024xglrb321rp3wb3fhprw7pl6zvmpgfkpwgabbyx8p58k4yccrd")) (modules '((guix build utils))) (snippet '(begin @@ -1374,7 +1374,7 @@ (define-public qtcanvas3d (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1383,7 +1383,7 @@ (define-public qtcharts version ".tar.xz")) (sha256 (base32 - "02361bf59bsnhk0kz767vbg4rbx8qn5z92avcfhh00ds2slk0z2c")))) + "0gdark4z2g8j0kzjg1aqq91ap04h6hzjl163g8xlwxwdn5dxpnql")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1401,7 +1401,7 @@ (define-public qtcharts (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1410,7 +1410,7 @@ (define-public qtdatavis3d version ".tar.xz")) (sha256 (base32 - "1ws46ijmxmrgg6rmg9mb5sfa2zx4rpjw1f7vqqcgpirhafznbq8x")))) + "1zm4xfi2ijqr3n3g0lfs3yzil6w7c54r8vsj1d541lz7wnm92ka1")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1428,7 +1428,7 @@ (define-public qtdatavis3d (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1437,7 +1437,7 @@ (define-public qtnetworkauth version ".tar.xz")) (sha256 (base32 - "1wd967sqw0rf8j6wg4qm45rsrzfbg0kcf9j0rrq0qm9h5md4fcq9")))) + "1gba6rdhcvljc4dnzhnkxrdlaxm3y095ljqg1sz3p1k0m632s4pa")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1457,7 +1457,7 @@ (define-public qtnetworkauth (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1466,7 +1466,7 @@ (define-public qtremoteobjects version ".tar.xz")) (sha256 (base32 - "1kgarxc63jx12ifgjj8cw2033nm1p0lkxq6762zyy7yxjfpk3wdc")))) + "16fna70pljn45yj6hv3g4qvb1imcnfj43jchvydspdhg08ykbda9")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1490,7 +1490,7 @@ (define-public qtremoteobjects (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1499,7 +1499,7 @@ (define-public qtspeech version ".tar.xz")) (sha256 (base32 - "0nzj6vs56qplym1rr1jbybbpr5jwqhbjqk9igpcj06kd4gbhqk7r")))) + "12l7rycjfa6d9gnnjd6i097pf1qqzjnz9c1jgxhpldvkf0n7pbi7")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests -- cgit v1.2.3 From d733a469d74f74734825f1ce777956fb4cac5534 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 26 Nov 2019 19:33:15 +0100 Subject: gnu: Remove dependency on Python 2 for some Qt packages. * gnu/packages/qt.scm (qtbase, qtmultimedia) [native-inputs]: Replace python-2 by python. (qtdeclarative)[native-inputs]: Replace python-2 by python, add python-wrapper. --- gnu/packages/qt.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 86685a325b..c0d652a407 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -401,7 +401,7 @@ (define-public qtbase ("gperf" ,gperf) ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2) + ("python" ,python) ("vulkan-headers" ,vulkan-headers) ("ruby" ,ruby))) (arguments @@ -756,7 +756,8 @@ (define-public qtdeclarative (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2) + ("python" ,python) + ("python-wrapper" ,python-wrapper) ("qtsvg" ,qtsvg) ("qtxmlpatterns" ,qtxmlpatterns))) (inputs @@ -889,7 +890,7 @@ (define-public qtmultimedia (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2) + ("python" ,python) ("qtdeclarative" ,qtdeclarative))) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3