From fcf36aa1ded5db35b13bf9247020da7f361496b81c99009127032ae4f501bb07 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 11 May 2020 13:13:52 +0000 Subject: [PATCH] Accepting request 802518 from GNOME:Next New stable rel OBS-URL: https://build.opensuse.org/request/show/802518 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnote?expand=0&rev=125 --- gnote-3.36.0.tar.xz | 3 --- gnote-3.36.1.tar.xz | 3 +++ gnote-initial-notes-creation.patch | 29 ----------------------------- gnote.changes | 11 +++++++++++ gnote.spec | 5 ++--- 5 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 gnote-3.36.0.tar.xz create mode 100644 gnote-3.36.1.tar.xz delete mode 100644 gnote-initial-notes-creation.patch diff --git a/gnote-3.36.0.tar.xz b/gnote-3.36.0.tar.xz deleted file mode 100644 index ee58cbc..0000000 --- a/gnote-3.36.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29e503645d84abd94eb3ddadbfe7a63a82b30fd7f3ad01418cd4e4c58e07f336 -size 3495000 diff --git a/gnote-3.36.1.tar.xz b/gnote-3.36.1.tar.xz new file mode 100644 index 0000000..5500820 --- /dev/null +++ b/gnote-3.36.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5be049f0fd7b9365b706f6a0a180f78caccec30f716de3c5c176b16accfe04ca +size 3512000 diff --git a/gnote-initial-notes-creation.patch b/gnote-initial-notes-creation.patch deleted file mode 100644 index 2197f96..0000000 --- a/gnote-initial-notes-creation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ea1da8fef7d78e4780059728fd352c6d2869a54c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Aurimas=20=C4=8Cernius?= -Date: Sun, 3 May 2020 12:54:53 +0300 -Subject: [PATCH] Fix start note creation and importing on first run - -Fixes https://gitlab.gnome.org/GNOME/gnote/-/issues/36 ---- - src/notemanager.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/notemanager.cpp b/src/notemanager.cpp -index 5c58ee25..ff7375ed 100644 ---- a/src/notemanager.cpp -+++ b/src/notemanager.cpp -@@ -50,8 +50,9 @@ namespace gnote { - void NoteManager::init(const Glib::ustring & directory) - { - Glib::ustring backup = directory + "/Backup"; -- NoteManagerBase::init(directory, backup); -+ // Before base init, after it will be false already - bool is_first_run = first_run(); -+ NoteManagerBase::init(directory, backup); - - Glib::RefPtr settings = m_preferences.get_schema_settings(Preferences::SCHEMA_GNOTE); - // Watch the START_NOTE_URI setting and update it so that the --- -2.26.2 - - diff --git a/gnote.changes b/gnote.changes index 37a34d9..4fee4e4 100644 --- a/gnote.changes +++ b/gnote.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun May 10 16:22:53 UTC 2020 - Bjørn Lie + +- Update to version 3.36.1: + + Fix note existence check when synchronizing. + + Stability fixes for synchronization. + + Fix start note creation and importing on first run. + + Fix occasional crash when closing. + + Updated translations. +- Drop gnote-initial-notes-creation.patch: Fixed upstream. + ------------------------------------------------------------------- Tue May 5 19:30:23 UTC 2020 - Dominique Leuenberger diff --git a/gnote.spec b/gnote.spec index 53cd951..b0c34ae 100644 --- a/gnote.spec +++ b/gnote.spec @@ -19,7 +19,7 @@ %define base_version 3.36 Name: gnote -Version: 3.36.0 +Version: 3.36.1 Release: 0 Summary: A Port of Tomboy to C++ License: GPL-3.0-or-later @@ -27,8 +27,7 @@ Group: Productivity/Text/Editors URL: https://wiki.gnome.org/Apps/Gnote Source0: https://download.gnome.org/sources/gnote/%{base_version}/%{name}-%{version}.tar.xz Source99: gnote-rpmlintrc -# PATCH-FIX-UPSTREAM gnote-initial-notes-creation.patch boo#1170588 dimstar@opensuse.org -- Fix generation of sample notes on first start -Patch0: gnote-initial-notes-creation.patch + BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++