From 9d01749feaa1586b1caf449712116e7518bb2303 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 24 Jan 2021 15:44:06 +0100 Subject: gnu: qt5: Add source code URLs of mirrors. * gnu/packages/qt.scm (qt5-urls): New procedure. (qtbase, qtsvg, qtimageformats, qtx11extras) (qtxmlpatterns, qtdeclarative, qtconnectivity) (qtwebsockets, qtsensors, qtmultimedia, qtwayland) (qtserialport, qtserialbus, qtwebchannel, qtwebglplugin) (qtwebview, qttools, qtscript, qtquickcontrols) (qtquickcontrols2, qtgraphicaleffects, qtgamepad) (qtscxml, qtpurchasing, qtcharts, qtdatavis3d) (qtnetworkauth, qtremoteobjects, qtspeech) (qtwebengine): Use it. --- gnu/packages/qt.scm | 170 +++++++++++++++------------------------------------- 1 file changed, 49 insertions(+), 121 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 79d41b3e73..96a28ceb29 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2015, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2015, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016 Thomas Danckaert @@ -343,16 +343,31 @@ developers using C++ or QML, a CSS & JavaScript like language.") ;; Qt 5: assembler error; see . (supported-systems (delete "mips64el-linux" %supported-systems)))) +(define (qt5-urls component version) + "Return a list of URLs for VERSION of the Qt5 COMPONENT." + ;; We can't use a mirror:// scheme because these URLs are not exact copies: + ;; the layout differs between them. + (list (string-append "https://download.qt.io/official_releases/qt/" + (version-major+minor version) "/" version + "/submodules/" component "-everywhere-src-" + version ".tar.xz") + (string-append "https://download.qt.io/archive/qt/" + (version-major+minor version) "/" version + "/submodules/" component "-everywhere-src-" + version ".tar.xz") + (let ((directory (string-append "qt5" (string-drop component 2)))) + (string-append "http://sources.buildroot.net/" directory "/" + component "-everywhere-src-" version ".tar.xz")) + (string-append "https://distfiles.macports.org/qt5/" + component "-everywhere-src-" version ".tar.xz"))) + (define-public qtbase (package (name "qtbase") (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8")) @@ -611,10 +626,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "18dmfc8s428fzbk7k5vl3212b25455ayrz7s716nwyiy3ahgmmy7")))) @@ -686,10 +698,7 @@ HostData=lib/qt5 (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "132g4rlm61pdcpcrclr1rwpbrxn7va4wjfb021mh8pn1cl0wlgkk")) @@ -727,10 +736,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0njlh6d327nll7d8qaqrwr5x15m9yzgyar2j45qigs1f7ah896my")))) @@ -751,10 +757,7 @@ from within Qt 5."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "1dyg1z4349k04yyzn8xbp4f5qjgm60gz6wgzp80khpilcmk8g6i1")))) @@ -782,10 +785,7 @@ xmlpatternsvalidator."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0l0nhc2si6dl9r4s1bs45z90qqigs8jnrsyjjdy38q4pvix63i53")))) @@ -826,10 +826,7 @@ with JavaScript and C++."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0a5wzin635b926b8prdwfazgy1vhyf8m6an64wp2lpkp78z7prmb")))) @@ -850,10 +847,7 @@ with Bluetooth and NFC."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "116amx4mnv50k0fpswgpr5x8wjny8nbffrjmld01pzhkhfqn4vph")))) @@ -877,10 +871,7 @@ consume data received from the server, or both."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0qccpgbhyg9k4x5nni7xm0pyvaqia3zrcd42cn7ksf5h21lwmkxw")))) @@ -910,10 +901,7 @@ recognition API for devices."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "1sczzcvk3c5gczz53yvp8ma6gp8aixk5pcq7wh344c9md3g8xkbs")) @@ -961,10 +949,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0al3yypy3fin62n8d1859jh0mn0fbpa161l7f37hgd4gf75365nk")) @@ -1021,10 +1006,7 @@ compositor libraries."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "08ga9a1lwj83872nxablk602z1dq0la6jqsiicvd7m1sfbfpgnd6")))) @@ -1055,10 +1037,7 @@ interacting with serial ports from within Qt."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "14bahg82jciciqkl74q9hvf3a8kp3pk5v731vp2416k4b8bn4xqb")))) @@ -1090,10 +1069,7 @@ and others."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0x7q66994pw6cd0f505bmirw1sssqs740zaw8lyqqqr32m2ch7bx")))) @@ -1114,10 +1090,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "05rl657848fsprsnabdqb5z363c6drjc32k59223vl351f8ihhgb")))) @@ -1150,10 +1123,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0jzzcm7z5njkddzfhmyjz4dbbzq8h93980cci4479zc4xq9r47y6")))) @@ -1203,10 +1173,7 @@ positioning and geolocation plugins."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "1iakl3hlyg51ri1czmis8mmb257b0y1zk2a2knybd3mq69wczc2v")))) @@ -1231,10 +1198,7 @@ that helps in Qt development."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "1zlvg3hc6h70d789g3kv6dxbwswzkskkm00bdgl01grwrdy4izg9")) @@ -1255,10 +1219,7 @@ ECMAScript and Qt."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0qa4dlhn3iv9yvaic8hw86v6h8rn9sgq8xjfdaym04pfshfyypfm")))) @@ -1279,10 +1240,7 @@ can be used to build complete interfaces in Qt Quick."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0q0mk2mjlf9ll0gdrdzxy8096s6g9draaqiwrlvdpa7lv14x7xzs")))) @@ -1304,10 +1262,7 @@ not available."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "03xmwhapv0b2qj661iaqqrvhxc7qiid0acrp6rj85824ha2pyyj8")))) @@ -1331,10 +1286,7 @@ coloring, and many more."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "00wd3h465waxdghg2vdhs5pkj0xikwjn88l12477dksm8zdslzgp")))) @@ -1361,10 +1313,7 @@ and mobile applications targeting TV-like form factors."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "141pfschv6zmcvvn3pi7f5vb4nf96zpngy80f9bly1sn58syl303")) @@ -1392,10 +1341,7 @@ also contains functionality to support data models and executable content."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0lg8x7g7dkf95xwxq8b4yw4ypdz68igkscya96xwbklg3q08gc39")))) @@ -1412,10 +1358,7 @@ purchasing goods and services."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "1drvm15i6n10b6a1acgarig120ppvqh3r6fqqdn8i3blx81m5cmd")))) @@ -1439,10 +1382,7 @@ selecting one of the charts themes.") (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "080fkpxg70m3c697wfnkjhca58b7r1xsqd559jzb21985pdh6g3j")))) @@ -1466,10 +1406,7 @@ customized by using themes or by adding custom items and labels to them.") (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0pi6p7bq54kzij2p69cgib7n55k69jsq0yqq09yli645s4ym202g")))) @@ -1495,10 +1432,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "1mhlws5w0igf5hw0l90p6dz6k7w16dqfbnk2li0zxdmayk2039m6")))) @@ -1532,10 +1466,7 @@ processes or computers."))) (version "5.14.2") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "1nn6kspbp8hfkz1jhzc1qx1m9z7r1bgkdqgi9n4vl1q25yk8x7jy")))) @@ -1597,10 +1528,7 @@ using the Enchant spell-checking library.") (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")) + (uri (qt5-urls name version)) (sha256 (base32 "0iy9lsl6zxlkca6x2p1506hbj3wmhnaipg23z027wfccbnkxcsg1")) -- cgit v1.2.3 From 75bdc9a782fb18eb2392ac5c7ae97ff0011fb28a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 3 Jan 2021 19:08:43 -0500 Subject: gnu: Add materialdecoration. * gnu/packages/qt.scm (materialdecoration): New variable. Signed-off-by: Leo Prikler --- gnu/packages/qt.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 96a28ceb29..d1822e9707 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -45,6 +45,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix packages) #:use-module (guix deprecation) #:use-module (guix utils) @@ -72,6 +73,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) @@ -103,6 +105,36 @@ #:use-module (gnu packages xml) #:use-module (srfi srfi-1)) +(define-public materialdecoration + (package + (name "materialdecoration") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lirios/materialdecoration.git") + (commit "2079487116c6c794af3a15452342a69293039b46"))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1pczmxbmnsgj9s1g6ap55qq2q4ccibcnhsw9b6cl5rzgc48izy06")))) + (build-system qt-build-system) + (native-inputs + `(("cmake-shared" ,cmake-shared) + ("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("qtbase" ,qtbase) + ("qtwayland" ,qtwayland) + ("wayland" ,wayland))) + (synopsis "Material Decoration for Qt") + (description "MaterialDecoration is a client-side decoration for Qt +applications on Wayland.") + (home-page "https://github.com/lirios/materialdecoration") + (license license:lgpl3+))) + (define-public grantlee (package (name "grantlee") -- cgit v1.2.3 From 6a3ec5c5495626726bed143e0292807df7cd8d1c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 5 Jan 2021 17:50:16 -0500 Subject: gnu: Add qt5ct. * gnu/packages/qt.scm (qt5ct): New variable. Signed-off-by: Leo Prikler --- gnu/packages/qt.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d1822e9707..cef9c6802f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -105,6 +105,61 @@ #:use-module (gnu packages xml) #:use-module (srfi srfi-1)) +(define-public qt5ct + (package + (name "qt5ct") + (version "1.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2")) + (sha256 + (base32 "1lnx4wqk87lbr6lqc64w5g5ppjjv75kq2r0q0bz9gfpryzdw8xxg")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No target + #:imported-modules + (,@%gnu-build-system-modules + (guix build cmake-build-system) + (guix build qt-build-system)) + #:modules + ((guix build gnu-build-system) + ((guix build qt-build-system) + #:prefix qt:) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "qt5ct.pro" + (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") + (string-append (assoc-ref inputs "qttools") + "/bin/lrelease"))) + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (invoke "qmake" + (string-append "PREFIX=" out) + (string-append "BINDIR=" out "/bin") + (string-append "DATADIR=" out "/share") + (string-append "PLUGINDIR=" out "/lib/qt5/plugins"))) + #t)) + (add-after 'install 'qt-wrap + (assoc-ref qt:%standard-phases 'qt-wrap))))) + (native-inputs + `(("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg))) + (synopsis "Qt5 Configuration Tool") + (description "Qt5CT is a program that allows users to configure Qt5 +settings (such as icons, themes, and fonts) in desktop environments or +window managers, that don't provide Qt integration by themselves.") + (home-page "https://qt5ct.sourceforge.io/") + (license license:bsd-2))) + (define-public materialdecoration (package (name "materialdecoration") -- cgit v1.2.3