From nobody Sun Jul 09 10:52:27 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QzP974Qprz4lqRb; Sun, 9 Jul 2023 10:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzP971dr3z3jnC; Sun, 9 Jul 2023 10:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688899947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AF6FfK3bb+ID5veDvAqLz9vy/zr0Yq85LWU2Kl6iNqU=; b=uSC0YQ8rQLI4GQjXfCBM1sUJdZ5+OD44fTkBoXYhBzDS1uz+/Y7mxa1071orCnvtxk2BGq 9G2NqcjSZ6C/i19dYu3XPIcGAEO/gHAQZasO1zPqfWYeEj8eG22YQsWCYGTWm/lnhxND0q lsTTlJE6W/0DWqhOnfP1s9KItwXuWK+YWyxCtsG2KSjcLpamm1EUsKi+YxEl6QzzK5Cqvv nIZLVso1QC0gcvoPGUvTnWrghlGp3VUdPvIvyG5qorJvipVv/Eo4i7klzwWIuRfDG9k/F3 nfb4nzy24i1cyjheOz/x3AHHCYVfgEBJ9mAHW2Xkg6Qv54urC9HatLyhNERZlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688899947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AF6FfK3bb+ID5veDvAqLz9vy/zr0Yq85LWU2Kl6iNqU=; b=CTJWHn7qI5bRlePZ08j/OtFwJhz6BEmv0mxoE2/7JNuCLS43lzlOgRnTj1hRbqKFBeeuaq QvO/wPXjoSN0ByMU5ehZWuGDkZ5qMGu/VkPYJcPzwRvn+OqqOW5oZh1DPpgOISnumv4pjG aPQMPwpeHjX/np/94DTmC7TEX88kCkYQfo11g1tnHM7barwchpoZUat5zG2B/OnG/PItuu p8d+qOJ/0VbiZ99PzFyfu1JBzhOxP9YZNfqNa9V4IChQWjILBbyND2mS1jDVO5biA0XRFd enybNsPHk9WpC3h/DGJclLWtS1fOkbQA2R7aKpXUooqAdV7CxduE4xP+lX/wyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688899947; a=rsa-sha256; cv=none; b=BDoXWNv8WfaaDxcnLjScHJuE8xCgrFgZ0o/KKSzxFLD/2fnl1tJESaGareUvFH6dLqOMnN UU7pSedVUkS/4jIanyGwAEXLcsbtM+SzWOhWWJDiqAd9nbe0pmoWVIRHu1njctOrXsW4Dw MHwfuHZ0qFUMg7r3n2NRnJlaa+uwjoIYbKSkt7j7dlnveUQ/3Bt/N4qTmeLM15yAHP2Tk+ 17LOE10AgDuyTGKFYe1KtEH6XSkD1D67GTh2dM/XYDmM3u1Ih/Sddh0e2rGi7zfbA60PFR O+JB8t711XFN9OIo7SGllBeVeSrFUM9ppgHQlW3Kmyjc6XpMuFOTjhK5PlwzKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzP970lR8z10nS; Sun, 9 Jul 2023 10:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369AqRMh003224; Sun, 9 Jul 2023 10:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369AqRKV003212; Sun, 9 Jul 2023 10:52:27 GMT (envelope-from git) Date: Sun, 9 Jul 2023 10:52:27 GMT Message-Id: <202307091052.369AqRKV003212@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: c046f20e4064 - main - editors/sam: Fix build on 32-bit architectures List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c046f20e4064f13a8c7e3da07cf7e0a9d0b3818e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c046f20e4064f13a8c7e3da07cf7e0a9d0b3818e commit c046f20e4064f13a8c7e3da07cf7e0a9d0b3818e Author: Florian Limberger AuthorDate: 2023-07-09 10:49:28 +0000 Commit: Gleb Popov 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};