diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-11-11 03:29:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-11 03:29:03 +0000 |
| commit | b4899ed9fc78f45325ef4e2ebd460869e53a605d (patch) | |
| tree | 22eb729a14c18edf4c1a015ec26189729e9c6272 /app-misc/graphlcd-base/files | |
| parent | c020d9e9432cd0e36fe47ad14216d6048adb49fc (diff) | |
gentoo auto-resync : 11:11:2022 - 03:29:03
Diffstat (limited to 'app-misc/graphlcd-base/files')
| -rw-r--r-- | app-misc/graphlcd-base/files/graphlcd-base-2.0.3-imagemagick7.patch | 12 | ||||
| -rw-r--r-- | app-misc/graphlcd-base/files/graphlcd-base-2.0.3-musl.patch | 31 |
2 files changed, 37 insertions, 6 deletions
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 + { + |