From 0a42adc6f1ba17b7f779ffdb780597e779c416c1 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Jun 13 2017 06:06:38 +0000 Subject: update to 1.19.1 --- diff --git a/.gitignore b/.gitignore index 9e14569..8dc6476 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /pluma-1.18.0.tar.xz /pluma-1.18.1.tar.xz /pluma-1.18.2.tar.xz +/pluma-1.19.1.tar.xz diff --git a/pluma.spec b/pluma.spec index 55dd962..8804369 100644 --- a/pluma.spec +++ b/pluma.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.18 +%global branch 1.19 # Settings used for build from snapshots. %{!?rel_build:%global commit c1ca209172a8b3a0751ac0a1e2dbec33c1894290} @@ -14,7 +14,7 @@ Summary: Text editor for the MATE desktop Name: pluma -Version: %{branch}.2 +Version: %{branch}.1 %if 0%{?rel_build} Release: 1%{?dist} %else @@ -30,8 +30,6 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} -Patch1: pluma_0001-Support-new-location-of-gtk-bookmarks-file.patch - BuildRequires: desktop-file-utils BuildRequires: enchant-devel BuildRequires: libpeas-devel @@ -107,8 +105,6 @@ Development files for mate-text-editor %prep %setup -q%{!?rel_build:n %{name}-%{commit}} -%patch1 -p1 -b .0001 - %if 0%{?rel_build} # for releases #NOCONFIGURE=1 ./autogen.sh @@ -195,6 +191,9 @@ fi %changelog +* Tue Jun 13 2017 Wolfgang Ulbrich - 1.19.1-1 +- update to 1.19.1 + * Sat May 06 2017 Wolfgang Ulbrich - 1.18.2-1 - update to 1.18.2 diff --git a/pluma_0001-Support-new-location-of-gtk-bookmarks-file.patch b/pluma_0001-Support-new-location-of-gtk-bookmarks-file.patch deleted file mode 100644 index f09fb9c..0000000 --- a/pluma_0001-Support-new-location-of-gtk-bookmarks-file.patch +++ /dev/null @@ -1,170 +0,0 @@ -From 2d8dc45d586f21fe82dd706abc50f27103b75005 Mon Sep 17 00:00:00 2001 -From: Paolo Borelli -Date: Tue, 25 Apr 2017 19:09:42 +0200 -Subject: [PATCH] Support new location of gtk bookmarks file - -The gtk bookmarks file is now in XDG dir, so let's first try there and -otherwise fall back to the old location ---- - plugins/filebrowser/pluma-file-bookmarks-store.c | 133 +++++++++++++++-------- - 1 file changed, 85 insertions(+), 48 deletions(-) - -diff --git a/plugins/filebrowser/pluma-file-bookmarks-store.c b/plugins/filebrowser/pluma-file-bookmarks-store.c -index 073d6bb..bcd550a 100644 ---- a/plugins/filebrowser/pluma-file-bookmarks-store.c -+++ b/plugins/filebrowser/pluma-file-bookmarks-store.c -@@ -494,66 +494,103 @@ add_bookmark (PlumaFileBookmarksStore * model, - return ret; - } - --static void --init_bookmarks (PlumaFileBookmarksStore * model) -+static gchar * -+get_bookmarks_file (void) -+{ -+ return g_build_filename (g_get_user_config_dir (), "gtk-3.0", "bookmarks", NULL); -+} -+ -+static gchar * -+get_legacy_bookmarks_file (void) -+{ -+ return g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL); -+} -+ -+static gboolean -+parse_bookmarks_file (PlumaFileBookmarksStore *model, -+ const gchar *bookmarks, -+ gboolean *added) - { -- gchar *bookmarks; - GError *error = NULL; - gchar *contents; - gchar **lines; - gchar **line; -- gboolean added = FALSE; - -- /* Read the bookmarks file */ -- bookmarks = g_build_filename (g_get_home_dir (), -- ".gtk-bookmarks", -- NULL); -- -- if (g_file_get_contents (bookmarks, &contents, NULL, &error)) { -- lines = g_strsplit (contents, "\n", 0); -- -- for (line = lines; *line; ++line) { -- if (**line) { -- gchar *pos; -- gchar *name; -- -- /* CHECK: is this really utf8? */ -- pos = g_utf8_strchr (*line, -1, ' '); -- -- if (pos != NULL) { -- *pos = '\0'; -- name = pos + 1; -- } else { -- name = NULL; -- } -- -- /* the bookmarks file should contain valid -- * URIs, but paranoia is good */ -- if (pluma_utils_is_valid_uri (*line)) { -- added |= add_bookmark (model, name, *line); -- } -+ if (!g_file_get_contents (bookmarks, &contents, NULL, &error)) -+ { -+ /* The bookmarks file doesn't exist (which is perfectly fine) */ -+ g_error_free (error); -+ -+ return FALSE; -+ } -+ -+ lines = g_strsplit (contents, "\n", 0); -+ -+ for (line = lines; *line; ++line) -+ { -+ if (**line) -+ { -+ gchar *pos; -+ gchar *name; -+ -+ /* CHECK: is this really utf8? */ -+ pos = g_utf8_strchr (*line, -1, ' '); -+ -+ if (pos != NULL) -+ { -+ *pos = '\0'; -+ name = pos + 1; -+ } -+ else -+ { -+ name = NULL; -+ } -+ -+ /* the bookmarks file should contain valid -+ * URIs, but paranoia is good */ -+ if (pluma_utils_is_valid_uri (*line)) -+ { -+ *added |= add_bookmark (model, name, *line); - } - } -+ } -+ -+ g_strfreev (lines); -+ g_free (contents); - -- g_strfreev (lines); -- g_free (contents); -+ /* Add a watch */ -+ if (model->priv->bookmarks_monitor == NULL) -+ { -+ GFile *file; - -- /* Add a watch */ -- if (model->priv->bookmarks_monitor == NULL) { -- GFile * file; -+ file = g_file_new_for_path (bookmarks); -+ model->priv->bookmarks_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL); -+ g_object_unref (file); - -- file = g_file_new_for_path (bookmarks); -- model->priv->bookmarks_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL); -- g_object_unref (file); -+ g_signal_connect (model->priv->bookmarks_monitor, -+ "changed", -+ G_CALLBACK (on_bookmarks_file_changed), -+ model); -+ } - -- g_signal_connect (model->priv->bookmarks_monitor, -- "changed", -- (GCallback)on_bookmarks_file_changed, -- model); -- } -- } else { -- /* The bookmarks file doesn't exist (which is perfectly fine) */ -- g_error_free (error); -+ return TRUE; -+} -+ -+static void -+init_bookmarks (PlumaFileBookmarksStore *model) -+{ -+ gchar *bookmarks; -+ gboolean added = FALSE; -+ -+ bookmarks = get_bookmarks_file (); -+ -+ if (!parse_bookmarks_file (model, bookmarks, &added)) -+ { -+ g_free (bookmarks); -+ -+ /* try the old location (gtk <= 3.4) */ -+ bookmarks = get_legacy_bookmarks_file (); -+ parse_bookmarks_file (model, bookmarks, &added); - } - - if (added) { --- -2.12.2 - diff --git a/sources b/sources index 443ea05..3687574 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pluma-1.18.2.tar.xz) = 285170531c92ad13fdd35286c06de62b75f0426a830c51f4f54799b4b5377d65b3e1fd1e1af3827462a356947e853e4203a4ed394a8b6137bbd87e289f490b6d +SHA512 (pluma-1.19.1.tar.xz) = 27851010a751ecb5383df22accb6131859c054ff3bf5afd802312194700f8b550053996a79a36a852492371de4002f9370b259c04fd025389d699c6048943eb8