1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00

Merge pull request #118601 from romildo/upd.xfce

xfce.mousepad: 0.5.3 -> 0.5.4
This commit is contained in:
Sandro 2021-04-05 18:45:07 +02:00 committed by GitHub
commit 24d04bc192
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 31 deletions

View file

@ -1,25 +0,0 @@
From 3b06d6129033ddaa8dc455a6a572077fd63a3816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 1 Mar 2021 17:03:07 -0300
Subject: [PATCH] Allow checking parent sources when looking up schema
---
mousepad/mousepad-settings-store.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mousepad/mousepad-settings-store.c b/mousepad/mousepad-settings-store.c
index e5a848b..de989bd 100644
--- a/mousepad/mousepad-settings-store.c
+++ b/mousepad/mousepad-settings-store.c
@@ -181,7 +181,7 @@ mousepad_settings_store_add_settings (MousepadSettingsStore *self,
const gchar *prefix;
/* loop through keys in schema and store mapping of their setting name to GSettings */
- schema = g_settings_schema_source_lookup (source, schema_id, FALSE);
+ schema = g_settings_schema_source_lookup (source, schema_id, TRUE);
keys = g_settings_schema_list_keys (schema);
prefix = schema_id + MOUSEPAD_ID_LEN + 1;
for (key = keys; key && *key; key++)
--
2.30.0

View file

@ -1,18 +1,16 @@
{ mkXfceDerivation, gobject-introspection, vala, gtk3, gtksourceview3, xfconf }: { mkXfceDerivation, gobject-introspection, vala, gtk3, gtksourceview4, xfconf }:
mkXfceDerivation { mkXfceDerivation {
category = "apps"; category = "apps";
pname = "mousepad"; pname = "mousepad";
version = "0.5.3"; version = "0.5.4";
odd-unstable = false; odd-unstable = false;
sha256 = "0ki5k5p24dpawkyq4k8am1fcq02njhnmhq5vf2ah1zqbc0iyl5yn"; sha256 = "0yrmjs6cyzm08jz8wzrx8wdxj7zdbxn6x625109ckfcfxrkp4a2f";
nativeBuildInputs = [ gobject-introspection vala ]; nativeBuildInputs = [ gobject-introspection vala ];
buildInputs = [ gtk3 gtksourceview3 xfconf ]; buildInputs = [ gtk3 gtksourceview4 xfconf ];
patches = [ ./allow-checking-parent-sources-when-looking-up-schema.patch ];
meta = { meta = {
description = "Simple text editor for Xfce"; description = "Simple text editor for Xfce";