FTBFS with GCC 10

This commit is contained in:
Zdenek Dohnal 2020-02-03 14:15:48 +01:00
parent 7239cc0b81
commit 5949ec934a
2 changed files with 32 additions and 1 deletions

25
pnm2ppa-gcc10.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/syslog.c b/syslog.c
index e70f12c..af067e2 100644
--- a/syslog.c
+++ b/syslog.c
@@ -27,6 +27,7 @@
#include "global.h"
+char syslog_message[128];
/*
For some reason, BeOS doesn't seem to implement syslog(), even though it is
diff --git a/syslog.h b/syslog.h
index 7d0e436..5c1accd 100644
--- a/syslog.h
+++ b/syslog.h
@@ -39,7 +39,7 @@
#include <syslog.h>
#endif
-char syslog_message[128];
+extern char syslog_message[128];
extern size_t message_size ;
void wrap_syslog( int, char *, char *);

View File

@ -2,7 +2,7 @@ Name: pnm2ppa
Summary: Drivers for printing to HP PPA printers
Epoch: 1
Version: 1.04
Release: 44%{?dist}
Release: 45%{?dist}
URL: http://sourceforge.net/projects/pnm2ppa
Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz
# Following sourcelink is dead currently.
@ -15,6 +15,8 @@ Patch3: pnm2ppa-redhat.patch
Patch4: pnm2ppa-coverity-return-local.patch
# add ldflags to Makefile
Patch5: pnm2ppa-ldflags.patch
# FTBFS with GCC 10
Patch6: pnm2ppa-gcc10.patch
License: GPLv2+
# gcc is no longer in buildroot by default
@ -37,6 +39,7 @@ Install pnm2ppa if you need to print to a PPA printer.
%patch3 -p1 -b .rh
%patch4 -p1 -b .coverity-return-local
%patch5 -p1 -b .ldflags
%patch6 -p1 -b .gcc10
for file in docs/en/LICENSE pbm2ppa-0.8.6/LICENSE; do
sed "s|\r||g" $file > $file.new && \
@ -93,6 +96,9 @@ done
%config(noreplace) %{_sysconfdir}/pbm2ppa.conf
%changelog
* Mon Feb 03 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-45
- FTBFS with GCC 10
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild