sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3c02f113ee95c89836329ee96c3510591307c88d)

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 (3c02f113ee95c89836329ee96c3510591307c88d)
Date: Tue, 14 Mar 2023 22:40:49 +0000

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

x11-toolkits/gtk+3/DEPENDS |
10 -
x11-toolkits/gtk+3/DETAILS |
8 -
x11-toolkits/gtk+3/HISTORY |
7
x11-toolkits/gtk+3/patches/0002-Dist-gdk-wayland-cursor-meson.build.patch |
43 -----
x11-toolkits/gtk+3/patches/0003-wayland-Look-for-cursor-themes.patch |
73 ----------
5 files changed, 16 insertions(+), 125 deletions(-)

New commits:
commit 3c02f113ee95c89836329ee96c3510591307c88d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

x11-toolkits/gtk+3: version 3.24.37

diff --git a/x11-toolkits/gtk+3/DEPENDS b/x11-toolkits/gtk+3/DEPENDS
index 8b883cb..ab10b01 100755
--- a/x11-toolkits/gtk+3/DEPENDS
+++ b/x11-toolkits/gtk+3/DEPENDS
@@ -71,6 +71,11 @@ if is_depends_enabled "${SPELL}" "libx11"; then
"" \
"for X11 workarounds for various limitations" &&

+ optional_depends libxinerama \
+ "xinerama=yes" \
+ "xinerama=no" \
+ "for X11 Xinerama extension support" &&
+
optional_depends libxrandr \
"" \
"" \
@@ -79,11 +84,6 @@ fi &&

depends -sub "PDF PS SVG GOBJ ${XLIB_SUB}" cairo &&

-optional_depends libxinerama \
- "xinerama=yes" \
- "xinerama=no" \
- "for X11 Xinerama extension support" &&
-
optional_depends wayland \
"wayland_backend=true" \
"wayland_backend=false" \
diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
index 404bb9d..aa7027d 100755
--- a/x11-toolkits/gtk+3/DETAILS
+++ b/x11-toolkits/gtk+3/DETAILS
@@ -1,11 +1,11 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=gtk+3
if [[ $GTK_VER == devel ]];then
- VERSION=3.24.35
-
SOURCE_HASH=sha512:3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade
+ VERSION=3.24.37
+
SOURCE_HASH="sha256:6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57:UPSTREAM_HASH"
else
- VERSION=3.24.35
-
SOURCE_HASH=sha512:3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade
+ VERSION=3.24.37
+
SOURCE_HASH="sha256:6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57:UPSTREAM_HASH"
fi
SOURCE=gtk+-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gtk+-$VERSION"
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index c969e99..b2c53c5 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,10 @@
+2023-03-14 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 3.24.27, switched to sha256 UPSTREAM_HASH
+ * DEPENDS: libxinerama option is available in Xlib functionality only
+ * 0002-Dist-gdk-wayland-cursor-meson.build}.patch,
+ patches/0003-wayland-Look-for-cursor-themes.patch: dropped, applied
in
+ upstream
+
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
diff --git
a/x11-toolkits/gtk+3/patches/0002-Dist-gdk-wayland-cursor-meson.build.patch
b/x11-toolkits/gtk+3/patches/0002-Dist-gdk-wayland-cursor-meson.build.patch
deleted file mode 100644
index f1c2f1d..0000000
---
a/x11-toolkits/gtk+3/patches/0002-Dist-gdk-wayland-cursor-meson.build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen AT redhat.com>
-Date: Wed, 23 Nov 2022 06:24:40 -0500
-Subject: [PATCH] Dist gdk/wayland/cursor/meson.build
-
-This file was missing from the 3.24.35 tarball.
-Oops.
----
- gdk/wayland/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
-index 0ad465f6aa..1b06c650b4 100644
---- a/gdk/wayland/Makefile.am
-+++ b/gdk/wayland/Makefile.am
-@@ -128,7 +128,8 @@ xdg-activation-v1-client-protocol.h :
$(WAYLAND_PROTOCOLS_DATADIR)/staging/xdg-a
- EXTRA_DIST += \
- protocol/gtk-primary-selection.xml \
- protocol/gtk-shell.xml \
-- protocol/server-decoration.xml \
-+ protocol/server-decoration.xml \
-+ cursor/meson.build \
- meson.build
-
- -include $(top_srcdir)/git.mk
-diff --git a/gdk/wayland/cursor/meson.build b/gdk/wayland/cursor/meson.build
-new file mode 100644
-index 0000000..02d5f2b
---- /dev/null
-+++ b/gdk/wayland/cursor/meson.build
-@@ -0,0 +1,12 @@
-+wayland_cursor_sources = files([
-+ 'wayland-cursor.c',
-+ 'xcursor.c',
-+ 'os-compatibility.c'
-+])
-+
-+libwayland_cursor = static_library('wayland+cursor',
-+ sources: wayland_cursor_sources,
-+ include_directories: [ confinc, ],
-+ dependencies: [ glib_dep, wlclientdep, ],
-+ c_args: common_cflags,
-+)
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
deleted file mode 100644
index edbfb72..0000000
--- a/x11-toolkits/gtk+3/patches/0003-wayland-Look-for-cursor-themes.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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 (3c02f113ee95c89836329ee96c3510591307c88d), Pavel Vinogradov, 03/14/2023