From 5ca6ef95f4299524117743974d8dfd8dde442ba5 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 14 Aug 2016 14:14:11 +0800 Subject: gnu: qtbase: Add search path specification for 'QMAKEPATH'. * gnu/packages/qt.scm (qtbase)[native-search-paths]: New field. [arguments]: Add phase to patch 'qt_config.prf'. --- gnu/packages/qt.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a35c33724a..a12c526d4a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -445,7 +445,36 @@ (define-public qtbase "-no-avx" "-no-avx2" "-no-mips_dsp" - "-no-mips_dspr2")))))))) + "-no-mips_dspr2"))))) + (add-after 'install 'patch-qt_config.prf + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (qt_config.prf (string-append + out "/mkspecs/features/qt_config.prf"))) + ;; For each Qt module, let `qmake' uses search paths in the + ;; module directory instead of all in QT_INSTALL_PREFIX. + (substitute* qt_config.prf + (("\\$\\$\\[QT_INSTALL_HEADERS\\]") + "$$replace(dir, mkspecs/modules, include)") + (("\\$\\$\\[QT_INSTALL_LIBS\\]") + "$$replace(dir, mkspecs/modules, lib)") + (("\\$\\$\\[QT_HOST_LIBS\\]") + "$$replace(dir, mkspecs/modules, lib)") + (("\\$\\$\\[QT_INSTALL_PLUGINS\\]") + "$$replace(dir, mkspecs/modules, plugins)") + (("\\$\\$\\[QT_INSTALL_LIBEXECS\\]") + "$$replace(dir, mkspecs/modules, libexec)") + (("\\$\\$\\[QT_INSTALL_BINS\\]") + "$$replace(dir, mkspecs/modules, bin)") + (("\\$\\$\\[QT_INSTALL_IMPORTS\\]") + "$$replace(dir, mkspecs/modules, imports)") + (("\\$\\$\\[QT_INSTALL_QML\\]") + "$$replace(dir, mkspecs/modules, qml)")) + #t)))))) + (native-search-paths + (list (search-path-specification + (variable "QMAKEPATH") + (files '(""))))) (home-page "https://www.qt.io/") (synopsis "Cross-platform GUI library") (description "Qt is a cross-platform application and UI framework for -- cgit v1.2.3 From ae0e51330ccaeb170eb2a42d7d99883739694135 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 14 Aug 2016 19:54:02 +0200 Subject: gnu: Add qtquickcontrols. * gnu/packages/qt.scm (qtquickcontrols): New variable. --- gnu/packages/qt.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a12c526d4a..ca777dde78 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -802,6 +802,23 @@ (define-public qtscript (inputs `(("qtbase" ,qtbase))))) +(define-public qtquickcontrols + (package (inherit qtsvg) + (name "qtquickcontrols") + (version "5.6.1-1") + (source (origin + (method url-fetch) + (uri (string-append "https://download.qt.io/official_releases/qt/" + (version-major+minor version) "/" version + "/submodules/" name "-opensource-src-" + version ".tar.xz")) + (sha256 + (base32 + "0cjzf844r7wi32ssc9vbw1a2m9hnr8c0i1p7yyljy962ifplf401")))) + (inputs + `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))))) + (define-public python-sip (package (name "python-sip") -- cgit v1.2.3 From 42da149291cd85f6bac5b1c5497f712b874e4c13 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 14 Aug 2016 19:57:15 +0200 Subject: gnu: Add qtquickcontrols2. * gnu/packages/qt.scm (qtquickcontrols2): New variable. --- gnu/packages/qt.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ca777dde78..65b6d828b9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -819,6 +819,23 @@ (define-public qtquickcontrols `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))))) +(define-public qtquickcontrols2 + (package (inherit qtsvg) + (name "qtquickcontrols2") + (version "5.6.1-1") + (source (origin + (method url-fetch) + (uri (string-append "https://download.qt.io/official_releases/qt/" + (version-major+minor version) "/" version + "/submodules/" name "-opensource-src-" + version ".tar.xz")) + (sha256 + (base32 + "0wfa2xcqsvx3zihd5nb9f9qhq0xn14c03sw1qdymzfsryqwmk4ac")))) + (inputs + `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))))) + (define-public python-sip (package (name "python-sip") -- cgit v1.2.3 From 4e4ed0eee8e4d35a6b58a11f3532b108c6bb2a15 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 14 Aug 2016 19:58:17 +0200 Subject: gnu: Add qtgraphicaleffects. * gnu/packages/qt.scm (qtgraphicaleffects): New variable. --- gnu/packages/qt.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 65b6d828b9..19488acd8e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -836,6 +836,23 @@ (define-public qtquickcontrols2 `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))))) +(define-public qtgraphicaleffects + (package (inherit qtsvg) + (name "qtgraphicaleffects") + (version "5.6.1-1") + (source (origin + (method url-fetch) + (uri (string-append "https://download.qt.io/official_releases/qt/" + (version-major+minor version) "/" version + "/submodules/" name "-opensource-src-" + version ".tar.xz")) + (sha256 + (base32 + "0560800fa9sd6dw1vk0ia9vq8ywdrwch2cpsi1vmh4iyxgwfr71b")))) + (inputs + `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))))) + (define-public python-sip (package (name "python-sip") -- cgit v1.2.3 From 18174d8acd2aba0a8ff8d0060b9265b0f7e2ec36 Mon Sep 17 00:00:00 2001 From: David Craven Date: Mon, 15 Aug 2016 21:00:43 +0200 Subject: gnu: qtkeychain: Use modular qt. * gnu/packages/qt.scm (qtkeychain)[inputs]: Add qtbase. Remove qt. [native-inputs]: Add qttools. --- gnu/packages/qt.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 19488acd8e..021bb709df 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1070,8 +1070,10 @@ (define-public qtkeychain (sha256 (base32 "0fka5q5cdzlf79igcjgbnb2smvwbwfasqawkzkbr34whispgm6lz")))) (build-system cmake-build-system) + (native-inputs + `(("qttools" ,qttools))) (inputs - `(("qt" ,qt))) + `(("qtbase" ,qtbase))) (arguments `(#:tests? #f ; No tests included #:phases -- cgit v1.2.3 From 9a935ef2df6b31546e68cfce384921268ba717f5 Mon Sep 17 00:00:00 2001 From: David Craven Date: Tue, 16 Aug 2016 20:24:24 +0200 Subject: gnu: qt: Update qt to 5.7.0. * gnu/packages/qt.scm (qtbase): Update it. (qtsvg): Update it. (qtimageformats): Update it. (qtx11extras): Update it. (qtxmlpatterns): Update it. (qtdeclarative): Update it. (qtconnectivity): Update it. (qtwebsockets): Update it. (qtsensors): Update it. (qtmultimedia): Update it. (qtwayland): Update it. (qtserialport): Update it. (qtwebchannel): Update it. (qtlocation): Update it. (qttools): Update it. (qtscript): Update it. (qtquickcontrols): Update it. (qtquickcontrols2): Update it. (qtgraphicaleffects): Update it. --- gnu/packages/qt.scm | 78 ++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 021bb709df..a7eee7c06c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -313,7 +313,7 @@ (define-public qt-4 (define-public qtbase (package (name "qtbase") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -322,7 +322,7 @@ (define-public qtbase version ".tar.xz")) (sha256 (base32 - "0fbwprlhqmdyhh2wb9122fcpq7pbil530iak482b9sy5gqs7i5ij")) + "0ip6xnizsn269r4s1nq9lkx8cdxkjqr1fidwrj3sa8xb7h96syry")) (modules '((guix build utils))) (snippet '(begin @@ -484,7 +484,7 @@ (define-public qtbase (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -493,7 +493,7 @@ (define-public qtsvg version ".tar.xz")) (sha256 (base32 - "1w0jvhgaiddafcms2nv8wl1klg07lncmjwm1zhdw3l6rxi9071sw")))) + "10fqrlqkiq83xhx79g8d2sjy7hjdnp28067z8f4byj7db81rzy51")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -518,7 +518,7 @@ (define-public qtsvg (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -527,7 +527,7 @@ (define-public qtimageformats version ".tar.xz")) (sha256 (base32 - "1p98acvsm3azka2by1ph4gdb31qbnndrr5k5wns4xk2d760y8ifc")))) + "1rb27x7i2pmvsck6wax2cg31gqpzaakciy45wm5l3lcl86j48czg")))) (native-inputs `()) (inputs `(("libmng" ,libmng) @@ -540,7 +540,7 @@ (define-public qtimageformats (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -549,7 +549,7 @@ (define-public qtx11extras version ".tar.xz")) (sha256 (base32 - "0yj5yg2dqkrwbgbicmk2rpqsagmi8dsffkrprpsj0fmkx4awhv5y")))) + "1yrkn8pqdbvbqykas3wx1vdfimhjkgx3s5jgdxib9dgmgyx6vjzw")))) (native-inputs `(("perl" ,perl))) (inputs `(("mesa" ,mesa) @@ -558,7 +558,7 @@ (define-public qtx11extras (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -567,14 +567,14 @@ (define-public qtxmlpatterns version ".tar.xz")) (sha256 (base32 - "1966rrk7f6c55k57j33rffdjs77kk4mawrnnl8yv1ckcirxc3np1")))) + "02z2qxamslg6sphnaykjcjfpypq4b69pb586s43vw4fplm72m21q")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase))))) (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -583,7 +583,7 @@ (define-public qtdeclarative version ".tar.xz")) (sha256 (base32 - "094gx5mzqzcga97y7ihf052b6i5iv512lh7m0702m5q94nsn1pqw")))) + "1x7rij423g5chlfd2kix54f393vxwjvdfsn1c7sybqmfycwn5pl6")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -597,7 +597,7 @@ (define-public qtdeclarative (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -606,7 +606,7 @@ (define-public qtconnectivity version ".tar.xz")) (sha256 (base32 - "0sr6sxp0q45pacs25knr28139xdrphcjgrwlksdhdpsryfw19mzi")))) + "00r7lc1w3snfp2qfqmviqzv0cw16zd8m1sfpvxvpl65yqmzcli4q")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -618,7 +618,7 @@ (define-public qtconnectivity (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -627,7 +627,7 @@ (define-public qtwebsockets version ".tar.xz")) (sha256 (base32 - "1fz0x8570zxc00a22skd848svma3p2g3xyxj14jq10559jihqqil")))) + "0hwb2l7iwf4wf7l95dli8j3b7h0nffp56skfg1x810kzj0df26vl")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative))) @@ -636,7 +636,7 @@ (define-public qtwebsockets (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -645,7 +645,7 @@ (define-public qtsensors version ".tar.xz")) (sha256 (base32 - "0kcrvf6vzn6g2v2m70f9r3raalzmfp48rwjlqhss3w84jfz3y04r")))) + "1gii6wg2xd3bkb86y5hgpmwcpl04xav030zscpl6fhscl9kcqg98")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative))) @@ -654,7 +654,7 @@ (define-public qtsensors (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -663,7 +663,7 @@ (define-public qtmultimedia version ".tar.xz")) (sha256 (base32 - "0paffx0614ivjbf87lr9klpbqik6r1pzbc14l41np6d9jv3dqa2f")))) + "0ndmhiflmyr144nq8drd5njsdi282ixsm4730q5n0ji2v9dp1bh5")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -678,7 +678,7 @@ (define-public qtmultimedia (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -687,7 +687,7 @@ (define-public qtwayland version ".tar.xz")) (sha256 (base32 - "1fnvgpi49ilds3ah9iizxj9qhhb5rnwqd9h03bhkwf0ydywv52c4")))) + "04dynjcr6gxi3hcqdf688a4hkabi2l17slpcx9k0f3dxygwcgf96")))) (native-inputs `(("glib" ,glib) ("perl" ,perl) @@ -709,7 +709,7 @@ (define-public qtwayland (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -718,7 +718,7 @@ (define-public qtserialport version ".tar.xz")) (sha256 (base32 - "135cbgghxk0c6dblmyyrw6znfb9m8sac9hhyc2dm6vq7vzy8id52")))) + "0rc2l14s59qskp16wqlkizfai32s41qlm7a86r3qahx28gc51qaw")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -727,7 +727,7 @@ (define-public qtserialport (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -736,7 +736,7 @@ (define-public qtwebchannel version ".tar.xz")) (sha256 (base32 - "10kys3ppjkj60fs1s335fdcpdsbxsjn6ibvm6zph9gqbncabd2l7")))) + "05lqfidlh1ahdd1j9y20p2037qbcq51zkdzj2m8fwhn7ghbwvd1s")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -746,7 +746,7 @@ (define-public qtwebchannel (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -755,18 +755,18 @@ (define-public qtlocation version ".tar.xz")) (sha256 (base32 - "0my4pbcxa58yzvdh65l5qx99ln03chjr5c3ml5v37wfk7nx23k69")))) + "0rd898gndn41jrp78203lxd94ybfv693l0qg0myag4r46ikk69vh")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) - ;("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols) ("qtserialport" ,qtserialport))) (inputs `(("qtbase" ,qtbase))))) (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -775,7 +775,7 @@ (define-public qttools version ".tar.xz")) (sha256 (base32 - "0haic027a2d7p7k8xz83fbvci4a4dln34360rlwgy7hlyy5m4nip")))) + "004m9l7bgh7qnncbyl3d5fkggdrqx58ib21xv4hflvvarxrssibg")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative))) @@ -786,7 +786,7 @@ (define-public qttools (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -795,7 +795,7 @@ (define-public qtscript version ".tar.xz")) (sha256 (base32 - "1gini9483flqa9q4a4bl81bh7g5s408bycqykqhgbklmfd29y5lx")))) + "0040890p5ilyrmcpndz1hhp08x2ms5gw4lp4n5iax2a957yy2i4w")))) (native-inputs `(("perl" ,perl) ("qttools" ,qttools))) @@ -805,7 +805,7 @@ (define-public qtscript (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -814,7 +814,7 @@ (define-public qtquickcontrols version ".tar.xz")) (sha256 (base32 - "0cjzf844r7wi32ssc9vbw1a2m9hnr8c0i1p7yyljy962ifplf401")))) + "0cpcrmz9n5b4bgmshmk093lirl9xwqb23inchnai1zqg21vrmqfq")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))))) @@ -822,7 +822,7 @@ (define-public qtquickcontrols (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -831,7 +831,7 @@ (define-public qtquickcontrols2 version ".tar.xz")) (sha256 (base32 - "0wfa2xcqsvx3zihd5nb9f9qhq0xn14c03sw1qdymzfsryqwmk4ac")))) + "0i8h933vhvx1bmniqdx0idg6vk82w9byd3dq0bb2phwjg5vv1xb3")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))))) @@ -839,7 +839,7 @@ (define-public qtquickcontrols2 (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.6.1-1") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -848,7 +848,7 @@ (define-public qtgraphicaleffects version ".tar.xz")) (sha256 (base32 - "0560800fa9sd6dw1vk0ia9vq8ywdrwch2cpsi1vmh4iyxgwfr71b")))) + "1rwdjg5mk6xpadmxfq64xfp573zp5lrj9illb9105ra5wff565n8")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))))) -- cgit v1.2.3