diff --git a/gnote-3.21.0.tar.xz b/gnote-3.21.0.tar.xz deleted file mode 100644 index 1279fb3..0000000 --- a/gnote-3.21.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81bfbb1a9e3ec4afa5e8c799031e20694e8ff5b188b529e24825be509b5d13c0 -size 3307716 diff --git a/gnote-3.21.1.tar.xz b/gnote-3.21.1.tar.xz new file mode 100644 index 0000000..6196298 --- /dev/null +++ b/gnote-3.21.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60afc734ac50adef4373e8920c62417eaf1930952cf1c91bb3abb176baf3c600 +size 3308944 diff --git a/gnote-buildfix.patch b/gnote-buildfix.patch deleted file mode 100644 index e569c3a..0000000 --- a/gnote-buildfix.patch +++ /dev/null @@ -1,257 +0,0 @@ -From 3c0e8258806a726fc5adeb115875587be53bc77e Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Wed, 31 Aug 2016 20:59:46 +0200 -Subject: [PATCH] Fix build - -has_buffer and is_loaded both expect to return a bool, so returning -plain m_buffer won't cut it - -Fixes build error - -[ 89s] In file included from ../../../src/noteaddin.hpp:38:0, -[ 89s] from backlinksnoteaddin.hpp:27, -[ 89s] from backlinksnoteaddin.cpp:25: -[ 89s] ../../../src/note.hpp: In member function 'bool gnote::Note::has_buffer() const': -[ 89s] ../../../src/note.hpp:127:14: error: cannot convert 'const Glib::RefPtr' to 'bool' in return -[ 89s] return m_buffer; -[ 89s] ^~~~~~~~ -[ 89s] ../../../src/note.hpp: In member function 'bool gnote::Note::is_loaded() const': -[ 89s] ../../../src/note.hpp:142:23: error: cannot convert 'const Glib::RefPtr' to 'bool' in return -[ 89s] return (m_buffer); - -https://bugzilla.gnome.org/show_bug.cgi?id=770541 ---- - src/actionmanager.cpp | 6 +++--- - src/addins/exporttogtg/exporttogtgnoteaddin.cpp | 6 +++--- - src/addins/printnotes/printnotesnoteaddin.cpp | 2 +- - src/addins/todo/todonoteaddin.cpp | 2 +- - src/dbus/searchprovider.cpp | 2 +- - src/note.hpp | 4 ++-- - src/notebuffer.cpp | 6 +++--- - src/notetag.cpp | 2 +- - src/notewindow.cpp | 4 ++-- - src/remotecontrolproxy.cpp | 2 +- - src/searchnoteswidget.cpp | 2 +- - src/synchronization/gnotesyncclient.cpp | 2 +- - 12 files changed, 20 insertions(+), 20 deletions(-) - -diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp -index 2bc6f42..bdd5d48 100644 ---- a/src/actionmanager.cpp -+++ b/src/actionmanager.cpp -@@ -144,17 +144,17 @@ namespace gnote { - - int pos = 0; - Glib::RefPtr section = make_app_menu_section(APP_ACTION_NEW); -- if(section != 0) { -+ if(section) { - menu->insert_section(pos++, section); - } - - section = make_app_menu_section(APP_ACTION_MANAGE); -- if(section != 0) { -+ if(section) { - menu->insert_section(pos++, section); - } - - section = make_app_menu_section(APP_ACTION_LAST); -- if(section != 0) { -+ if(section) { - menu->insert_section(pos++, section); - } - -diff --git a/src/addins/exporttogtg/exporttogtgnoteaddin.cpp b/src/addins/exporttogtg/exporttogtgnoteaddin.cpp -index 871f001..d6a8662 100644 ---- a/src/addins/exporttogtg/exporttogtgnoteaddin.cpp -+++ b/src/addins/exporttogtg/exporttogtgnoteaddin.cpp -@@ -84,10 +84,10 @@ std::map ExportToGTGNoteAddin::get_actions_popover_widgets() - void ExportToGTGNoteAddin::export_button_clicked(const Glib::VariantBase&) - { - try { -- if (s_gtg_interface == 0) { -+ if (!s_gtg_interface) { - Glib::RefPtr node_info = Gio::DBus::NodeInfo::create_for_xml(GTG_INTERFACE); - s_gtg_interface = node_info->lookup_interface("org.gnome.GTG"); -- if(s_gtg_interface == 0) { -+ if(!s_gtg_interface) { - ERR_OUT(_("GTG XML loaded, but interface not found")); - return; - } -@@ -101,7 +101,7 @@ void ExportToGTGNoteAddin::export_button_clicked(const Glib::VariantBase&) - try { - Glib::RefPtr proxy = Gio::DBus::Proxy::create_for_bus_sync( - Gio::DBus::BUS_TYPE_SESSION, "org.gnome.GTG", "/org/gnome/GTG", "org.gnome.GTG", s_gtg_interface); -- if(proxy == 0) { -+ if(!proxy) { - ERR_OUT(_("Failed to create D-Bus proxy for GTG")); - return; - } -diff --git a/src/addins/printnotes/printnotesnoteaddin.cpp b/src/addins/printnotes/printnotesnoteaddin.cpp -index 36d07df..624adfe 100644 ---- a/src/addins/printnotes/printnotesnoteaddin.cpp -+++ b/src/addins/printnotes/printnotesnoteaddin.cpp -@@ -254,7 +254,7 @@ namespace printnotes { - } - - gnote::DepthNoteTag::Ptr depth = get_buffer()->find_depth_tag(p_start); -- if(depth != 0) { -+ if(depth) { - indentation += ((int) (dpiX / 3)) * depth->get_depth(); - } - layout->set_width(pango_units_from_double((int)context->get_width() - -diff --git a/src/addins/todo/todonoteaddin.cpp b/src/addins/todo/todonoteaddin.cpp -index 71803c1..79b415a 100644 ---- a/src/addins/todo/todonoteaddin.cpp -+++ b/src/addins/todo/todonoteaddin.cpp -@@ -42,7 +42,7 @@ TodoModule::TodoModule() - void Todo::initialize() - { - FOREACH(const std::string & s, s_todo_patterns) { -- if(get_note()->get_tag_table()->lookup(s) == 0) { -+ if(!get_note()->get_tag_table()->lookup(s)) { - Glib::RefPtr tag = Gtk::TextTag::create(s); - tag->property_foreground() = "#0080f0"; - tag->property_weight() = PANGO_WEIGHT_BOLD; -diff --git a/src/dbus/searchprovider.cpp b/src/dbus/searchprovider.cpp -index 28e2658..9328eea 100644 ---- a/src/dbus/searchprovider.cpp -+++ b/src/dbus/searchprovider.cpp -@@ -228,7 +228,7 @@ Glib::VariantContainerBase SearchProvider::LaunchSearch_stub(const Glib::Variant - - gchar *SearchProvider::get_icon() - { -- if(m_note_icon == 0) { -+ if(!m_note_icon) { - Gtk::IconInfo info = gnote::IconManager::obj().lookup_icon(gnote::IconManager::NOTE, 48); - m_note_icon = Gio::Icon::create(info.get_filename()); - } -diff --git a/src/note.hpp b/src/note.hpp -index fc960c1..864c47b 100644 ---- a/src/note.hpp -+++ b/src/note.hpp -@@ -124,7 +124,7 @@ public: - const Glib::RefPtr & get_tag_table(); - bool has_buffer() const - { -- return m_buffer; -+ return (bool)m_buffer; - } - const Glib::RefPtr & get_buffer(); - bool has_window() const -@@ -139,7 +139,7 @@ public: - bool is_special() const; - bool is_loaded() const - { -- return (m_buffer); -+ return (bool)m_buffer; - } - bool is_opened() const - { -diff --git a/src/notebuffer.cpp b/src/notebuffer.cpp -index 0192259..107fdb3 100644 ---- a/src/notebuffer.cpp -+++ b/src/notebuffer.cpp -@@ -265,7 +265,7 @@ namespace gnote { - - Glib::RefPtr depth = find_depth_tag(iter); - -- return depth; -+ return (bool)depth; - } - - -@@ -1358,7 +1358,7 @@ namespace gnote { - if (iter.get_line() < buffer->get_line_count() - 1) { - Gtk::TextIter next_line = buffer->get_iter_at_line(iter.get_line()+1); - next_line_has_depth = -- NoteBuffer::Ptr::cast_static(buffer)->find_depth_tag (next_line); -+ (bool)NoteBuffer::Ptr::cast_static(buffer)->find_depth_tag (next_line); - } - - bool at_empty_line = iter.ends_line () && iter.starts_line (); -@@ -1593,7 +1593,7 @@ namespace gnote { - NoteBuffer::Ptr note_buffer = NoteBuffer::Ptr::cast_dynamic(buffer); - // Do not insert bullet if it's already there - // this happens when using double identation in bullet list -- if(note_buffer->find_depth_tag(apply_start) == 0) { -+ if(!note_buffer->find_depth_tag(apply_start)) { - note_buffer->insert_bullet (apply_start, depth_tag->get_depth(), depth_tag->get_direction()); - buffer->remove_all_tags (apply_start, apply_start); - offset += 2; -diff --git a/src/notetag.cpp b/src/notetag.cpp -index d67345a..d69217f 100644 ---- a/src/notetag.cpp -+++ b/src/notetag.cpp -@@ -523,7 +523,7 @@ namespace gnote { - - bool NoteTagTable::tag_has_depth(const Glib::RefPtr & tag) - { -- return DepthNoteTag::Ptr::cast_dynamic(tag); -+ return (bool)DepthNoteTag::Ptr::cast_dynamic(tag); - } - - -diff --git a/src/notewindow.cpp b/src/notewindow.cpp -index bc09b36..998d76a 100644 ---- a/src/notewindow.cpp -+++ b/src/notewindow.cpp -@@ -204,7 +204,7 @@ namespace gnote { - return; - } - remove_accel_group(*parent); -- if(parent->get_window() != 0 -+ if(parent->get_window() - && (parent->get_window()->get_state() & Gdk::WINDOW_STATE_MAXIMIZED) == 0) { - int cur_width, cur_height; - parent->get_size(cur_width, cur_height); -@@ -607,7 +607,7 @@ namespace gnote { - m_global_keys->enabled(m_enabled); - FOREACH(const MainWindowAction::Ptr & action, get_widget_actions()) { - // A list includes empty actions to mark separators, non-modifying actions are always enabled -- if(action != 0 && Glib::RefPtr::cast_dynamic(action) == 0) { -+ if(action && !Glib::RefPtr::cast_dynamic(action)) { - action->set_enabled(enable); - } - } -diff --git a/src/remotecontrolproxy.cpp b/src/remotecontrolproxy.cpp -index aab810f..b13e1ed 100644 ---- a/src/remotecontrolproxy.cpp -+++ b/src/remotecontrolproxy.cpp -@@ -35,7 +35,7 @@ namespace { - void load_interface_from_file(const char *filename, const char *interface_name, - Glib::RefPtr & interface) - { -- if(interface != 0) { -+ if(interface) { - return; - } - std::ifstream fin(filename); -diff --git a/src/searchnoteswidget.cpp b/src/searchnoteswidget.cpp -index 2b68a6b..2100846 100644 ---- a/src/searchnoteswidget.cpp -+++ b/src/searchnoteswidget.cpp -@@ -1536,7 +1536,7 @@ void SearchNotesWidget::parse_sorting_setting(const Glib::ustring & sorting) - void SearchNotesWidget::on_rename_notebook() - { - Glib::RefPtr selection = m_notebooksTree->get_selection(); -- if(selection == 0) { -+ if(!selection) { - return; - } - std::vector selected_row = selection->get_selected_rows(); -diff --git a/src/synchronization/gnotesyncclient.cpp b/src/synchronization/gnotesyncclient.cpp -index 66b82cb..ee216eb 100644 ---- a/src/synchronization/gnotesyncclient.cpp -+++ b/src/synchronization/gnotesyncclient.cpp -@@ -54,7 +54,7 @@ namespace sync { - { - m_local_manifest_file_path = Glib::build_filename(IGnote::conf_dir(), LOCAL_MANIFEST_FILE_NAME); - Glib::RefPtr manifest = Gio::File::create_for_path(m_local_manifest_file_path); -- if(manifest != 0) { -+ if(manifest) { - m_file_watcher = manifest->monitor_file(); - m_file_watcher->signal_changed() - .connect(sigc::mem_fun(*this, &GnoteSyncClient::on_changed)); --- -2.9.3 - diff --git a/gnote.changes b/gnote.changes index 0951cc4..de195b8 100644 --- a/gnote.changes +++ b/gnote.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Sep 19 17:11:29 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.1: + + New Features: + - Shell search provider will search only in note titles + (bgo#765894). + - Change accelerator for Back button to . + + Fixes: + - Fix build against Glibmm 2.21 (bgo#770541). + - Fix memory leak in TrieTree (bgo#770056). + + Updated translations. +- Drop gnote-buildfix.patch: Fixed upstream. + ------------------------------------------------------------------- Wed Aug 31 19:01:22 UTC 2016 - dimstar@opensuse.org diff --git a/gnote.spec b/gnote.spec index c08108b..2f5fec0 100644 --- a/gnote.spec +++ b/gnote.spec @@ -18,15 +18,13 @@ %define _gnote_version 3.21 Name: gnote -Version: 3.21.0 +Version: 3.21.1 Release: 0 Summary: A Port of Tomboy to C++ License: GPL-3.0+ Group: Productivity/Text/Editors Url: http://live.gnome.org/Gnote Source: http://download.gnome.org/sources/gnote/3.21/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gnote-buildfix.patch bgo#770541 dimstar@opensuse.org -- Fix build -Patch0: gnote-buildfix.patch BuildRequires: boost-devel >= 1.34 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -69,7 +67,6 @@ search results from documents. %prep %setup -q -%patch0 -p1 translation-update-upstream %build