Accepting request 1296285 from hardware

OBS-URL: https://build.opensuse.org/request/show/1296285
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sbl?expand=0&rev=49

sbl-gcc15.patch

@@ -0,0 +1,79 @@
+--- a/brld/brld.c	2013-03-17 15:02:27.000000000 +0100
++++ b/brld/brld.c	2025-04-16 21:41:43.613731105 +0200
+@@ -321,7 +321,7 @@
+   brltbl = texttbl;
+ 
+ /* start braille-thread */
+-  result = pthread_create (&thread_id, NULL, thread_brl, NULL);
++  result = pthread_create (&thread_id, NULL, (void * (*)(void *))thread_brl, NULL);
+   if (result != 0)
+    {
+      fprintf (stderr, "error: could not create braille thread\n");
+--- a/brld/libbrld.c	2013-03-17 15:02:27.000000000 +0100
++++ b/brld/libbrld.c	2025-04-16 21:39:00.857911681 +0200
+@@ -35,7 +35,7 @@
+ 
+ int brld_open (char *host, int port)
+ {
+-  struct hostent *hp, *gethostbyname ();
++  struct hostent *hp;
+ 
+   struct sockaddr_in sad;       /* inet socket */
+ 
+--- a/sbl/Fhp/brlconf.h	2013-03-17 15:02:27.000000000 +0100
++++ b/sbl/Fhp/brlconf.h	2025-04-16 22:37:42.779155578 +0200
+@@ -14,7 +14,7 @@
+  * GNU General Public License, as published by the Free Software
+  * Foundation.  Please see the file COPYING for details.
+ */
+-#ifndef _BRLCONf_H
++#ifndef _BRLCONF_H
+ #define _BRLCONF_H
+ #include "../brl.h"
+ struct brlinfo fhpdevs[] = {
+--- a/sbl/speech/softspeech_server.c	2013-03-17 15:02:27.000000000 +0100
++++ b/sbl/speech/softspeech_server.c	2025-04-16 22:23:58.804848272 +0200
+@@ -1938,7 +1938,7 @@
+    {
+      subprocess_t *p = &proc[pnum];
+ 
+-     fprintf (db_fp, "p = 0x%08x\n", (unsigned) p);
++     fprintf (db_fp, "p = 0x%08x\n", (uintptr_t) p);
+      if (p->argv != NULL)
+        fprintf (db_fp, "proc %d (%s)\n", pnum, p->argv[0]);
+      fprintf (db_fp, "to_active   = %d\n", p->to_active);
+@@ -2170,7 +2170,7 @@
+   if (*mlp != m)
+    {
+      fprintf (db_fp, "Call of free for non allocated block"
+-              ", ptr = 0x%08x (%s, %d)!\n", (unsigned) ptr, f, l);
++              ", ptr = 0x%08x (%s, %d)!\n", (uintptr_t) ptr, f, l);
+      return;
+    }
+   total_alloc -= m->size;
+@@ -2193,12 +2193,12 @@
+   if (*mlp != m)
+    {
+      fprintf (db_fp, "block not allocated, ptr = 0x%08x (%s, %d)!\n",
+-              (unsigned) ptr, f, l);
++              (uintptr_t) ptr, f, l);
+    }
+   else
+    {
+      fprintf (db_fp, "block ok, ptr = 0x%08x (%s, %d)!\n",
+-              (unsigned) ptr, f, l);
++              (uintptr_t) ptr, f, l);
+    }
+ }
+ 
+--- a/sbl/kbdsniff.c	2013-03-17 15:02:27.000000000 +0100
++++ b/sbl/kbdsniff.c	2025-04-16 21:37:54.280531161 +0200
+@@ -22,7 +22,7 @@
+ 
+ int kbd_open (int port)
+ {
+-  struct hostent *hp, *gethostbyname ();
++  struct hostent *hp;
+ 
+   struct sockaddr_in sock_addr;
+ 

sbl.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jul 28 08:02:05 UTC 2025 - Andreas Schwab <schwab@suse.de>
+
+- use-termios.patch: Use <termios.h> instead of obsolete <termio.h>
+
+-------------------------------------------------------------------
+Wed Apr 16 12:52:49 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
+
+- Add sbl-gcc15.patch to fix gcc-15 compile time errors
+
 -------------------------------------------------------------------
 Sun Apr 21 16:41:04 UTC 2024 - Michael Gorse <mgorse@suse.com>
 

sbl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sbl
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,9 @@ Patch6:         sbl-sppkdev.patch
 Patch7:         sbl-orca-python3.patch
 # PAtCH-FIX-UPSTREAM sbl-gcc14.patch
 Patch8:         sbl-gcc14.patch
+# fixes to make gcc-15 happy
+Patch9:         sbl-gcc15.patch
+Patch10:        use-termios.patch
 BuildRequires:  bluez-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libusb-devel
@@ -69,10 +72,12 @@ this python module enables orca to use brld for braille output
 %patch -P 6 -p1
 %patch -P 7 -p1
 %patch -P 8 -p1
+%patch -P 9 -p1
+%patch -P 10 -p1
 
 %build
-make %{?_smp_mflags} CFLAGS="%{optflags} -fcommon -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE" \
-	LIB_CFLAGS="%{optflags} -fcommon -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -fPIC $(pkg-config speech-dispatcher --cflags)"
+make %{?_smp_mflags} CFLAGS="%{optflags} -fcommon -D_POSIX_C_SOURCE=2 -D_DEFAULT_SOURCE" \
+	LIB_CFLAGS="%{optflags} -fcommon -D_POSIX_C_SOURCE=2 -D_DEFAULT_SOURCE -fPIC $(pkg-config speech-dispatcher --cflags)"
 
 %install
 %make_install LIBINSTPATH=%{_libdir}

use-termios.patch

@@ -0,0 +1,13 @@
+Index: sbl-3.5.0.20130317.git7a75bc29/sbl/spk.c
+===================================================================
+--- sbl-3.5.0.20130317.git7a75bc29.orig/sbl/spk.c
++++ sbl-3.5.0.20130317.git7a75bc29/sbl/spk.c
+@@ -1,7 +1,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <termio.h>
++#include <termios.h>
+ 
+ #include "mbrola.h"
+ #include "festival.h"