gnu: glib: Remove replacement with GIO appinfo patch.
* gnu/packages/glib.scm (glib)[replacement]: Remove. [source]: Add "glib-appinfo-watch.patch". (glib-with-gio-patch): Remove.
This commit is contained in:
parent
a350523556
commit
52ef5b3847
1 changed files with 2 additions and 12 deletions
|
@ -172,7 +172,6 @@ shared NFS home directories.")
|
||||||
(package
|
(package
|
||||||
(name "glib")
|
(name "glib")
|
||||||
(version "2.62.6")
|
(version "2.62.6")
|
||||||
(replacement glib-with-gio-patch)
|
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/"
|
(uri (string-append "mirror://gnome/sources/"
|
||||||
|
@ -181,7 +180,8 @@ shared NFS home directories.")
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))
|
"174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))
|
||||||
(patches (search-patches "glib-tests-timer.patch"))
|
(patches (search-patches "glib-appinfo-watch.patch"
|
||||||
|
"glib-tests-timer.patch"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
'(begin
|
'(begin
|
||||||
|
@ -379,16 +379,6 @@ dynamic loading, and an object system.")
|
||||||
(home-page "https://developer.gnome.org/glib/")
|
(home-page "https://developer.gnome.org/glib/")
|
||||||
(license license:lgpl2.1+)))
|
(license license:lgpl2.1+)))
|
||||||
|
|
||||||
(define glib-with-gio-patch
|
|
||||||
;; GLib with a fix for <https://bugs.gnu.org/35594>.
|
|
||||||
;; TODO: Fold into 'glib' above in the next rebuild cycle.
|
|
||||||
(package
|
|
||||||
(inherit glib)
|
|
||||||
(source (origin
|
|
||||||
(inherit (package-source glib))
|
|
||||||
(patches (cons (search-patch "glib-appinfo-watch.patch")
|
|
||||||
(origin-patches (package-source glib))))))))
|
|
||||||
|
|
||||||
(define-public glib-with-documentation
|
(define-public glib-with-documentation
|
||||||
;; glib's doc must be built in a separate package since it requires gtk-doc,
|
;; glib's doc must be built in a separate package since it requires gtk-doc,
|
||||||
;; which in turn depends on glib.
|
;; which in turn depends on glib.
|
||||||
|
|
Reference in a new issue