diff --git a/c23.patch b/c23.patch new file mode 100644 index 0000000..3ccd25e --- /dev/null +++ b/c23.patch @@ -0,0 +1,21 @@ +diff -up suite3270-4.5/x3270/CmeP.h.c23 suite3270-4.5/x3270/CmeP.h +--- suite3270-4.5/x3270/CmeP.h.c23 2026-02-23 17:11:47.532461550 +0100 ++++ suite3270-4.5/x3270/CmeP.h 2026-02-23 17:12:44.818297155 +0100 +@@ -120,16 +120,7 @@ typedef struct _CmeRec { + * + ************************************************************/ + +-#if defined(__clang__) /*[*/ +-# pragma clang diagnostic push +-# pragma clang diagnostic ignored "-Wstrict-prototypes" +-#endif /*]*/ +-typedef void (*_XawEntryVoidFunc)(); +-#if defined(__clang__) /*[*/ +-# pragma clang diagnostic pop +-#endif /*]*/ +- +-#define XtInheritHighlight ((_XawEntryVoidFunc) _XtInherit) ++#define XtInheritHighlight (void (*)(struct _WidgetRec *)) _XtInherit + #define XtInheritUnhighlight XtInheritHighlight + #define XtInheritNotify XtInheritHighlight + diff --git a/mkversion.patch b/mkversion.patch new file mode 100644 index 0000000..7da52f2 --- /dev/null +++ b/mkversion.patch @@ -0,0 +1,12 @@ +diff -up suite3270-4.5/Common/mkversion.py.orig suite3270-4.5/Common/mkversion.py +--- suite3270-4.5/Common/mkversion.py.orig 2026-02-23 17:23:54.155112220 +0100 ++++ suite3270-4.5/Common/mkversion.py 2026-02-23 17:24:19.943983520 +0100 +@@ -111,7 +111,7 @@ def mkversion(outfile_name: str, program + + # Get the date. + if 'SOURCE_DATE_EPOCH' in os.environ: +- now = datetime.fromtimestamp(int(os.environ['SOURCE_DATE_EPOCH'])).replace(tzinfo=timezone.utc) ++ now = datetime.utcfromtimestamp(int(os.environ['SOURCE_DATE_EPOCH'])) + else: + now = datetime.now(timezone.utc) + builddate = datetime.strftime(now, '%a %b %d %H:%M:%S %Z %Y') diff --git a/sources b/sources index d55d866..0a961b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (suite3270-4.3ga8-src.tgz) = 3ee75ca2a4681e90226b9287f05deda51ee88e5262809cd008d732b2ccc952c7312dd1f42e6d1eb793ada459d69fa206a5f89b4add2afc953eb4897c89bc9744 +SHA512 (suite3270-4.5ga5-src.tgz) = 4d80f4d31b88a5d99862b6a2c0fbb6c4f45ea55d393d306cd0cb7e989a85759da7df5afcda1ba24e6608ab9a61a5385d8d63786b5e83c6ba192d1b682546d02e diff --git a/x3270.spec b/x3270.spec index c8d18c4..d8ee587 100644 --- a/x3270.spec +++ b/x3270.spec @@ -1,16 +1,19 @@ %global catalogue /etc/X11/fontpath.d -%global majorver 4.3 +%global majorver 4.5 Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 -Version: 4.3ga8 -Release: 2%{?dist} +Version: 4.5ga5 +Release: 3%{?dist} License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0 URL: https://x3270.miraheze.org/wiki/Main_Page Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz Source1: x3270.png Source2: x3270.desktop Patch0: x3270-3.5-paths.patch +# workaround C23 related issues +Patch1: c23.patch +Patch2: mkversion.patch BuildRequires: make BuildRequires: ncurses-devel @@ -25,6 +28,7 @@ Summary: IBM 3278/3279 terminal emulator for the X Window System BuildRequires: mkfontdir bdftopcf BuildRequires: libXaw-devel Requires: %{name} = %{version} +Requires: xrdb %package text Summary: IBM 3278/3279 terminal emulator for text mode @@ -61,7 +65,7 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM %build -%configure --enable-x3270 --enable-c3270 --enable-s3270 --enable-pr3287 --enable-playback +%configure --enable-x3270 --enable-c3270 --enable-s3270 --enable-pr3287 --disable-tcl3270 --disable-b3270 --enable-playback make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS" LIBX3270DIR=%{_sysconfdir} @@ -113,6 +117,37 @@ desktop-file-install \ %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 4.5ga5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jun 13 2026 Yaakov Selkowitz - 4.5ga5-2 +- Rebuilt for openssl 4.0 + +* Mon Feb 23 2026 Dan Horák - 4.5ga5-1 +- updated to 4.5ga5(rhbz#2368663) + +* Sat Jan 17 2026 Fedora Release Engineering - 4.4ga6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Sun Nov 16 2025 Yaakov Selkowitz - 4.4ga6-3 +- Add xrdb dependency + +* Fri Jul 25 2025 Fedora Release Engineering - 4.4ga6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed May 7 2025 Jakub Čajka 4.4ga6-1 +- updated to 4.4ga6(rhbz#2362329) + +* Fri Mar 28 2025 Jakub Čajka 4.4ga5-1 +- updated to 4.4ga5(rhbz#2344000) + +* Mon Jan 27 2025 Jakub Čajka 4.4alpha1-1 +- updated to 4.4alpha1(rhbz#2332509) +- workaround C23 related issues(rhbz#2341559) + +* Sun Jan 19 2025 Fedora Release Engineering - 4.3ga8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 4.3ga8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild