From nobody Tue Dec 05 22:50:36 2023 X-Original-To: dev-commits-ports-main@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 4SlG311gsxz53ZXN; Tue, 5 Dec 2023 22:50:37 +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 4SlG311D6nz4GJH; Tue, 5 Dec 2023 22:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701816637; 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=fmjEvpomOQfcLhFjHV3joJKzSBO8W7PBAtRCLEwiWiQ=; b=EjcBNF8R9XFSvuCOpcgUUUvYu5RBtsqJ+0K2h51h3BMEcs90D1guhZOIxwbXdFn9JaQUXL 9A+3+bTIz16kwPK+6uThWj1R1ttH6uBa5M+SEohFEP652PY9NNHJ11ybhvfouLnUC5dFW5 1zurUfKvOXfYcQHKshPhGEa9B7YXk+Kiq0PLFwjcVPEfA5P8gSBHwcI6S7CMklKTWMsyAP JAjzWPJcLSFkKqQHzmQqZd3CwYUM/ltPopulBk/q6mIIS4pe5qaS7c9vGNJrnajjt9okF9 W9SUGMSec7YMRLcPWAzkyUsghIIDSw2YvymtFBTvAsnSvgO5NSVMZlY63clYgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701816637; a=rsa-sha256; cv=none; b=L8Txs3uIEbHjX9WBqeID9Zs1TgsvW82MndLp7/C5NZXKNwvfsX8gJdAKZTn6+mVLpNLKLR OQT249F7Ieuq//GSz+RvRb4eNnQxS434eX1QWokGbz+l2KJ33Zdclvsj9q7cJGpQm0CjlW 87HYgWS53UnRhRS9LlldZHRBFlDNx0S5UVkVWPG3lQKcZN5+97Apqs2qLImf4ekQHTOptH aQNvhKREQtySRjyJppZYdmsr9vsn2SbiZbOUWfZjKt/tV1cif8Wp3DIqNB0SPFeo7TYIcK vBFp5KuDjJu6urs5K3s2Z9yAtfX0+N3orWKnGU2gg1N/1R2eyXJHrDNqCXWVUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701816637; 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=fmjEvpomOQfcLhFjHV3joJKzSBO8W7PBAtRCLEwiWiQ=; b=rOc8l8byDn+gszzE46ZEpzBeeUBcrmUsVCu1NBzzI9pbOGghVcX0QuX5+pl3pfHtEZCOTI cvwhNMlndQwMDY9QBoecW3bGYIMeZ+zr0krLHCWJMNNa8nmyzxJbNZFwUOM4d1NPNNX9Nr AUA+Igc5NfFOEa9lnvUuyukQdWRWwhOMnn9MCGwHEHojw/dFLW6B3v26AxyYLm5D+EfaR+ qJQsYT/MmZwJkU7R2Upf4lcs6k91slbYNECjmNFo9bkly9Aqy2qSATzRZQCtHGPE9yLEIK 6SP1qhwMTc+vkOegAAu0HVHqRKvJrCgN84sQS9n1mC86AyV/t2hYddV6nonmjg== 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 4SlG310JD8zDS7; Tue, 5 Dec 2023 22:50:37 +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 3B5MoabK054484; Tue, 5 Dec 2023 22:50:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5Moack054482; Tue, 5 Dec 2023 22:50:36 GMT (envelope-from git) Date: Tue, 5 Dec 2023 22:50:36 GMT Message-Id: <202312052250.3B5Moack054482@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 5cd4319f34f1 - main - Revert "x11-toolkits/open-motif*: EditRes functionality is unreliable on 64 bit" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cd4319f34f19678e6f8f115362d820b550d4c5b Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5cd4319f34f19678e6f8f115362d820b550d4c5b commit 5cd4319f34f19678e6f8f115362d820b550d4c5b Author: Cy Schubert AuthorDate: 2023-12-05 22:49:10 +0000 Commit: Cy Schubert CommitDate: 2023-12-05 22:49:10 +0000 Revert "x11-toolkits/open-motif*: EditRes functionality is unreliable on 64 bit" A patch to x11-toolkits/libXmu, still in review, is required to, a) build this patch, b) work. This reverts commit feec232fadd3d30c62282b6dd218536b7322e761. --- x11-toolkits/open-motif-devel/Makefile | 2 +- .../files/patch-lib_Xm_EditresCom.c | 127 --------------------- x11-toolkits/open-motif/Makefile | 2 +- .../open-motif/files/patch-lib_Xm_EditresCom.c | 127 --------------------- 4 files changed, 2 insertions(+), 256 deletions(-) diff --git a/x11-toolkits/open-motif-devel/Makefile b/x11-toolkits/open-motif-devel/Makefile index d64c1dbe67d9..ec74a5e473a9 100644 --- a/x11-toolkits/open-motif-devel/Makefile +++ b/x11-toolkits/open-motif-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= open-motif PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 7 +PORTREVISION= 6 CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel diff --git a/x11-toolkits/open-motif-devel/files/patch-lib_Xm_EditresCom.c b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_EditresCom.c deleted file mode 100644 index 6eff286772da..000000000000 --- a/x11-toolkits/open-motif-devel/files/patch-lib_Xm_EditresCom.c +++ /dev/null @@ -1,127 +0,0 @@ ---- lib/Xm/EditresCom.c.orig 2023-02-15 16:42:34.000000000 -0800 -+++ lib/Xm/EditresCom.c 2023-10-16 20:14:52.602297000 -0700 -@@ -183,6 +183,39 @@ - } - #endif - -+#define HAVE_XMU_GET_WIDGET_INFO_RESOLVE 1 -+#ifdef HAVE_XMU_GET_WIDGET_INFO_RESOLVE -+static Boolean GetWidgetInfo(ProtocolStream *stream, WidgetInfo *info) { -+ return _XEditResGetWidgetInfoResolve(stream, info); -+} -+#else -+static Boolean GetWidgetInfo(ProtocolStream *stream, WidgetInfo *info) { -+ return _XEditResGetWidgetInfo(stream, info); -+} -+#endif -+ -+#define HAVE_XMU_PUT_WIDGET_INFO_UNRESOLVE 1 -+#ifdef HAVE_XMU_PUT_WIDGET_INFO_UNRESOLVE -+static void PutWidgetInfo(ProtocolStream *stream, WidgetInfo *info) { -+ _XEditResPutWidgetInfoUnresolve(stream, info); -+} -+#else -+static Boolean PutWidgetInfo(ProtocolStream *stream, WidgetInfo *info) { -+ _XEditResPutWidgetInfo(stream, info); -+} -+#endif -+ -+#define HAVE_XMU_PUT_WIDGET_UNRESOLVE 1 -+#ifdef HAVE_XMU_PUT_WIDGET_UNRESOLVE -+static void PutWidget(ProtocolStream *stream, Widget widget) { -+ _XEditResPutWidgetUnresolve(stream, widget); -+} -+#else -+static void PutWidget(ProtocolStream *stream, Widget widget) { -+ _XEditResPut32(stream, widget); -+} -+#endif -+ - /************************************************************ - * - * Resource Editor Communication Code -@@ -352,7 +385,7 @@ - XtCalloc(sizeof(WidgetInfo), sv_event->num_entries); - - for (i = 0; i < sv_event->num_entries; i++) { -- if (!_XEditResGetWidgetInfo(stream, sv_event->widgets + i)) -+ if (!GetWidgetInfo(stream, sv_event->widgets + i)) - goto done; - } - } -@@ -364,7 +397,7 @@ - find_event->widgets = (WidgetInfo *) - XtCalloc(sizeof(WidgetInfo), 1); - -- if (!(_XEditResGetWidgetInfo(stream, find_event->widgets) && -+ if (!(GetWidgetInfo(stream, find_event->widgets) && - _XEditResGetSigned16(stream, &(find_event->x)) && - _XEditResGetSigned16(stream, &(find_event->y)))) - { -@@ -384,7 +417,7 @@ - get_event->widgets = (WidgetInfo *) - XtCalloc(sizeof(WidgetInfo), get_event->num_entries); - for (i = 0; i < get_event->num_entries; i++) { -- if (!_XEditResGetWidgetInfo(stream, get_event->widgets + i)) -+ if (!GetWidgetInfo(stream, get_event->widgets + i)) - goto done; - } - } -@@ -397,7 +430,7 @@ - _XEditResGet16(stream, &(gv_event->num_entries)); - gv_event->widgets = (WidgetInfo *) - XtCalloc(sizeof(WidgetInfo), gv_event->num_entries); -- _XEditResGetWidgetInfo(stream, gv_event->widgets); -+ GetWidgetInfo(stream, gv_event->widgets); - } - break; - -@@ -846,7 +879,7 @@ - - for (i = 0 ; i < sv_event->num_entries; i++) { - if ((str = VerifyWidget(w, &(sv_event->widgets[i]))) != NULL) { -- _XEditResPutWidgetInfo(stream, &(sv_event->widgets[i])); -+ PutWidgetInfo(stream, &(sv_event->widgets[i])); - _XEditResPutString8(stream, str); - XtFree(str); - count++; -@@ -973,7 +1006,7 @@ - */ - - (*(info->count))++; -- _XEditResPutWidgetInfo(info->stream, info->entry); -+ PutWidgetInfo(info->stream, info->entry); - _XEditResPutString8(info->stream, pbuf); - if (pbuf != buf) - XtFree(pbuf); -@@ -1174,7 +1207,7 @@ - * Send out the widget id. - */ - -- _XEditResPutWidgetInfo(stream, &(geom_event->widgets[i])); -+ PutWidgetInfo(stream, &(geom_event->widgets[i])); - if ((str = VerifyWidget(w, &(geom_event->widgets[i]))) != NULL) { - _XEditResPutBool(stream, True); /* an error occured. */ - _XEditResPutString8(stream, str); /* set message. */ -@@ -1420,7 +1453,7 @@ - /* - * Send out the widget id. - */ -- _XEditResPutWidgetInfo(stream, &(res_event->widgets[i])); -+ PutWidgetInfo(stream, &(res_event->widgets[i])); - if ((str = VerifyWidget(w, &(res_event->widgets[i]))) != NULL) { - _XEditResPutBool(stream, True); /* an error occured. */ - _XEditResPutString8(stream, str); /* set message. */ -@@ -1766,10 +1799,11 @@ - - _XEditResPut16(stream, num_widgets); /* insert number of widgets. */ - for (i = 0; i < num_widgets; i++) /* insert Widgets themselves. */ -- _XEditResPut32(stream, widget_list[i]); -+ PutWidget(stream, (Widget)widget_list[i]); - - XtFree((char *)widget_list); - } -+ - - #if 0 - /************************************************************ diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index 91f5f39f22c9..2723ca4a7381 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -1,6 +1,6 @@ PORTNAME= open-motif PORTVERSION= 2.3.8 -PORTREVISION= 8 +PORTREVISION= 7 CATEGORIES= x11-toolkits # MASTER_SITES= SF/${PORTNAME}/Motif%202.3.4%20Source%20Code/ MASTER_SITES= SF/motif/Motif%20${PORTVERSION}%20Source%20Code/ diff --git a/x11-toolkits/open-motif/files/patch-lib_Xm_EditresCom.c b/x11-toolkits/open-motif/files/patch-lib_Xm_EditresCom.c deleted file mode 100644 index 6eff286772da..000000000000 --- a/x11-toolkits/open-motif/files/patch-lib_Xm_EditresCom.c +++ /dev/null @@ -1,127 +0,0 @@ ---- lib/Xm/EditresCom.c.orig 2023-02-15 16:42:34.000000000 -0800 -+++ lib/Xm/EditresCom.c 2023-10-16 20:14:52.602297000 -0700 -@@ -183,6 +183,39 @@ - } - #endif - -+#define HAVE_XMU_GET_WIDGET_INFO_RESOLVE 1 -+#ifdef HAVE_XMU_GET_WIDGET_INFO_RESOLVE -+static Boolean GetWidgetInfo(ProtocolStream *stream, WidgetInfo *info) { -+ return _XEditResGetWidgetInfoResolve(stream, info); -+} -+#else -+static Boolean GetWidgetInfo(ProtocolStream *stream, WidgetInfo *info) { -+ return _XEditResGetWidgetInfo(stream, info); -+} -+#endif -+ -+#define HAVE_XMU_PUT_WIDGET_INFO_UNRESOLVE 1 -+#ifdef HAVE_XMU_PUT_WIDGET_INFO_UNRESOLVE -+static void PutWidgetInfo(ProtocolStream *stream, WidgetInfo *info) { -+ _XEditResPutWidgetInfoUnresolve(stream, info); -+} -+#else -+static Boolean PutWidgetInfo(ProtocolStream *stream, WidgetInfo *info) { -+ _XEditResPutWidgetInfo(stream, info); -+} -+#endif -+ -+#define HAVE_XMU_PUT_WIDGET_UNRESOLVE 1 -+#ifdef HAVE_XMU_PUT_WIDGET_UNRESOLVE -+static void PutWidget(ProtocolStream *stream, Widget widget) { -+ _XEditResPutWidgetUnresolve(stream, widget); -+} -+#else -+static void PutWidget(ProtocolStream *stream, Widget widget) { -+ _XEditResPut32(stream, widget); -+} -+#endif -+ - /************************************************************ - * - * Resource Editor Communication Code -@@ -352,7 +385,7 @@ - XtCalloc(sizeof(WidgetInfo), sv_event->num_entries); - - for (i = 0; i < sv_event->num_entries; i++) { -- if (!_XEditResGetWidgetInfo(stream, sv_event->widgets + i)) -+ if (!GetWidgetInfo(stream, sv_event->widgets + i)) - goto done; - } - } -@@ -364,7 +397,7 @@ - find_event->widgets = (WidgetInfo *) - XtCalloc(sizeof(WidgetInfo), 1); - -- if (!(_XEditResGetWidgetInfo(stream, find_event->widgets) && -+ if (!(GetWidgetInfo(stream, find_event->widgets) && - _XEditResGetSigned16(stream, &(find_event->x)) && - _XEditResGetSigned16(stream, &(find_event->y)))) - { -@@ -384,7 +417,7 @@ - get_event->widgets = (WidgetInfo *) - XtCalloc(sizeof(WidgetInfo), get_event->num_entries); - for (i = 0; i < get_event->num_entries; i++) { -- if (!_XEditResGetWidgetInfo(stream, get_event->widgets + i)) -+ if (!GetWidgetInfo(stream, get_event->widgets + i)) - goto done; - } - } -@@ -397,7 +430,7 @@ - _XEditResGet16(stream, &(gv_event->num_entries)); - gv_event->widgets = (WidgetInfo *) - XtCalloc(sizeof(WidgetInfo), gv_event->num_entries); -- _XEditResGetWidgetInfo(stream, gv_event->widgets); -+ GetWidgetInfo(stream, gv_event->widgets); - } - break; - -@@ -846,7 +879,7 @@ - - for (i = 0 ; i < sv_event->num_entries; i++) { - if ((str = VerifyWidget(w, &(sv_event->widgets[i]))) != NULL) { -- _XEditResPutWidgetInfo(stream, &(sv_event->widgets[i])); -+ PutWidgetInfo(stream, &(sv_event->widgets[i])); - _XEditResPutString8(stream, str); - XtFree(str); - count++; -@@ -973,7 +1006,7 @@ - */ - - (*(info->count))++; -- _XEditResPutWidgetInfo(info->stream, info->entry); -+ PutWidgetInfo(info->stream, info->entry); - _XEditResPutString8(info->stream, pbuf); - if (pbuf != buf) - XtFree(pbuf); -@@ -1174,7 +1207,7 @@ - * Send out the widget id. - */ - -- _XEditResPutWidgetInfo(stream, &(geom_event->widgets[i])); -+ PutWidgetInfo(stream, &(geom_event->widgets[i])); - if ((str = VerifyWidget(w, &(geom_event->widgets[i]))) != NULL) { - _XEditResPutBool(stream, True); /* an error occured. */ - _XEditResPutString8(stream, str); /* set message. */ -@@ -1420,7 +1453,7 @@ - /* - * Send out the widget id. - */ -- _XEditResPutWidgetInfo(stream, &(res_event->widgets[i])); -+ PutWidgetInfo(stream, &(res_event->widgets[i])); - if ((str = VerifyWidget(w, &(res_event->widgets[i]))) != NULL) { - _XEditResPutBool(stream, True); /* an error occured. */ - _XEditResPutString8(stream, str); /* set message. */ -@@ -1766,10 +1799,11 @@ - - _XEditResPut16(stream, num_widgets); /* insert number of widgets. */ - for (i = 0; i < num_widgets; i++) /* insert Widgets themselves. */ -- _XEditResPut32(stream, widget_list[i]); -+ PutWidget(stream, (Widget)widget_list[i]); - - XtFree((char *)widget_list); - } -+ - - #if 0 - /************************************************************