Skip to content

Commit

Permalink
Xaw3d : update version to 1.6.6 (#10762)
Browse files Browse the repository at this point in the history
  • Loading branch information
jykanase authored Feb 6, 2025
1 parent 5be9138 commit f9e5f00
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 915 deletions.
60 changes: 0 additions & 60 deletions SPECS-EXTENDED/Xaw3d/Xaw3d-1.6.1-fontset.patch

This file was deleted.

44 changes: 44 additions & 0 deletions SPECS-EXTENDED/Xaw3d/Xaw3d-1.6.5-fontset.patch
Original file line number Diff line number Diff line change
@@ -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;
6 changes: 3 additions & 3 deletions SPECS-EXTENDED/Xaw3d/Xaw3d.signatures.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Signatures": {
"libXaw3d-1.6.3.tar.bz2": "2dba993f04429ec3d7e99341e91bf46be265cc482df25963058c15f1901ec544",
"libXaw3d-1.6.3.tar.bz2.sig": "b9d970f78c9a4b279e49d44b4bba0fedc5eee34a74bf1b9bbb48b65b0cd229cd",
"mattst88.asc": "fea077506e27392203568df63280eed2e2fd5a50bd6df08c30819ac7b176914e"
"libXaw3d-1.6.6.tar.xz": "a41c3e37135ad616b1f28bbde70002afbf3cb59a30df34141f829d32eadc8646",
"libXaw3d-1.6.6.tar.xz.sig": "ba59884fc0ce7e48d5c35692a49d614be9241e1a585c03e3646c9ce5f075f696",
"alan.coopersmith.asc": "35a05973372b792db073c21163e9e4cd135bd9bb08dc4372991ae4b596b99f09"
}
}
20 changes: 13 additions & 7 deletions SPECS-EXTENDED/Xaw3d/Xaw3d.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ Vendor: Microsoft Corporation
Distribution: Azure Linux
Summary: A version of the MIT Athena widget set for X
Name: Xaw3d
Version: 1.6.3
Release: 3%{?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.6
Release: 1%{?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: alan.coopersmith.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

License: MIT
Expand Down Expand Up @@ -88,7 +89,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
Expand All @@ -97,6 +98,11 @@ rm -r $RPM_BUILD_ROOT%{_docdir}
%{_includedir}/X11/Xaw3d

%changelog

* Wed Oct 16 2024 Jyoti Kanase <[email protected]> - 1.6.6-1
- Update to 1.6.6
- License verified

* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 1.6.3-3
- Initial CBL-Mariner import from Fedora 32 (license: MIT).

Expand Down
Binary file added SPECS-EXTENDED/Xaw3d/alan.coopersmith.asc
Binary file not shown.
Binary file added SPECS-EXTENDED/Xaw3d/libXaw3d-1.6.6.tar.xz.sig
Binary file not shown.
Loading

0 comments on commit f9e5f00

Please sign in to comment.