From nobody Tue Dec 05 22:39:10 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 4SlFnp3Sq7z53YmQ; Tue, 5 Dec 2023 22:39:10 +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 4SlFnp2vnhz4FM6; Tue, 5 Dec 2023 22:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701815950; 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=lIHvLtOir9LLEF9uD695lxv7+OfU6DQz8u5wPB556A0=; b=HT6VO44R+yaWCU474SKYMjkUl2wWbl5ELpARJ9mpgHOGRpNavRtksH/jxtg09jzfwX++Nm 0ug//L2upXWwiJ//mQWEV8sW0lgBppWHtg+2rAsvZNNu7RM+55TPTI35upi4v5Pf7LTtSy zb1/VQNQAepanGOgHzFd7J80gjU1DmEAAtfbeyLl73zoSUa+uOqUyvC9eGL0K5zfwRI+OO fXAc0MeacUlCsZl4X6LYxCO+UEKt8bzUJc1gKHX2/L5ewIEmSS0XdYHeT5CA+Z9wRliCEf Nh7O2mt0HbYNBimuPm5Pmik+t0txycpc+SgpBHGKRnDSau9/NFtfp0/YhDvJqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701815950; a=rsa-sha256; cv=none; b=ozq9QvSe+uyFxo0STlUSZH3eiyyf3hBd63ODMk/DSZsV92ghPcVNmz7/8+dsC/+4tlBIaF csTWfHioU88lpHyeJlVXw/tBLONy2YUd3fnPUy32G55Jwk3dyHbY8NtTxfgtJomHAnKAqI Rv4VynEDZPOczPLlI9XGMO6K8ZVpmK9FSTtz36IPC0nFgX82LbqiVg/3/55GmkjHpvmAZw gxfo7zxn4rk0KYzYRonkcLAfyvZhmbVPtUwUN0MFoe6My2G7AMH6yaJbPJ7aYWI++Sa5fY w8SJnXlGe57ohQRQ4nkEVoJsynlykFjws3r5ymOZNb5iLE2P9eP9TdganuSoEA== 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=1701815950; 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=lIHvLtOir9LLEF9uD695lxv7+OfU6DQz8u5wPB556A0=; b=B2jF5kTc1KrFwTJFb5qhqizg8ISgDtEtc9VWe2A3FO5QGCNH1RuxRFzulMMLsdjH0Tl6xE W5PYlKhbjlJmnw4EdZT0Ru+auuIOFagiyW7wMJOuOzOHYb2YYrycG6YPOZTlVO3gvA/uuW CSHG3P4lXosfRdLJ/nTVOuMJE364F6iYEWj0/HDGzpeU+1TOcI5S7GQXJ4rIcCXsI4dTPQ QnpjHStmF0JpebKldP0hsVnnP/iAtAgWQGnQ5yt77jEsnyyzfa92rMwojjdSUbIKTqpKQX I98LsxpOVSet0NmY197JTGBlFsjpkEh3YGvKt5DmvhN70umhtvoFTTvHAIp6Zg== 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 4SlFnp1rD3zD8X; Tue, 5 Dec 2023 22:39:10 +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 3B5MdAqd028613; Tue, 5 Dec 2023 22:39:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5MdArF028610; Tue, 5 Dec 2023 22:39:10 GMT (envelope-from git) Date: Tue, 5 Dec 2023 22:39:10 GMT Message-Id: <202312052239.3B5MdArF028610@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: feec232fadd3 - main - 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: feec232fadd3d30c62282b6dd218536b7322e761 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=feec232fadd3d30c62282b6dd218536b7322e761 commit feec232fadd3d30c62282b6dd218536b7322e761 Author: Cy Schubert AuthorDate: 2023-10-16 05:34:04 +0000 Commit: Cy Schubert CommitDate: 2023-12-05 22:39:03 +0000 x11-toolkits/open-motif*: EditRes functionality is unreliable on 64 bit Like x11-toolkits/libXmu, the same problem exists in Motif and editres(1) will not pop up the resource box, displaying, "this widget no longer exists in the client." Additional discussion and patch posted near the end of the discussion at, https://gitlab.freedesktop.org/xorg/lib/libxmu/-/issues/1 MFH: 2023Q4 --- 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, 256 insertions(+), 2 deletions(-) diff --git a/x11-toolkits/open-motif-devel/Makefile b/x11-toolkits/open-motif-devel/Makefile index ec74a5e473a9..d64c1dbe67d9 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= 6 +PORTREVISION= 7 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 new file mode 100644 index 000000000000..6eff286772da --- /dev/null +++ b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_EditresCom.c @@ -0,0 +1,127 @@ +--- 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 2723ca4a7381..91f5f39f22c9 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= 7 +PORTREVISION= 8 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 new file mode 100644 index 000000000000..6eff286772da --- /dev/null +++ b/x11-toolkits/open-motif/files/patch-lib_Xm_EditresCom.c @@ -0,0 +1,127 @@ +--- 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 + /************************************************************