[packages/sane-frontends] - build system fixes - disabled gimp plugin - rel 2
baggins
baggins at pld-linux.org
Fri Jan 31 09:43:33 CET 2025
commit 3eee234fc843ba52f993ebd182667f5e9fb2f3b7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Jan 31 09:30:12 2025 +0100
- build system fixes
- disabled gimp plugin
- rel 2
sane-frontends-c99.patch | 58 +++++++++++++++++++++++++
sane-frontends-configure-c99.patch | 86 ++++++++++++++++++++++++++++++++++++++
sane-frontends.spec | 14 ++++---
3 files changed, 153 insertions(+), 5 deletions(-)
---
diff --git a/sane-frontends.spec b/sane-frontends.spec
index 16d4354..56ac8e7 100644
--- a/sane-frontends.spec
+++ b/sane-frontends.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_without gimp # don't build GIMP plugin
+%bcond_with gimp # don't build GIMP plugin
%bcond_with gtk1 # use GTK+ 1.2.x for GUI (for eg. for GIMP 1.2)
#
Summary: SANE - easy local and networked scanner access
@@ -10,23 +10,25 @@ Summary(pl.UTF-8): SANE - prosta obsługa skanerów lokalnych i sieciowych
Summary(pt_BR.UTF-8): Front-ends para o SANE
Name: sane-frontends
Version: 1.0.14
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Applications/Graphics
#Source0Download: https://gitlab.com/sane-project/frontends/tags
Source0: https://gitlab.com/sane-project/frontends/uploads/14e5c5a9205b10bd3df04501852eab28/%{name}-%{version}.tar.gz
# Source0-md5: c63bf7b0bb5f530cf3c08715db721cd3
Patch0: sane-backends-1_20.patch
+Patch1: %{name}-c99.patch
+Patch2: %{name}-configure-c99.patch
URL: http://sane-project.org/
BuildRequires: autoconf
BuildRequires: automake
%if %{with gtk1}
-BuildRequires: gtk+-devel >= 1.2.0
%{?with_gimp:BuildRequires: gimp-devel < 1.3.0}
%{?with_gimp:BuildRequires: gimp-devel >= 1:1.2.0}
+BuildRequires: gtk+-devel >= 1.2.0
%else
-BuildRequires: gtk+2-devel >= 1:2.0.0
%{?with_gimp:BuildRequires: gimp-devel >= 1:1.3.23}
+BuildRequires: gtk+2-devel >= 1:2.0.0
%endif
BuildRequires: sane-backends-devel >= 1.0.14
Requires: sane-backends >= 1.0.14
@@ -66,7 +68,9 @@ verifique o manpage do saned(1).
%prep
%setup -q
-%patch0 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
%build
cp -f /usr/share/automake/config.sub .
diff --git a/sane-frontends-c99.patch b/sane-frontends-c99.patch
new file mode 100644
index 0000000..c1c799b
--- /dev/null
+++ b/sane-frontends-c99.patch
@@ -0,0 +1,58 @@
+Avoid implicit declaration of isfdtype, for C99 compatibility.
+
+Partially fixed upstream via:
+
+commit 7ebdf2cd6232aa22c78fd9b59951a3e9ee43a715
+Author: Ralph Little <skelband at gmail.com>
+Date: Tue Apr 6 09:27:09 2021 -0700
+
+ scanadf: fixes for various compilation warnings
+
+Rest submitted upstream:
+
+ <https://gitlab.com/sane-project/frontends/-/merge_requests/9>
+
+diff --git a/configure b/configure
+index 663bf8b..804634b 100755
+--- a/configure
++++ b/configure
+@@ -4507,7 +4507,7 @@ fi
+
+
+
+-for ac_header in os2.h fcntl.h unistd.h libc.h sys/time.h sys/types.h
++for ac_header in os2.h fcntl.h unistd.h libc.h sys/time.h sys/types.h sys/socket.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+diff --git a/configure.in b/configure.in
+index ef43528..06dd75d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -75,7 +75,8 @@ esac
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(os2.h fcntl.h unistd.h libc.h sys/time.h sys/types.h)
++AC_CHECK_HEADERS(os2.h fcntl.h unistd.h libc.h sys/time.h sys/types.h
++ sys/socket.h)
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+diff --git a/include/sane/config.h.in b/include/sane/config.h.in
+index baf35be..b8d901d 100644
+--- a/include/sane/config.h.in
++++ b/include/sane/config.h.in
+@@ -108,6 +108,9 @@
+ /* Define to 1 if you have the `strtod' function. */
+ #undef HAVE_STRTOD
+
++/* Define to 1 if you have the <sys/socket.h> header file. */
++#undef HAVE_SYS_SOCKET_H
++
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #undef HAVE_SYS_STAT_H
+
+--
+2.39.0
+
diff --git a/sane-frontends-configure-c99.patch b/sane-frontends-configure-c99.patch
new file mode 100644
index 0000000..15f299d
--- /dev/null
+++ b/sane-frontends-configure-c99.patch
@@ -0,0 +1,86 @@
+Avoid implicit function declarations, for improved compatibility with
+future compilers.
+
+Submitted upstream:
+
+ <https://gitlab.com/sane-project/frontends/-/merge_requests/9>
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 9c7f451..922e5d1 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -484,6 +484,7 @@ dnl
+ AC_TRY_RUN([
+ #include <sane/sane.h>
+ #include <stdio.h>
++#include <stdlib.h>
+
+ int
+ main ()
+diff --git a/aclocal.m4 b/aclocal.m4
+index b83ffbb..88829e4 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -494,6 +494,7 @@ dnl
+ AC_TRY_RUN([
+ #include <sane/sane.h>
+ #include <stdio.h>
++#include <stdlib.h>
+
+ int
+ main ()
+diff --git a/configure b/configure
+index de16eb2..663bf8b 100755
+--- a/configure
++++ b/configure
+@@ -2210,7 +2210,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ for ac_declaration in \
+- '' \
++ '#include <stdlib.h>' \
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
+ 'extern "C" void std::exit (int); using std::exit;' \
+ 'extern "C" void exit (int) throw ();' \
+@@ -2732,8 +2732,8 @@ main ()
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
++ return 2;
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -3734,7 +3734,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ for ac_declaration in \
+- '' \
++ '#include <stdlib.h>' \
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
+ 'extern "C" void std::exit (int); using std::exit;' \
+ 'extern "C" void exit (int) throw ();' \
+@@ -4463,8 +4463,8 @@ main ()
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
++ return 2;
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -6818,6 +6818,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+
+ #include <sane/sane.h>
+ #include <stdio.h>
++#include <stdlib.h>
+
+ int
+ main ()
+--
+2.39.0
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sane-frontends.git/commitdiff/3eee234fc843ba52f993ebd182667f5e9fb2f3b7
More information about the pld-cvs-commit
mailing list