gentoo resync : 02.09.2020

3 files changed, 36 insertions, 2 deletions

diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index dae844c5260e..7d357b3738e6 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,5 +1,6 @@
+AUX 3.36.0-fix-32bit-tests-build.patch 916 BLAKE2B 17301f082a57bd513da3f82e4adbabe3b577bbbaa8623ac3882e2b69555d384b4ecb3cc74676f10d06d58907f831536164c40bb3dc82443a25f6e7664c0af48e SHA512 901a5781cb6acdf7febad8fd264d16b1aeacbfc6c44126593d75b4f271aa0925da65a846b8b27afe42633e491994ab68913bd36484b6b77473fe8adb972e28cc
 DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
 EBUILD sysprof-3.34.1-r1.ebuild 2178 BLAKE2B c7af4fa12f96de0aff7639364be3fd34574646a1345c27210b3ec6275a3fec64e002c43479dc290906983a673b319b68481469ccf954a270a74c0269290c43ca SHA512 3ef91c9ebe8d26f96bc0ecde85ca9c171c573c6c29a7050554301e4933ab5bb214a9069bb459129bbdc2b99c16b45197c69b4603ebf7270f648ff3d96dcd7681
-EBUILD sysprof-3.36.0.ebuild 2247 BLAKE2B 1fa6898c75a04a64d7f364bcea689b856dd45700a6b95874517abf46e90bb5395d14c9e15132876b505852dc90064c80d938797ce5d756de96a46053f1842d8e SHA512 ffa65d2350b0f537b4cc0d3f61d3e59f289e78463afee3b490723e9db7e61407060cf6290b919a8b5eea85ab2903729f7651a80cd4efde60d9f53ae019280977
+EBUILD sysprof-3.36.0.ebuild 2307 BLAKE2B 1568508955c5be1b360553aa1e1aaba72ebd4f4c2e62884ebcfc8b0f0cff7ba2032159b3a9ef414c1cb56944f33662c65016a43d59b115a1763fea3be55fe112 SHA512 c350410c8775e4f8ec6817d73add43a86afd36fcd4d3a303f9e87aef642edbbfaaa799a685f8cd70aa579b86fff71f224e0ee120b47b21722330f396b62fffe2
 MISC metadata.xml 704 BLAKE2B 0f16b3a4886ed687e5e889f9cacee3148f0ed4c80f5bc88c66217dcd7d411a0e900710d36e7e9a12995872f75b247f231fd1a085fe699a3b3d14d48e67e13dbd SHA512 247b92c056fe9b224ca5a096825223b883534af67bdd514dfa424460ee3b50cf7187bdd81fc70c64b1073477e7292f19d92d8d5112c1f27472f59e59bcae450d
diff --git a/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch b/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch
new file mode 100644
index 000000000000..a9d4ab58ef9a
--- /dev/null
+++ b/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch
@@ -0,0 +1,29 @@
+From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001
+From: Rasmus Thomsen <oss@cogitri.dev>
+Date: Sat, 7 Mar 2020 10:44:16 +0100
+Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for
+ gsize
+
+This fixes the build on 32-bit platforms with -Werror-format
+
+fixes #32
+---
+ src/tests/allocs-by-size.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c
+index 666113a..6260d4b 100644
+--- a/src/tests/allocs-by-size.c
++++ b/src/tests/allocs-by-size.c
+@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader)
+     {
+       const Item *item = &g_array_index (ar, Item, i);
+ 
+-      g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n",
++      g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n",
+                item->size, item->cmp, item->count);
+     }
+ }
+-- 
+2.20.1
+
diff --git a/dev-util/sysprof/sysprof-3.36.0.ebuild b/dev-util/sysprof/sysprof-3.36.0.ebuild
index f177e8ac8280..25aaf9a9f76a 100644
--- a/dev-util/sysprof/sysprof-3.36.0.ebuild
+++ b/dev-util/sysprof/sysprof-3.36.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 LICENSE="GPL-3+ GPL-2+"
 API_VERSION="3"
 SLOT="0/${API_VERSION}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk +unwind"
 
 RDEPEND="
@@ -34,6 +34,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-32bit-tests-build.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	# These are installed by dev-util/sysprof-capture