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.org…
+#
+# 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/d41b471b202cbbc5e916…
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.org…
+#
+# 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/d41b471b202cbbc5e916…
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/83d239b41f966f93d3…