From 4a23604489cf3b9381318a626098a0086d42adc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 5 Apr 2021 10:48:56 -0300 Subject: [PATCH] xfce.mousepad: 0.5.3 -> 0.5.4 - Update to version 0.5.4 - Has been ported GtkSourceView 4 - Remove the patch allow-checking-parent-sources-when-looking-up-schema.patch, which has been integrated upstream --- ...arent-sources-when-looking-up-schema.patch | 25 ------------------- .../xfce/applications/mousepad/default.nix | 10 +++----- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch diff --git a/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch b/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch deleted file mode 100644 index aa797bf42cf..00000000000 --- a/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3b06d6129033ddaa8dc455a6a572077fd63a3816 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -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 - diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index eaac32bb5e3..22fdd00cb2f 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -1,18 +1,16 @@ -{ mkXfceDerivation, gobject-introspection, vala, gtk3, gtksourceview3, xfconf }: +{ mkXfceDerivation, gobject-introspection, vala, gtk3, gtksourceview4, xfconf }: mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.3"; + version = "0.5.4"; odd-unstable = false; - sha256 = "0ki5k5p24dpawkyq4k8am1fcq02njhnmhq5vf2ah1zqbc0iyl5yn"; + sha256 = "0yrmjs6cyzm08jz8wzrx8wdxj7zdbxn6x625109ckfcfxrkp4a2f"; nativeBuildInputs = [ gobject-introspection vala ]; - buildInputs = [ gtk3 gtksourceview3 xfconf ]; - - patches = [ ./allow-checking-parent-sources-when-looking-up-schema.patch ]; + buildInputs = [ gtk3 gtksourceview4 xfconf ]; meta = { description = "Simple text editor for Xfce";