Skip to content

Commit f9e5f00

Browse files
authored
Xaw3d : update version to 1.6.6 (#10762)
1 parent 5be9138 commit f9e5f00

8 files changed

Lines changed: 62 additions & 915 deletions

SPECS-EXTENDED/Xaw3d/Xaw3d-1.6.1-fontset.patch

Lines changed: 0 additions & 60 deletions
This file was deleted.
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
--- libXaw3d-1.6.5/src/Command.c~ 2023-05-12 19:08:46.000000000 -0500
2+
+++ libXaw3d-1.6.5/src/Command.c 2024-02-01 15:39:48.779640222 -0600
3+
@@ -220,6 +220,8 @@
4+
CommandWidget cbw = (CommandWidget) new;
5+
int shape_event_base, shape_error_base;
6+
7+
+ if (!cbw->label.font) XtError("Aborting: no font found\n");
8+
+
9+
if (cbw->command.shape_style != XawShapeRectangle
10+
&& !XShapeQueryExtension(XtDisplay(new), &shape_event_base,
11+
&shape_error_base))
12+
--- libXaw3d-1.6.5/src/List.c~ 2023-05-12 19:08:46.000000000 -0500
13+
+++ libXaw3d-1.6.5/src/List.c 2024-02-01 15:40:50.716135054 -0600
14+
@@ -362,6 +362,8 @@
15+
{
16+
ListWidget lw = (ListWidget) new;
17+
18+
+ if (!lw->list.font) XtError("Aborting: no font found\n");
19+
+
20+
/*
21+
* Initialize all private resources.
22+
*/
23+
--- libXaw3d-1.6.5/src/SmeBSB.c~ 2023-05-12 19:08:46.000000000 -0500
24+
+++ libXaw3d-1.6.5/src/SmeBSB.c 2024-02-01 15:41:39.772150867 -0600
25+
@@ -203,6 +203,8 @@
26+
else
27+
entry->sme_bsb.label = XtNewString( entry->sme_bsb.label );
28+
29+
+ if (!entry->sme_bsb.font) XtError("Aborting: no font found\n");
30+
+
31+
CreateGCs(new);
32+
33+
GetBitmapInfo(new, TRUE); /* Left Bitmap Info */
34+
--- libXaw3d-1.6.5/src/Tip.c~ 2023-05-12 19:08:46.000000000 -0500
35+
+++ libXaw3d-1.6.5/src/Tip.c 2024-02-01 15:42:15.952687460 -0600
36+
@@ -248,6 +248,8 @@
37+
TipWidget tip = (TipWidget)w;
38+
XGCValues values;
39+
40+
+ if (!tip->tip.font) XtError("Aborting: no font found\n");
41+
+
42+
tip->tip.timer = 0;
43+
44+
values.foreground = tip->tip.foreground;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
3-
"libXaw3d-1.6.3.tar.bz2": "2dba993f04429ec3d7e99341e91bf46be265cc482df25963058c15f1901ec544",
4-
"libXaw3d-1.6.3.tar.bz2.sig": "b9d970f78c9a4b279e49d44b4bba0fedc5eee34a74bf1b9bbb48b65b0cd229cd",
5-
"mattst88.asc": "fea077506e27392203568df63280eed2e2fd5a50bd6df08c30819ac7b176914e"
3+
"libXaw3d-1.6.6.tar.xz": "a41c3e37135ad616b1f28bbde70002afbf3cb59a30df34141f829d32eadc8646",
4+
"libXaw3d-1.6.6.tar.xz.sig": "ba59884fc0ce7e48d5c35692a49d614be9241e1a585c03e3646c9ce5f075f696",
5+
"alan.coopersmith.asc": "35a05973372b792db073c21163e9e4cd135bd9bb08dc4372991ae4b596b99f09"
66
}
77
}

SPECS-EXTENDED/Xaw3d/Xaw3d.spec

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ Vendor: Microsoft Corporation
22
Distribution: Azure Linux
33
Summary: A version of the MIT Athena widget set for X
44
Name: Xaw3d
5-
Version: 1.6.3
6-
Release: 3%{?dist}
7-
Source0: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2
8-
Source1: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2.sig
9-
Source2: mattst88.asc
5+
Version: 1.6.6
6+
Release: 1%{?dist}
7+
Source0: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.xz
8+
Source1: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.xz.sig
9+
Source2: alan.coopersmith.asc
10+
1011
Patch5: Xaw3d-1.5-debian-fixes.patch
1112
Patch7: Xaw3d-1.6.1-3Dlabel.patch
12-
Patch10: Xaw3d-1.6.1-fontset.patch
13+
Patch10: Xaw3d-1.6.5-fontset.patch
1314
Patch11: Xaw3d-1.6.1-hsbar.patch
1415

1516
License: MIT
@@ -88,7 +89,7 @@ rm -r $RPM_BUILD_ROOT%{_docdir}
8889

8990
%files
9091
%license COPYING
91-
%doc ChangeLog README src/README.XAW3D
92+
%doc ChangeLog README.md src/README.XAW3D
9293
%{_libdir}/*.so.*
9394

9495
%files devel
@@ -97,6 +98,11 @@ rm -r $RPM_BUILD_ROOT%{_docdir}
9798
%{_includedir}/X11/Xaw3d
9899

99100
%changelog
101+
102+
* Wed Oct 16 2024 Jyoti Kanase <v-jykanase@microsoft.com> - 1.6.6-1
103+
- Update to 1.6.6
104+
- License verified
105+
100106
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.6.3-3
101107
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
102108

2.57 KB
Binary file not shown.
566 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)