Merge pull request #18126 from Rmys/master

sane-frontends rebuild

hardware/scanner/sane-frontends/actions.py

@@ -6,13 +6,19 @@
 
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
+
+WorkDir="sane-frontends-%s" % get.srcVERSION()
+
 def setup():
+    pisitools.cflags.add("-std=gnu11")
+    shelltools.system("sed -i 's/isfdtype(fileno(stderr), S_IFSOCK)/0/' sanei/sanei_init_debug.c")
     autotools.configure("--with-gnu-ld")
 
 def build():
-    autotools.make()
+    shelltools.system("make")
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())

hardware/scanner/sane-frontends/files/sane-frontends-1.0.14-c99.patch

@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/933615#c7
+Signed-off-by: Stephane Bakhos <nuitari@nuitari.net>
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -61,6 +61,7 @@
+       AC_TRY_RUN([
+ #include <gtk/gtk.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ int 
+ main ()
+@@ -484,6 +485,7 @@
+       AC_TRY_RUN([
+ #include <sane/sane.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ int 
+ main ()
+--- a/aclocal.m4 2024-09-17 00:41:08.100761458 -0400
++++ b/aclocal.m4 2024-09-17 00:56:44.718894896 -0400
+@@ -494,6 +494,7 @@
+       AC_TRY_RUN([
+ #include <sane/sane.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ int 
+ main ()
+--- a/configure      2024-09-17 01:07:22.612760156 -0400
++++ b/configure   2024-09-17 01:07:39.628889934 -0400
+@@ -6818,6 +6818,7 @@
+ 
+ #include <sane/sane.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ int
+ main ()
+--- a/configure.in      2024-09-17 01:18:19.480771874 -0400
++++ b/configure.in        2024-09-17 01:15:08.469314114 -0400
+@@ -75,7 +75,7 @@
+ 
+ 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

hardware/scanner/sane-frontends/pspec.xml

@@ -12,13 +12,14 @@
         <IsA>app:console</IsA>
         <Summary>Graphical frontend to SANE</Summary>
         <Description>sane-frontends includes the scanadf and xcam programs.</Description>
-        <Archive sha1sum="063e11df3e32d7a43161fd37026a4dc601d5482d" type="targz">ftp://ftp.uwsg.indiana.edu/linux/gentoo/distfiles/sane-frontends-1.0.14.tar.gz</Archive>
+        <Archive sha1sum="063e11df3e32d7a43161fd37026a4dc601d5482d" type="targz">https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/sane-frontends/1.0.14-16/sane-frontends_1.0.14.orig.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>sane-backends-devel</Dependency>
             <Dependency>gimp-devel</Dependency>
             <Dependency>gtk2-devel</Dependency>
         </BuildDependencies>
         <Patches>
+            <Patch level="1">sane-frontends-1.0.14-c99.patch</Patch>
             <Patch level="1">sane-frontends-1.0.14-array-out-of-bounds.patch</Patch>
             <Patch level="1">sane-frontends-1.0.14-sane-backends-1.0.20.patch</Patch>
         </Patches>