packages/x3270
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!8 update to version 4.2

Browse Source 
From: @wang--ge 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
This commit is contained in:
openeuler-ci-bot 2023-09-05 09:08:15 +00:00 committed by Gitee
commit 917e905613
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 57 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gcc-10.patch
View File

@ -1,20 +0,0 @@
--- a/x3270/xscreen.h_old 2021-08-03 15:23:42.725100426 +0800
+++ b/x3270/xscreen.h 2021-08-03 15:23:54.081295953 +0800
@@ -163,5 +163,5 @@
struct font_list *next;
char *mlabel;
};
-struct font_list *font_list;
-int font_count;
+extern struct font_list *font_list;
+extern int font_count;
--- a/include/glue.h 2021-08-03 15:43:01.289032463 +0800
+++ b/include/glue.h 2021-08-03 15:41:24.155363894 +0800
@@ -49,5 +49,5 @@
void register_merge_profile(merge_profile_t *);
/* XtGlue.c */
-void (*Error_redirect)(const char *);
-void (*Warning_redirect)(const char *);
+extern void (*Error_redirect)(const char *);
+extern void (*Warning_redirect)(const char *);

BIN
suite3270-3.6ga5-src.tgz
View File

Binary file not shown.

BIN
suite3270-4.2ga10-src.tgz Normal file
View File

Binary file not shown.

55
x3270-3.5-ibmhostpath.patch
View File

@ -1,18 +1,17 @@
diff -up suite3270-3.5/c3270/c3270.man.ibmhosts suite3270-3.5/c3270/c3270.man
--- suite3270-3.5/c3270/c3270.man.ibmhosts 2016-05-16 10:54:55.000000000 +0200
+++ suite3270-3.5/c3270/c3270.man 2016-05-16 10:55:03.000000000 +0200
@@ -3403,7 +3403,7 @@ backslash character.
If more than one \fB\-xrm\fP option is given for the same resource,
the last one on the command line is used.
.SH "FILES"
-/usr/local/lib/x3270/ibm_hosts
+/etc/ibm_hosts
.br
$HOME/.c3270pro
diff -up suite3270-3.5/c3270/ibm_hosts.man.ibmhosts suite3270-3.5/c3270/ibm_hosts.man
--- suite3270-3.5/c3270/ibm_hosts.man.ibmhosts 2016-05-16 10:53:16.000000000 +0200
+++ suite3270-3.5/c3270/ibm_hosts.man 2016-05-16 10:53:38.000000000 +0200
From 084a4729861de3168a3fd4d1cb7ed9b36071b83b Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Sat, 2 Sep 2023 16:07:39 +0800
Subject: [PATCH] x3270 3.5 ibmhostpatch
---
c3270/ibm_hosts.man | 4 ++--
x3270/ibm_hosts.man | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/c3270/ibm_hosts.man b/c3270/ibm_hosts.man
index 3377f6d..e6a7a01 100644
--- a/c3270/ibm_hosts.man
+++ b/c3270/ibm_hosts.man
@@ -3,7 +3,7 @@
.SH "NAME"
ibm_hosts \- host database for x3270 and c3270
@ -22,7 +21,7 @@ diff -up suite3270-3.5/c3270/ibm_hosts.man.ibmhosts suite3270-3.5/c3270/ibm_host
.SH "DESCRIPTION"
The \fBibm_hosts\fP
file contains information regarding IBM hosts on the network.
@@ -82,7 +82,7 @@ The name \fBvm\fP will cause the 3270 em
@@ -82,7 +82,7 @@ The name \fBvm\fP will cause the 3270 emulator to connect to the host
enter the string `3' on the second data-entry field on the screen, and
send the Enter \s-1AID\s+1 sequence.
.SH "FILES"
@ -31,9 +30,10 @@ diff -up suite3270-3.5/c3270/ibm_hosts.man.ibmhosts suite3270-3.5/c3270/ibm_host
.SH "SEE ALSO"
x3270(1),
c3270(1)
diff -up suite3270-3.5/x3270/ibm_hosts.man.ibmhosts suite3270-3.5/x3270/ibm_hosts.man
--- suite3270-3.5/x3270/ibm_hosts.man.ibmhosts 2016-05-16 10:54:26.000000000 +0200
+++ suite3270-3.5/x3270/ibm_hosts.man 2016-05-16 10:54:40.000000000 +0200
diff --git a/x3270/ibm_hosts.man b/x3270/ibm_hosts.man
index f41c165..58ad390 100644
--- a/x3270/ibm_hosts.man
+++ b/x3270/ibm_hosts.man
@@ -3,7 +3,7 @@
.SH "NAME"
ibm_hosts \- host database for x3270 and c3270
@ -43,7 +43,7 @@ diff -up suite3270-3.5/x3270/ibm_hosts.man.ibmhosts suite3270-3.5/x3270/ibm_host
.SH "DESCRIPTION"
The \fBibm_hosts\fP
file contains information regarding IBM hosts on the network.
@@ -82,7 +82,7 @@ The name \fBvm\fP will cause the 3270 em
@@ -82,7 +82,7 @@ The name \fBvm\fP will cause the 3270 emulator to connect to the host
enter the string `3' on the second data-entry field on the screen, and
send the Enter \s-1AID\s+1 sequence.
.SH "FILES"
@ -52,15 +52,6 @@ diff -up suite3270-3.5/x3270/ibm_hosts.man.ibmhosts suite3270-3.5/x3270/ibm_host
.SH "SEE ALSO"
x3270(1),
c3270(1)
diff -up suite3270-3.5/x3270/x3270.man.ibmhosts suite3270-3.5/x3270/x3270.man
--- suite3270-3.5/x3270/x3270.man.ibmhosts 2016-05-16 10:53:50.000000000 +0200
+++ suite3270-3.5/x3270/x3270.man 2016-05-16 10:54:00.000000000 +0200
@@ -5275,7 +5275,7 @@ T}
The special types \fBsocks4a\fP and \fBsocks5d\fP can also be used to force
the proxy server to do the hostname resolution for the SOCKS protocol.
.SH "FILES"
-/usr/lib/X11/x3270/ibm_hosts
+/etc/ibm_hosts
.br
$HOME/.x3270pro
--
2.33.0

