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

4 files changed, 80 insertions, 7 deletions

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 <anholt@FreeBSD.org>
 
 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)
    {