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
+
+

remove_unnecessary_unicode_character.patch

@@ -0,0 +1,33 @@
+From 8cf5af772cba2c94ff7cee4f052de650ff2cd14b Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 26 Jul 2024 09:25:35 +0200
+Subject: [PATCH] backend/kodakio.c: Remove unnecessary Unicode character
+
+There is an bidirectional Unicode character <202d> in the comment.
+The character looks like a typo, because it does not look fitting
+there, so IMHO it can be removed.
+
+Checking tools like rpminspect are wary of Unicode characters in the
+code after CVE regarding bidirectional Unicode characters from several
+years ago, and character <202d> is for left-to-right override in
+Unicode, so tools report them as an issue.
+---
+ backend/kodakaio.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/backend/kodakaio.c b/backend/kodakaio.c
+index 0241e2a84..da3e234f4 100644
+--- a/backend/kodakaio.c
++++ b/backend/kodakaio.c
+@@ -1827,7 +1827,7 @@ k_init_parametersta(KodakAio_Scanner * s)
+ 	    SANE_UNFIX(s->val[OPT_BR_X].w), SANE_UNFIX(s->val[OPT_BR_Y].w));
+ 
+ 	/*
+-	 * The default color depth is stored in mode_params.depth:‭
++	 * The default color depth is stored in mode_params.depth:
+ 	 */
+ 	if (mode_params[s->val[OPT_MODE].w].depth == 1)
+ 		s->params.depth = 1;
+-- 
+GitLab
+

sane-backends-1.3.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bd3114d0ed8eca9f054e2c6727ab95afa6da0e8e602cc648955e1a788bc2070
-size 6089608

sane-backends-1.3.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc8796701015def1c598f97962a70d63957b9786841391cc412a606568b42b96
+size 6089639

sane-backends.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+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>
+
+- Cherry-pick upstream patch to remove unnecessary Unicode character
+  * remove_unnecessary_unicode_character.patch
+- Use individual %patch statements over %autosetup to allow
+  for different levels of path stripping for both patches
+
+-------------------------------------------------------------------
+Thu May 23 15:17:34 UTC 2024 - Arnav Singh <opensuse@arnavion.dev>
+
+- Updated to sane-backends version 1.3.1
+  * Re-release of 1.3.0 because upstream unreleased 1.3.0 due to VCS issues.
+    ( https://gitlab.com/sane-project/backends/-/issues/751 )
+
 -------------------------------------------------------------------
 Fri May  3 00:47:40 UTC 2024 - Arnav Singh <opensuse@arnavion.dev>
 

sane-backends.spec

@@ -53,7 +53,7 @@ BuildRequires:  pkgconfig(systemd)
 Summary:        SANE (Scanner Access Now Easy) Scanner Drivers
 License:        GPL-2.0-or-later AND SUSE-GPL-2.0+-with-sane-exception AND SUSE-Public-Domain
 Group:          Hardware/Scanner
-Version:        1.3.0
+Version:        1.3.1
 Release:        0
 URL:            http://www.sane-project.org/
 # On https://gitlab.com/sane-project/backends/-/releases , the "Source code (tar.gz)" link
@@ -85,6 +85,10 @@ Source201:      create_sane-backends-autoconfig.rules
 # Sources 202 and 203 are files to enable socket based service activation which replaced xinetd
 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).
@@ -189,7 +193,10 @@ Saned allows access to locally attached scanners over the network.
 # 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
-%autosetup -p0 -n backends-%{version}
+%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
 # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped.