2 Commits

Author SHA256 Message Date
3f52a14470 Upgrade x3270 to version 4.5ga5 2026-01-19 09:29:36 +01:00
77ef760200 Sync changes to SLFO-1.2 branch 2025-08-20 14:14:21 +02:00
8 changed files with 58 additions and 1719 deletions

Binary file not shown.

BIN
suite3270-4.5ga5-src.tgz LFS Normal file

Binary file not shown.

View File

@@ -1,26 +0,0 @@
From 5dff59aef62fbd8a35e34e15e402a97b54b6deb4 Mon Sep 17 00:00:00 2001
From: Paul Mattes <paul.mattes@case.edu>
Date: Sat, 24 May 2025 09:12:09 -0500
Subject: [PATCH] Fix mitm dependency bug that causes GNU Make 4.4 parallel
build errors
---
mitm/Makefile.obj.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mitm/Makefile.obj.in b/mitm/Makefile.obj.in
index 658f60f6..cd55258c 100644
--- a/mitm/Makefile.obj.in
+++ b/mitm/Makefile.obj.in
@@ -63,7 +63,7 @@ version.o: mkversion.py $(VOBJS) version.txt
$(CC) $(CFLAGS) -c -o $@ $(XVERSION)
$(RM) $(XVERSION)
-mitm: $(OBJS1) $(DEP3270)
+mitm: $(OBJS1) $(DEP32XX)
$(CC) -o $@ $(LDFLAGS) $(OBJS1) $(LD32XX) $(LIBS)
man:: mitm.man
--
2.47.1

File diff suppressed because it is too large Load Diff

15
x3270-termios.patch Normal file
View File

@@ -0,0 +1,15 @@
---
Common/x3270if.c | 2 ++
1 file changed, 2 insertions(+)
--- a/Common/x3270if.c
+++ b/Common/x3270if.c
@@ -97,6 +97,8 @@
# endif /*]*/
#endif
+#include <termios.h>
+
#include "base64.h"
#include "names.h"
#include "s3270_proto.h"

View File

@@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Jan 16 10:58:25 UTC 2026 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
- Upgrade x3270 to version 4.5ga5
- Release Notes: https://x3270.miraheze.org/wiki/Release_Notes/suite3270/4.5ga5
- Removed obsolete patches
* x3270-dependency.patch
* x3270-notparallel.patch
-------------------------------------------------------------------
Wed Jan 14 13:50:43 UTC 2026 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
- Amended the .spec file (jsc#PED-15247)
* Removed the update-desktop-files dependencies
- Removed the 'x3270.desktop' file
-------------------------------------------------------------------
Fri Oct 24 05:13:28 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
- Applied a patch
* x3270-termios.patch
to include 'termios.h' in 'Common/x3270if.c'
- Ammended the .spec file
-------------------------------------------------------------------
Mon May 26 09:48:44 UTC 2025 - Dr. Werner Fink <werner@suse.de>

View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=x3270
GenericName=x3270
Comment=IBM 3270 Terminal Emulator
Exec=x3270
Icon=utilities-terminal
Terminal=false
Type=Application
Categories=System;TerminalEmulator;X-GNOME-Utilities;

View File

@@ -1,7 +1,7 @@
#
# spec file for package x3270
#
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2026 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,28 +16,27 @@
#
%define _suffix ga6
%define _suffix ga5
%define _fullname suite3270-%{version}%{_suffix}
%define _x026ver 1.2
Name: x3270
Version: 4.4
Version: 4.5
Release: 0
Summary: A Family of IBM 3270 Terminal Emulators
License: MIT
Group: System/X11/Terminals
URL: https://x3270.miraheze.org
#Git-Clone: https://github.com/pmattes/x3270
Source0: https://downloads.sourceforge.net/project/x3270/x3270/%{version}%{_suffix}/%{_fullname}-src.tgz#/%{_fullname}-src.tar.gz
Source0: https://downloads.sourceforge.net/project/x3270/x3270/%{version}%{_suffix}/%{_fullname}-src.tgz#/%{_fullname}-src.tgz
Source1: https://downloads.sourceforge.net/project/x3270/x026/%{_x026ver}/x026-%{_x026ver}.tgz
Source2: x3270.desktop
Patch0: mknod.patch
Patch100: usr_local_bin.patch
Patch102: x026-offset.diff
Patch101: x026-offset.diff
# fix build with gcc 15
Patch103: x3270-gcc15.patch
# upstream commit to make it parallel build
Patch104: x3270-dependency.patch
Patch105: x3270-notparallel.patch
Patch102: x3270-gcc15.patch
#
Patch103: x3270-termios.patch
#
BuildRequires: bdftopcf
BuildRequires: fdupes
BuildRequires: fontpackages-devel
@@ -47,9 +46,9 @@ BuildRequires: mkfontdir
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: python3
BuildRequires: readline-devel
BuildRequires: tcl-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xaw7)
@@ -115,10 +114,9 @@ x026 is a fun toy which emulates an x026 puncher.
%setup -q -n suite3270-%{version} -a1
%patch -P 0
%patch -P 100
%patch -P 101
%patch -P 102
%patch -P 103
%patch -P 104 -p 1
%patch -P 105 -p 1
%patch -P 103 -p 1
find . -name ".gitignore" -delete
@@ -139,10 +137,9 @@ export LIBX3270DIR=%{_sysconfdir}/x3270
--with-fontdir=%{_miscfontsdir}
# There is broken generated makefile
sed -i -e 's:$(FALLBACKS_:$(FALLBACKS):g' x3270/Makefile
if test -n "$SOURCE_DATE_EPOCH"
then
# there is a mistake in Common/mkersion.py
SOURCE_DATE_EPOCH="$(date --date="@$SOURCE_DATE_EPOCH" +'%%a %%b %%d %%H:%%M:%%S %%Z %%Y')"
# Ensure SOURCE_DATE_EPOCH remains an integer for tools like mkversion.py
if [ -n "$SOURCE_DATE_EPOCH" ]; then
export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}"
fi
%make_build LIBX3270DIR=${LIBX3270DIR} unix CC="gcc ${CFLAGS}"
# the IBM 026 keypunch emulator
@@ -159,7 +156,7 @@ make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install
make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man
# the IBM 026 keypunch emulator
cd x026-%{_x026ver}
make DESTDIR=%{buildroot} install install.man
make DESTDIR=%{buildroot} install install.man MANPATH=%{_mandir}
cd ..
# move site config files to the standard locations
mkdir -p %{buildroot}%{_libexecdir}/x3270
@@ -182,15 +179,10 @@ cp -pr --parents tcl3270/{Examples,html} %{buildroot}%{_docdir}/%{name}
# create symlinks in documentation
%fdupes -s %{buildroot}/%{_docdir}
install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/x3270.desktop
%suse_update_desktop_file x3270
%post
%desktop_database_post
%reconfigure_fonts_post
%postun
%desktop_database_postun
%reconfigure_fonts_postun
%posttrans
@@ -215,7 +207,6 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/x3270.desktop
%{_mandir}/man1/x3270.1%{?ext_man}
%doc %{_docdir}/%{name}/x3270/Examples
%doc %{_docdir}/%{name}/x3270/html
%{_datadir}/applications/x3270.desktop
# b3270
%{_bindir}/b3270
%{_mandir}/man1/b3270.1%{?ext_man}