commit c1ddb69
hovercats
·
2024-11-08 06:49:55 +0000 UTC
parent 82b9cd4
wayland: 1.23.0
5 files changed,
+18,
-16
+1,
-1
1@@ -11,4 +11,4 @@
2 #undef HAVE_SYS_UCRED_H
3 #define HAVE_XUCRED_CR_PID 0
4 #define PACKAGE "wayland"
5-#define PACKAGE_VERSION "1.21.0"
6+#define PACKAGE_VERSION "1.23.0"
1@@ -1,15 +1,15 @@
2-From 0861bb71b7a595fcf484db70fdc440b16ac8f970 Mon Sep 17 00:00:00 2001
3+From 25e4247c73e392be9bda7fec4eb8666c5acb8dcf Mon Sep 17 00:00:00 2001
4 From: Michael Forney <mforney@mforney.org>
5 Date: Fri, 30 Dec 2016 02:16:59 -0800
6 Subject: [PATCH] cursor: Add hand2 and question_arrow
7
8 ---
9 cursor/convert_font.c | 4 +-
10- cursor/cursor-data.h | 124 ++++++++++++++++++++++++++++++++++++++++----------
11+ cursor/cursor-data.h | 124 +++++++++++++++++++++++++++++++++---------
12 2 files changed, 102 insertions(+), 26 deletions(-)
13
14 diff --git a/cursor/convert_font.c b/cursor/convert_font.c
15-index 45b6ac6..de1b0f4 100644
16+index 74e45fb..9116ef8 100644
17 --- a/cursor/convert_font.c
18 +++ b/cursor/convert_font.c
19 @@ -488,7 +488,9 @@ static struct {
20@@ -24,7 +24,7 @@ index 45b6ac6..de1b0f4 100644
21
22 static void
23 diff --git a/cursor/cursor-data.h b/cursor/cursor-data.h
24-index dd7a80a..8ff4acc 100644
25+index 2ee2f8a..fcdcf7e 100644
26 --- a/cursor/cursor-data.h
27 +++ b/cursor/cursor-data.h
28 @@ -486,49 +486,121 @@ static uint32_t cursor_data[] = {
29@@ -173,7 +173,7 @@ index dd7a80a..8ff4acc 100644
30 0x00000000, 0x00000000,
31 };
32
33-@@ -550,5 +622,7 @@ static struct cursor_metadata {
34+@@ -550,7 +622,9 @@ static struct cursor_metadata {
35 { "top_side", 15, 16, 7, 1, 2160 },
36 { "xterm", 9, 16, 4, 8, 2400 },
37 { "hand1", 13, 16, 12, 0, 2544 },
38@@ -181,7 +181,9 @@ index dd7a80a..8ff4acc 100644
39 + { "hand2", 16, 16, 0, 1, 2752 },
40 + { "watch", 16, 16, 15, 9, 3008 },
41 + { "question_arrow", 11, 16, 5, 8, 3264 },
42- };
43+
44+ /* https://www.freedesktop.org/wiki/Specifications/cursor-spec/ */
45+ { "sw-resize", 16, 16, 1, 14, 0 },
46 --
47-2.11.0
48+2.45.1
49
1@@ -1,4 +1,4 @@
2-From 73a48baabf1e154c6d6bc79270106305773ef95f Mon Sep 17 00:00:00 2001
3+From 66a4e2de5aa7f157778a314bf7e73e99b23a9a1e Mon Sep 17 00:00:00 2001
4 From: Michael Forney <mforney@mforney.org>
5 Date: Wed, 16 Dec 2020 00:56:19 -0800
6 Subject: [PATCH] wayland-util.h: remove unused math.h include
7@@ -10,19 +10,19 @@ This header is unused since f5df38959b (2012).
8 2 files changed, 2 deletions(-)
9
10 diff --git a/src/connection.c b/src/connection.c
11-index d0c7d9f..62e6dbd 100644
12+index 8870fd2..537fb92 100644
13 --- a/src/connection.c
14 +++ b/src/connection.c
15-@@ -26,7 +26,6 @@
16-
17+@@ -27,7 +27,6 @@
18 #define _GNU_SOURCE
19
20+ #include <assert.h>
21 -#include <math.h>
22 #include <stdlib.h>
23 #include <stdint.h>
24 #include <string.h>
25 diff --git a/src/wayland-util.h b/src/wayland-util.h
26-index 7997778..5731cf8 100644
27+index 929a34f..27cecbc 100644
28 --- a/src/wayland-util.h
29 +++ b/src/wayland-util.h
30 @@ -31,7 +31,6 @@
31@@ -34,5 +34,5 @@ index 7997778..5731cf8 100644
32 #include <inttypes.h>
33 #include <stdarg.h>
34 --
35-2.32.0
36+2.45.1
37
+1,
-1
1@@ -1 +1 @@
2-Subproject commit 8135e856ebd79872f886466e9cee39affb7d9ee8
3+Subproject commit a156431ea66fe67d69c9fbba8a8ad34dabbab81c
+1,
-1
1@@ -1 +1 @@
2-1.21.0 r0
3+1.23.0 r0