From 19515cb04465a037861847ae7ca66be0bbb71e149fe8454eafd03820c3814bcd Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 6 Apr 2023 13:19:56 +0000 Subject: [PATCH] - Update to release 0.5 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libei?expand=0&rev=15 --- libei-0.4.1.tar.gz | 3 --- libei-0.5.tar.gz | 3 +++ libei.changes | 14 +++++++++++++ libei.spec | 8 +++++--- system-munit.diff | 20 +++++++++---------- ver.diff | 50 ++++++++++++++++++++++++---------------------- 6 files changed, 58 insertions(+), 40 deletions(-) delete mode 100644 libei-0.4.1.tar.gz create mode 100644 libei-0.5.tar.gz diff --git a/libei-0.4.1.tar.gz b/libei-0.4.1.tar.gz deleted file mode 100644 index e7c5447..0000000 --- a/libei-0.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e7193ce46a46426c402f915538007726983deaac76ba478b89a531501959300 -size 162709 diff --git a/libei-0.5.tar.gz b/libei-0.5.tar.gz new file mode 100644 index 0000000..5dd2c70 --- /dev/null +++ b/libei-0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5d1989ad6ad48be8a1c606d87a8b769b1f475e5c8a5ec533ce735a3f99151e4 +size 209544 diff --git a/libei.changes b/libei.changes index c9d1502..82b7eff 100644 --- a/libei.changes +++ b/libei.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Apr 6 13:12:49 UTC 2023 - Jan Engelhardt + +- Update to release 0.5 + * The previously protobuf-based ad-hoc protocol has changed to + custom format defined in the protocol.xml file. This protocol + is heavily influenced by the Wayland protocol but not binary + compatible. The protocol is not yet stable. + * ei_get_version() has been removed, with the protocol having + per-interface versions this is no longer useful. + * ei_device_start_emulating() now takes a sequence number. + * Support for properties has been removed. + * libreis has been removed. + ------------------------------------------------------------------- Tue Dec 13 10:10:37 UTC 2022 - Jan Engelhardt diff --git a/libei.spec b/libei.spec index 19d04a0..75e6112 100644 --- a/libei.spec +++ b/libei.spec @@ -1,7 +1,7 @@ # # spec file for package libei # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ Name: libei -%define lname libei-suse3 -Version: 0.4.1 +%define lname libei-suse4 +Version: 0.5 Release: 0 Summary: Library for emulated input in Wayland License: MIT @@ -31,6 +31,8 @@ Patch2: ver.diff BuildRequires: meson >= 0.57 BuildRequires: ninja BuildRequires: protobuf-c +BuildRequires: python3-attrs +BuildRequires: python3-jinja2 BuildRequires: pkgconfig(libevdev) BuildRequires: pkgconfig(libprotobuf-c) BuildRequires: pkgconfig(libsystemd) diff --git a/system-munit.diff b/system-munit.diff index 7923295..488397d 100644 --- a/system-munit.diff +++ b/system-munit.diff @@ -4,19 +4,19 @@ Date: 2020-08-13 11:01:08.470708019 +0200 Do not fail the build if munit available (only) via /usr. --- - meson.build | 2 -- + test/meson.build | 2 -- 1 file changed, 2 deletions(-) -Index: libei-0.3/meson.build +Index: libei-0.5/test/meson.build =================================================================== ---- libei-0.3.orig/meson.build -+++ libei-0.3/meson.build -@@ -236,8 +236,6 @@ endif +--- libei-0.5.orig/test/meson.build ++++ libei-0.5/test/meson.build +@@ -2,8 +2,6 @@ if not get_option('tests') + subdir_done() + endif - # tests - if get_option('tests') -- subproject('munit', default_options: 'werror=false') +-subproject('munit', default_options: 'werror=false') - - munit = dependency('munit', fallback: ['munit', 'munit_dep']) + munit = dependency('munit', fallback: ['munit', 'munit_dep']) - lib_unittest = static_library('unittest', + lib_unittest = static_library('unittest', diff --git a/ver.diff b/ver.diff index 214b065..07944bf 100644 --- a/ver.diff +++ b/ver.diff @@ -4,38 +4,40 @@ Date: 2020-08-13 11:07:06.143460258 +0200 unversioned libraries suck. --- - meson.build | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) + src/meson.build | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) -Index: libei-0.2/meson.build +Index: libei-0.5/src/meson.build =================================================================== ---- libei-0.2.orig/meson.build -+++ libei-0.2/meson.build -@@ -110,7 +110,8 @@ lib_libei = shared_library('ei', - src_libei, +--- libei-0.5.orig/src/meson.build ++++ libei-0.5/src/meson.build +@@ -62,7 +62,8 @@ lib_libei = library('ei', dependencies: deps_libei, + include_directories: [inc_builddir], gnu_symbol_visibility: 'hidden', - install: true + install: true, -+ soversion: 'suse3' ++ soversion: 'suse4' ) - install_headers('src/libei.h') - -@@ -149,7 +150,8 @@ lib_libeis = shared_library('eis', - src_libeis, - dependencies: [dep_libutil, dep_protobuf], + libei_headers = files('libei.h') + install_headers(libei_headers) +@@ -114,7 +115,8 @@ lib_libeis = library('eis', + dependencies: [dep_libutil], + include_directories: [inc_builddir], gnu_symbol_visibility: 'hidden', - install: true + install: true, -+ soversion: 'suse3' ++ soversion: 'suse4' ) - install_headers('src/libeis.h') - -@@ -172,6 +174,7 @@ lib_libreis = shared_library('reis', - gnu_symbol_visibility: 'hidden', - install: true, - include_directories: 'src', -+ soversion: 'suse3' - ) - install_headers('src/libreis.h') - + libeis_headers = files('libeis.h') + install_headers(libeis_headers) +@@ -141,7 +143,8 @@ if build_oeffis + include_directories: [inc_builddir], + dependencies: deps_liboeffis, + gnu_symbol_visibility: 'hidden', +- install: true ++ install: true, ++ soversion: 'suse4' + ) + liboeffis_headers = files('liboeffis.h') + install_headers(liboeffis_headers)