03/07: gnu: glib: Remove replacement with GIO appinfo patch.

[guix-commits]

civodul pushed a commit to branch ungrafting
in repository guix.

commit 52ef5b384786b4a2f7031ee26ef6b196bc22f912
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Dec 8 11:00:11 2020 +0100

    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.
---
 gnu/packages/glib.scm | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index d1521b2..a37369c 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -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.