1 Commits

Author SHA256 Message Date
3f52a14470 Upgrade x3270 to version 4.5ga5 2026-01-19 09:29:36 +01:00
7 changed files with 106 additions and 31 deletions

Binary file not shown.

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

Binary file not shown.

12
x3270-gcc15.patch Normal file
View File

@@ -0,0 +1,12 @@
--- x026-1.2/x026.c 2025-02-14 11:59:47.781340989 +0000
+++ x026-1.2/x026.c 2025-02-14 11:57:47.954597116 +0000
@@ -603,7 +603,7 @@ struct button {
char *label;
void (*callback)(int);
} button[] = {
- { "Off", (void (*)())exit },
+ { "Off", (void (*)(int))exit },
{ "Save", save },
{ NULL, NULL },
};

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,5 +1,59 @@
-------------------------------------------------------------------
Tue Jan 7 13:01:40 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
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>
- Add two upstream commits as patches
* x3270-dependency.patch
* x3270-notparallel.patch
to make it build in parallel again
-------------------------------------------------------------------
Fri May 23 12:00:26 UTC 2025 - Dr. Werner Fink <werner@suse.de>
- Correct sourceforge load paths
- Work around wrong usage of SOURCE_DATE_EPOCH
-------------------------------------------------------------------
Wed May 21 14:18:02 UTC 2025 - Dr. Werner Fink <werner@suse.de>
- Upgrade to version 4.4ga6
- Release Notes/suite3270/4.4ga6
* https://x3270.miraheze.org/wiki/Release_Notes/suite3270/4.4ga6
- Do not build in parallel as 4.4ga6 builds become random
with missing symbols
-------------------------------------------------------------------
Fri Feb 14 12:02:19 UTC 2025 - pgajdos@suse.com
- added patches
fix fix build with gcc 15
+ x3270-gcc15.patch
-------------------------------------------------------------------
Tue Jan 7 12:14:08 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
- Upgrade x3270 to version 4.3.ga10 (bsc#1234758)
- Release Notes/suite3270/4.3ga10

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) 2024 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,23 +16,27 @@
#
%define _suffix ga10
%define _suffix ga5
%define _fullname suite3270-%{version}%{_suffix}
%define _x026ver 1.2
Name: x3270
Version: 4.3
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://download.sourceforge.net/x3270/%{_fullname}-src.tgz
Source1: https://download.sourceforge.net/x3270/x026-%{_x026ver}.tgz
Source2: x3270.desktop
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
Patch0: mknod.patch
Patch100: usr_local_bin.patch
Patch102: x026-offset.diff
Patch101: x026-offset.diff
# fix build with gcc 15
Patch102: x3270-gcc15.patch
#
Patch103: x3270-termios.patch
#
BuildRequires: bdftopcf
BuildRequires: fdupes
BuildRequires: fontpackages-devel
@@ -42,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)
@@ -110,11 +114,14 @@ 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 -p 1
find . -name ".gitignore" -delete
%build
%global _lto_cflags %{nil}
export CFLAGS="%{optflags}"
export LIBX3270DIR=%{_sysconfdir}/x3270
%configure \
@@ -130,7 +137,11 @@ export LIBX3270DIR=%{_sysconfdir}/x3270
--with-fontdir=%{_miscfontsdir}
# There is broken generated makefile
sed -i -e 's:$(FALLBACKS_:$(FALLBACKS):g' x3270/Makefile
%make_build LIBX3270DIR=${LIBX3270DIR} unix CC="gcc %{optflags}"
# 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
cd x026-%{_x026ver}
xmkmf
@@ -145,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
@@ -168,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
@@ -201,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}