Skip to content

Commit 5fe6820

Browse files
marker: fix incompatible pointer type (#404111)
2 parents 041121c + a21a07f commit 5fe6820

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 92a679e02f08eef8e2f8c91371b7a3a1f95b4bbc Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Tomi=20L=C3=A4hteenm=C3=A4ki?= <[email protected]>
3+
Date: Fri, 25 Apr 2025 22:04:10 +0300
4+
Subject: [PATCH] Fix incompatible pointer in marker_window_init()
5+
6+
The `g_action_group_activate_action()` takes `GActionGroup` as first parameter.
7+
8+
This fixes compilation with `-Wincompatible-pointer-types`.
9+
---
10+
src/marker-window.c | 2 +-
11+
1 file changed, 1 insertion(+), 1 deletion(-)
12+
13+
diff --git a/src/marker-window.c b/src/marker-window.c
14+
index 0ffd0ce3..98b2fdc5 100644
15+
--- a/src/marker-window.c
16+
+++ b/src/marker-window.c
17+
@@ -866,7 +866,7 @@ marker_window_init (MarkerWindow *window)
18+
if (marker_prefs_get_show_sidebar())
19+
{
20+
// show sidebar and set the "Sidebar" button as activated
21+
- g_action_group_activate_action(G_ACTION_MAP (window), "sidebar", NULL);
22+
+ g_action_group_activate_action(G_ACTION_GROUP (window), "sidebar", NULL);
23+
}
24+
g_signal_connect(window, "delete-event", G_CALLBACK(window_deleted_event_cb), window);
25+

pkgs/by-name/ma/marker/package.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
2626
hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0=";
2727
};
2828

29+
patches = [
30+
# https://github.com/fabiocolacio/Marker/pull/427
31+
./fix_incompatible_pointer_in_marker_window_init.patch
32+
];
33+
2934
nativeBuildInputs = [
3035
itstool
3136
meson

0 commit comments

Comments
 (0)