From 9f7720affb4ac0273347f7bf7aef734f5746ea81 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 6 Aug 2018 09:49:24 +1000 Subject: [PATCH] libxkbcommon 0.8.2 --- .gitignore | 1 + ...bcomp-fix-pointer-value-for-FreeStmt.patch | 26 ------------------- libxkbcommon.spec | 9 ++++--- sources | 2 +- 4 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 0001-xkbcomp-fix-pointer-value-for-FreeStmt.patch diff --git a/.gitignore b/.gitignore index fdc4059..0a94216 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libxkbcommon-0.7.1.tar.xz /libxkbcommon-0.8.0.tar.xz +/libxkbcommon-0.8.2.tar.xz diff --git a/0001-xkbcomp-fix-pointer-value-for-FreeStmt.patch b/0001-xkbcomp-fix-pointer-value-for-FreeStmt.patch deleted file mode 100644 index 0b5a7fe..0000000 --- a/0001-xkbcomp-fix-pointer-value-for-FreeStmt.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 259a8c12c288ac5bcc37c4b39f509f555f490870 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 30 Jul 2018 14:11:46 +1000 -Subject: [PATCH] xkbcomp: fix pointer value for FreeStmt - -Signed-off-by: Peter Hutterer ---- - src/xkbcomp/ast-build.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xkbcomp/ast-build.c b/src/xkbcomp/ast-build.c -index 58f97f9..e75fe47 100644 ---- a/src/xkbcomp/ast-build.c -+++ b/src/xkbcomp/ast-build.c -@@ -233,7 +233,7 @@ ExprAppendMultiKeysymList(ExprDef *expr, ExprDef *append) - darray_append(expr->keysym_list.symsNumEntries, numEntries); - darray_concat(expr->keysym_list.syms, append->keysym_list.syms); - -- FreeStmt((ParseCommon *) &append); -+ FreeStmt((ParseCommon *) append); - - return expr; - } --- -2.17.1 - diff --git a/libxkbcommon.spec b/libxkbcommon.spec index 3e025c1..48ab1eb 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -1,8 +1,8 @@ #global gitdate 20120917 Name: libxkbcommon -Version: 0.8.0 -Release: 6%{?gitdate:.%{gitdate}}%{?dist} +Version: 0.8.2 +Release: 1%{?gitdate:.%{gitdate}}%{?dist} Summary: X.Org X11 XKB parsing library License: MIT URL: http://www.x.org @@ -14,8 +14,6 @@ Source0: http://xkbcommon.org/download/%{name}-%{version}.tar.xz %endif Source1: make-git-snapshot.sh -Patch01: 0001-xkbcomp-fix-pointer-value-for-FreeStmt.patch - BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros byacc flex bison BuildRequires: xorg-x11-proto-devel libX11-devel @@ -98,6 +96,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %{_libdir}/pkgconfig/xkbcommon-x11.pc %changelog +* Mon Aug 06 2018 Peter Hutterer 0.8.2-1 +- libxkbcommon 0.8.2 + * Tue Jul 31 2018 Florian Weimer - 0.8.0-6 - Rebuild with fixed binutils diff --git a/sources b/sources index f45e6cf..e0fd505 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libxkbcommon-0.8.0.tar.xz) = ad64baa03685b72e1047f9fdfc95661acf5bace59280a95d3defaca73c91fb77c31ecde00b430726e3521ff90cf8dd93ecbc816c18be0971cb616e00b81cf163 +SHA512 (libxkbcommon-0.8.2.tar.xz) = b714240ec6120bbe44b5da7a4f89b1c2f24cfd6e5ebbe81e5290d135c8f2e5a68f89ac256b73430a446167345f8db309b35dcf74f3d3840e20897cd91eccc172