From owner-svn-ports-all@freebsd.org Tue Apr 4 19:41:11 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A332BD2EA56; Tue, 4 Apr 2017 19:41:11 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7299D19D2; Tue, 4 Apr 2017 19:41:11 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v34JfAkU043591; Tue, 4 Apr 2017 19:41:10 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v34Jf9Iu043577; Tue, 4 Apr 2017 19:41:09 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201704041941.v34Jf9Iu043577@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 4 Apr 2017 19:41:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437750 - head/deskutils/gnote/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Apr 2017 19:41:11 -0000 Author: jkim Date: Tue Apr 4 19:41:08 2017 New Revision: 437750 URL: https://svnweb.freebsd.org/changeset/ports/437750 Log: Fix build with glibmm 2.50 (r437481). It is backported from the upstream commit: https://git.gnome.org/browse/gnote/commit/?id=df504af Approved by: bapt Added: head/deskutils/gnote/files/patch-src_actionmanager.cpp (contents, props changed) head/deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteaddin.cpp (contents, props changed) head/deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin.cpp (contents, props changed) head/deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicationaddin.cpp (contents, props changed) head/deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp (contents, props changed) head/deskutils/gnote/files/patch-src_dbus_searchprovider.cpp (contents, props changed) head/deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp - copied, changed from r437749, head/deskutils/gnote/files/patch-src_gnome-keyring_ring.cpp head/deskutils/gnote/files/patch-src_note.hpp (contents, props changed) head/deskutils/gnote/files/patch-src_notebuffer.cpp (contents, props changed) head/deskutils/gnote/files/patch-src_notetag.cpp (contents, props changed) head/deskutils/gnote/files/patch-src_notewindow.cpp (contents, props changed) head/deskutils/gnote/files/patch-src_remotecontrolproxy.cpp (contents, props changed) head/deskutils/gnote/files/patch-src_searchnoteswidget.cpp (contents, props changed) head/deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp (contents, props changed) Deleted: head/deskutils/gnote/files/patch-src_gnome-keyring_ring.cpp Added: head/deskutils/gnote/files/patch-src_actionmanager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_actionmanager.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,23 @@ +--- src/actionmanager.cpp.orig 2015-11-28 15:45:18 UTC ++++ src/actionmanager.cpp +@@ -177,17 +177,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); + } + Added: head/deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteaddin.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteaddin.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,24 @@ +--- src/addins/exporttogtg/exporttogtgnoteaddin.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/addins/exporttogtg/exporttogtgnoteaddin.cpp +@@ -79,10 +79,10 @@ void ExportToGTGNoteAddin::on_note_opene + void ExportToGTGNoteAddin::export_button_clicked() + { + 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; + } +@@ -96,7 +96,7 @@ void ExportToGTGNoteAddin::export_button + 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; + } Added: head/deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,11 @@ +--- src/addins/printnotes/printnotesnoteaddin.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/addins/printnotes/printnotesnoteaddin.cpp +@@ -277,7 +277,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() - Added: head/deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicationaddin.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicationaddin.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,11 @@ +--- src/addins/statistics/statisticsapplicationaddin.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/addins/statistics/statisticsapplicationaddin.cpp +@@ -44,7 +44,7 @@ void StatisticsApplicationAddin::initial + { + if(!m_initialized) { + m_initialized = true; +- if(m_action == 0) { ++ if(!m_action) { + m_action = Gtk::Action::create(); + m_action->set_name("ShowStatistics"); + m_action->set_label(_("Show Statistics")); Added: head/deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,11 @@ +--- src/addins/todo/todonoteaddin.cpp.orig 2015-11-28 15:44:34 UTC ++++ 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; Added: head/deskutils/gnote/files/patch-src_dbus_searchprovider.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_dbus_searchprovider.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,11 @@ +--- src/dbus/searchprovider.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/dbus/searchprovider.cpp +@@ -228,7 +228,7 @@ Glib::VariantContainerBase SearchProvide + + 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()); + } Copied and modified: head/deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp (from r437749, head/deskutils/gnote/files/patch-src_gnome-keyring_ring.cpp) ============================================================================== --- head/deskutils/gnote/files/patch-src_gnome-keyring_ring.cpp Tue Apr 4 19:26:57 2017 (r437749, copy source) +++ head/deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -1,5 +1,5 @@ ---- src/gnome_keyring/ring.cpp.orig 2013-10-30 16:54:52.000000000 +0100 -+++ src/gnome_keyring/ring.cpp 2013-10-30 16:56:09.000000000 +0100 +--- src/gnome_keyring/ring.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/gnome_keyring/ring.cpp @@ -20,6 +20,7 @@ Added: head/deskutils/gnote/files/patch-src_note.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_note.hpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,20 @@ +--- src/note.hpp.orig 2015-11-28 15:44:34 UTC ++++ 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 + { Added: head/deskutils/gnote/files/patch-src_notebuffer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_notebuffer.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,29 @@ +--- src/notebuffer.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/notebuffer.cpp +@@ -248,7 +248,7 @@ namespace gnote { + + Glib::RefPtr depth = find_depth_tag(iter); + +- return depth; ++ return (bool)depth; + } + + +@@ -1341,7 +1341,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 (); +@@ -1576,7 +1576,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; Added: head/deskutils/gnote/files/patch-src_notetag.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_notetag.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,11 @@ +--- src/notetag.cpp.orig 2015-11-28 15:44:34 UTC ++++ 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); + } + + Added: head/deskutils/gnote/files/patch-src_notewindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_notewindow.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,29 @@ +--- src/notewindow.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/notewindow.cpp +@@ -186,7 +186,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); +@@ -316,7 +316,7 @@ namespace gnote { + } + m_widget_actions[order] = action; + m_signal_actions_changed(); +- if(Glib::RefPtr::cast_dynamic(action) == 0) { ++ if(!Glib::RefPtr::cast_dynamic(action)) { + action->set_sensitive(m_enabled); + } + } +@@ -619,7 +619,7 @@ namespace gnote { + m_global_keys->enabled(m_enabled); + FOREACH(const Glib::RefPtr & 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_sensitive(enable); + } + } Added: head/deskutils/gnote/files/patch-src_remotecontrolproxy.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_remotecontrolproxy.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,11 @@ +--- src/remotecontrolproxy.cpp.orig 2015-11-28 15:44:34 UTC ++++ 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); Added: head/deskutils/gnote/files/patch-src_searchnoteswidget.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_searchnoteswidget.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,11 @@ +--- src/searchnoteswidget.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/searchnoteswidget.cpp +@@ -1520,7 +1520,7 @@ void SearchNotesWidget::parse_sorting_se + 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(); Added: head/deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp Tue Apr 4 19:41:08 2017 (r437750) @@ -0,0 +1,11 @@ +--- src/synchronization/gnotesyncclient.cpp.orig 2015-11-28 15:44:34 UTC ++++ 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));