FTBFS with the newest glibc - timeb.h is removed
This commit is contained in:
parent
7cb6f648cd
commit
c69a0429a3
12
hplip-timeb-removed.patch
Normal file
12
hplip-timeb-removed.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/prnt/hpcups/CommonDefinitions.h b/prnt/hpcups/CommonDefinitions.h
|
||||||
|
index 082aec9..86763d4 100644
|
||||||
|
--- a/prnt/hpcups/CommonDefinitions.h
|
||||||
|
+++ b/prnt/hpcups/CommonDefinitions.h
|
||||||
|
@@ -48,7 +48,6 @@
|
||||||
|
#include <syslog.h>
|
||||||
|
#include <assert.h>
|
||||||
|
#include <time.h>
|
||||||
|
-#include <sys/timeb.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#ifndef _GNU_SOURCE
|
@ -161,6 +161,10 @@ Patch56: hplip-revert-plugins.patch
|
|||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1861055
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1861055
|
||||||
# reported upstream https://bugs.launchpad.net/fedora/+bug/1889280
|
# reported upstream https://bugs.launchpad.net/fedora/+bug/1889280
|
||||||
Patch57: hplip-thread-isalive-removed.patch
|
Patch57: hplip-thread-isalive-removed.patch
|
||||||
|
# glibc moved timeb.h into compat package and it will be removed in the future
|
||||||
|
# the code doesn't use anything from timeb.h, so it is safe to remove it
|
||||||
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1900977
|
||||||
|
Patch58: hplip-timeb-removed.patch
|
||||||
|
|
||||||
|
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
@ -436,6 +440,8 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
|
|||||||
%patch56 -p1 -b .revert-plugins
|
%patch56 -p1 -b .revert-plugins
|
||||||
# 1861055 - hplip: remove threading.Thread.isAlive method calls - use threading.Thread.is_alive()
|
# 1861055 - hplip: remove threading.Thread.isAlive method calls - use threading.Thread.is_alive()
|
||||||
%patch57 -p1 -b .thread-isalive-removed
|
%patch57 -p1 -b .thread-isalive-removed
|
||||||
|
# timed.h is removed from glibc
|
||||||
|
%patch58 -p1 -b .timed-removed
|
||||||
|
|
||||||
sed -i.duplex-constraints \
|
sed -i.duplex-constraints \
|
||||||
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
|
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
|
||||||
@ -770,6 +776,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
|||||||
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
|
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 22 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.9-2
|
||||||
|
- timeb is removed from glibc
|
||||||
|
|
||||||
* Tue Oct 13 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.9-2
|
* Tue Oct 13 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.9-2
|
||||||
- downloading gpg key for plugin can take some time and wayland can
|
- downloading gpg key for plugin can take some time and wayland can
|
||||||
kill the connection, work it around to prefer more stable keyservers
|
kill the connection, work it around to prefer more stable keyservers
|
||||||
|
Loading…
Reference in New Issue
Block a user