Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging / Packages / appstream-glib
Commits: 7d9671eb by Jan Alexander Steffens (heftig) at 2024-03-10T20:48:23+01:00 0.8.2-4 - - - - - 3 changed files: - + .SRCINFO - PKGBUILD - + as-yaml-support-application-yaml-mimetype.patch Changes: ===================================== .SRCINFO ===================================== @@ -0,0 +1,27 @@ +pkgbase = appstream-glib + pkgdesc = Objects and methods for reading and writing AppStream metadata + pkgver = 0.8.2 + pkgrel = 4 + url = https://people.freedesktop.org/~hughsient/appstream-glib/ + arch = x86_64 + license = LGPL-2.1-or-later + makedepends = git + makedepends = gobject-introspection + makedepends = gperf + makedepends = gtk-doc + makedepends = meson + depends = curl + depends = gtk3 + depends = libstemmer + depends = libyaml + depends = pacman + provides = appdata-tools + provides = libappstream-glib.so + conflicts = appdata-tools + replaces = appdata-tools + source = git+https://github.com/hughsie/appstream-glib#commit=02c8ad3b66075d9b2c9094dff816cd44839a4b45 + source = as-yaml-support-application-yaml-mimetype.patch + b2sums = SKIP + b2sums = 63c82bb52fbe1aeab2aeb33147d99690a81a0528f9438c934a5fe7295581145b385e55b7d67c98a43e21cdb529883eaed750e2b4d842c56e21d8faf583f57580 + +pkgname = appstream-glib ===================================== PKGBUILD ===================================== @@ -3,11 +3,11 @@ pkgname=appstream-glib pkgver=0.8.2 -pkgrel=3 +pkgrel=4 pkgdesc="Objects and methods for reading and writing AppStream metadata" url="https://people.freedesktop.org/~hughsient/appstream-glib/"; arch=(x86_64) -license=(LGPL) +license=(LGPL-2.1-or-later) depends=( curl gtk3 @@ -29,8 +29,12 @@ provides=( conflicts=(appdata-tools) replaces=(appdata-tools) _commit=02c8ad3b66075d9b2c9094dff816cd44839a4b45 # tags/appstream_glib_0_8_2^0 -source=("git+https://github.com/hughsie/appstream-glib#commit=$_commit";) -b2sums=('SKIP') +source=( + "git+https://github.com/hughsie/appstream-glib#commit=$_commit"; + as-yaml-support-application-yaml-mimetype.patch +) +b2sums=('SKIP' + '63c82bb52fbe1aeab2aeb33147d99690a81a0528f9438c934a5fe7295581145b385e55b7d67c98a43e21cdb529883eaed750e2b4d842c56e21d8faf583f57580') pkgver() { cd $pkgname @@ -39,6 +43,10 @@ pkgver() { prepare() { cd $pkgname + + # Unbreak tests + # https://gitlab.alpinelinux.org/alpine/aports/-/commit/8538b3b2f0e0eae7af5e6c38827c907d483efd6c + git apply -3 ../as-yaml-support-application-yaml-mimetype.patch } build() { ===================================== as-yaml-support-application-yaml-mimetype.patch ===================================== @@ -0,0 +1,16 @@ +as_test_yaml_fails because the mimetype is detected as `application/yaml`, which +is not recognized. +diff --git a/libappstream-glib/as-yaml.c b/libappstream-glib/as-yaml.c +index d764d15..da83fea 100644 +--- a/libappstream-glib/as-yaml.c ++++ b/libappstream-glib/as-yaml.c +@@ -506,7 +506,8 @@ as_yaml_from_file (GFile *file, AsYamlFromFlags flags, GCancellable *cancellable + g_strcmp0 (content_type, "application/x-gzip") == 0) { + conv = G_CONVERTER (g_zlib_decompressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP)); + stream_data = g_converter_input_stream_new (file_stream, conv); +- } else if (g_strcmp0 (content_type, "application/x-yaml") == 0) { ++ } else if (g_strcmp0 (content_type, "application/x-yaml") == 0 || ++ g_strcmp0 (content_type, "application/yaml") == 0) { + stream_data = g_object_ref (file_stream); + } else { + g_set_error (error, View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/appstream-glib/-/commit/7d9671eb74a7865284b5508214c3137e9b22e404 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/appstream-glib/-/commit/7d9671eb74a7865284b5508214c3137e9b22e404 You're receiving this email because of your account on gitlab.archlinux.org.
