git: c046f20e4064 - main - editors/sam: Fix build on 32-bit architectures

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Sun, 09 Jul 2023 10:52:27 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c046f20e4064f13a8c7e3da07cf7e0a9d0b3818e

commit c046f20e4064f13a8c7e3da07cf7e0a9d0b3818e
Author:     Florian Limberger <flo@purplekraken.com>
AuthorDate: 2023-07-09 10:49:28 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2023-07-09 10:51:47 +0000

    editors/sam: Fix build on 32-bit architectures
    
    The build fails on 32-bit architectures, because the source assumes
    that unsigned long and uint64_t have the same size. Until upstream is
    fixed (I have submitted the patch there, too), fix the build with local
    patches.
    
    Reviewed By: arrowd
    
    Differential Revision: https://reviews.freebsd.org/D40942
---
 editors/sam/Makefile                 |  1 +
 editors/sam/files/patch-libXg_gwin.c | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index b64a2901d2d7..1df5950a57b6 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sam
 DISTVERSION=	g20230103
+PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	flo@purplekraken.com
diff --git a/editors/sam/files/patch-libXg_gwin.c b/editors/sam/files/patch-libXg_gwin.c
new file mode 100644
index 000000000000..bf2d55054a8c
--- /dev/null
+++ b/editors/sam/files/patch-libXg_gwin.c
@@ -0,0 +1,20 @@
+--- libXg/gwin.c.orig	2023-07-08 20:04:38 UTC
++++ libXg/gwin.c
+@@ -455,7 +455,7 @@ Mouseaction(Widget w, XEvent *e, String *p, Cardinal *
+ 
+ static void
+ SelCallback(Widget w, XtPointer cldata, Atom *sel, Atom *seltype,
+-    XtPointer val, uint64_t *len, int *fmt)
++    XtPointer val, unsigned long *len, int *fmt)
+ {
+     GwinWidget gw = (GwinWidget)w;
+     XTextProperty p = {0};
+@@ -486,7 +486,7 @@ SelCallback(Widget w, XtPointer cldata, Atom *sel, Ato
+ 
+ static Boolean
+ SendSel(Widget w, Atom *sel, Atom *target, Atom *rtype, XtPointer *ans,
+-        uint64_t *anslen, int *ansfmt)
++        unsigned long *anslen, int *ansfmt)
+ {
+     GwinWidget gw = (GwinWidget)w;
+     XTextProperty p = {0};