From owner-dev-commits-ports-all@freebsd.org Tue May 18 15:04:33 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D568664F41A; Tue, 18 May 2021 15:04:33 +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 4Fkzmx4m4Mz4hqJ; Tue, 18 May 2021 15:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8843921575; Tue, 18 May 2021 15:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14IF4Xg6076895; Tue, 18 May 2021 15:04:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14IF4XjP076894; Tue, 18 May 2021 15:04:33 GMT (envelope-from git) Date: Tue, 18 May 2021 15:04:33 GMT Message-Id: <202105181504.14IF4XjP076894@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: bec544ecd393 - main - x11-toolkits/libXaw: update to 1.0.14 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bec544ecd3932cff8c64cd07baed7ec34445331c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2021 15:04:34 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bec544ecd3932cff8c64cd07baed7ec34445331c commit bec544ecd3932cff8c64cd07baed7ec34445331c Author: Jan Beich AuthorDate: 2021-03-27 17:40:21 +0000 Commit: Jan Beich CommitDate: 2021-05-18 14:57:14 +0000 x11-toolkits/libXaw: update to 1.0.14 Changes: https://lists.x.org/archives/xorg-announce/2021-March/003077.html PR: 255773 Reported by: portscout Approved by: zeising Exp-run by: antoine Differential Revision: https://reviews.freebsd.org/D30205 --- astro/xtide/files/patch-xxLocationList.cc | 20 ++++++++++ x11-toolkits/libXaw/Makefile | 3 +- x11-toolkits/libXaw/distinfo | 5 ++- x11-toolkits/v/files/patch-srcx-vcomboc.cxx | 20 ++++++++++ x11-toolkits/v/files/patch-srcx-vlistcc.cxx | 59 +++++++++++++++++++++++++++-- 5 files changed, 100 insertions(+), 7 deletions(-) diff --git a/astro/xtide/files/patch-xxLocationList.cc b/astro/xtide/files/patch-xxLocationList.cc new file mode 100644 index 000000000000..cce97eee1ed2 --- /dev/null +++ b/astro/xtide/files/patch-xxLocationList.cc @@ -0,0 +1,20 @@ +Regressed by https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/197e9d055f3c + +xxLocationList.cc:90:3: error: no matching function for call to 'XawListChange' + XawListChange (list->widget(), stringList, 0, 0, 1); + ^~~~~~~~~~~~~ +/usr/local/include/X11/Xaw/List.h:167:6: note: candidate function not viable: no known conversion from 'char **' to 'const char **' for 2nd argument +void XawListChange + ^ + +--- xxLocationList.cc.orig 2014-10-11 19:42:10 UTC ++++ xxLocationList.cc +@@ -87,7 +87,7 @@ void xxLocationList::pickStation (const XawListReturnS + + + void xxLocationList::listChanged() { +- XawListChange (list->widget(), stringList, 0, 0, 1); ++ XawListChange (list->widget(), (_Xconst char**)stringList, 0, 0, 1); + } + + diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile index 87c610366103..f257d0ce956d 100644 --- a/x11-toolkits/libXaw/Makefile +++ b/x11-toolkits/libXaw/Makefile @@ -1,8 +1,7 @@ # Created by: Eric Anholt PORTNAME= libXaw -PORTVERSION= 1.0.13 -PORTREVISION= 3 +PORTVERSION= 1.0.14 PORTEPOCH= 2 CATEGORIES= x11-toolkits diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo index 683ba0c55823..bf3817f35e10 100644 --- a/x11-toolkits/libXaw/distinfo +++ b/x11-toolkits/libXaw/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/lib/libXaw-1.0.13.tar.bz2) = 8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd -SIZE (xorg/lib/libXaw-1.0.13.tar.bz2) = 674140 +TIMESTAMP = 1616866821 +SHA256 (xorg/lib/libXaw-1.0.14.tar.bz2) = 76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e +SIZE (xorg/lib/libXaw-1.0.14.tar.bz2) = 690994 diff --git a/x11-toolkits/v/files/patch-srcx-vcomboc.cxx b/x11-toolkits/v/files/patch-srcx-vcomboc.cxx new file mode 100644 index 000000000000..b693a4a618c4 --- /dev/null +++ b/x11-toolkits/v/files/patch-srcx-vcomboc.cxx @@ -0,0 +1,20 @@ +Regressed by https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/197e9d055f3c + +vcomboc.cxx:331:2: error: no matching function for call to 'XawListChange' + XawListChange(_popupList, _workList, _numItems, _maxWidth, True); + ^~~~~~~~~~~~~ +/usr/local/include/X11/Xaw/List.h:167:6: note: candidate function not viable: no known conversion from 'char *[32]' to 'const char **' for 2nd argument +void XawListChange + ^ + +--- srcx/vcomboc.cxx.orig 2003-04-04 21:37:00 UTC ++++ srcx/vcomboc.cxx +@@ -328,7 +328,7 @@ static Pixmap down_bitmap = 0; + #ifndef Athena + XmListReplaceItemsPosUnselected(_popupList, (XmString*)_workList, _numItems, 1); + #else +- XawListChange(_popupList, _workList, _numItems, _maxWidth, True); ++ XawListChange(_popupList, (_Xconst char**)_workList, _numItems, _maxWidth, True); + #endif + if (val < 0) // unselect + val = 0; diff --git a/x11-toolkits/v/files/patch-srcx-vlistcc.cxx b/x11-toolkits/v/files/patch-srcx-vlistcc.cxx index c2f3f47d9f8e..b624428b824d 100644 --- a/x11-toolkits/v/files/patch-srcx-vlistcc.cxx +++ b/x11-toolkits/v/files/patch-srcx-vlistcc.cxx @@ -1,6 +1,59 @@ ---- srcx/vlistc.cxx.orig 2007-07-31 22:27:03.000000000 +0200 -+++ srcx/vlistc.cxx 2007-07-31 22:28:09.000000000 +0200 -@@ -676,7 +676,7 @@ +Regressed by https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/197e9d055f3c + +vlistc.cxx:344:2: error: no matching function for call to 'XawListChange' + XawListChange(wCmd, _workList, _listRows, _maxWidth, True); +vlistc.cxx:374:6: error: no matching function for call to 'XawListChange' + XawListChange(wCmd, _workList, _listRows, _maxWidth, True); + ^~~~~~~~~~~~~ +vlistc.cxx:405:6: error: no matching function for call to 'XawListChange' + XawListChange(wCmd, _workList, _listRows, _maxWidth, True); + ^~~~~~~~~~~~~ +vlistc.cxx:484:5: error: no matching function for call to 'XawListChange' + XawListChange(wCmd, _workList, _listRows, _maxWidth, True); + ^~~~~~~~~~~~~ +/usr/local/include/X11/Xaw/List.h:167:6: note: candidate function not viable: no known conversion from 'char *[33]' to 'const char **' for 2nd argument +void XawListChange + ^ + +--- srcx/vlistc.cxx.orig 2003-04-04 21:37:00 UTC ++++ srcx/vlistc.cxx +@@ -341,7 +341,7 @@ extern "C" + NULL); + #else + // turn them all off! +- XawListChange(wCmd, _workList, _listRows, _maxWidth, True); ++ XawListChange(wCmd, (_Xconst char**)_workList, _listRows, _maxWidth, True); + SetScroll(_ScrlShown, _ScrlTop); + #endif + SetCmdVal(val,Value); +@@ -371,7 +371,7 @@ extern "C" + #ifndef Athena + XmListDeselectAllItems(wCmd); + #else +- XawListChange(wCmd, _workList, _listRows, _maxWidth, True); ++ XawListChange(wCmd, (_Xconst char**)_workList, _listRows, _maxWidth, True); + #endif + return; + } +@@ -402,7 +402,7 @@ extern "C" + + if (newSel >= 0 && newSel < _listRows) + { +- XawListChange(wCmd, _workList, _listRows, _maxWidth, True); ++ XawListChange(wCmd, (_Xconst char**)_workList, _listRows, _maxWidth, True); + XawListHighlight(wCmd, newSel); + } + else // have to scroll +@@ -481,7 +481,7 @@ extern "C" + _workList[ix] = _fullList[ix + _workMapsTo]; + } + +- XawListChange(wCmd, _workList, _listRows, _maxWidth, True); ++ XawListChange(wCmd, (_Xconst char**)_workList, _listRows, _maxWidth, True); + + // See if the currently selected item is on the list, and rehighlight + int newSel = _curSelection - _workMapsTo; +@@ -676,7 +676,7 @@ extern "C" //============================>>> CScollProcCB <<<============================= void CScrollProcCB(Widget w, XtPointer This, XtPointer position) {