rpms/motif
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import motif-2.3.4-19.el8

Browse Source
This commit is contained in:
CentOS Sources 2023-05-16 06:04:10 +00:00 committed by Stepan Oksanichenko
parent 1d62a441d8
commit c64b1aee38
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
SOURCES/0001-EditresCom-Fix-build-with-modern-systems.patch Normal file
View File

@ -0,0 +1,54 @@
From 591ae206f83a359a590090524c286cb03e5c2494 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue, 6 Sep 2022 17:39:19 +0200
Subject: [PATCH] EditresCom: Fix build with modern systems.
The code in _XtGetStringValues() depends on the LONG_BIT define.
However, modern system require -D_XOPEN_SOURCE to set LONG_BIT, so with
the current code as it is, LONG_BIT is not defined (from limits.h) and
the build wrongly assumes this is a 32bit build.
Unfortunately, defining _XOPEN_SOURCE to have LONG_BIT set would disable
the definition of caddr_t, a deprecated definition inherited from BSD,
so we also need to replace that with a simple cast to (long *).
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
---
lib/Xm/EditresCom.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/Xm/EditresCom.c b/lib/Xm/EditresCom.c
index 4114ff8b..c93d6844 100644
--- a/lib/Xm/EditresCom.c
+++ b/lib/Xm/EditresCom.c
@@ -43,6 +43,9 @@ in this Software without prior written authorization from the X Consortium.
#include <config.h>
#endif
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 700
+#endif
#include <X11/IntrinsicP.h> /* To get into the composite and core widget
structures. */
@@ -59,6 +62,7 @@ in this Software without prior written authorization from the X Consortium.
#include <X11/Xmd.h>
#include <stdio.h>
+#include <limits.h>
#define _XEditResPutBool _XEditResPut8
#define _XEditResPutResourceType _XEditResPut8
@@ -1608,7 +1612,7 @@ _XtGetStringValues(Widget w, Arg *warg, int numargs)
old_handler = XtAppSetWarningMsgHandler(XtWidgetToApplicationContext(w),
EditResCvtWarningHandler);
from.size = res->resource_size;
- from.addr = (caddr_t)&value;
+ from.addr = (void *)&value;
to.addr = NULL;
to.size = 0;
to_color.addr = NULL;
--
2.37.3

10
SPECS/motif.spec
View File

@ -1,7 +1,7 @@
Summary: Run-time libraries and programs
Name: motif
Version: 2.3.4
Release: 18%{?dist}
Release: 19%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
Source: http://downloads.sf.net/motif/motif-%{version}-src.tgz
@ -39,6 +39,7 @@ Patch52: revert-of-motifzone_1565.patch
Patch53: motifzone_1660.patch
Patch54: motifzone_1612.patch
Patch55: 0001-EditresCom-Fix-build-with-modern-systems.patch
Conflicts: lesstif <= 0.92.32-6
@ -87,6 +88,7 @@ This package contains the static Motif libraries.
%patch52 -p1 -b .revert-of-motifzone_1565
%patch53 -p1 -b .motifzone_1660
%patch54 -p1 -b .motifzone_1612
%patch55 -p1 -b .long_bit
%build
CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" \
@ -144,6 +146,12 @@ rm -rf %{buildroot}
%{_libdir}/lib*.a
%changelog
* Mon Sep 26 2022 Olivier Fourdan <ofourdan@redhat.com> - 2.3.4-19
- Fix LONG_BIT definition missing (rhbz#2124810)
* Wed Sep 07 2022 Mika Penttila <mpenttil@redhat.com> - 2.3.4-18
- Version bump
* Fri Apr 08 2022 Mika Penttila <mpenttil@redhat.com> - 2.3.4-17
- Added forgotten patches and corrected release number