From a21a07fb81fcb51d3f9f452e59eace5a3b895d10 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 4 May 2025 20:45:45 +0800 Subject: [PATCH] marker: fix incompatible pointer type --- ...atible_pointer_in_marker_window_init.patch | 25 +++++++++++++++++++ pkgs/by-name/ma/marker/package.nix | 5 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/by-name/ma/marker/fix_incompatible_pointer_in_marker_window_init.patch diff --git a/pkgs/by-name/ma/marker/fix_incompatible_pointer_in_marker_window_init.patch b/pkgs/by-name/ma/marker/fix_incompatible_pointer_in_marker_window_init.patch new file mode 100644 index 000000000000..0421e8ff4ef6 --- /dev/null +++ b/pkgs/by-name/ma/marker/fix_incompatible_pointer_in_marker_window_init.patch @@ -0,0 +1,25 @@ +From 92a679e02f08eef8e2f8c91371b7a3a1f95b4bbc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tomi=20L=C3=A4hteenm=C3=A4ki?= +Date: Fri, 25 Apr 2025 22:04:10 +0300 +Subject: [PATCH] Fix incompatible pointer in marker_window_init() + +The `g_action_group_activate_action()` takes `GActionGroup` as first parameter. + +This fixes compilation with `-Wincompatible-pointer-types`. +--- + src/marker-window.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/marker-window.c b/src/marker-window.c +index 0ffd0ce3..98b2fdc5 100644 +--- a/src/marker-window.c ++++ b/src/marker-window.c +@@ -866,7 +866,7 @@ marker_window_init (MarkerWindow *window) + if (marker_prefs_get_show_sidebar()) + { + // show sidebar and set the "Sidebar" button as activated +- g_action_group_activate_action(G_ACTION_MAP (window), "sidebar", NULL); ++ g_action_group_activate_action(G_ACTION_GROUP (window), "sidebar", NULL); + } + g_signal_connect(window, "delete-event", G_CALLBACK(window_deleted_event_cb), window); + diff --git a/pkgs/by-name/ma/marker/package.nix b/pkgs/by-name/ma/marker/package.nix index 2a5165da2b3b..990f016b9311 100644 --- a/pkgs/by-name/ma/marker/package.nix +++ b/pkgs/by-name/ma/marker/package.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0="; }; + patches = [ + # https://github.com/fabiocolacio/Marker/pull/427 + ./fix_incompatible_pointer_in_marker_window_init.patch + ]; + nativeBuildInputs = [ itstool meson