[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/10: gnu: appstream-glib: Fix test failure.
From: |
guix-commits |
Subject: |
10/10: gnu: appstream-glib: Fix test failure. |
Date: |
Tue, 7 Jan 2020 12:20:06 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit d2e1b2dac70807640cd8851c67dbf0cbb342bf5c
Author: Marius Bakke <address@hidden>
AuthorDate: Tue Jan 7 15:49:01 2020 +0100
gnu: appstream-glib: Fix test failure.
* gnu/packages/patches/appstream-glib-2020.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/glib.scm (appstream-glib)[source](patches): New field.
---
gnu/local.mk | 1 +
gnu/packages/glib.scm | 1 +
gnu/packages/patches/appstream-glib-2020.patch | 31 ++++++++++++++++++++++++++
3 files changed, 33 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 3e0ab25..acbe99d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -709,6 +709,7 @@ 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/arm-trusted-firmware-optional-bin-generation.patch
\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 528b67e..72d5ea0 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -904,6 +904,7 @@ programming language. It also contains the utility
(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"))))
diff --git a/gnu/packages/patches/appstream-glib-2020.patch
b/gnu/packages/patches/appstream-glib-2020.patch
new file mode 100644
index 0000000..ab8a4bb
--- /dev/null
+++ b/gnu/packages/patches/appstream-glib-2020.patch
@@ -0,0 +1,31 @@
+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");
- branch master updated (9020252 -> d2e1b2d), guix-commits, 2020/01/07
- 03/10: gnu: rocksdb: Update to 6.5.2., guix-commits, 2020/01/07
- 05/10: gnu: ungoogled-chromium: Do not set LD_LIBRARY_PATH in wrapper., guix-commits, 2020/01/07
- 01/10: gnu: googletest: Update to 1.10.0., guix-commits, 2020/01/07
- 02/10: gnu: python-patsy: Update to 0.5.1., guix-commits, 2020/01/07
- 06/10: gnu: ungoogled-chromium: Lower resource limits., guix-commits, 2020/01/07
- 07/10: gnu: colord: Adjust inputs., guix-commits, 2020/01/07
- 08/10: gnu: libgeotiff: Propagate proj., guix-commits, 2020/01/07
- 09/10: gnu: libgeotiff: Do not build static library., guix-commits, 2020/01/07
- 04/10: gnu: Ceph: Update to 14.2.5., guix-commits, 2020/01/07
- 10/10: gnu: appstream-glib: Fix test failure.,
guix-commits <=