27
x3270-3.5-paths.patch
View File

@ -1,18 +1,33 @@
diff -up suite3270-3.5/x3270/Examples/cms_logon.bash.paths suite3270-3.5/x3270/Examples/cms_logon.bash
--- suite3270-3.5/x3270/Examples/cms_logon.bash.paths 2015-09-20 01:04:56.000000000 +0200
+++ suite3270-3.5/x3270/Examples/cms_logon.bash 2016-05-12 12:00:57.000000000 +0200
From be8d37f0cb06db9b6f7770e9a0d15631a8ae3608 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Sat, 2 Sep 2023 16:11:41 +0800
Subject: [PATCH] x3270 3.5 paths
---
x3270/Examples/cms_logon.bash | 2 +-
x3270/Examples/peer_script.expect | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x3270/Examples/cms_logon.bash b/x3270/Examples/cms_logon.bash
index 8002fec..460fc18 100644
--- a/x3270/Examples/cms_logon.bash
+++ b/x3270/Examples/cms_logon.bash
@@ -1,4 +1,4 @@
-#! /usr/local/bin/bash
+#! /bin/bash
# Copyright (c) 1995-2009, Paul Mattes.
# All rights reserved.
diff -up suite3270-3.5/x3270/Examples/peer_script.expect.paths suite3270-3.5/x3270/Examples/peer_script.expect
--- suite3270-3.5/x3270/Examples/peer_script.expect.paths 2015-09-20 01:04:56.000000000 +0200
+++ suite3270-3.5/x3270/Examples/peer_script.expect 2016-05-12 12:00:57.000000000 +0200
diff --git a/x3270/Examples/peer_script.expect b/x3270/Examples/peer_script.expect
index 8d72e01..43a95c3 100644
--- a/x3270/Examples/peer_script.expect
+++ b/x3270/Examples/peer_script.expect
@@ -1,4 +1,4 @@
-#! /usr/local/bin/expect
+#! /usr/bin/expect
# TSO login script, which runs as a peer of x3270.
# expect version
--
2.33.0

