[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/09: gnu: glib: Remove replacement with GIO appinfo patch.
From: |
guix-commits |
Subject: |
03/09: gnu: glib: Remove replacement with GIO appinfo patch. |
Date: |
Tue, 8 Dec 2020 08:07:51 -0500 (EST) |
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.
- branch ungrafting created (now e19810e), guix-commits, 2020/12/08
- 03/09: gnu: glib: Remove replacement with GIO appinfo patch.,
guix-commits <=
- 01/09: gnu: dbus: Remove replacement., guix-commits, 2020/12/08
- 02/09: gnu: libx11: Update to 1.6.10 and remove replacement., guix-commits, 2020/12/08
- 07/09: gnu: openssl: Update to 1.1.1g and remove replacement., guix-commits, 2020/12/08
- 06/09: gnu: gnutls: Update to 3.6.15 and remove replacement., guix-commits, 2020/12/08
- 08/09: gnu: libspiro: Update to 20200505 and remove replacement., guix-commits, 2020/12/08
- 04/09: gnu: freetype: Update to 2.10.4 and remove replacement., guix-commits, 2020/12/08
- 05/09: gnu: fontconfig: Use 'font-dejavu' and remove replacement., guix-commits, 2020/12/08
- 09/09: gnu: libjpeg-turbo: Update to 2.0.5 and remove replacement., guix-commits, 2020/12/08