Florian Weimer 2023-01-17 17:18:35 +01:00
parent 945c54ab0a
commit 5112ed2a1f
2 changed files with 44 additions and 1 deletions

36
xsane-configure-c99.patch Normal file
View File

@ -0,0 +1,36 @@
Avoid implicit function declarations, for improved compatibility with
future compilers.
Fixed upstream via:
commit 562008027f343127d70bae44457cf8f06c666428
Author: Ralph Little <littlesincanada@yahoo.co.uk>
Date: Thu Aug 29 21:49:08 2019 -0700
m4/sane.m4: remove m4/sane.m4 and update aclocal.m4 to suit.
We are now using pkg-config and it is pretty much a one-liner.
No point in a whole file in m4 for just this feature.
diff -up xsane-0.999/configure.c99 xsane-0.999/configure
--- xsane-0.999/configure.c99 2023-01-17 17:11:53.179785420 +0100
+++ xsane-0.999/configure 2023-01-17 17:11:58.234735290 +0100
@@ -6672,6 +6672,7 @@ else
#include <sane/sane.h>
#include <stdio.h>
+#include <stdlib.h>
int
main ()
diff -up xsane-0.999/m4/sane.m4.c99 xsane-0.999/m4/sane.m4
--- xsane-0.999/m4/sane.m4.c99 2023-01-17 17:11:08.940224113 +0100
+++ xsane-0.999/m4/sane.m4 2023-01-17 17:11:11.565198082 +0100
@@ -44,6 +44,7 @@ dnl
AC_TRY_RUN([
#include <sane/sane.h>
#include <stdio.h>
+#include <stdlib.h>
int
main ()

View File

@ -10,7 +10,7 @@
Name: xsane Name: xsane
Summary: X Window System front-end for the SANE scanner interface Summary: X Window System front-end for the SANE scanner interface
Version: 0.999 Version: 0.999
Release: 43%{?dist} Release: 44%{?dist}
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
Source1: xsane-256x256.png Source1: xsane-256x256.png
# use "xdg-open" instead of "netscape" to launch help browser # use "xdg-open" instead of "netscape" to launch help browser
@ -69,6 +69,9 @@ Patch15: xsane-0.999-signal-handling.patch
# autoconf-generated files # autoconf-generated files
Patch100: xsane-0.999-7-autoconf.patch.bz2 Patch100: xsane-0.999-7-autoconf.patch.bz2
Patch101: xsane-configure-c99.patch
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
URL: http://www.xsane.org/ URL: http://www.xsane.org/
@ -142,6 +145,7 @@ done
%patch15 -p1 -b .signal-handling %patch15 -p1 -b .signal-handling
%patch100 -p1 -b .autoconf %patch100 -p1 -b .autoconf
%patch101 -p1 -b .c99
# in-root config.h breaks off-root building # in-root config.h breaks off-root building
rm include/config.h rm include/config.h
@ -265,6 +269,9 @@ fi
%{_datadir}/sane/xsane %{_datadir}/sane/xsane
%changelog %changelog
* Tue Jan 17 2023 Florian Weimer <fweimer@redhat.com> - 0.999-44
- Port configure script to C99
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-43 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild