Compare commits

..

No commits in common. "rawhide" and "f33" have entirely different histories.

2 changed files with 10 additions and 82 deletions

View file

@ -1,24 +0,0 @@
diff -up xmakemol-5.16/edit.c.pointertype xmakemol-5.16/edit.c
--- xmakemol-5.16/edit.c.pointertype 2005-03-07 10:14:44.000000000 +0000
+++ xmakemol-5.16/edit.c 2024-01-30 11:08:10.690500512 +0000
@@ -1758,7 +1758,7 @@ make_scale_coords_dialog (Widget parent)
int n = 0;
Widget atob, btoa, child, rc;
- XmString label = "";
+ XmString label = XmStringCreateSimple("");
if (! scale_coords_dialog)
{
diff -up xmakemol-5.16/frames.c.pointertype xmakemol-5.16/frames.c
--- xmakemol-5.16/frames.c.pointertype 2007-08-25 11:20:29.000000000 +0000
+++ xmakemol-5.16/frames.c 2024-01-30 15:34:46.934021294 +0000
@@ -106,7 +106,7 @@ make_frame_dlg(Widget parent)
Widget *kids;
#endif
- XmString label = "";
+ XmString label = XmStringCreateSimple("");
if (! frames_dialog) {

View file

@ -1,9 +1,8 @@
Name: xmakemol
Version: 5.16
Release: 25%{?dist}
Release: 10%{?dist}
Summary: Program for visualizing atomic and molecular systems
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
License: GPLv2+
URL: https://www.nongnu.org/xmakemol/
Source0: http://savannah.nongnu.org/download/xmakemol/xmakemol-%{version}.tar.gz
@ -17,11 +16,10 @@ Patch3: xmakemol-5.16-print_torsions.patch
Patch4: xmakemol-5.16-extern.patch
# Fix BZ#1914657, crash about NULL widget class
Patch5: xmakemol-5.16-widget.patch
# Fix BZ#2261809, initialization of XmString from incompatible pointer type
Patch6: xmakemol-5.16-pointertype.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: freeglut-devel
BuildRequires: mesa-libGLU-devel
BuildRequires: mesa-libGLw-devel
BuildRequires: libX11-devel
@ -30,7 +28,7 @@ BuildRequires: libXpm-devel
BuildRequires: libICE-devel
BuildRequires: zlib-devel
BuildRequires: motif-devel
BuildRequires: freeglut-devel
%description
XMakemol is a mouse-based program, written using the LessTif widget
@ -46,13 +44,12 @@ bonds. Features include:
%prep
%autosetup -N
%patch -P0 -p1 -b .fsf
%patch -P1 -p0 -b .vecat
%patch -P2 -p1 -b .hbond
%patch -P3 -p1 -b .torsion
%patch -P4 -p1 -b .extern
%patch -P5 -p1 -b .widget
%patch -P6 -p1 -b .pointertype
%patch0 -p1 -b .fsf
%patch1 -p0 -b .vecat
%patch2 -p1 -b .hbond
%patch3 -p1 -b .torsion
%patch4 -p1 -b .extern
%patch5 -p1 -b .widget
%build
%configure
@ -70,51 +67,6 @@ bonds. Features include:
%{_bindir}/xmake_anim.pl
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 5.16-21
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Jan 30 2024 Susi Lehtola <jussilehtola@fedoraproject.org> - 5.16-19
- Fix FTBFS on Fedora 40.
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Dec 05 2022 Susi Lehtola <jussilehtola@fedoraproject.org> - 5.16-15
- Freeglut is now available in RHEL9.
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sun Jan 10 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 5.16-10
- Fix crash for NULL widget class (BZ #1914657).