gentoo auto-resync : 11:11:2022 - 03:29:03

4 files changed, 41 insertions, 8 deletions

diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 7d7c6e4938a0..b481f92efcee 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,6 +1,7 @@
 AUX graphlcd-base-2.0.3-clang.patch 1797 BLAKE2B 11496515cb65b2689eb6a5866f6085ee53385ba8a4fb7499a45d66c86be03dcaed61f7f11146a57556180105c177ae78c701a0a42dfc5700a491992c7d687574 SHA512 d850ddd526e33d03424bf2ad6b7a911d264a00568200acfc8f931d2d4dff82d261a60104b6225ff1364c3c2860cf3c84654778759fd34ad5fb706dee6c13486b
 AUX graphlcd-base-2.0.3-cpp.patch 20195 BLAKE2B 5b9c3db6af66ed2b5dedb4d7acc7238c5e622c39df17cf71dd92e5ff8e461effbfe218248a56a3f79619267c0f6b10beae617e9a2a954936f27e2e818eaf99a9 SHA512 a746f74cbd7256e19bd851800f95c34811c6b02929e26c68bd2b091b52d0077070e3a9b7b7c562c1440c3f1f0bcb3237b653748c59729bd60f7284bfa3b39745
-AUX graphlcd-base-2.0.3-imagemagick7.patch 12164 BLAKE2B 040ecd2d6cf0ff97ab28e5b9e44917d74a5feccc2e92246087eb878eb5d87220cad6d169c8cfce7ebc6ce47fbb306e8a2838cfe34e60300f36b8ae74154c59f5 SHA512 79b69a9a8fb50099cbb0f054920b2eb8fa846dbb679ecfd3ffc27977a07b13ce38c32e7fc3cffae93eb3f345ed2b25da66c3eb564940375ffa949980904aae93
+AUX graphlcd-base-2.0.3-imagemagick7.patch 12180 BLAKE2B 26f41a9bfaf83b1c065afd9bc77a5552a5d0183b0458fa9a136ad5ce6dc8b8420341e4fe3c474e70ba71f4990077e78c36e825d0b69ebd65e8a6b2f6ba5dee8e SHA512 04edc28a859850bc40c9f18bad3a8e5a33fb889713f24b85d9d78b2a3c7d9c397abf3bb36bb89c1ddcc6d9a4fcddc0c985c946b7ac24532bdc37d2112ad3a1d9
+AUX graphlcd-base-2.0.3-musl.patch 879 BLAKE2B 096867a3095f6e2b6ac8d8cfb4695bfb417f1d72a3b2e2b42d5bb3bc9a309076d2b3d1ff103092076dd38ed3ac88ab368c2b1fe0580ce54045396f60e837fad4 SHA512 0cce578b26a9e85524ef8b7dda4a09fe757a2d778ed2b03c41e1b7e995b306dbe069ac03043f6f1051b29f55d71aa644d84e79a17a957ae6bfb58d43e4d8543d
 DIST graphlcd-base-2.0.3.tar.bz2 523229 BLAKE2B cfdca5a6a73e8a3858d694aa997037b56471feb20541a328210a106d22c97f57e20f0798411e5a92ca616e5991ec167a8986730b985d0aefcbbb6c6454ab78c2 SHA512 dd0d6a1f1d43405d6ff2e531010f97d47081e3e8e9ccd238adc1084912c99838e80e85b8bd6b37d6462859c3c96229fd83e5ac93fb4068ffe5c30cff3787d138
-EBUILD graphlcd-base-2.0.3-r3.ebuild 2353 BLAKE2B 12a60833b072478e22830770acef4c7310b59230307a308ce2c620ae4f6a13d2df8cb575c579b7f160e8ab824e2d88777f4f3281a2af002e47ed632091ff1f5d SHA512 e52089029a9891982966359677242658cc27901fd7d622d3aeb0ea31ce40ad514e4c82a5772f5b9f998ec73cb03ca3e5bad2fe79d4edcf965fbd4ed813953664
+EBUILD graphlcd-base-2.0.3-r3.ebuild 2391 BLAKE2B 0388fff40f8f27881cee93b197290ae10385a309b57ebc4790f31f950c61c78aa5115a06a3b38bbd9181f587c15c09ead6e923d5fdc101b8aecffe36ca862b33 SHA512 fd7fc4a824b76da4d1ee9f023e854616e4049735b62b241fbbebadb6b5eeea742cd08c14e878fcf8cc74f7f92f140287960b3010f923e98c426372410e1caa77
 MISC metadata.xml 1010 BLAKE2B edb76fc1024e7dc42a14155d892a126d611cf3157604b1a12590c97e4c3270dfb66f49962b08780c6bc53874f94acb1188cc275221e27b2e83ed3b02c343dbad SHA512 d623de28fc64e351373fbb6005393e6bded18f163ec771d1f6854b87fe022250fb88447c919c6a88379fb23d4fc057a2a752365a7759ce621c5ab8059d471aab
