music pushed to python-graph-tool (f35). "Re-enable s390x (fix
RHBZ#1771034) (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-08-29 01:13:39 UTC
From d41b471b202cbbc5e916cfdba1cb13d0a7cc0a29 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Aug 27 2021 20:24:21 +0000
Subject: Re-enable s390x (fix RHBZ#1771034)
Work around resource limits to re-enable s390x, and get closer to the
root causes on the remaining excluded architectures
---
diff --git a/python-graph-tool.spec b/python-graph-tool.spec
index 054f3b3..09814a2 100644
--- a/python-graph-tool.spec
+++ b/python-graph-tool.spec
@@ -42,7 +42,7 @@ documentation.}
Name: python-%{modname}
Version: 2.43
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Efficient network analysis tool written in Python
License: LGPLv3+
@@ -51,17 +51,60 @@ Source0: https://downloads.skewed.de/%{modname}/%{modname}-%{version}.tar
# Remove the compilation flags upstream sets
Patch0: 0001-remove-upstream-compilation-flags.patch
-# Fails on i686: issue filed: https://git.skewed.de/count0/graph-tool/issues/617
-# https://bugzilla.redhat.com/show_bug.cgi?id=1771023
-# Fails on armv7hl: virtual memory exhausted
+# Need to reduce debugging symbols to make compiling possible on these
+# architectures at all. See:
+# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
+#
+# Works around:
+# Fails on armv7hl:
+# virtual memory exhausted
# https://bugzilla.redhat.com/show_bug.cgi?id=1771024
-# Fails on ppc64le: note: variable tracking size limit exceeded with '-fvar-tracking-assignments', retrying without
+# Fails on ppc64le:
+# note: variable tracking size limit exceeded with
+# '-fvar-tracking-assignments', retrying without
# https://bugzilla.redhat.com/show_bug.cgi?id=1771031
-# Fails on s390x: note: variable tracking size limit exceeded with '-fvar-tracking-assignments', retrying without
+# Fails on s390x:
+# note: variable tracking size limit exceeded with
+# '-fvar-tracking-assignments', retrying without
# https://bugzilla.redhat.com/show_bug.cgi?id=1771034
-# Takes ~23 hours on x86_64 if we get unlucky and get a 6 core 16gig machine, ~4 hours if we get a 48 core 128gig machine
+%ifarch armv7hl ppc64le s390x
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+%endif
+
+# Fails on i686, armv7hl
+# ../../../src/pcg-cpp/include/pcg_random.hpp:1247:40: error: call to
+# non-'constexpr' function 'pcg_extras::uint_x4<U, V>
+# pcg_extras::operator-(const pcg_extras::uint_x4<U, V>&, const
+# pcg_extras::uint_x4<U, V>&) [with UInt = unsigned int; UIntX2 = long
+# long unsigned int]'
+# 1247 | (state_type(1U) << table_pow2) - state_type(1U);
+# | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
+# In file included from ../../../src/pcg-cpp/include/pcg_extras.hpp:84,
+# from ../../../src/pcg-cpp/include/pcg_random.hpp:114,
+# from ../../../src/graph/random.hh:21,
+# from graph_motifs.hh:26,
+# from graph_motifs.cc:24:
+# ../../../src/pcg-cpp/include/pcg_uint128.hpp:642:22: note:
+# 'pcg_extras::uint_x4<U, V> pcg_extras::operator-(const
+# pcg_extras::uint_x4<U, V>&, const pcg_extras::uint_x4<U, V>&) [with
+# UInt = unsigned int; UIntX2 = long long unsigned int]' declared here
+# 642 | uint_x4<UInt,UIntX2> operator-(const uint_x4<UInt,UIntX2>& a,
+# | ^~~~~~~~
+# issue filed: https://git.skewed.de/count0/graph-tool/issues/617
+# https://bugzilla.redhat.com/show_bug.cgi?id=1771023
+# https://bugzilla.redhat.com/show_bug.cgi?id=1771024
+#
+# Fails on ppc64le:
+# /usr/include/boost/math/tools/promotion.hpp:138:10:
+# error: static assertion failed:
+# Sorry, but this platform does not have sufficient long double support for
+# the special functions to be reliably implemented.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1771031
+#
+# Takes ~23 hours on x86_64 if we get unlucky and get a 6 core 16gig machine,
+# ~4 hours if we get a 48 core 128gig machine
# Takes ~45 hours on aarch64
-ExcludeArch: i686 armv7hl ppc64le s390x
+ExcludeArch: %{ix86} armv7hl ppc64le
BuildRequires: make
BuildRequires: git-core
@@ -124,6 +167,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{_libdir}/pkgconfig/%{modname}-py%{python3_version}.pc
%changelog
+* Fri Aug 27 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 2.43-2
+- Work around resource limits to re-enable s390x, and get closer to the root
+ causes on the remaining excluded architectures
+
* Tue Aug 10 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.43-1
- Update to latest release
- Remove unneeded patches
https://src.fedoraproject.org/rpms/python-graph-tool/c/d41b471b202cbbc5e9...
2Â years, 8Â months
music pushed to python-graph-tool (f34). "Re-enable s390x (fix
RHBZ#1771034) (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-08-29 01:13:05 UTC
From d41b471b202cbbc5e916cfdba1cb13d0a7cc0a29 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Aug 27 2021 20:24:21 +0000
Subject: Re-enable s390x (fix RHBZ#1771034)
Work around resource limits to re-enable s390x, and get closer to the
root causes on the remaining excluded architectures
---
diff --git a/python-graph-tool.spec b/python-graph-tool.spec
index 054f3b3..09814a2 100644
--- a/python-graph-tool.spec
+++ b/python-graph-tool.spec
@@ -42,7 +42,7 @@ documentation.}
Name: python-%{modname}
Version: 2.43
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Efficient network analysis tool written in Python
License: LGPLv3+
@@ -51,17 +51,60 @@ Source0: https://downloads.skewed.de/%{modname}/%{modname}-%{version}.tar
# Remove the compilation flags upstream sets
Patch0: 0001-remove-upstream-compilation-flags.patch
-# Fails on i686: issue filed: https://git.skewed.de/count0/graph-tool/issues/617
-# https://bugzilla.redhat.com/show_bug.cgi?id=1771023
-# Fails on armv7hl: virtual memory exhausted
+# Need to reduce debugging symbols to make compiling possible on these
+# architectures at all. See:
+# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
+#
+# Works around:
+# Fails on armv7hl:
+# virtual memory exhausted
# https://bugzilla.redhat.com/show_bug.cgi?id=1771024
-# Fails on ppc64le: note: variable tracking size limit exceeded with '-fvar-tracking-assignments', retrying without
+# Fails on ppc64le:
+# note: variable tracking size limit exceeded with
+# '-fvar-tracking-assignments', retrying without
# https://bugzilla.redhat.com/show_bug.cgi?id=1771031
-# Fails on s390x: note: variable tracking size limit exceeded with '-fvar-tracking-assignments', retrying without
+# Fails on s390x:
+# note: variable tracking size limit exceeded with
+# '-fvar-tracking-assignments', retrying without
# https://bugzilla.redhat.com/show_bug.cgi?id=1771034
-# Takes ~23 hours on x86_64 if we get unlucky and get a 6 core 16gig machine, ~4 hours if we get a 48 core 128gig machine
+%ifarch armv7hl ppc64le s390x
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+%endif
+
+# Fails on i686, armv7hl
+# ../../../src/pcg-cpp/include/pcg_random.hpp:1247:40: error: call to
+# non-'constexpr' function 'pcg_extras::uint_x4<U, V>
+# pcg_extras::operator-(const pcg_extras::uint_x4<U, V>&, const
+# pcg_extras::uint_x4<U, V>&) [with UInt = unsigned int; UIntX2 = long
+# long unsigned int]'
+# 1247 | (state_type(1U) << table_pow2) - state_type(1U);
+# | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
+# In file included from ../../../src/pcg-cpp/include/pcg_extras.hpp:84,
+# from ../../../src/pcg-cpp/include/pcg_random.hpp:114,
+# from ../../../src/graph/random.hh:21,
+# from graph_motifs.hh:26,
+# from graph_motifs.cc:24:
+# ../../../src/pcg-cpp/include/pcg_uint128.hpp:642:22: note:
+# 'pcg_extras::uint_x4<U, V> pcg_extras::operator-(const
+# pcg_extras::uint_x4<U, V>&, const pcg_extras::uint_x4<U, V>&) [with
+# UInt = unsigned int; UIntX2 = long long unsigned int]' declared here
+# 642 | uint_x4<UInt,UIntX2> operator-(const uint_x4<UInt,UIntX2>& a,
+# | ^~~~~~~~
+# issue filed: https://git.skewed.de/count0/graph-tool/issues/617
+# https://bugzilla.redhat.com/show_bug.cgi?id=1771023
+# https://bugzilla.redhat.com/show_bug.cgi?id=1771024
+#
+# Fails on ppc64le:
+# /usr/include/boost/math/tools/promotion.hpp:138:10:
+# error: static assertion failed:
+# Sorry, but this platform does not have sufficient long double support for
+# the special functions to be reliably implemented.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1771031
+#
+# Takes ~23 hours on x86_64 if we get unlucky and get a 6 core 16gig machine,
+# ~4 hours if we get a 48 core 128gig machine
# Takes ~45 hours on aarch64
-ExcludeArch: i686 armv7hl ppc64le s390x
+ExcludeArch: %{ix86} armv7hl ppc64le
BuildRequires: make
BuildRequires: git-core
@@ -124,6 +167,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{_libdir}/pkgconfig/%{modname}-py%{python3_version}.pc
%changelog
+* Fri Aug 27 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 2.43-2
+- Work around resource limits to re-enable s390x, and get closer to the root
+ causes on the remaining excluded architectures
+
* Tue Aug 10 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.43-1
- Update to latest release
- Remove unneeded patches
https://src.fedoraproject.org/rpms/python-graph-tool/c/d41b471b202cbbc5e9...
2Â years, 8Â months
ngompa pushed to appstream-generator (f35). "Add missing patch"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-08-29 00:33:01 UTC
From 2e088686f9cad70ef83a43088dfae7f0f48ff320 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Aug 29 2021 00:08:12 +0000
Subject: Add missing patch
---
diff --git a/0001-Fix-build-with-GLib-2.69.patch b/0001-Fix-build-with-GLib-2.69.patch
new file mode 100644
index 0000000..a5af3b1
--- /dev/null
+++ b/0001-Fix-build-with-GLib-2.69.patch
@@ -0,0 +1,134 @@
+From 0644bc10d13fc68ab39b4328a386033f700b8410 Mon Sep 17 00:00:00 2001
+From: Matthias Klumpp <matthias(a)tenstral.net>
+Date: Sun, 29 Aug 2021 01:45:29 +0200
+Subject: [PATCH] Fix build with GLib >= 2.69
+
+GLibD for GLib 2.69 changed some API, so we need to account for that
+while still having the code build for older versions of GLib.
+---
+ meson.build | 1 +
+ src/app.d | 1 -
+ src/asgen/defines.d.in | 3 ++
+ src/asgen/handlers/screenshothandler.d | 46 ++++++++++++++++++--------
+ src/asgen/meson.build | 5 +++
+ 5 files changed, 41 insertions(+), 15 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f4b0aa9..dc32699 100644
+--- a/meson.build
++++ b/meson.build
+@@ -15,6 +15,7 @@ build_root = meson.build_root()
+ #
+ src_dir = include_directories('src/')
+
++glib_dep = dependency('glib-2.0')
+ glibd_dep = dependency('glibd-2.0')
+ appstream_dep = dependency('appstream', version : '>= 0.14.5')
+ ascompose_dep = dependency('appstream-compose', version : '>= 0.14.5')
+diff --git a/src/app.d b/src/app.d
+index 070c980..d9b61ea 100644
+--- a/src/app.d
++++ b/src/app.d
+@@ -224,7 +224,6 @@ void main(string[] args)
+ default:
+ writeln (format ("The command '%s' is unknown.", command));
+ exit (1);
+- break;
+ }
+ }
+
+diff --git a/src/asgen/defines.d.in b/src/asgen/defines.d.in
+index af49792..16cccba 100644
+--- a/src/asgen/defines.d.in
++++ b/src/asgen/defines.d.in
+@@ -25,3 +25,6 @@ public enum DATADIR = "@datadir@";
+
+ // current version of the tool
+ public enum ASGEN_VERSION = "@asgen_version@";
++
++// Used for GLib/GLibD API change tests
++public enum GLIB_GE_2_69 = @glib_ge_2_29@;
+diff --git a/src/asgen/handlers/screenshothandler.d b/src/asgen/handlers/screenshothandler.d
+index 26dcd12..14a346c 100644
+--- a/src/asgen/handlers/screenshothandler.d
++++ b/src/asgen/handlers/screenshothandler.d
+@@ -35,6 +35,7 @@ import ascompose.c.types : ImageFormat, ImageLoadFlags, ImageSaveFlags;
+ static import ascompose.Image;
+ static import std.file;
+
++import asgen.defines : GLIB_GE_2_69;
+ import asgen.config : Config;
+ import asgen.result : GeneratorResult;
+ import asgen.downloader : Downloader;
+@@ -124,20 +125,37 @@ private VideoInfo checkVideoInfo (GeneratorResult gres, Component cpt, const Con
+ try {
+ // NOTE: We are currently extracting information from ffprobe's simple output, but it also has a JSON
+ // mode. Parsing JSON is a bit slower, but if it is more reliable we should switch to that.
+- Spawn.sync (null, // working directory
+- [conf.ffprobeBinary,
+- "-v", "quiet",
+- "-show_entries", "stream=width,height,codec_name,codec_type",
+- "-show_entries", "format=format_name",
+- "-of", "default=noprint_wrappers=1",
+- vidFname],
+- [], // envp
+- SpawnFlags.LEAVE_DESCRIPTORS_OPEN,
+- null, // child setup
+- null, // user data
+- ffStdout, // out stdout
+- ffStderr, // out stderr
+- exitStatus);
++ static if (GLIB_GE_2_69) {
++ Spawn.sync (null, // working directory
++ [conf.ffprobeBinary,
++ "-v", "quiet",
++ "-show_entries", "stream=width,height,codec_name,codec_type",
++ "-show_entries", "format=format_name",
++ "-of", "default=noprint_wrappers=1",
++ vidFname],
++ [], // envp
++ SpawnFlags.LEAVE_DESCRIPTORS_OPEN,
++ null, // child setup
++ null, // user data
++ ffStdout, // out stdout
++ ffStderr, // out stderr
++ &exitStatus);
++ } else {
++ Spawn.sync (null, // working directory
++ [conf.ffprobeBinary,
++ "-v", "quiet",
++ "-show_entries", "stream=width,height,codec_name,codec_type",
++ "-show_entries", "format=format_name",
++ "-of", "default=noprint_wrappers=1",
++ vidFname],
++ [], // envp
++ SpawnFlags.LEAVE_DESCRIPTORS_OPEN,
++ null, // child setup
++ null, // user data
++ ffStdout, // out stdout
++ ffStderr, // out stderr
++ exitStatus);
++ }
+ } catch (Exception e) {
+ logError ("Failed to spawn ffprobe: %s", e.to!string);
+ gres.addHint (cpt, "metainfo-screenshot-but-no-media", ["fname": vidFname.baseName, "msg": e.to!string]);
+diff --git a/src/asgen/meson.build b/src/asgen/meson.build
+index 48f64a5..26f47d7 100644
+--- a/src/asgen/meson.build
++++ b/src/asgen/meson.build
+@@ -1,7 +1,12 @@
+
++glib_ge_2_29 = 'false'
++if glib_dep.version().version_compare('>=2.69')
++ glib_ge_2_29 = 'true'
++endif
+ conf_data = configuration_data()
+ conf_data.set('datadir', join_paths(get_option('prefix'), get_option('datadir'), 'appstream'))
+ conf_data.set('asgen_version', asgen_version)
++conf_data.set('glib_ge_2_29', glib_ge_2_29)
+ configure_file(input : 'defines.d.in',
+ output: 'defines.d',
+ configuration: conf_data
+--
+2.31.1
+
https://src.fedoraproject.org/rpms/appstream-generator/c/2e088686f9cad70e...
2Â years, 8Â months
ngompa pushed to appstream-generator (f35). "Update to 0.8.5"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-08-29 00:33:01 UTC
From 9ab0cbf47384a43dc0a4cd40e1e4269b0907e52d Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Aug 29 2021 00:05:58 +0000
Subject: Update to 0.8.5
---
diff --git a/.gitignore b/.gitignore
index fb74bfd..c7e64db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/appstream-generator-nodemodules.tar.gz
/appstream-generator-0.8.2.tar.gz
/appstream-generator-0.8.4.tar.gz
+/appstream-generator-0.8.5.tar.gz
diff --git a/0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch b/0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch
deleted file mode 100644
index f56671c..0000000
--- a/0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d5dad3b174eea7e9fbe0ed6e7b55a366b8eb203d Mon Sep 17 00:00:00 2001
-From: Dan Printzell <xwildn00bx(a)gmail.com>
-Date: Sun, 2 May 2021 23:54:47 +0200
-Subject: [PATCH] Fix compilation due to broken generated GdkPixbuf code
-
-Gir-to-d tries to handle the return value of 'gdk_pixdata_from_pixbuf'
-as if it is zero-terminated.
-Which causes it to try to use 'getArrayLength' on a void*, causing a
-compilation error.
-Temporary fix for now is to just not export that function.
-
-Additionally, Add missing include for 'FILE*' that GdkPixbufModule needs
-inside 'girepo/gdkpixbuf/c/types.d'.
-
-Signed-off-by: Dan Printzell <xwildn00bx(a)gmail.com>
----
- contrib/girwrap/APILookupGdkPixbuf.txt | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/contrib/girwrap/APILookupGdkPixbuf.txt b/contrib/girwrap/APILookupGdkPixbuf.txt
-index a72ca04..d5edb36 100644
---- a/contrib/girwrap/APILookupGdkPixbuf.txt
-+++ b/contrib/girwrap/APILookupGdkPixbuf.txt
-@@ -224,3 +224,13 @@ struct: Pixdata
- noProperty: pixel_data
-
- move: pixbuf_from_pixdata Pixbuf from_pixdata
-+
-+# Gir-to-d tries to handle the return value of 'gdk_pixdata_from_pixbuf' as if it is zero-terminated.
-+# Which causes it to try to use 'getArrayLength' on a void*, causing a compilation error.
-+# Temporary fix for now is to just not export that function.
-+noCode: from_pixbuf
-+
-+# Add missing include for FILE* that GdkPixbufModule needs inside 'girepo/gdkpixbuf/c/types.d'.
-+addAliases: start
-+private import core.stdc.stdio : FILE;
-+addAliases: end
---
-2.31.1
-
diff --git a/appstream-generator.spec b/appstream-generator.spec
index da17d99..945ceeb 100644
--- a/appstream-generator.spec
+++ b/appstream-generator.spec
@@ -5,7 +5,7 @@
%bcond_without vendored_js
Name: appstream-generator
-Version: 0.8.4
+Version: 0.8.5
Release: 1%{?dist}
Summary: Fast AppStream metadata generator
@@ -20,14 +20,14 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: %{name}-nodemodules.tar.gz
# Backports from upstream
-Patch0001: 0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch
+Patch0001: 0001-Fix-build-with-GLib-2.69.patch
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glibd-2.0)
-BuildRequires: pkgconfig(appstream) >= 0.14.2
-BuildRequires: pkgconfig(appstream-compose) >= 0.14.2
+BuildRequires: pkgconfig(appstream) >= 0.14.5
+BuildRequires: pkgconfig(appstream-compose) >= 0.14.5
BuildRequires: pkgconfig(lmdb) >= 0.9
BuildRequires: pkgconfig(libarchive) >= 3.2
BuildRequires: pkgconfig(libcurl)
@@ -119,6 +119,9 @@ install contrib/setup/node_modules/jquery-flot/jquery.flot*.js -t %{buildroot}%{
%{_datadir}/metainfo/org.freedesktop.appstream.generator.metainfo.xml
%changelog
+* Sat Aug 28 2021 Neal Gompa <ngompa(a)fedoraproject.org> - 0.8.5-1
+- Update to 0.8.5
+
* Wed Aug 18 2021 Neal Gompa <ngompa(a)fedoraproject.org> - 0.8.4-1
- Update to 0.8.4 (#1924378)
diff --git a/sources b/sources
index d169fa7..a114664 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (appstream-generator-0.8.4.tar.gz) = 62f2c8293ce8abd57d75a4132114ad8316e92835bed94924f5ff2f3c9e8c38d1c218751c9b6b73cf730c303647502597514050572fd365ffae4f642ab50f9afb
+SHA512 (appstream-generator-0.8.5.tar.gz) = cf2d392583efd4f241d81cff93d793221640c603601974e2d7bdecb5a2ccc381b0ae6e9f21d224680c0d5ef276e439d5625b50cb6bd9ae90cc93fde53725bc22
SHA512 (appstream-generator-nodemodules.tar.gz) = 723cc10816ca38b02c1ca8257b7d128772c049f2f39e2d0717aae4790f61e61696f585024de5be6cc7aa448e8f7db4e1d28ecc52d24995941d3d8bd5b1bf9eeb
https://src.fedoraproject.org/rpms/appstream-generator/c/9ab0cbf47384a43d...
2Â years, 8Â months
ngompa pushed to appstream-generator (f35). "Backport fix for broken
generated GdkPixbuf code"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-08-29 00:33:01 UTC
From 83d239b41f966f93d3dc75e44d390b511e8f6c40 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Aug 19 2021 13:24:28 +0000
Subject: Backport fix for broken generated GdkPixbuf code
---
diff --git a/0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch b/0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch
new file mode 100644
index 0000000..f56671c
--- /dev/null
+++ b/0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch
@@ -0,0 +1,40 @@
+From d5dad3b174eea7e9fbe0ed6e7b55a366b8eb203d Mon Sep 17 00:00:00 2001
+From: Dan Printzell <xwildn00bx(a)gmail.com>
+Date: Sun, 2 May 2021 23:54:47 +0200
+Subject: [PATCH] Fix compilation due to broken generated GdkPixbuf code
+
+Gir-to-d tries to handle the return value of 'gdk_pixdata_from_pixbuf'
+as if it is zero-terminated.
+Which causes it to try to use 'getArrayLength' on a void*, causing a
+compilation error.
+Temporary fix for now is to just not export that function.
+
+Additionally, Add missing include for 'FILE*' that GdkPixbufModule needs
+inside 'girepo/gdkpixbuf/c/types.d'.
+
+Signed-off-by: Dan Printzell <xwildn00bx(a)gmail.com>
+---
+ contrib/girwrap/APILookupGdkPixbuf.txt | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/contrib/girwrap/APILookupGdkPixbuf.txt b/contrib/girwrap/APILookupGdkPixbuf.txt
+index a72ca04..d5edb36 100644
+--- a/contrib/girwrap/APILookupGdkPixbuf.txt
++++ b/contrib/girwrap/APILookupGdkPixbuf.txt
+@@ -224,3 +224,13 @@ struct: Pixdata
+ noProperty: pixel_data
+
+ move: pixbuf_from_pixdata Pixbuf from_pixdata
++
++# Gir-to-d tries to handle the return value of 'gdk_pixdata_from_pixbuf' as if it is zero-terminated.
++# Which causes it to try to use 'getArrayLength' on a void*, causing a compilation error.
++# Temporary fix for now is to just not export that function.
++noCode: from_pixbuf
++
++# Add missing include for FILE* that GdkPixbufModule needs inside 'girepo/gdkpixbuf/c/types.d'.
++addAliases: start
++private import core.stdc.stdio : FILE;
++addAliases: end
+--
+2.31.1
+
diff --git a/appstream-generator.spec b/appstream-generator.spec
index 7463207..da17d99 100644
--- a/appstream-generator.spec
+++ b/appstream-generator.spec
@@ -19,6 +19,9 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# $ cd ../../ && tar czvf %{name}-nodemodules.tar.gz contrib/setup/node_modules
Source1: %{name}-nodemodules.tar.gz
+# Backports from upstream
+Patch0001: 0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch
+
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gio-2.0)
@@ -71,6 +74,7 @@ as JSON documents and HTML pages.
%if %{with vendored_js}
%setup -q -T -D -a 1
%endif
+%autopatch -p1
%build
# Drop '-specs=/usr/lib/rpm/redhat/redhat-hardened-ld' as LDC doesn't support it
https://src.fedoraproject.org/rpms/appstream-generator/c/83d239b41f966f93...
2Â years, 8Â months
ngompa pushed to appstream-generator (f35). "Update to 0.8.4
(#1924378)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-08-29 00:33:01 UTC
From c6e7318744879556489fed086dd10f3cd41fcb16 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Aug 18 2021 19:44:44 +0000
Subject: Update to 0.8.4 (#1924378)
---
diff --git a/.gitignore b/.gitignore
index 5e6cc18..fb74bfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/appstream-generator-0.8.1.tar.gz
/appstream-generator-nodemodules.tar.gz
/appstream-generator-0.8.2.tar.gz
+/appstream-generator-0.8.4.tar.gz
diff --git a/appstream-generator.spec b/appstream-generator.spec
index 545a551..7463207 100644
--- a/appstream-generator.spec
+++ b/appstream-generator.spec
@@ -5,8 +5,8 @@
%bcond_without vendored_js
Name: appstream-generator
-Version: 0.8.2
-Release: 4%{?dist}
+Version: 0.8.4
+Release: 1%{?dist}
Summary: Fast AppStream metadata generator
License: LGPLv3+ and MIT
@@ -23,17 +23,11 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glibd-2.0)
-BuildRequires: pkgconfig(appstream) >= 0.12.10
+BuildRequires: pkgconfig(appstream) >= 0.14.2
+BuildRequires: pkgconfig(appstream-compose) >= 0.14.2
BuildRequires: pkgconfig(lmdb) >= 0.9
BuildRequires: pkgconfig(libarchive) >= 3.2
-BuildRequires: pkgconfig(cairo) >= 1.12
-BuildRequires: pkgconfig(gdk-pixbuf-2.0)
-BuildRequires: pkgconfig(librsvg-2.0)
-BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libcurl)
-BuildRequires: pkgconfig(freetype2)
-BuildRequires: pkgconfig(pango)
-BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: gir-to-d >= 0.18.0
BuildRequires: ldc >= 1:1.1.0
@@ -109,8 +103,7 @@ install contrib/setup/node_modules/jquery-flot/jquery.flot*.js -t %{buildroot}%{
%check
-# Cf. https://github.com/ximion/appstream-generator/issues/72
-(%meson_test) || :
+%meson_test
%files
@@ -122,6 +115,9 @@ install contrib/setup/node_modules/jquery-flot/jquery.flot*.js -t %{buildroot}%{
%{_datadir}/metainfo/org.freedesktop.appstream.generator.metainfo.xml
%changelog
+* Wed Aug 18 2021 Neal Gompa <ngompa(a)fedoraproject.org> - 0.8.4-1
+- Update to 0.8.4 (#1924378)
+
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index db05c32..d169fa7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (appstream-generator-0.8.2.tar.gz) = fb5264817f54da80e4baa51624e1c9fa9cb0c85a6115211adb8fc2918755477d12e519185173c532404f200eabacf77d61d05266980b6fca11378ca7153d2b4e
+SHA512 (appstream-generator-0.8.4.tar.gz) = 62f2c8293ce8abd57d75a4132114ad8316e92835bed94924f5ff2f3c9e8c38d1c218751c9b6b73cf730c303647502597514050572fd365ffae4f642ab50f9afb
SHA512 (appstream-generator-nodemodules.tar.gz) = 723cc10816ca38b02c1ca8257b7d128772c049f2f39e2d0717aae4790f61e61696f585024de5be6cc7aa448e8f7db4e1d28ecc52d24995941d3d8bd5b1bf9eeb
https://src.fedoraproject.org/rpms/appstream-generator/c/c6e7318744879556...
2Â years, 8Â months
ngompa pushed to appstream (f35). "Update to 0.14.5"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-08-29 00:09:19 UTC
From 55c375eee78f34eb28a9d281b949d7f4a25aa2d4 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Aug 28 2021 20:43:10 +0000
Subject: Update to 0.14.5
---
diff --git a/.gitignore b/.gitignore
index 2d6b767..9e16b59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/AppStream-0.14.2.tar.xz
/AppStream-0.14.3.tar.xz
/AppStream-0.14.4.tar.xz
+/AppStream-0.14.5.tar.xz
diff --git a/appstream.spec b/appstream.spec
index cb2cbec..e1dcf8c 100644
--- a/appstream.spec
+++ b/appstream.spec
@@ -4,8 +4,8 @@
Summary: Utilities to generate, maintain and access the AppStream database
Name: appstream
-Version: 0.14.4
-Release: 2%{?dist}
+Version: 0.14.5
+Release: 1%{?dist}
# lib LGPLv2+, tools GPLv2+
License: GPLv2+ and LGPLv2+
@@ -179,13 +179,18 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
## symlink pointing to ^^, but need to take care, since rpm has
## trouble replacing dirs with symlinks, omit it for now -- rex
%exclude %{_datadir}/gtk-doc/html/appstream
+# Maybe this should be split out? -- ngompa
+%{_datadir}/installed-tests/appstream/metainfo-validate.test
%ldconfig_scriptlets compose
%files compose
+%{_libexecdir}/appstreamcli-compose
+%{_mandir}/man1/appstreamcli-compose.1*
%{_libdir}/libappstream-compose.so.0*
%{_libdir}/libappstream-compose.so.%{version}
%{_libdir}/girepository-1.0/AppStreamCompose-1.0.typelib
+%{_metainfodir}/org.freedesktop.appstream.compose.metainfo.xml
%files compose-devel
%{_includedir}/appstream-compose/
@@ -206,6 +211,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
%changelog
+* Sat Aug 28 2021 Neal Gompa <ngompa(a)fedoraproject.org> - 0.14.5-1
+- Update to 0.14.5
+
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index bdd6f00..6a4e9fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (AppStream-0.14.4.tar.xz) = 86bd98e94f3e730d37030be31c6ea0000ba12b35e13778458c0f50bad75babf8c8e93b62492a2546a42f750f91ae81f3456d04e63ad9a4acb804cf38493440a4
+SHA512 (AppStream-0.14.5.tar.xz) = 3f2fff8ee98a5689534802136b9fc8368422ce73c72458924b49beeb5b01170dadf25308bee692cfbc0b0a6cd4b3ee3047e46668a1b76a16b23faec4bf8ae78c
https://src.fedoraproject.org/rpms/appstream/c/55c375eee78f34eb28a9d281b9...
2Â years, 8Â months
ngompa pushed to appstream-generator (rawhide). "Add missing patch"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-08-29 00:08:20 UTC
From 2e088686f9cad70ef83a43088dfae7f0f48ff320 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Aug 29 2021 00:08:12 +0000
Subject: Add missing patch
---
diff --git a/0001-Fix-build-with-GLib-2.69.patch b/0001-Fix-build-with-GLib-2.69.patch
new file mode 100644
index 0000000..a5af3b1
--- /dev/null
+++ b/0001-Fix-build-with-GLib-2.69.patch
@@ -0,0 +1,134 @@
+From 0644bc10d13fc68ab39b4328a386033f700b8410 Mon Sep 17 00:00:00 2001
+From: Matthias Klumpp <matthias(a)tenstral.net>
+Date: Sun, 29 Aug 2021 01:45:29 +0200
+Subject: [PATCH] Fix build with GLib >= 2.69
+
+GLibD for GLib 2.69 changed some API, so we need to account for that
+while still having the code build for older versions of GLib.
+---
+ meson.build | 1 +
+ src/app.d | 1 -
+ src/asgen/defines.d.in | 3 ++
+ src/asgen/handlers/screenshothandler.d | 46 ++++++++++++++++++--------
+ src/asgen/meson.build | 5 +++
+ 5 files changed, 41 insertions(+), 15 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f4b0aa9..dc32699 100644
+--- a/meson.build
++++ b/meson.build
+@@ -15,6 +15,7 @@ build_root = meson.build_root()
+ #
+ src_dir = include_directories('src/')
+
++glib_dep = dependency('glib-2.0')
+ glibd_dep = dependency('glibd-2.0')
+ appstream_dep = dependency('appstream', version : '>= 0.14.5')
+ ascompose_dep = dependency('appstream-compose', version : '>= 0.14.5')
+diff --git a/src/app.d b/src/app.d
+index 070c980..d9b61ea 100644
+--- a/src/app.d
++++ b/src/app.d
+@@ -224,7 +224,6 @@ void main(string[] args)
+ default:
+ writeln (format ("The command '%s' is unknown.", command));
+ exit (1);
+- break;
+ }
+ }
+
+diff --git a/src/asgen/defines.d.in b/src/asgen/defines.d.in
+index af49792..16cccba 100644
+--- a/src/asgen/defines.d.in
++++ b/src/asgen/defines.d.in
+@@ -25,3 +25,6 @@ public enum DATADIR = "@datadir@";
+
+ // current version of the tool
+ public enum ASGEN_VERSION = "@asgen_version@";
++
++// Used for GLib/GLibD API change tests
++public enum GLIB_GE_2_69 = @glib_ge_2_29@;
+diff --git a/src/asgen/handlers/screenshothandler.d b/src/asgen/handlers/screenshothandler.d
+index 26dcd12..14a346c 100644
+--- a/src/asgen/handlers/screenshothandler.d
++++ b/src/asgen/handlers/screenshothandler.d
+@@ -35,6 +35,7 @@ import ascompose.c.types : ImageFormat, ImageLoadFlags, ImageSaveFlags;
+ static import ascompose.Image;
+ static import std.file;
+
++import asgen.defines : GLIB_GE_2_69;
+ import asgen.config : Config;
+ import asgen.result : GeneratorResult;
+ import asgen.downloader : Downloader;
+@@ -124,20 +125,37 @@ private VideoInfo checkVideoInfo (GeneratorResult gres, Component cpt, const Con
+ try {
+ // NOTE: We are currently extracting information from ffprobe's simple output, but it also has a JSON
+ // mode. Parsing JSON is a bit slower, but if it is more reliable we should switch to that.
+- Spawn.sync (null, // working directory
+- [conf.ffprobeBinary,
+- "-v", "quiet",
+- "-show_entries", "stream=width,height,codec_name,codec_type",
+- "-show_entries", "format=format_name",
+- "-of", "default=noprint_wrappers=1",
+- vidFname],
+- [], // envp
+- SpawnFlags.LEAVE_DESCRIPTORS_OPEN,
+- null, // child setup
+- null, // user data
+- ffStdout, // out stdout
+- ffStderr, // out stderr
+- exitStatus);
++ static if (GLIB_GE_2_69) {
++ Spawn.sync (null, // working directory
++ [conf.ffprobeBinary,
++ "-v", "quiet",
++ "-show_entries", "stream=width,height,codec_name,codec_type",
++ "-show_entries", "format=format_name",
++ "-of", "default=noprint_wrappers=1",
++ vidFname],
++ [], // envp
++ SpawnFlags.LEAVE_DESCRIPTORS_OPEN,
++ null, // child setup
++ null, // user data
++ ffStdout, // out stdout
++ ffStderr, // out stderr
++ &exitStatus);
++ } else {
++ Spawn.sync (null, // working directory
++ [conf.ffprobeBinary,
++ "-v", "quiet",
++ "-show_entries", "stream=width,height,codec_name,codec_type",
++ "-show_entries", "format=format_name",
++ "-of", "default=noprint_wrappers=1",
++ vidFname],
++ [], // envp
++ SpawnFlags.LEAVE_DESCRIPTORS_OPEN,
++ null, // child setup
++ null, // user data
++ ffStdout, // out stdout
++ ffStderr, // out stderr
++ exitStatus);
++ }
+ } catch (Exception e) {
+ logError ("Failed to spawn ffprobe: %s", e.to!string);
+ gres.addHint (cpt, "metainfo-screenshot-but-no-media", ["fname": vidFname.baseName, "msg": e.to!string]);
+diff --git a/src/asgen/meson.build b/src/asgen/meson.build
+index 48f64a5..26f47d7 100644
+--- a/src/asgen/meson.build
++++ b/src/asgen/meson.build
+@@ -1,7 +1,12 @@
+
++glib_ge_2_29 = 'false'
++if glib_dep.version().version_compare('>=2.69')
++ glib_ge_2_29 = 'true'
++endif
+ conf_data = configuration_data()
+ conf_data.set('datadir', join_paths(get_option('prefix'), get_option('datadir'), 'appstream'))
+ conf_data.set('asgen_version', asgen_version)
++conf_data.set('glib_ge_2_29', glib_ge_2_29)
+ configure_file(input : 'defines.d.in',
+ output: 'defines.d',
+ configuration: conf_data
+--
+2.31.1
+
https://src.fedoraproject.org/rpms/appstream-generator/c/2e088686f9cad70e...
2Â years, 8Â months
ngompa pushed to appstream-generator (rawhide). "Update to 0.8.5"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-08-29 00:06:41 UTC
From 9ab0cbf47384a43dc0a4cd40e1e4269b0907e52d Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Aug 29 2021 00:05:58 +0000
Subject: Update to 0.8.5
---
diff --git a/.gitignore b/.gitignore
index fb74bfd..c7e64db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/appstream-generator-nodemodules.tar.gz
/appstream-generator-0.8.2.tar.gz
/appstream-generator-0.8.4.tar.gz
+/appstream-generator-0.8.5.tar.gz
diff --git a/0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch b/0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch
deleted file mode 100644
index f56671c..0000000
--- a/0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d5dad3b174eea7e9fbe0ed6e7b55a366b8eb203d Mon Sep 17 00:00:00 2001
-From: Dan Printzell <xwildn00bx(a)gmail.com>
-Date: Sun, 2 May 2021 23:54:47 +0200
-Subject: [PATCH] Fix compilation due to broken generated GdkPixbuf code
-
-Gir-to-d tries to handle the return value of 'gdk_pixdata_from_pixbuf'
-as if it is zero-terminated.
-Which causes it to try to use 'getArrayLength' on a void*, causing a
-compilation error.
-Temporary fix for now is to just not export that function.
-
-Additionally, Add missing include for 'FILE*' that GdkPixbufModule needs
-inside 'girepo/gdkpixbuf/c/types.d'.
-
-Signed-off-by: Dan Printzell <xwildn00bx(a)gmail.com>
----
- contrib/girwrap/APILookupGdkPixbuf.txt | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/contrib/girwrap/APILookupGdkPixbuf.txt b/contrib/girwrap/APILookupGdkPixbuf.txt
-index a72ca04..d5edb36 100644
---- a/contrib/girwrap/APILookupGdkPixbuf.txt
-+++ b/contrib/girwrap/APILookupGdkPixbuf.txt
-@@ -224,3 +224,13 @@ struct: Pixdata
- noProperty: pixel_data
-
- move: pixbuf_from_pixdata Pixbuf from_pixdata
-+
-+# Gir-to-d tries to handle the return value of 'gdk_pixdata_from_pixbuf' as if it is zero-terminated.
-+# Which causes it to try to use 'getArrayLength' on a void*, causing a compilation error.
-+# Temporary fix for now is to just not export that function.
-+noCode: from_pixbuf
-+
-+# Add missing include for FILE* that GdkPixbufModule needs inside 'girepo/gdkpixbuf/c/types.d'.
-+addAliases: start
-+private import core.stdc.stdio : FILE;
-+addAliases: end
---
-2.31.1
-
diff --git a/appstream-generator.spec b/appstream-generator.spec
index da17d99..945ceeb 100644
--- a/appstream-generator.spec
+++ b/appstream-generator.spec
@@ -5,7 +5,7 @@
%bcond_without vendored_js
Name: appstream-generator
-Version: 0.8.4
+Version: 0.8.5
Release: 1%{?dist}
Summary: Fast AppStream metadata generator
@@ -20,14 +20,14 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: %{name}-nodemodules.tar.gz
# Backports from upstream
-Patch0001: 0001-Fix-compilation-due-to-broken-generated-GdkPixbuf-co.patch
+Patch0001: 0001-Fix-build-with-GLib-2.69.patch
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glibd-2.0)
-BuildRequires: pkgconfig(appstream) >= 0.14.2
-BuildRequires: pkgconfig(appstream-compose) >= 0.14.2
+BuildRequires: pkgconfig(appstream) >= 0.14.5
+BuildRequires: pkgconfig(appstream-compose) >= 0.14.5
BuildRequires: pkgconfig(lmdb) >= 0.9
BuildRequires: pkgconfig(libarchive) >= 3.2
BuildRequires: pkgconfig(libcurl)
@@ -119,6 +119,9 @@ install contrib/setup/node_modules/jquery-flot/jquery.flot*.js -t %{buildroot}%{
%{_datadir}/metainfo/org.freedesktop.appstream.generator.metainfo.xml
%changelog
+* Sat Aug 28 2021 Neal Gompa <ngompa(a)fedoraproject.org> - 0.8.5-1
+- Update to 0.8.5
+
* Wed Aug 18 2021 Neal Gompa <ngompa(a)fedoraproject.org> - 0.8.4-1
- Update to 0.8.4 (#1924378)
diff --git a/sources b/sources
index d169fa7..a114664 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (appstream-generator-0.8.4.tar.gz) = 62f2c8293ce8abd57d75a4132114ad8316e92835bed94924f5ff2f3c9e8c38d1c218751c9b6b73cf730c303647502597514050572fd365ffae4f642ab50f9afb
+SHA512 (appstream-generator-0.8.5.tar.gz) = cf2d392583efd4f241d81cff93d793221640c603601974e2d7bdecb5a2ccc381b0ae6e9f21d224680c0d5ef276e439d5625b50cb6bd9ae90cc93fde53725bc22
SHA512 (appstream-generator-nodemodules.tar.gz) = 723cc10816ca38b02c1ca8257b7d128772c049f2f39e2d0717aae4790f61e61696f585024de5be6cc7aa448e8f7db4e1d28ecc52d24995941d3d8bd5b1bf9eeb
https://src.fedoraproject.org/rpms/appstream-generator/c/9ab0cbf47384a43d...
2Â years, 8Â months