From 9a22a59be248dc14a6b28b64cba0c1fb19c02bf18385677fe4648230b3196792 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 2 Nov 2024 16:17:28 +0100 Subject: [PATCH] Add ncurses.patch --- libt3key.changes | 5 +++++ libt3key.spec | 17 +++++++---------- ncurses.patch | 22 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 ncurses.patch diff --git a/libt3key.changes b/libt3key.changes index 0ab4feb..6b73001 100644 --- a/libt3key.changes +++ b/libt3key.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 2 15:11:49 UTC 2024 - Jan Engelhardt + +- Add ncurses.patch to fix FTBFS with gcc-14 + ------------------------------------------------------------------- Thu Dec 19 23:50:58 UTC 2019 - Jan Engelhardt diff --git a/libt3key.spec b/libt3key.spec index 5cf6755..89a77c3 100644 --- a/libt3key.spec +++ b/libt3key.spec @@ -1,7 +1,7 @@ # # spec file for package libt3key # -# Copyright (c) 2019 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 @@ -24,11 +24,11 @@ Summary: The Tilde Toolkit's terminal key sequence database library License: GPL-3.0-only Group: Development/Libraries/C and C++ URL: https://os.ghalkes.nl/t3/libt3key.html - #Git-Clone: https://github.com/gphalkes/t3key Source: https://os.ghalkes.nl/dist/%name-%version.tar.bz2 Source2: https://os.ghalkes.nl/dist/%name-%version.tar.bz2.sig Source3: %name.keyring +Patch1: ncurses.patch BuildRequires: fdupes BuildRequires: gettext-tools BuildRequires: libtool @@ -77,29 +77,27 @@ emulators, to key symbols. This subpackage contains the t3learnkeys and t3keyc programs. %prep -%setup -q +%autosetup -p1 %build export CC=gcc %configure --docdir="%_docdir/%name" -make %{?_smp_mflags} +%make_build %install %make_install rm -f "%buildroot/%_libdir"/*.la +chmod a+x "%buildroot/%_libdir"/*.so* %fdupes %buildroot/%_prefix -%post -p /sbin/ldconfig -n %lname -%postun -p /sbin/ldconfig -n %lname +%ldconfig_scriptlets -n %lname %files -n %lname -%defattr(-,root,root) %_libdir/libt3key.so.1* -%doc COPYING %_datadir/%lname/ +%license COPYING %files devel -%defattr(-,root,root) %_includedir/t3/ %_libdir/libt3key.so %_libdir/pkgconfig/libt3key.pc @@ -107,7 +105,6 @@ rm -f "%buildroot/%_libdir"/*.la %exclude %_docdir/%name/COPYING %files utils -%defattr(-,root,root) %_bindir/t3* %_mandir/man1/t3*.1* diff --git a/ncurses.patch b/ncurses.patch new file mode 100644 index 0000000..f673c25 --- /dev/null +++ b/ncurses.patch @@ -0,0 +1,22 @@ +From: Jan Engelhardt +Date: 2024-11-02 16:06:53.256545988 +0100 +References: https://github.com/gphalkes/t3key/pull/2 + +.config.c:8:13: error: implicit declaration of function ‘setupterm’; did you mean ‘set_term’? [-Wimplicit-function-declaration] + +--- + config.pkg | 1 + + 1 file changed, 1 insertion(+) + +Index: libt3key-0.2.10/config.pkg +=================================================================== +--- libt3key-0.2.10.orig/config.pkg ++++ libt3key-0.2.10/config.pkg +@@ -144,6 +144,7 @@ EOF + #include + #include + #include ++#include + + int main(int argc, char *argv[]) { + int args[9], error, fd;