From 6cedaadd305f3433ac472da35a0aa654be0748506458d42336258b8e2edb4477 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 2 Nov 2024 15:11:34 +0000 Subject: [PATCH 1/3] [info=c4af1772f79e6283d70df22fed5a35c4a874b399e81925511a9e80c2271d269d] OBS-URL: https://build.opensuse.org/package/show/editors/libt3key?expand=0&rev=12 --- .gitattributes | 23 ++++++++ .gitignore | 1 + _scmsync.obsinfo | 4 ++ build.specials.obscpio | 3 + libt3key-0.2.10.tar.bz2 | 3 + libt3key-0.2.10.tar.bz2.sig | Bin 0 -> 135 bytes libt3key.changes | 34 +++++++++++ libt3key.keyring | 38 ++++++++++++ libt3key.spec | 114 ++++++++++++++++++++++++++++++++++++ 9 files changed, 220 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _scmsync.obsinfo create mode 100644 build.specials.obscpio create mode 100644 libt3key-0.2.10.tar.bz2 create mode 100644 libt3key-0.2.10.tar.bz2.sig create mode 100644 libt3key.changes create mode 100644 libt3key.keyring create mode 100644 libt3key.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..daf8f14 --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1576927930 +commit: c4af1772f79e6283d70df22fed5a35c4a874b399e81925511a9e80c2271d269d +url: https://src.opensuse.org/jengelh/libt3key +revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..e20ebb3 --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1526cd7369e3d36e828f87f52f1d3cfabafa920e9620150defbbbae1cd570254 +size 256 diff --git a/libt3key-0.2.10.tar.bz2 b/libt3key-0.2.10.tar.bz2 new file mode 100644 index 0000000..079f4d0 --- /dev/null +++ b/libt3key-0.2.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3f63c8a5bdf4efc10a293e5124a4a1095af6149af96b0a10b3ce7da7400f8c1 +size 87863 diff --git a/libt3key-0.2.10.tar.bz2.sig b/libt3key-0.2.10.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..3b2fd9eb20a2c38473797e6a478078613f684225af7749647b04e6a5eb70c139 GIT binary patch literal 135 zcmeBZWnmEHV9*s)WHE?1rqHa`u*9K$?y4xI?_1(6?*+0l#Xib>!Y`9vknWJ4k(iU6 zTCA6s!@$KU08_!A!0?B&v77Vtx{fpJ5AsEH&6E26JF)9iUfji|;NA(Jo7X5MGyGH9 l_M`6~&(yV(8nUKTIIIvU2)L!>m%DlIn#AjuqMb4p0s#7CI`{wp literal 0 HcmV?d00001 diff --git a/libt3key.changes b/libt3key.changes new file mode 100644 index 0000000..0ab4feb --- /dev/null +++ b/libt3key.changes @@ -0,0 +1,34 @@ +------------------------------------------------------------------- +Thu Dec 19 23:50:58 UTC 2019 - Jan Engelhardt + +- Update to release 0.2.10 + * This release shuffles a few keys around in the xterm keymap, + to make it work on more terminals that claim to be xterm, and + adds a link for rxvt-unicode-256color. + +------------------------------------------------------------------- +Mon Jan 7 13:23:35 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 0.2.9 + * Updated the rxvt definition to include keys from mrxvt. + * Updated the Linux key database with keys for Application + Keypad Mode. + * Added fallbacks from terminfo for many keys with modifiers, + using the ncurses extended names. + +------------------------------------------------------------------- +Thu Feb 19 18:10:13 UTC 2015 - p.drouand@gmail.com + +- Update to version 0.2.6 + * Re-release of version 0.2.5 to update the configure script. + +------------------------------------------------------------------- +Fri Feb 7 22:07:19 UTC 2014 - dimstar@opensuse.org + +- Declare CC=gcc to ensure we build with gcc; seems make falls back + to 'c99' otherwise (instead of requiring posix_cc). + +------------------------------------------------------------------- +Mon Jun 10 12:46:54 UTC 2013 - jengelh@inai.de + +- Initial package (version 0.2.5) for build.opensuse.org diff --git a/libt3key.keyring b/libt3key.keyring new file mode 100644 index 0000000..757b4fa --- /dev/null +++ b/libt3key.keyring @@ -0,0 +1,38 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +gxlPsZP8Ibkb/kclOvRwNzo= +=yATM +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libt3key.spec b/libt3key.spec new file mode 100644 index 0000000..5cf6755 --- /dev/null +++ b/libt3key.spec @@ -0,0 +1,114 @@ +# +# spec file for package libt3key +# +# Copyright (c) 2019 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: libt3key +%define lname libt3key1 +Version: 0.2.10 +Release: 0 +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 +BuildRequires: fdupes +BuildRequires: gettext-tools +BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: pkg-config +BuildRequires: pkgconfig(libt3config) >= 0.2.5 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) + +%description +libt3key is library that provides a database of mappings from escape +sequences as generated by different consoles and terminals or +emulators, to key symbols. + +%package -n %lname +Summary: The Tilde Toolkit's terminal key sequence database library +Group: System/Libraries + +%description -n %lname +libt3key is library that provides a database of mappings from escape +sequences as generated by different consoles and terminals or +emulators, to key symbols. + +%package devel +Summary: Development files for libt3key, a terminal key sequence db library +Group: Development/Libraries/C and C++ +Requires: %lname = %version + +%description devel +libt3key is library that provides a database of mappings from escape +sequences as generated by different consoles and terminals or +emulators, to key symbols. + +This subpackage contains libraries and header files for developing +applications that want to make use of libt3key. + +%package utils +Summary: Utilities for working with libt3key terminal descriptions +Group: System/Base + +%description utils +libt3key is library that provides a database of mappings from escape +sequences as generated by different consoles and terminals or +emulators, to key symbols. + +This subpackage contains the t3learnkeys and t3keyc programs. + +%prep +%setup -q + +%build +export CC=gcc +%configure --docdir="%_docdir/%name" +make %{?_smp_mflags} + +%install +%make_install +rm -f "%buildroot/%_libdir"/*.la +%fdupes %buildroot/%_prefix + +%post -p /sbin/ldconfig -n %lname +%postun -p /sbin/ldconfig -n %lname + +%files -n %lname +%defattr(-,root,root) +%_libdir/libt3key.so.1* +%doc COPYING +%_datadir/%lname/ + +%files devel +%defattr(-,root,root) +%_includedir/t3/ +%_libdir/libt3key.so +%_libdir/pkgconfig/libt3key.pc +%_docdir/%name/ +%exclude %_docdir/%name/COPYING + +%files utils +%defattr(-,root,root) +%_bindir/t3* +%_mandir/man1/t3*.1* + +%changelog From eb2731d138c2b9985ea14f652a762cce296779347a3f984a6abd4255ca0a2379 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 2 Nov 2024 15:17:42 +0000 Subject: [PATCH 2/3] [info=16bc2e6b489fa724c2da934da70b44182f0dc70a87965a14c1a33684e665f666] OBS-URL: https://build.opensuse.org/package/show/editors/libt3key?expand=0&rev=13 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- libt3key.changes | 6 ++++++ libt3key.spec | 27 +++++++++++++++++---------- ncurses.patch | 22 ++++++++++++++++++++++ 5 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 ncurses.patch diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index daf8f14..e5e5cdd 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1576927930 -commit: c4af1772f79e6283d70df22fed5a35c4a874b399e81925511a9e80c2271d269d +mtime: 1730560648 +commit: 16bc2e6b489fa724c2da934da70b44182f0dc70a87965a14c1a33684e665f666 url: https://src.opensuse.org/jengelh/libt3key revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index e20ebb3..8b9503c 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1526cd7369e3d36e828f87f52f1d3cfabafa920e9620150defbbbae1cd570254 +oid sha256:c15f7ed8a5a51bf47b6ddbf120c00bf1d5067546d4f36c0ee5bb7550d24ad09f size 256 diff --git a/libt3key.changes b/libt3key.changes index 0ab4feb..8ad2472 100644 --- a/libt3key.changes +++ b/libt3key.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 2 15:11:49 UTC 2024 - Jan Engelhardt + +- Add ncurses.patch to fix FTBFS with gcc-14 +- Split non-library files from libt3key to restore SLPP conformance + ------------------------------------------------------------------- Thu Dec 19 23:50:58 UTC 2019 - Jan Engelhardt diff --git a/libt3key.spec b/libt3key.spec index 5cf6755..203247d 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 @@ -46,6 +46,7 @@ emulators, to key symbols. %package -n %lname Summary: The Tilde Toolkit's terminal key sequence database library Group: System/Libraries +Requires: %name-data %description -n %lname libt3key is library that provides a database of mappings from escape @@ -65,6 +66,13 @@ emulators, to key symbols. This subpackage contains libraries and header files for developing applications that want to make use of libt3key. +%package data +Summary: Terminal capability descriptions for libt3key +Group: System/Base + +%description data +Terminal capability descriptions for libt3key. + %package utils Summary: Utilities for working with libt3key terminal descriptions Group: System/Base @@ -77,29 +85,29 @@ 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 +%license COPYING + +%files data %_datadir/%lname/ %files devel -%defattr(-,root,root) %_includedir/t3/ %_libdir/libt3key.so %_libdir/pkgconfig/libt3key.pc @@ -107,7 +115,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; From 8cc59987133a2ed0f48d32d87cf5caf3da3fcd95329ce2ff4453c5660deaf31a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 2 Nov 2024 22:18:01 +0000 Subject: [PATCH 3/3] [info=9a22a59be248dc14a6b28b64cba0c1fb19c02bf18385677fe4648230b3196792] OBS-URL: https://build.opensuse.org/package/show/editors/libt3key?expand=0&rev=14 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- libt3key.changes | 1 - libt3key.spec | 12 +----------- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index e5e5cdd..8ed1351 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1730560648 -commit: 16bc2e6b489fa724c2da934da70b44182f0dc70a87965a14c1a33684e665f666 +mtime: 1730585843 +commit: 9a22a59be248dc14a6b28b64cba0c1fb19c02bf18385677fe4648230b3196792 url: https://src.opensuse.org/jengelh/libt3key revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 8b9503c..0753bf1 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c15f7ed8a5a51bf47b6ddbf120c00bf1d5067546d4f36c0ee5bb7550d24ad09f +oid sha256:19c4a04125f5cb154dd9b3791d87a21b76be17efaf7cda5a1122f9ccd2f111e3 size 256 diff --git a/libt3key.changes b/libt3key.changes index 8ad2472..6b73001 100644 --- a/libt3key.changes +++ b/libt3key.changes @@ -2,7 +2,6 @@ Sat Nov 2 15:11:49 UTC 2024 - Jan Engelhardt - Add ncurses.patch to fix FTBFS with gcc-14 -- Split non-library files from libt3key to restore SLPP conformance ------------------------------------------------------------------- Thu Dec 19 23:50:58 UTC 2019 - Jan Engelhardt diff --git a/libt3key.spec b/libt3key.spec index 203247d..89a77c3 100644 --- a/libt3key.spec +++ b/libt3key.spec @@ -46,7 +46,6 @@ emulators, to key symbols. %package -n %lname Summary: The Tilde Toolkit's terminal key sequence database library Group: System/Libraries -Requires: %name-data %description -n %lname libt3key is library that provides a database of mappings from escape @@ -66,13 +65,6 @@ emulators, to key symbols. This subpackage contains libraries and header files for developing applications that want to make use of libt3key. -%package data -Summary: Terminal capability descriptions for libt3key -Group: System/Base - -%description data -Terminal capability descriptions for libt3key. - %package utils Summary: Utilities for working with libt3key terminal descriptions Group: System/Base @@ -102,10 +94,8 @@ chmod a+x "%buildroot/%_libdir"/*.so* %files -n %lname %_libdir/libt3key.so.1* -%license COPYING - -%files data %_datadir/%lname/ +%license COPYING %files devel %_includedir/t3/