diff --git a/libbraille-0.19.0-visibility.patch b/libbraille-0.19.0-visibility.patch index e129749..f9b7f8f 100644 --- a/libbraille-0.19.0-visibility.patch +++ b/libbraille-0.19.0-visibility.patch @@ -1,7 +1,6 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig 2006-03-04 01:31:27.000000000 +0100 -+++ configure.ac 2009-10-07 01:53:26.000000000 +0200 +diff -urp libbraille-0.19.0.orig/configure.ac libbraille-0.19.0/configure.ac +--- libbraille-0.19.0.orig/configure.ac 2006-03-03 18:31:27.000000000 -0600 ++++ libbraille-0.19.0/configure.ac 2024-04-21 12:08:43.799885754 -0500 @@ -208,6 +208,44 @@ AC_SUBST(JAVA_INC) AC_SUBST(JAVA_INC_NATIVE) AM_CONDITIONAL(JAVAWRAPPER, test x$enable_java = xyes) @@ -47,10 +46,9 @@ Index: configure.ac # Finally create all the generated files # The configure script takes "file.in" and substitutes variables to produce # "file". In this case we are just generating the Makefiles, but this could -Index: include/braille.h -=================================================================== ---- include/braille.h.orig 2006-03-04 01:31:25.000000000 +0100 -+++ include/braille.h 2009-10-07 02:08:27.000000000 +0200 +diff -urp libbraille-0.19.0.orig/include/braille.h libbraille-0.19.0/include/braille.h +--- libbraille-0.19.0.orig/include/braille.h 2006-03-03 18:31:25.000000000 -0600 ++++ libbraille-0.19.0/include/braille.h 2024-04-21 12:08:43.799885754 -0500 @@ -25,13 +25,7 @@ extern "C" { // that uses this DLL. This way any other project whose source files include this file see // LIBBRAILLE_API functions as being imported from a DLL, wheras this DLL sees symbols diff --git a/libbraille-fix-prototype.patch b/libbraille-fix-prototype.patch new file mode 100644 index 0000000..559eb9a --- /dev/null +++ b/libbraille-fix-prototype.patch @@ -0,0 +1,14 @@ +diff -urp libbraille-0.19.0.orig/backend/baum/brl.c libbraille-0.19.0/backend/baum/brl.c +--- libbraille-0.19.0.orig/backend/baum/brl.c 2006-03-03 18:31:25.000000000 -0600 ++++ libbraille-0.19.0/backend/baum/brl.c 2024-04-21 12:02:18.174577670 -0500 +@@ -29,8 +29,8 @@ + static char (*drvinit_func) (brli_term *term, const char *pathname); + static char (*drvclose_func) (brli_term *term); + static int (*write_func) (brli_term *term, char *bytes, int size); +-static int (*read_byte_func) (brli_term *term, char *byte, int timeout); +-static int (*read_bytes_func) (brli_term *term, char *bytes, int size, int timeout); ++static int (*read_byte_func) (brli_term *term, unsigned char *byte, int timeout); ++static int (*read_bytes_func) (brli_term *term, unsigned char *bytes, int size, int timeout); + + #define ESCAPE 0x1B + #define TSP_DATA_SIZE 5 diff --git a/libbraille.changes b/libbraille.changes index 7b6d7da..935f930 100644 --- a/libbraille.changes +++ b/libbraille.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Apr 21 17:09:03 UTC 2024 - Michael Gorse + +- Rebuild libbraille-0.19.0-visibility.patch to apply with -p1, + and adjust autosetup. +- Add libbraille-fix-prototype.patch: fix build with gcc 14. + +------------------------------------------------------------------- +Thu Feb 29 15:35:25 UTC 2024 - pgajdos@suse.com + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN + ------------------------------------------------------------------- Tue Oct 19 13:12:57 UTC 2021 - pgajdos@suse.com diff --git a/libbraille.spec b/libbraille.spec index 46a6881..8fe68ea 100644 --- a/libbraille.spec +++ b/libbraille.spec @@ -1,7 +1,7 @@ # # spec file for package libbraille # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,8 @@ URL: https://sourceforge.net/projects/libbraille/files/libbraille/ Source: http://downloads.sourceforge.net/project/libbraille/libbraille/libbraille-%{version}/libbraille-%{version}.tar.gz # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch0: libbraille-0.19.0-visibility.patch +# PATCH-FIX-UPSTREAM libbraille-fix-prototype.patch +Patch1: libbraille-fix-prototype.patch BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: libusb-devel @@ -92,8 +94,7 @@ write text on the display, directly draw dots, or get the value of keys pressed on the Braille keyboard. %prep -%setup -q -%patch0 +%autosetup -p1 %build autoreconf -fi