28
x3270.spec
View File

@ -1,21 +1,20 @@
%define _majorver 3.6
%define _majorver 4.2
%define _fullname suite3270-%{version}
%define _fontpath /etc/X11/fontpath.d
%define _deskdir %{_datadir}/applications
%define _pngdir %{_datadir}/icons/hicolor/48x48/apps
Name: x3270
Version: 3.6ga5
Release: 6
Version: 4.2ga10
Release: 1
Summary: An IBM 3270 terminal emulator for the X Window System and Windows.
License: BSD
URL: http://x3270.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{_fullname}-src.tgz
Source0: http://prdownloads.sourceforge.net/%{name}/%{_fullname}-src.tgz
Source1: x3270.desktop
Source2: x3270.png
Patch0: x3270-3.5-ibmhostpath.patch
Patch1: x3270-3.5-paths.patch
Patch2: gcc-10.patch
BuildRequires: desktop-file-utils fontpackages-devel imake libtool
BuildRequires: libXaw-devel ncurses-devel openssl-devel readline-devel
@ -67,7 +66,7 @@ This contains man files for the using of x3270
%autosetup -n suite3270-%{_majorver} -p1
for dir in c3270 pr3287 s3270 x3270; do
for file in LICENSE README html; do
for file in html; do
mv $dir/$file $file.$dir
done
done
@ -78,13 +77,10 @@ done
--enable-c3270 \
--enable-pr3287 \
--enable-s3270 \
--enable-x3270
--enable-x3270 \
--enable-playback
%make_build CCOPTIONS="$RPM_OPT_FLAGS" LIBX3270DIR=%{_sysconfdir}
pushd Playback
make CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS"
popd
%install
%make_install CIFONTDIR=%{_fontdir} LIBX3270DIR=%{_sysconfdir}
@ -93,15 +89,14 @@ make install.man DESTDIR=%{buildroot}
mkdir -p %{buildroot}%{_fontpath}
ln -sf %{_fontdir} %{buildroot}%{_fontpath}/%{name}
install -p -m 755 Playback/playback %{buildroot}%{_bindir}
install -p -m 644 Playback/playback.man %{buildroot}%{_mandir}/man1/playback.1
install -p -m 755 "$(find ./obj -type f -name playback -print -quit)" %{buildroot}%{_bindir}
install -p -m 644 playback/playback.man %{buildroot}%{_mandir}/man1/playback.1
mkdir -p %{buildroot}%{_deskdir}
desktop-file-install --dir %{buildroot}%{_deskdir} %{SOURCE1}
install -D -p -m 644 %{SOURCE2} %{buildroot}%{_pngdir}/%{basename:%{SOURCE2}}
%post
pushd %{_fontdir}
%{_prefix}/bin/mkfontdir
@ -110,7 +105,7 @@ popd
%files
%doc README.* html.*
%license LICENSE.*
%license wc3270/LICENSE.*
%config(noreplace) %{_sysconfdir}/ibm_hosts
%{_deskdir}/x3270.desktop
%{_pngdir}/x3270.png
@ -123,6 +118,9 @@ popd
%changelog
* Sat Sep 02 2023 Ge Wang <wang__ge@126.com> - 4.2ga10-1
- Update to version 4.2
* Tue Aug 03 2021 linjiaxin5 <linjiaxin5@huawei.com> - 3.6ga5-6
- Fix failure caused by GCC upgrade to 10