Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (12624b89ccdcb8ce40bd9618fe5be3faae45ab56)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (12624b89ccdcb8ce40bd9618fe5be3faae45ab56)
  • Date: Thu, 23 Feb 2023 17:53:07 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

x11-toolkits/gtk+3/HISTORY | 4
x11-toolkits/gtk+3/patches/0003-wayland-Look-for-cursor-themes.patch | 73
++++++++++
2 files changed, 77 insertions(+)

New commits:
commit 12624b89ccdcb8ce40bd9618fe5be3faae45ab56
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

x11-toolkits/gtk+3: added patch to fix cursor changes in Wayland

diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index aed4818..c969e99 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,7 @@
+2023-02-23 Pavel Vinogradov <public AT sourcemage.org>
+ * patches/0003-wayland-Look-for-cursor-themes.patch: added patch to
fix
+ cursor changes in Wayland
+
2023-02-21 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: libepoxy and libxkbcommon are common for X11 and Wayland
builds

diff --git
a/x11-toolkits/gtk+3/patches/0003-wayland-Look-for-cursor-themes.patch
b/x11-toolkits/gtk+3/patches/0003-wayland-Look-for-cursor-themes.patch
new file mode 100644
index 0000000..edbfb72
--- /dev/null
+++ b/x11-toolkits/gtk+3/patches/0003-wayland-Look-for-cursor-themes.patch
@@ -0,0 +1,73 @@
+From 3f1536632f682c355d0c3abe1afc80cf975c2cce Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen AT redhat.com>
+Date: Tue, 29 Jun 2021 16:57:15 -0400
+Subject: [PATCH] wayland: Look for cursor themes in $HOME
+
+We should look in the same places that libXcursor does,
+so add $XDG_DATA_HOME/icons and $HOME/.icons to the list.
+
+Fixes: #4080
+---
+ gdk/wayland/gdkdisplay-wayland.c | 36 +++++++++++++++++++++++++-------
+ 1 file changed, 29 insertions(+), 7 deletions(-)
+
+diff --git a/gdk/wayland/gdkdisplay-wayland.c
b/gdk/wayland/gdkdisplay-wayland.c
+index f60f75a9a1..ddf2bf312c 100644
+--- a/gdk/wayland/gdkdisplay-wayland.c
++++ b/gdk/wayland/gdkdisplay-wayland.c
+@@ -1112,6 +1112,26 @@ gdk_wayland_display_init (GdkWaylandDisplay *display)
+ display->monitors = g_ptr_array_new_with_free_func (g_object_unref);
+ }
+
++static struct wl_cursor_theme *
++try_load_theme (GdkWaylandDisplay *display_wayland,
++ const char *dir,
++ gboolean dotdir,
++ const char *name,
++ int size)
++{
++ struct wl_cursor_theme *theme = NULL;
++ char *path;
++
++ path = g_build_filename (dir, dotdir ? ".icons" : "icons", name,
"cursors", NULL);
++
++ if (g_file_test (path, G_FILE_TEST_IS_DIR))
++ theme = wl_cursor_theme_create (path, size, display_wayland->shm);
++
++ g_free (path);
++
++ return theme;
++}
++
+ static struct wl_cursor_theme *
+ get_cursor_theme (GdkWaylandDisplay *display_wayland,
+ const char *name,
+@@ -1121,16 +1141,18 @@ get_cursor_theme (GdkWaylandDisplay *display_wayland,
+ struct wl_cursor_theme *theme = NULL;
+ int i;
+
++ theme = try_load_theme (display_wayland, g_get_user_data_dir (), FALSE,
name, size);
++ if (theme)
++ return theme;
++
++ theme = try_load_theme (display_wayland, g_get_home_dir (), TRUE, name,
size);
++ if (theme)
++ return theme;
++
+ xdg_data_dirs = g_get_system_data_dirs ();
+ for (i = 0; xdg_data_dirs[i]; i++)
+ {
+- char *path = g_build_filename (xdg_data_dirs[i], "icons", name,
"cursors", NULL);
+-
+- if (g_file_test (path, G_FILE_TEST_IS_DIR))
+- theme = wl_cursor_theme_create (path, size, display_wayland->shm);
+-
+- g_free (path);
+-
++ theme = try_load_theme (display_wayland, xdg_data_dirs[i], FALSE,
name, size);
+ if (theme)
+ return theme;
+ }
+--
+GitLab
+



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (12624b89ccdcb8ce40bd9618fe5be3faae45ab56), Pavel Vinogradov, 02/23/2023

Archive powered by MHonArc 2.6.24.

Top of Page