Accepting request 1272483 from graphics

OBS-URL: https://build.opensuse.org/request/show/1272483
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=98

c23-keywords.patch

@@ -0,0 +1,40 @@
+
+gitlab.com/sane-project/backends/-/merge_requests/862
+gitlab.com/sane-project/backends/-/commit/f5736eb
+
+
+From 90815a9f2576c2428287a500cab6caeddb80f9a8 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Wed, 5 Feb 2025 13:19:11 +0100
+Subject: [PATCH] sm3600.h: Fix build with standard C23
+
+bool, true and false are keywords in the standard C23 - the sm3600
+backend defines them on its own, which is forbidden with the new
+standard.
+
+The patch adds ifdef guards for the affected typedef - the old code
+will be used for older standards, C23 will define TBool as bool.
+---
+ backend/sm3600.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/backend/sm3600.h b/backend/sm3600.h
+index 2ecbeb236..5d8a8d809 100644
+--- a/backend/sm3600.h
++++ b/backend/sm3600.h
+@@ -77,7 +77,11 @@ Start: 2.4.2001
+ 
+ /* ====================================================================== */
+ 
++#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 202311L
+ typedef enum { false, true } TBool;
++#else
++typedef bool TBool;
++#endif /* GCC < 15 */
+ 
+ typedef SANE_Status TState;
+ 
+-- 
+GitLab
+
+

sane-backends.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 22 19:54:19 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
+
+- add c23-keywords.patch from upstream to fix gcc15 compile error
+
 -------------------------------------------------------------------
 Tue Aug  6 13:46:39 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 

sane-backends.spec

@@ -87,6 +87,8 @@ Source202:      saned@.service
 Source203:      saned.socket
 # PATCH-FIX-UPSTREAM - gl/sane-project/backends#848 - backend/kodakio.c: Remove unnecessary Unicode character
 Patch0:         remove_unnecessary_unicode_character.patch
+# PATCH-FIX-UPSTREAM - gl/sane-project/backends#862
+Patch1:         c23-keywords.patch
 # Patch100... is SUSE specific stuff:
 # Patch102 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner
 # (see https://bugzilla.opensuse.org/show_bug.cgi?id=788756#c14).
@@ -193,6 +195,7 @@ Saned allows access to locally attached scanners over the network.
 # see https://bugzilla.opensuse.org/show_bug.cgi?id=788756#c14
 %setup -n backends-%{version}
 %patch -P0 -p1
+%patch -P1 -p1
 %patch -P102 -p0
 
 # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc