futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: glib: Remove replacement with GIO appinfo patch.

Browse Source 
* gnu/packages/glib.scm (glib)[replacement]: Remove.
[source]: Add "glib-appinfo-watch.patch".
(glib-with-gio-patch): Remove.
This commit is contained in:
Ludovic Courtès 2020-12-08 11:00:11 +01:00
parent a350523556
commit 52ef5b3847
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/glib.scm
View File

@ -172,7 +172,6 @@ shared NFS home directories.")
(package
(name "glib")
(version "2.62.6")
(replacement glib-with-gio-patch)
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
@ -181,7 +180,8 @@ shared NFS home directories.")
(sha256
(base32
"174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))
(patches (search-patches "glib-tests-timer.patch"))
(patches (search-patches "glib-appinfo-watch.patch"
"glib-tests-timer.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@ -379,16 +379,6 @@ dynamic loading, and an object system.")
(home-page "https://developer.gnome.org/glib/")
(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
;; glib's doc must be built in a separate package since it requires gtk-doc,
;; which in turn depends on glib.