mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
marker: fix incompatible pointer type
This commit is contained in:
parent
c00afdff9d
commit
a21a07fb81
2 changed files with 30 additions and 0 deletions
|
@ -0,0 +1,25 @@
|
||||||
|
From 92a679e02f08eef8e2f8c91371b7a3a1f95b4bbc Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Tomi=20L=C3=A4hteenm=C3=A4ki?= <lihis@lihis.net>
|
||||||
|
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);
|
||||||
|
|
|
@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
|
||||||
hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0=";
|
hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# https://github.com/fabiocolacio/Marker/pull/427
|
||||||
|
./fix_incompatible_pointer_in_marker_window_init.patch
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
itstool
|
itstool
|
||||||
meson
|
meson
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue