4 Commits

Author SHA256 Message Date
83386e1a18 Delete suite3270-4.3ga10-src.tgz 2025-10-27 09:17:02 +01:00
81af3859d2 Upload files to "/" 2025-10-27 09:16:46 +01:00
d739c7baa9 Upload files to "/" 2025-10-27 09:16:22 +01:00
2010d65147 Upload files to "/" 2025-10-27 09:15:39 +01:00
8 changed files with 1771 additions and 11 deletions

Binary file not shown.

BIN
suite3270-4.4ga6-src.tar.gz LFS Normal file

Binary file not shown.

26
x3270-dependency.patch Normal file
View File

@@ -0,0 +1,26 @@
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

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 },
};

1654
x3270-notparallel.patch Normal file

File diff suppressed because it is too large Load Diff

11
x3270-termios.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/Common/x3270if.c 2025-04-25 17:07:13.000000000 +0200
+++ b/Common/x3270if.c 2025-10-24 07:23:30.404621282 +0200
@@ -89,6 +89,8 @@
# endif /*]*/
#endif
+#include <termios.h>
+
#include "base64.h"
#include "names.h"
#include "s3270_proto.h"

View File

@@ -1,5 +1,43 @@
-------------------------------------------------------------------
Tue Jan 7 13:01:40 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
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,7 +1,7 @@
#
# spec file for package x3270
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 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,31 @@
#
%define _suffix ga10
%define _suffix ga6
%define _fullname suite3270-%{version}%{_suffix}
%define _x026ver 1.2
Name: x3270
Version: 4.3
Version: 4.4
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
Source0: https://downloads.sourceforge.net/project/x3270/x3270/%{version}%{_suffix}/%{_fullname}-src.tgz#/%{_fullname}-src.tar.gz
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
# fix build with gcc 15
Patch103: x3270-gcc15.patch
# upstream commit to make it parallel build
Patch104: x3270-dependency.patch
Patch105: x3270-notparallel.patch
#
Patch106: x3270-termios.patch
#
BuildRequires: bdftopcf
BuildRequires: fdupes
BuildRequires: fontpackages-devel
@@ -42,6 +50,7 @@ BuildRequires: mkfontdir
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: python3
BuildRequires: readline-devel
BuildRequires: tcl-devel
BuildRequires: update-desktop-files
@@ -111,10 +120,15 @@ x026 is a fun toy which emulates an x026 puncher.
%patch -P 0
%patch -P 100
%patch -P 102
%patch -P 103
%patch -P 104 -p 1
%patch -P 105 -p 1
%patch -P 106 -p 1
find . -name ".gitignore" -delete
%build
%global _lto_cflags %{nil}
export CFLAGS="%{optflags}"
export LIBX3270DIR=%{_sysconfdir}/x3270
%configure \
@@ -130,7 +144,12 @@ 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}"
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')"
fi
%make_build LIBX3270DIR=${LIBX3270DIR} unix CC="gcc ${CFLAGS}"
# the IBM 026 keypunch emulator
cd x026-%{_x026ver}
xmkmf
@@ -145,7 +164,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