From 20cb838143913a0de8f255d91b0401192dd87d6c74dd5e74cc633263cc51e1a1 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 5 Feb 2024 11:59:10 +0000
Subject: [PATCH] - update to 1.1.3   * configure: Use LT_INIT from libtool 2
 instead of deprecated AC_PROG_LIBTOOL   * Set close-on-exec when opening
 files   * _XkbMakeAtom: remove check for impossible case   * _XkbInitAtoms:
 check for malloc() failure   * XkbChangeAtomDisplay: stop leaking atom name  
 * XkbCFReportError: avoid -Wformat-nonliteral warning   * XkbWriteCFile: stop
 leaking header file ifdef name   * DefaultParser: avoid
 -Wimplicit-fallthrough warnings   * xkbtext.c: Add tbGetBufferString helper
 function   * XkbIndentText: Fix -Wsign-compare warning   * Fix -Wsign-compare
 warnings in xkbtext.c & xkmread.c   * Add a meson build system -  switched to
 meson build system

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libxkbfile?expand=0&rev=24
---
 libxkbfile-1.1.2.tar.xz |  3 ---
 libxkbfile-1.1.3.tar.xz |  3 +++
 libxkbfile.changes      | 18 ++++++++++++++++++
 libxkbfile.spec         | 15 ++++++---------
 4 files changed, 27 insertions(+), 12 deletions(-)
 delete mode 100644 libxkbfile-1.1.2.tar.xz
 create mode 100644 libxkbfile-1.1.3.tar.xz

diff --git a/libxkbfile-1.1.2.tar.xz b/libxkbfile-1.1.2.tar.xz
deleted file mode 100644
index 3f2ad3f..0000000
--- a/libxkbfile-1.1.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b8a3784fac420b201718047cfb6c2d5ee7e8b9481564c2667b4215f6616644b1
-size 311428
diff --git a/libxkbfile-1.1.3.tar.xz b/libxkbfile-1.1.3.tar.xz
new file mode 100644
index 0000000..85b448a
--- /dev/null
+++ b/libxkbfile-1.1.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9b63eea997abb9ee6a8b4fbb515831c841f471af845a09de443b28003874bec
+size 314520
diff --git a/libxkbfile.changes b/libxkbfile.changes
index 4eb294b..2fee3d7 100644
--- a/libxkbfile.changes
+++ b/libxkbfile.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon Feb  5 11:51:49 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- update to 1.1.3
+  * configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL
+  * Set close-on-exec when opening files
+  * _XkbMakeAtom: remove check for impossible case
+  * _XkbInitAtoms: check for malloc() failure
+  * XkbChangeAtomDisplay: stop leaking atom name
+  * XkbCFReportError: avoid -Wformat-nonliteral warning
+  * XkbWriteCFile: stop leaking header file ifdef name
+  * DefaultParser: avoid -Wimplicit-fallthrough warnings
+  * xkbtext.c: Add tbGetBufferString helper function
+  * XkbIndentText: Fix -Wsign-compare warning
+  * Fix -Wsign-compare warnings in xkbtext.c & xkmread.c
+  * Add a meson build system
+-  switched to meson build system
+
 -------------------------------------------------------------------
 Thu Dec  8 20:55:13 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/libxkbfile.spec b/libxkbfile.spec
index 3a81eeb..9c7514b 100644
--- a/libxkbfile.spec
+++ b/libxkbfile.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libxkbfile
 #
-# Copyright (c) 2022 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
@@ -18,7 +18,7 @@
 
 %define lname	libxkbfile1
 Name:           libxkbfile
-Version:        1.1.2
+Version:        1.1.3
 Release:        0
 Summary:        X11 keyboard file manipulation library
 License:        MIT
@@ -28,9 +28,7 @@ URL:            https://xorg.freedesktop.org/
 #Git-Web:	http://cgit.freedesktop.org/xorg/lib/libxkbfile/
 Source:         http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
-BuildRequires:  autoconf >= 2.60
-BuildRequires:  automake
-BuildRequires:  libtool
+BuildRequires:  meson
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(kbproto)
 BuildRequires:  pkgconfig(x11)
@@ -71,12 +69,11 @@ in %{lname}.
 %setup -q
 
 %build
-%configure --disable-static
-%make_build
+%meson
+%meson_build
 
 %install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
+%meson_install
 
 %post -n %{lname} -p /sbin/ldconfig
 %postun -n %{lname} -p /sbin/ldconfig