7 changed files with 139 additions and 80 deletions
--- a/.Xaw3d.metadata
+++ b/.Xaw3d.metadata
@ -1,2 +1,3 @@
-dc50029f21d33e0abc167cc884d44d1bd9e6bca5 SOURCES/libXaw3d-1.6.3.tar.bz2
-96be8291305554351a95f401b423f5bba05ce160 SOURCES/mattst88.asc
+6e8c8b981cf0bb8c11e94c78694a2929b9a4f4da SOURCES/libXaw3d-1.6.5.tar.xz
+2c171797c80ab18a2ada25c9d46a910aeb363f7f SOURCES/libXaw3d-1.6.5.tar.xz.sig
+0751bc040e0e2ec05655a412017d40f76737b22c SOURCES/matt.turner.asc
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
-SOURCES/libXaw3d-1.6.3.tar.bz2
-SOURCES/mattst88.asc
+SOURCES/libXaw3d-1.6.5.tar.xz
+SOURCES/libXaw3d-1.6.5.tar.xz.sig
+SOURCES/matt.turner.asc
--- a/SOURCES/Xaw3d-1.6.1-fontset.patch
+++ b/SOURCES/Xaw3d-1.6.1-fontset.patch
@ -1,60 +0,0 @@
-diff -up libXaw3d-1.6.1/src/AsciiSink.c.fontset libXaw3d-1.6.1/src/AsciiSink.c
--- libXaw3d-1.6.1/src/AsciiSink.c.fontset	2012-02-01 12:24:00.000000000 -0700
-+++ libXaw3d-1.6.1/src/AsciiSink.c	2012-02-25 14:52:46.802779081 -0700
-@@ -513,6 +513,8 @@ Initialize(Widget request, Widget new, A
- {
-     AsciiSinkObject sink = (AsciiSinkObject) new;
- 
-+    if (!sink->ascii_sink.font) XtError("Aborting: no font found\n");
-+
-     GetGC(sink);
- 
-     sink->ascii_sink.insertCursorOn= CreateInsertCursor(XtScreenOfObject(new));
-diff -up libXaw3d-1.6.1/src/Command.c.fontset libXaw3d-1.6.1/src/Command.c
--- libXaw3d-1.6.1/src/Command.c.fontset	2011-09-19 15:42:36.000000000 -0600
-+++ libXaw3d-1.6.1/src/Command.c	2012-02-25 14:51:26.075372823 -0700
-@@ -218,6 +218,8 @@ Initialize(Widget request, Widget new, A
-   CommandWidget cbw = (CommandWidget) new;
-   int shape_event_base, shape_error_base;
- 
-+  if (!cbw->label.font) XtError("Aborting: no font found\n");
-+
-   if (cbw->command.shape_style != XawShapeRectangle
-       && !XShapeQueryExtension(XtDisplay(new), &shape_event_base,
- 			       &shape_error_base))
-diff -up libXaw3d-1.6.1/src/List.c.fontset libXaw3d-1.6.1/src/List.c
--- libXaw3d-1.6.1/src/List.c.fontset	2011-10-09 12:01:20.000000000 -0600
-+++ libXaw3d-1.6.1/src/List.c	2012-02-25 14:53:16.327465260 -0700
-@@ -362,6 +362,8 @@ Initialize(Widget junk, Widget new, ArgL
- {
-     ListWidget lw = (ListWidget) new;
- 
-+    if (!lw->list.font) XtError("Aborting: no font found\n");
-+
- /*
-  * Initialize all private resources.
-  */
-diff -up libXaw3d-1.6.1/src/SmeBSB.c.fontset libXaw3d-1.6.1/src/SmeBSB.c
--- libXaw3d-1.6.1/src/SmeBSB.c.fontset	2011-09-19 15:42:36.000000000 -0600
-+++ libXaw3d-1.6.1/src/SmeBSB.c	2012-02-25 14:50:19.056358107 -0700
-@@ -207,6 +207,8 @@ Initialize(Widget request, Widget new, A
-     else
- 	entry->sme_bsb.label = XtNewString( entry->sme_bsb.label );
- 
-+    if (!entry->sme_bsb.font) XtError("Aborting: no font found\n");
-+
-     CreateGCs(new);
- 
-     GetBitmapInfo(new, TRUE);	/* Left Bitmap Info */
-diff -up libXaw3d-1.6.1/src/Tip.c.fontset libXaw3d-1.6.1/src/Tip.c
--- libXaw3d-1.6.1/src/Tip.c.fontset	2012-02-15 12:10:38.000000000 -0700
-+++ libXaw3d-1.6.1/src/Tip.c	2012-02-25 14:50:19.058358017 -0700
-@@ -248,6 +248,8 @@ XawTipInitialize(Widget req, Widget w, A
-     TipWidget tip = (TipWidget)w;
-     XGCValues values;
- 
-+    if (!tip->tip.font) XtError("Aborting: no font found\n");
-+
-     tip->tip.timer = 0;
- 
-     values.foreground = tip->tip.foreground;
--- a/SOURCES/Xaw3d-1.6.5-fontset.patch
+++ b/SOURCES/Xaw3d-1.6.5-fontset.patch
@ -0,0 +1,44 @@
+--- libXaw3d-1.6.5/src/Command.c~	2023-05-12 19:08:46.000000000 -0500
+++ libXaw3d-1.6.5/src/Command.c	2024-02-01 15:39:48.779640222 -0600
+@@ -220,6 +220,8 @@
+   CommandWidget cbw = (CommandWidget) new;
+   int shape_event_base, shape_error_base;
+ 
+  if (!cbw->label.font) XtError("Aborting: no font found\n");
+
+   if (cbw->command.shape_style != XawShapeRectangle
+       && !XShapeQueryExtension(XtDisplay(new), &shape_event_base,
+ 			       &shape_error_base))
+--- libXaw3d-1.6.5/src/List.c~	2023-05-12 19:08:46.000000000 -0500
+++ libXaw3d-1.6.5/src/List.c	2024-02-01 15:40:50.716135054 -0600
+@@ -362,6 +362,8 @@
+ {
+     ListWidget lw = (ListWidget) new;
+ 
+    if (!lw->list.font) XtError("Aborting: no font found\n");
+
+ /*
+  * Initialize all private resources.
+  */
+--- libXaw3d-1.6.5/src/SmeBSB.c~	2023-05-12 19:08:46.000000000 -0500
+++ libXaw3d-1.6.5/src/SmeBSB.c	2024-02-01 15:41:39.772150867 -0600
+@@ -203,6 +203,8 @@
+     else
+ 	entry->sme_bsb.label = XtNewString( entry->sme_bsb.label );
+ 
+    if (!entry->sme_bsb.font) XtError("Aborting: no font found\n");
+
+     CreateGCs(new);
+ 
+     GetBitmapInfo(new, TRUE);	/* Left Bitmap Info */
+--- libXaw3d-1.6.5/src/Tip.c~	2023-05-12 19:08:46.000000000 -0500
+++ libXaw3d-1.6.5/src/Tip.c	2024-02-01 15:42:15.952687460 -0600
+@@ -248,6 +248,8 @@
+     TipWidget tip = (TipWidget)w;
+     XGCValues values;
+ 
+    if (!tip->tip.font) XtError("Aborting: no font found\n");
+
+     tip->tip.timer = 0;
+ 
+     values.foreground = tip->tip.foreground;
--- a/SOURCES/Xaw3d-c99-2.patch
+++ b/SOURCES/Xaw3d-c99-2.patch
@ -0,0 +1,35 @@
+commit 7b4af57e8a1471747e17fff184032d8250e598b6
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Thu Dec 7 18:01:47 2023 -0800
+
+    Multisink.c: Clear -Werror=incompatible-pointer-types error
+    
+    MultiSink.c: In function ‘SetValues’:
+    MultiSink.c:582:18: error: passing argument 1 of ‘SetTabs’ from
+     incompatible pointer type [-Werror=incompatible-pointer-types]
+      582 |         SetTabs( w, w->text_sink.tab_count, w->text_sink.char_tabs );
+          |                  ^
+          |                  |
+          |                  MultiSinkObject {aka struct _MultiSinkRec *}
+    MultiSink.c:99:21: note: expected ‘Widget’ {aka ‘struct _WidgetRec *’}
+     but argument is of type ‘MultiSinkObject’ {aka ‘struct _MultiSinkRec *’}
+       99 | static void SetTabs(Widget, int, short *);
+          |                     ^~~~~~
+    
+    Adopts change originally made to libXaw in XFree86 4
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+diff --git a/src/MultiSink.c b/src/MultiSink.c
+index acf6caaca871a77e..cbae854004802708 100644
+--- a/src/MultiSink.c
+++ b/src/MultiSink.c
+@@ -579,7 +579,7 @@ SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *nu
+     if ( w->multi_sink.fontset != old_w->multi_sink.fontset ) {
+ 	((TextWidget)XtParent(new))->text.redisplay_needed = True;
+ #ifndef NO_TAB_FIX
+-	SetTabs( w, w->text_sink.tab_count, w->text_sink.char_tabs );
+	SetTabs((Widget)w, w->text_sink.tab_count, w->text_sink.char_tabs);
+ #endif
+     }
+ 
--- a/SOURCES/libXaw3d-1.6.3.tar.bz2.sig
+++ b/SOURCES/libXaw3d-1.6.3.tar.bz2.sig
--- a/SPECS/Xaw3d.spec
+++ b/SPECS/Xaw3d.spec
@ -1,18 +1,20 @@
 Summary: A version of the MIT Athena widget set for X
 Name: Xaw3d
-Version: 1.6.3
-Release: 7%{?dist}
-Source0: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2
-Source1: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2.sig
-Source2: mattst88.asc
+Version: 1.6.5
+Release: 3%{?dist}
+Source0: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.xz
+Source1: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.xz.sig
+Source2: matt.turner.asc
 Patch5: Xaw3d-1.5-debian-fixes.patch
 Patch7: Xaw3d-1.6.1-3Dlabel.patch
-Patch10: Xaw3d-1.6.1-fontset.patch
+Patch10: Xaw3d-1.6.5-fontset.patch
 Patch11: Xaw3d-1.6.1-hsbar.patch
+Patch12: Xaw3d-c99-2.patch

-License: MIT
+License: MIT AND X11 AND GPL-3.0-or-later
 URL: http://xorg.freedesktop.org/

+BuildRequires: gcc
 BuildRequires: make
 BuildRequires: libXmu-devel
 BuildRequires: libXt-devel
@ -62,9 +64,10 @@ package.
 %setup -q -n libXaw3d-%{version}
 # This doesn't apply cleanly, but has not been applied
 #%patch5 -p1 -b .debian
-%patch7 -p1 -b .3Dlabel
-%patch10 -p1 -b .fontset
-%patch11 -p1 -b .hsbar
+%patch -P 7 -p1 -b .3Dlabel
+%patch -P 10 -p1 -b .fontset
+%patch -P 11 -p1 -b .hsbar
+%patch -P 12 -p1


 %build
@ -87,7 +90,7 @@ rm -r $RPM_BUILD_ROOT%{_docdir}

 %files
 %license COPYING
-%doc ChangeLog README src/README.XAW3D
+%doc ChangeLog README.md src/README.XAW3D
 %{_libdir}/*.so.*

 %files devel
@ -96,12 +99,47 @@ rm -r $RPM_BUILD_ROOT%{_docdir}
 %{_includedir}/X11/Xaw3d

 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.3-7
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.6.5-3
+- Rebuilt for MSVSphere 10

-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.3-6
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.6.5-3
+- Bump release for June 2024 mass rebuild
+
+* Fri Feb 02 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.6.5-2
+- SPDX license tags.
+
+* Thu Feb 01 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.6.5-1
+- 1.6.5
+
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Jan 09 2024 Florian Weimer <fweimer@redhat.com> - 1.6.4-4
+- Backport upstream patches to fix C type errors
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Oct 01 2022 Orion Poplawski <orion@nwra.com> - 1.6.4-1
+- Update to 1.6.4
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild