me/guix
Archived
1
0
Fork 0
Code Activity

gnu: qtbase: Incorporate bugfix variants.

Browse source 
* gnu/packages/qt.scm (qtbase/next, qtbase-for-krita): Remove variables.
(qtbase)[source](patches): Add "qtbase-absolute-runpath.patch" and
"qtbase-fix-krita-deadlock.patch".
(python-pyside-2-tools)[inputs]: Change from QTBASE/NEXT to QTBASE.
* gnu/packages/kde.scm (krita)[inputs]: Change from QTBASE-FOR-KRITA to QTBASE.
This commit is contained in:
Marius Bakke 2020-07-24 23:59:30 +02:00
parent 7f9d8a62ca
commit c23737d6e4
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/kde.scm
View file

@ -434,7 +434,7 @@ illustrate project schedules.")
("openexr" ,openexr) ("openexr" ,openexr)
("perl" ,perl) ("perl" ,perl)
("poppler-qt5" ,poppler-qt5) ("poppler-qt5" ,poppler-qt5)
("qtbase" ,qtbase-for-krita) ("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative" ,qtdeclarative)
("qtmultimedia" ,qtmultimedia) ("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)

28
gnu/packages/qt.scm
View file

@ -342,7 +342,6 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(define-public qtbase (define-public qtbase
(package (package
(name "qtbase") (name "qtbase")
;; TODO Remove ((gnu packages kde) qtbase-for-krita) when upgrading qtbase.
(version "5.14.2") (version "5.14.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -355,7 +354,9 @@ developers using C++ or QML, a CSS & JavaScript like language.")
"12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8")) "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8"))
;; Use TZDIR to avoid depending on package "tzdata". ;; Use TZDIR to avoid depending on package "tzdata".
(patches (search-patches "qtbase-use-TZDIR.patch" (patches (search-patches "qtbase-use-TZDIR.patch"
"qtbase-moc-ignore-gcc-macro.patch")) "qtbase-moc-ignore-gcc-macro.patch"
"qtbase-absolute-runpath.patch"
"qtbase-fix-krita-deadlock.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; corelib uses bundled harfbuzz, md4, md5, sha3 ;; corelib uses bundled harfbuzz, md4, md5, sha3
@ -597,27 +598,6 @@ developers using C++ or QML, a CSS & JavaScript like language.")
;; qt used to refer to the monolithic Qt 5.x package ;; qt used to refer to the monolithic Qt 5.x package
(define-deprecated qt qtbase) (define-deprecated qt qtbase)
;; This variable is required by 'python-pyside-2-tools', which copies some
;; qtbase executables that fail to run because RUNPATH refers to the
;; wrong $ORIGIN. TODO: Merge with qtbase in the next rebuild cycle.
(define qtbase/next
(package
(inherit qtbase)
(source
(origin
(inherit (package-source qtbase))
(patches (append (origin-patches (package-source qtbase))
(search-patches "qtbase-absolute-runpath.patch")))))))
(define-public qtbase-for-krita
(hidden-package
(package
(inherit qtbase)
(source (origin
(inherit (package-source qtbase))
(patches (append (origin-patches (package-source qtbase))
(search-patches "qtbase-fix-krita-deadlock.patch"))))))))
(define-public qtsvg (define-public qtsvg
(package (inherit qtbase) (package (inherit qtbase)
(name "qtsvg") (name "qtsvg")
@ -2721,7 +2701,7 @@ generate Python bindings for your C or C++ code.")
(inputs (inputs
`(("python-pyside-2" ,python-pyside-2) `(("python-pyside-2" ,python-pyside-2)
("python-shiboken-2" ,python-shiboken-2) ("python-shiboken-2" ,python-shiboken-2)
("qtbase" ,qtbase/next))) ("qtbase" ,qtbase)))
(native-inputs (native-inputs
`(("python" ,python-wrapper))) `(("python" ,python-wrapper)))
(arguments (arguments