diff --git a/app-misc/graphlcd-base/files/graphlcd-base-2.0.3-imagemagick7.patch b/app-misc/graphlcd-base/files/graphlcd-base-2.0.3-imagemagick7.patch
index 1c938fadd870..f75b895e27e8 100644
--- a/app-misc/graphlcd-base/files/graphlcd-base-2.0.3-imagemagick7.patch
+++ b/app-misc/graphlcd-base/files/graphlcd-base-2.0.3-imagemagick7.patch
@@ -68,10 +68,10 @@ index cfb50de..92e2847 100644
  endif
  
  
-diff --git a/glcdgraphics/extformats.c b/glcdgraphics/extformats.c
+diff --git a/glcdgraphics/extformats.cpp b/glcdgraphics/extformats.cpp
 index 5734fce..90441e6 100644
---- a/glcdgraphics/extformats.c
-+++ b/glcdgraphics/extformats.c
+--- a/glcdgraphics/extformats.cpp
++++ b/glcdgraphics/extformats.cpp
 @@ -21,11 +21,10 @@
  #include "extformats.h"
  #include "image.h"
@@ -308,10 +308,10 @@ Subject: [PATCH] Add cleanup for MagickWand
  glcdgraphics/extformats.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/glcdgraphics/extformats.c b/glcdgraphics/extformats.c
+diff --git a/glcdgraphics/extformats.cpp b/glcdgraphics/extformats.cpp
 index 90441e6..79d14da 100644
---- a/glcdgraphics/extformats.c
-+++ b/glcdgraphics/extformats.c
+--- a/glcdgraphics/extformats.cpp
++++ b/glcdgraphics/extformats.cpp
 @@ -65,6 +65,7 @@ bool cExtFormatFile::LoadScaled(cImage & image, const string & fileName, uint16_
  
    if (MagickReadImage(mw, fileName.c_str()) == MagickFalse) {
diff --git a/app-misc/graphlcd-base/files/graphlcd-base-2.0.3-musl.patch b/app-misc/graphlcd-base/files/graphlcd-base-2.0.3-musl.patch
new file mode 100644
index 000000000000..927d48071520
--- /dev/null
+++ b/app-misc/graphlcd-base/files/graphlcd-base-2.0.3-musl.patch
@@ -0,0 +1,31 @@
+From dd01f3be61f4d3e7078e06b759a890dcf33c2268 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Thu, 10 Nov 2022 23:53:40 +0100
+Subject: [PATCH] Fix compilation with >=GCC-12 and Musl
+
+This will fix a compiling failure:
+g++  -O2 -pipe -MMD -MP -MMD -MP -fPIC -I.. -c -D_GNU_SOURCE  skin.c
+In file included from config.c:2:
+type.h:48:17: error: expected ')' before 'Number'
+   48 |     cType(time_t Number): mType(number), mNumber(Number), mUpdateIn(0) {}
+      |          ~      ^~~~~~~
+      |                 )
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+---
+ glcdskin/type.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/glcdskin/type.h b/glcdskin/type.h
+index 4d54de8..350fa5f 100644
+--- a/glcdskin/type.h
++++ b/glcdskin/type.h
+@@ -19,6 +19,8 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+ 
++#include <time.h>
++
+ namespace GLCD
+ {
+ 
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild
index 46bedc2b59c4..df811179a910 100644
--- a/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-clang.patch"
 	"${FILESDIR}/${PN}-2.0.3-cpp.patch"
 	"${FILESDIR}/${PN}-2.0.3-imagemagick7.patch"
+	"${FILESDIR}/${PN}-2.0.3-musl.patch"
 )
 
 src_prepare() {