git: ce0eeafe569b - main - x11/libei: update upstream patches

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Thu, 18 May 2023 04:38:15 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ce0eeafe569b9e87e5fcf039ee10a82083dd2f5e

commit ce0eeafe569b9e87e5fcf039ee10a82083dd2f5e
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-05-18 04:35:17 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-05-18 04:36:32 +0000

    x11/libei: update upstream patches
---
 x11/libei/Makefile |  7 ++++---
 x11/libei/distinfo | 12 ++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/x11/libei/Makefile b/x11/libei/Makefile
index d64101a5d81d..f188e2689b91 100644
--- a/x11/libei/Makefile
+++ b/x11/libei/Makefile
@@ -5,10 +5,12 @@ CATEGORIES=	x11
 PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
 PATCHFILES+=	e01ce3480e9a.patch:-p1 # https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/202
 PATCHFILES+=	dd817c8ddec6.patch:-p1 # https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/202
-PATCHFILES+=	a6e5bae3e0bd.patch:-p1 # https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/202
-PATCHFILES+=	58371a9f1143.patch:-p1 # https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/202
+PATCHFILES+=	2a2c4cdd49f4.patch:-p1 # https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/202
+PATCHFILES+=	98252a806e3b.patch:-p1 # https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/202
 PATCHFILES+=	143bfd52603f.patch:-p1 # https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/202
 PATCHFILES+=	57a9059d644c.patch:-p1 # https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/202
+PATCHFILES+=	7015fa6ad0ac.patch:-p1 # https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/203
+PATCHFILES+=	3b8ce3dca19e.patch:-p1 # https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/203
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Library for Emulated Input
@@ -36,7 +38,6 @@ GL_ACCOUNT=	libinput
 GL_COMMIT=	df268d618a199ca5c71f47b1e17cd6cd3d87fc0e
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 MESON_ARGS=	-Dsd-bus-provider=basu -Dtests=disabled
-CFLAGS+=	-Wno-typedef-redefinition # https://gitlab.freedesktop.org/libinput/libei/-/issues/31
 
 OPTIONS_DEFINE=	BASU
 OPTIONS_DEFAULT=BASU
diff --git a/x11/libei/distinfo b/x11/libei/distinfo
index c10bb8d02b61..87784a80aa67 100644
--- a/x11/libei/distinfo
+++ b/x11/libei/distinfo
@@ -7,11 +7,15 @@ SHA256 (e01ce3480e9a.patch) = eacb590aae92625ada9c1812b9e7eb025261564592bc09ab31
 SIZE (e01ce3480e9a.patch) = 1819
 SHA256 (dd817c8ddec6.patch) = 7918d80113b38ae14774be12db1b638ecd06c23ba2573b7494184a33ca593eaa
 SIZE (dd817c8ddec6.patch) = 2552
-SHA256 (a6e5bae3e0bd.patch) = f7774147e8cf83edcc6814a3b778621efd92e0bc293a1dad39ae4e306f9a1037
-SIZE (a6e5bae3e0bd.patch) = 1444
-SHA256 (58371a9f1143.patch) = 0994bf913360f246d857b82534dbb0da2868bc6ed6fec5286c0388e913020614
-SIZE (58371a9f1143.patch) = 3959
+SHA256 (2a2c4cdd49f4.patch) = 971e635b0c0592043bdb8cbce2c462a300656ef90468cc77ec18d69ae85f577f
+SIZE (2a2c4cdd49f4.patch) = 1749
+SHA256 (98252a806e3b.patch) = ca24dc9e6624bdc3dbff313c129c1adde028ab23f567b6d10c2fa36f266e5d50
+SIZE (98252a806e3b.patch) = 3284
 SHA256 (143bfd52603f.patch) = 7ef7cf41fc2204ee86fe2248145b66e03f8ee806cbcfd9863f9e393b7f9460fe
 SIZE (143bfd52603f.patch) = 1020
 SHA256 (57a9059d644c.patch) = e81a2dbdc3e21cd1a46474b183d343952bb008597a80b54608e684768b2446cf
 SIZE (57a9059d644c.patch) = 1893
+SHA256 (7015fa6ad0ac.patch) = 965da07a27b7b00bd2786d5cb3dfa53e6ae31f2e55c28310dc671c074fd98096
+SIZE (7015fa6ad0ac.patch) = 1852
+SHA256 (3b8ce3dca19e.patch) = 2c39ecd955ea589cf881101ac392f20719e15eb66cb26eafc706e8bb9e37c59b
+SIZE (3b8ce3dca19e.patch) = 1177