- Fix symbol with multiple incompatible definitions which triggers
an error with LTO
This commit is contained in:
parent
1e448f44e5
commit
8786fba07b
17
x3270-3.5-odr.patch
Normal file
17
x3270-3.5-odr.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff -Nrup a/Common/glue.c b/Common/glue.c
|
||||
--- a/Common/glue.c 2018-02-10 15:07:44.000000000 -0700
|
||||
+++ b/Common/glue.c 2020-01-07 14:43:32.846491796 -0700
|
||||
@@ -1415,7 +1415,12 @@ bool flipped = false;
|
||||
|
||||
/* Replacements for functions in popups.c. */
|
||||
|
||||
-bool error_popup_visible = false;
|
||||
+bool
|
||||
+error_popup_visible(void)
|
||||
+{
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
|
||||
/* Pop up an error dialog. */
|
||||
void
|
@ -4,7 +4,7 @@
|
||||
Summary: An X Window System based IBM 3278/3279 terminal emulator
|
||||
Name: x3270
|
||||
Version: 3.6ga8
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: BSD
|
||||
URL: http://x3270.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz
|
||||
@ -12,6 +12,7 @@ Source1: x3270.png
|
||||
Source2: x3270.desktop
|
||||
Patch0: x3270-3.5-paths.patch
|
||||
Patch1: x3270-3.5-ibmhostpath.patch
|
||||
Patch2: x3270-3.5-odr.patch
|
||||
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: readline-devel
|
||||
@ -60,6 +61,7 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM
|
||||
%setup -q -n suite3270-%{majorver}
|
||||
%patch0 -p1 -b .paths
|
||||
%patch1 -p1 -b .ibmhosts
|
||||
%patch2 -p1
|
||||
|
||||
for d in c3270 pr3287 s3270 x3270; do
|
||||
for f in LICENSE README html; do
|
||||
@ -126,6 +128,10 @@ desktop-file-install \
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jan 17 2020 Jeff Law <law@redhat.com> - 3.6ga8-3
|
||||
- Fix symbol with multiple incompatible definitions which triggers
|
||||
an error with LTO
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6ga8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user