aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-03-04 12:34:34 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-03-04 22:06:22 +0100
commitc1a86b666f1a5ece3251bab0be4929167e84b410 (patch)
treec14126a7bc8ae985ea82bb079c0444072783174a
parent60ce496ad8230eeeb8e8073eec3c5c2257673925 (diff)
downloadguix-c1a86b666f1a5ece3251bab0be4929167e84b410.tar.gz
guix-c1a86b666f1a5ece3251bab0be4929167e84b410.zip
gnu: appstream-glib: Update to 0.7.17.
* gnu/packages/patches/appstream-glib-2020.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (appstream-glib): Update to 0.7.17. [source](patches): Remove.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/glib.scm5
-rw-r--r--gnu/packages/patches/appstream-glib-2020.patch31
3 files changed, 2 insertions, 35 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index cbb7d2b2f0..b62468c923 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -720,7 +720,6 @@ dist_patch_DATA = \
%D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
%D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \
- %D%/packages/patches/appstream-glib-2020.patch \
%D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/arm-trusted-firmware-disable-hdcp.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 03d6be596b..c98d8c18f5 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -898,16 +898,15 @@ programming language. It also contains the utility
(define-public appstream-glib
(package
(name "appstream-glib")
- (version "0.7.16")
+ (version "0.7.17")
(source (origin
(method url-fetch)
(uri (string-append "https://people.freedesktop.org/~hughsient/"
"appstream-glib/releases/"
"appstream-glib-" version ".tar.xz"))
- (patches (search-patches "appstream-glib-2020.patch"))
(sha256
(base32
- "14jr1psx5kxywdprgbqn79w309yz8lrqlsq7288hfrf87gbr1wh4"))))
+ "0jg58m1p5xfrh8zkpqhhg00nqs727z5i1qy6sb0a3vyc98fyk9vw"))))
(build-system meson-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
diff --git a/gnu/packages/patches/appstream-glib-2020.patch b/gnu/packages/patches/appstream-glib-2020.patch
deleted file mode 100644
index ab8a4bbdee..0000000000
--- a/gnu/packages/patches/appstream-glib-2020.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-2020 is no longer the future.
-
-Taken from upstream:
-https://github.com/hughsie/appstream-glib/commit/953c8e529d7291e60a95e580967ed79ce2c9ccf0
-
-diff --git a/data/tests/broken.appdata.xml b/data/tests/broken.appdata.xml
-index f7a5386e..cf80f5b4 100644
---- a/data/tests/broken.appdata.xml
-+++ b/data/tests/broken.appdata.xml
-@@ -40,7 +40,7 @@
- <p>This is a duplicate release on the same day!</p>
- </description>
- </release>
-- <release date="2020-01-01" version="0.6.2">
-+ <release date="2050-01-01" version="0.6.2">
- <description>
- <p>This is a release in the future!</p>
- </description>
-diff --git a/libappstream-glib/as-app-validate.c b/libappstream-glib/as-app-validate.c
-index c1103ace..f50e4e41 100644
---- a/libappstream-glib/as-app-validate.c
-+++ b/libappstream-glib/as-app-validate.c
-@@ -864,7 +864,7 @@ as_app_validate_release (AsApp *app,
- AS_PROBLEM_KIND_ATTRIBUTE_MISSING,
- "<release> has no timestamp");
- }
-- if (timestamp > 20120101 && timestamp < 20251231) {
-+ if (timestamp > 20120101 && timestamp < 20351231) {
- ai_app_validate_add (helper,
- AS_PROBLEM_KIND_ATTRIBUTE_INVALID,
- "<release> timestamp should be a UNIX time");