gentoo auto-resync : 04:09:2022 - 22:23:05

3 files changed, 32 insertions, 1 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 02a02edcb6e8..923b485ad932 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,10 +1,11 @@
 AUX cairo-1.12.18-disable-test-suite.patch 390 BLAKE2B 49db479ddcb636e80483357b291d66ae563d8dfeabde2f7b017fda4cb272cee856e9d29dfddcc22e3cfcb3e2ff62c9eba802ace0e5ef1e49aeeef26002482ec9 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783
 AUX cairo-1.16.0-binutils-2.34.patch 2332 BLAKE2B a0df3d0f99b26a867ac554ee515c7e435f02f49c97806bd7d2684a8d6fd737014560c2451761273641b88d9892fb4f5d00f9ca22a1b021e4edece442e7cd7425 SHA512 ca05ea37273c17d4e6b3076f23defb028d25ad96cf99e65937c3e59f5cf9e63a35cb8374a8e0d4037b03f889f338628c9303686cbc6dd2d695505fdde2119c95
+AUX cairo-1.16.0-binutils-2.39-ptr.patch 1174 BLAKE2B 7afe9aba01102dcf8ea52a26db9830c18e9bcb5d87833de760ff8b4fe5343c2ed178a74d043ef6fa5ec1d5bdead6b8f41f11ae2c6fa46317a07e76ce966c123e SHA512 8499bb67c0c17131ebab37c114838876a7afc051691adba83d848663e38d83006dedfaa0553e05b99216767a8d6d93c13ea370bc2d2b3e417cac9ebda4b08fb6
 AUX cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch 751 BLAKE2B 9b693598ac8fec28c0479544cc02dfbd1daab171b88bf7b1eb6ee353fdd32ee4228f24723d3b4937b3f30838d68d2a9a6f87b40d08896b59d36345d7e9447a32 SHA512 33d8454b2173c5be1f53576c143781f2b802ee961cef496d6fec5ba58554f4302ea6c351dc64f133d93c5495dacb3d387b8a201bfc415d54f8c77e41e877d319
 AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b4814253084c5ba7946b29ee5c5209c2c207721d9699d9fbab83e40f6d10394e89fe7a23ea5dc194cfcb2495e3ac2b075e22fa83bb SHA512 569cc28538333cdd907e3c9f26dd6512e48188dcb761284f2414936d60d4239d7ac15a5836f1f390d4881cce71bfb62a0679e097386116ecf807ecd03bf0f03f
 AUX cairo-1.16.0-strings.patch 1379 BLAKE2B 60b63e80ae35385a0c2cbbface46379e76ad8cbc472d76fd68803330e42c49f9c71d662b1824ebf16fbd1bde794ec12a34b8e311758d6e639411e35cd1f34f97 SHA512 d9d9e95b80a0aaee703ff4f58526455db5ac57bce35237826ef4730c54f58b6752756ab92f23e36343e056b0e84269c4b692dfc40cc7836afad3b44fc46c2e26
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r5.ebuild 3880 BLAKE2B 6ad87c765eedbbc340b1cfd9140ba615917b9d297a18eedb2448189ee2b02a3a682b0c2bccdfc6a1b544f1bb76032deffd55363eb966d64cd056b390ed101411 SHA512 8b8f20ae15c27f7ccc00c8a77b3c75039472aaef7d063076478d98432efc35f2c151b4eb1c78a3109f1aa256158f485031fb5e3e4c101e5f6f48a6ea5fb17bda
+EBUILD cairo-1.16.0-r5.ebuild 3924 BLAKE2B f41892bc51dffe2123c7b5396952cdec13396cdd8fdbfe9ebf37b9a73471da310618127720c2bac9070087667da1be089bae64a7e8604014c3e965b71e0ebcc6 SHA512 6cb1f355cb870b76615a05db47010f3ed4d80a4fcac929691cef958604e4e9ad5e75e6b82c7acbdcc005dd52525c43281efbdd5bc690102caeac2d2885ba68b2
 EBUILD cairo-9999.ebuild 3508 BLAKE2B b858786e987dfb89fb18a61222d50123d1975ce3eb9e3a324b149b771038ce8d6766bf0107e24cedabef053a812c155f3f938f5eb63ce7e7004904e71339fe5f SHA512 0d6a8991cf66279fc4e894781ba2b0cff145d56ef8ee94f952d736f0eea3751e8dfc396b3e2dcd578350191aa7d31a2c795c9da71027e9f767ff7209f284c82e
 MISC metadata.xml 710 BLAKE2B 11585ec0ac0ad56eb192f84388ab9fb7ce751ae29555fb366cd8966ec38fceace4978a2b6cad310073484eae51539dcbbe68323205b2b8e97217bc1b87f62b48 SHA512 1021784a9a6db6290fa57e2e5ed356131860820a114a601c8e77fab77eb7b075b81f1288e5df97cad8fe2d86b7aeb67a712f8fd9c5ed775d607d50d6a589dc01
diff --git a/x11-libs/cairo/cairo-1.16.0-r5.ebuild b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
index bf5a7256fd4b..dc8e73c91275 100644
--- a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
@@ -63,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-pdf-add-missing-flush.patch
 	"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
 	"${FILESDIR}"/${P}-strings.patch
+	"${FILESDIR}"/${P}-binutils-2.39-ptr.patch
 )
 
 src_prepare() {
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
new file mode 100644
index 000000000000..6749786d23bd
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
@@ -0,0 +1,29 @@
+https://gitlab.freedesktop.org/cairo/cairo/-/commit/74f2da7b70179a363b5a4649b9c5d6fd18d9cbc0
+https://bugs.gentoo.org/868405
+
+From 24996e6ee241ebcd303dd34a2b06b37a6dd0c217 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Wed, 13 Jul 2022 21:26:57 +0100
+Subject: [PATCH] Fix build with newer binutils-dev installed
+
+It seems the PTR typedef (or macro?) has been removed from newer versions
+of libbfd.
+
+Resolves: https://gitlab.freedesktop.org/cairo/cairo/-/issues/581
+Signed-off-by: Simon McVittie <smcv@debian.org>
+--- a/util/cairo-trace/lookup-symbol.c
++++ b/util/cairo-trace/lookup-symbol.c
+@@ -106,10 +106,10 @@ _symtab_init (struct symtab *symtab, const char *filename)
+     if (! bfd_check_format_matches (symtab->bfd, bfd_object, &matching))
+ 	goto BAIL;
+ 
+-    symcount = bfd_read_minisymbols (symtab->bfd, false, (PTR) &symtab->syms, &size);
++    symcount = bfd_read_minisymbols (symtab->bfd, false, (void **) &symtab->syms, &size);
+     if (symcount == 0) {
+ 	symcount = bfd_read_minisymbols (symtab->bfd, true /* dynamic */ ,
+-		(PTR) &symtab->syms, &size);
++		(void **) &symtab->syms, &size);
+     }
+     if (symcount < 0)
+ 	goto BAIL;
+GitLab