...
 
Commits (2)
gedit (3.32.0-2) UNRELEASED; urgency=medium
[ Sebastien Bacher ]
* debian/oatches/gitlab_idle_handling.patch:
- use gitlab pr#34's patch to fix an incorrect handling of idle
callbacks, thanks Andrea Azzarone (lp: #1646762)
-- Sebastien Bacher <seb128@ubuntu.com> Wed, 03 Apr 2019 11:30:24 +0200
[ Andrea Azzarone ]
* d/p/build-Reintroduce-enable-gvfs-metadata-option.patch:
- Reintroduce enable-gvfs-metadata option.
* d/p/gitlab_idle_handling.patch:
- Patch refreshed automatically by gbp pq import/export.
* d/p/series:
- Added d/p/build-Reintroduce-enable-gvfs-metadata-option.patch
-- Andrea Azzarone <andrea.azzarone@canonical.com> Mon, 15 Apr 2019 10:42:34 +0100
gedit (3.32.0-1) experimental; urgency=medium
......
From: Andrea Azzarone <andrea.azzarone@canonical.com>
Date: Mon, 1 Apr 2019 18:52:43 +0100
Subject: build: Reintroduce enable-gvfs-metadata option
Gedit used to have an enable-gvfs-metadata to enable using gvfs to store
metadata. This option was removed with the port to meson. Reintroduce it and set
the default to 'auto' (defaults to 'yes' when running in linux, to 'no'
otherwise).
Closes: https://gitlab.gnome.org/GNOME/gedit/issues/141
---
meson.build | 12 ++++++++++++
meson_options.txt | 4 ++++
2 files changed, 16 insertions(+)
diff --git a/meson.build b/meson.build
index 237c2ca..cb91705 100644
--- a/meson.build
+++ b/meson.build
@@ -119,6 +119,17 @@ config_h.set_quoted('LIBDIR', libdir)
config_h.set_quoted('DATADIR', datadir)
config_h.set_quoted('VERSION', version)
+enable_gvfs_metadata = get_option('enable-gvfs-metadata')
+if enable_gvfs_metadata == 'yes' or (enable_gvfs_metadata == 'auto' and host_machine.system() == 'linux')
+ enable_gvfs_metadata = true
+else
+ enable_gvfs_metadata = false
+endif
+
+if enable_gvfs_metadata
+ config_h.set('ENABLE_GVFS_METADATA', 1)
+endif
+
config_h.set('GEDIT_MAJOR_VERSION', version_major)
config_h.set('GEDIT_MINOR_VERSION', version_minor)
config_h.set('GEDIT_MICRO_VERSION', version_micro)
@@ -178,6 +189,7 @@ summary = [
' Introspection: @0@'.format(generate_gir),
' Plugins: @0@'.format(build_plugins),
' Vala API: @0@'.format(generate_vapi),
+ ' Gvfs metadata: @0@'.format(enable_gvfs_metadata),
'',
'Directories:',
' prefix: @0@'.format(prefix),
diff --git a/meson_options.txt b/meson_options.txt
index 9a387f4..90803fa 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -12,3 +12,7 @@ option('plugins',
option('documentation',
type: 'boolean', value: false,
description: 'Build reference manual (requires gtk-doc)')
+
+option('enable-gvfs-metadata',
+ type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
+ description: 'Enable using gvfs to store metadata')
From e0c78486c5b7ac198bb1a76872225063f5944f4c Mon Sep 17 00:00:00 2001
From: Andrea Azzarone <andrea.azzarone@canonical.com>
Date: Tue, 2 Apr 2019 17:33:12 +0100
Subject: [PATCH] open-document-selector: Properly remove idle
......@@ -11,11 +10,11 @@ reasons we cannot do that, so let's use g_source_remove.
Close: https://bugs.launchpad.net/bugs/1646762
---
gedit/gedit-open-document-selector.c | 34 ++++++++--------------------
gedit/gedit-open-document-selector.c | 34 ++++++++++------------------------
1 file changed, 10 insertions(+), 24 deletions(-)
diff --git a/gedit/gedit-open-document-selector.c b/gedit/gedit-open-document-selector.c
index 847807a51..67e2d4b39 100644
index 847807a..67e2d4b 100644
--- a/gedit/gedit-open-document-selector.c
+++ b/gedit/gedit-open-document-selector.c
@@ -51,6 +51,8 @@ struct _GeditOpenDocumentSelector
......@@ -100,5 +99,3 @@ index 847807a51..67e2d4b39 100644
}
g_clear_pointer (&selector->name_font, pango_font_description_free);
--
2.18.1
01_gedit-bugreport-location.patch
08_multiarch_fallback.patch
gitlab_idle_handling.patch
build-Reintroduce-enable-gvfs-metadata-option.patch