<pre style='margin:0'>
tobypeterson pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/33a01e6076e5e9e5e3c6f2d88acc679f22140cb1">https://github.com/macports/macports-ports/commit/33a01e6076e5e9e5e3c6f2d88acc679f22140cb1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 33a01e6076e pilrc: fix BMP loader
</span>33a01e6076e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 33a01e6076e5e9e5e3c6f2d88acc679f22140cb1
</span>Author: Nathan Korth <nkorth@nkorth.com>
AuthorDate: Wed Feb 12 22:16:22 2025 -0500
<span style='display:block; white-space:pre;color:#404040;'> pilrc: fix BMP loader
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> There was another 64-bit bug in here, causing the error message
</span><span style='display:block; white-space:pre;color:#404040;'> "Bitmap not monochrome, 16, 256, 16bit, 24bit or 32bit color".
</span>---
palm/pilrc/Portfile | 4 +-
palm/pilrc/files/64bit.diff | 94 +++++++++++++++++++++++++++++++++
palm/pilrc/files/fix-resource-list.diff | 15 ------
3 files changed, 96 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/palm/pilrc/Portfile b/palm/pilrc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33c5c839116..c4251f7d593 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/palm/pilrc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/palm/pilrc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name pilrc
version 3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories palm devel
license GPL-2+
maintainers {@nkorth nkorth.com:nkorth} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ master_sites sourceforge
</span> checksums rmd160 e9dfb96082c7406e269ea99aec4ce2a6029e8afd \
sha256 f3d6ea3c77f5d2a00707f4372a212377ab7bd77b3d68c3db7e28a553b235903f \
size 259898
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles fix-resource-list.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 64bit.diff
</span>
configure.cmd unix/configure
configure.args --disable-pilrcui
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/palm/pilrc/files/64bit.diff b/palm/pilrc/files/64bit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b813158b819
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/palm/pilrc/files/64bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,94 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur pilrc-3.2-orig/bitmap.c pilrc-3.2/bitmap.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../pilrc-3.2-orig/bitmap.c 2025-02-12 22:04:24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bitmap.c 2025-02-12 22:10:01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stddef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "pilrc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,36 +58,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct BITMAPFILEHEADER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_USHORT bfType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_USHORT bfSize1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_USHORT bfSize2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_USHORT bfReserved1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_USHORT bfReserved2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_USHORT bfOffBits1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_USHORT bfOffBits2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t bfType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t bfSize1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t bfSize2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t bfReserved1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t bfReserved2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t bfOffBits1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t bfOffBits2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } BITMAPFILEHEADER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct BITMAPINFOHEADER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_ULONG biSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- long biWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- long biHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_USHORT biPlanes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_USHORT biBitCount;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_ULONG biCompression;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_ULONG biSizeImage;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- long biXPelsPerMeter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- long biYPelsPerMeter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_ULONG biClrUsed;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_ULONG biClrImportant;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t biSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int32_t biWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int32_t biHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t biPlanes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t biBitCount;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t biCompression;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t biSizeImage;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int32_t biXPelsPerMeter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int32_t biYPelsPerMeter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t biClrUsed;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t biClrImportant;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } BITMAPINFOHEADER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct RGBQUAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_BYTE rgbBlue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_BYTE rgbGreen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_BYTE rgbRed;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PILRC_BYTE rgbReserved;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint8_t rgbBlue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint8_t rgbGreen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint8_t rgbRed;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint8_t rgbReserved;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } RGBQUAD;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct BITMAPINFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur pilrc-3.2-orig/util.c pilrc-3.2/util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../pilrc-3.2-orig/util.c 2025-02-12 22:04:24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ util.c 2025-02-12 22:10:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,9 +74,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFPL(PLEXRESOURCEDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct RESOURCEDIRENTRY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int type[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_int type[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_int id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_int offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } RESOURCEDIRENTRY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define szRESOURCEDIRENTRY "b4,w,l"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/palm/pilrc/files/fix-resource-list.diff b/palm/pilrc/files/fix-resource-list.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 12eb0344365..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/palm/pilrc/files/fix-resource-list.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../pilrc-3.2-orig/util.c 2004-07-14 22:38:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util.c 2022-08-19 23:05:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,9 +73,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFPL(PLEXRESOURCEDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct RESOURCEDIRENTRY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int type[4];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int id;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int offset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p_int type[4];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p_int id;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p_int offset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } RESOURCEDIRENTRY;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define szRESOURCEDIRENTRY "b4,w,l"
</span></pre><pre style='margin:0'>
</pre>