diff options
Diffstat (limited to 'deskutils/gnote')
18 files changed, 35 insertions, 260 deletions
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile index 04f5061fe84f..d167aaa1fa18 100644 --- a/deskutils/gnote/Makefile +++ b/deskutils/gnote/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gnote -PORTVERSION= 3.18.1 -PORTREVISION= 11 +PORTVERSION= 3.28.0 CATEGORIES= deskutils gnome MASTER_SITES= GNOME @@ -14,30 +13,27 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= itstool:textproc/itstool -LIB_DEPENDS= libpcre.so:devel/pcre \ - libgtkspell3-3.so:textproc/gtkspell3 \ - libboost_filesystem.so:devel/boost-libs \ +LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 \ + libenchant.so:textproc/enchant \ libsecret-1.so:security/libsecret \ libuuid.so:misc/e2fsprogs-libuuid PORTSCOUT= limitw:1,even -USE_GNOME= gtk30 gtkmm30 intltool libxml2 libxslt +USE_GNOME= gtkmm30 intltool libxml2 libxslt +USE_XORG= x11 USES= desktop-file-utils compiler:c++11-lib gettext gmake \ - gnome libtool pathfix pkgconfig tar:xz + gnome libtool localbase pathfix pkgconfig tar:xz INSTALLS_ICONS= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --with-dbus-service-dir=${PREFIX}/share/dbus-1/services INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.gnome.gnote.gschema.xml DOCS= AUTHORS ChangeLog NEWS README TODO -PLIST_SUB+= VERSION=${PORTVERSION} +PLIST_SUB+= VERSION=${PORTVERSION} SVER=${PORTVERSION:R} OPTIONS_DEFINE= DOCS diff --git a/deskutils/gnote/distinfo b/deskutils/gnote/distinfo index b7645fdc9603..f5171427616d 100644 --- a/deskutils/gnote/distinfo +++ b/deskutils/gnote/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnote-3.18.1.tar.xz) = 5da4ec9e7852b09af1067311fc6ee18a2c64384f4f5943b71ac37665144be58d -SIZE (gnote-3.18.1.tar.xz) = 3310004 +TIMESTAMP = 1525980004 +SHA256 (gnote-3.28.0.tar.xz) = a50d3986c6cc04c7c8215dfed938910611e2d7499f00bfe4f42050ed56a7b783 +SIZE (gnote-3.28.0.tar.xz) = 4002520 diff --git a/deskutils/gnote/files/patch-src_actionmanager.cpp b/deskutils/gnote/files/patch-src_actionmanager.cpp deleted file mode 100644 index a5bb75b44cec..000000000000 --- a/deskutils/gnote/files/patch-src_actionmanager.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- 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<Gio::Menu> 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/deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteaddin.cpp b/deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteaddin.cpp deleted file mode 100644 index 5cab2e9aad92..000000000000 --- a/deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteaddin.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- 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<Gio::DBus::NodeInfo> 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<Gio::DBus::Proxy> 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/deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin.cpp b/deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin.cpp deleted file mode 100644 index e127b77cf3e3..000000000000 --- a/deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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() - diff --git a/deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicationaddin.cpp b/deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicationaddin.cpp deleted file mode 100644 index 7a273ebc5c5f..000000000000 --- a/deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicationaddin.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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")); diff --git a/deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp b/deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp deleted file mode 100644 index b2ac324589ea..000000000000 --- a/deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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<Gtk::TextTag> tag = Gtk::TextTag::create(s); - tag->property_foreground() = "#0080f0"; - tag->property_weight() = PANGO_WEIGHT_BOLD; diff --git a/deskutils/gnote/files/patch-src_dbus_searchprovider.cpp b/deskutils/gnote/files/patch-src_dbus_searchprovider.cpp deleted file mode 100644 index 9490bbb4fc52..000000000000 --- a/deskutils/gnote/files/patch-src_dbus_searchprovider.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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()); - } diff --git a/deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp b/deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp deleted file mode 100644 index 1f92a07af12b..000000000000 --- a/deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/gnome_keyring/ring.cpp.orig 2015-11-28 15:44:34 UTC -+++ src/gnome_keyring/ring.cpp -@@ -20,6 +20,7 @@ - - - #include <cstring> -+#include <cstdlib> - - #include "keyringexception.hpp" - #include "ring.hpp" diff --git a/deskutils/gnote/files/patch-src_note.hpp b/deskutils/gnote/files/patch-src_note.hpp deleted file mode 100644 index 08d1409aa09d..000000000000 --- a/deskutils/gnote/files/patch-src_note.hpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/note.hpp.orig 2015-11-28 15:44:34 UTC -+++ src/note.hpp -@@ -124,7 +124,7 @@ public: - const Glib::RefPtr<NoteTagTable> & get_tag_table(); - bool has_buffer() const - { -- return m_buffer; -+ return (bool)m_buffer; - } - const Glib::RefPtr<NoteBuffer> & 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/deskutils/gnote/files/patch-src_notebuffer.cpp b/deskutils/gnote/files/patch-src_notebuffer.cpp deleted file mode 100644 index 61eb4224c566..000000000000 --- a/deskutils/gnote/files/patch-src_notebuffer.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- src/notebuffer.cpp.orig 2015-11-28 15:44:34 UTC -+++ src/notebuffer.cpp -@@ -248,7 +248,7 @@ namespace gnote { - - Glib::RefPtr<Gtk::TextTag> 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; diff --git a/deskutils/gnote/files/patch-src_notetag.cpp b/deskutils/gnote/files/patch-src_notetag.cpp deleted file mode 100644 index ef2d67e5dc16..000000000000 --- a/deskutils/gnote/files/patch-src_notetag.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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<Gtk::TextBuffer::Tag> & tag) - { -- return DepthNoteTag::Ptr::cast_dynamic(tag); -+ return (bool)DepthNoteTag::Ptr::cast_dynamic(tag); - } - - diff --git a/deskutils/gnote/files/patch-src_notewindow.cpp b/deskutils/gnote/files/patch-src_notewindow.cpp deleted file mode 100644 index c71c799611d1..000000000000 --- a/deskutils/gnote/files/patch-src_notewindow.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- 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<NonModifyingNoteAction>::cast_dynamic(action) == 0) { -+ if(!Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(action)) { - action->set_sensitive(m_enabled); - } - } -@@ -619,7 +619,7 @@ namespace gnote { - m_global_keys->enabled(m_enabled); - FOREACH(const Glib::RefPtr<Gtk::Action> & action, get_widget_actions()) { - // A list includes empty actions to mark separators, non-modifying actions are always enabled -- if(action != 0 && Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(action) == 0) { -+ if(action && !Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(action)) { - action->set_sensitive(enable); - } - } diff --git a/deskutils/gnote/files/patch-src_remotecontrolproxy.cpp b/deskutils/gnote/files/patch-src_remotecontrolproxy.cpp deleted file mode 100644 index 6a1989f12946..000000000000 --- a/deskutils/gnote/files/patch-src_remotecontrolproxy.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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<Gio::DBus::InterfaceInfo> & interface) - { -- if(interface != 0) { -+ if(interface) { - return; - } - std::ifstream fin(filename); diff --git a/deskutils/gnote/files/patch-src_searchnoteswidget.cpp b/deskutils/gnote/files/patch-src_searchnoteswidget.cpp deleted file mode 100644 index 91b9910a45f4..000000000000 --- a/deskutils/gnote/files/patch-src_searchnoteswidget.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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<Gtk::TreeSelection> selection = m_notebooksTree->get_selection(); -- if(selection == 0) { -+ if(!selection) { - return; - } - std::vector<Gtk::TreeModel::Path> selected_row = selection->get_selected_rows(); diff --git a/deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp b/deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp deleted file mode 100644 index e1ea88bc9b81..000000000000 --- a/deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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<Gio::File> 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)); diff --git a/deskutils/gnote/pkg-descr b/deskutils/gnote/pkg-descr index a8c0d6c70124..2b228014fd3f 100644 --- a/deskutils/gnote/pkg-descr +++ b/deskutils/gnote/pkg-descr @@ -3,4 +3,4 @@ Gnote is a port of Tomboy to C++. It is the same note taking application, including most of the add-ins (more are to come). Synchronization support is being worked on. -WWW: https://wiki.gnome.org/Gnote +WWW: https://wiki.gnome.org/Apps/Gnote diff --git a/deskutils/gnote/pkg-plist b/deskutils/gnote/pkg-plist index 48dbbe61b11e..b4afded358ca 100644 --- a/deskutils/gnote/pkg-plist +++ b/deskutils/gnote/pkg-plist @@ -1,49 +1,48 @@ bin/gnote lib/gnote/addins/%%VERSION%%/backlinks.desktop -lib/gnote/addins/%%VERSION%%/backlinks.so lib/gnote/addins/%%VERSION%%/bugzilla.desktop -lib/gnote/addins/%%VERSION%%/bugzilla.so lib/gnote/addins/%%VERSION%%/exporttogtg.desktop -lib/gnote/addins/%%VERSION%%/exporttogtg.so lib/gnote/addins/%%VERSION%%/exporttohtml.desktop -lib/gnote/addins/%%VERSION%%/exporttohtml.so lib/gnote/addins/%%VERSION%%/filesystemsyncservice.desktop -lib/gnote/addins/%%VERSION%%/filesystemsyncservice.so lib/gnote/addins/%%VERSION%%/fixedwidth.desktop -lib/gnote/addins/%%VERSION%%/fixedwidth.so lib/gnote/addins/%%VERSION%%/inserttimestamp.desktop -lib/gnote/addins/%%VERSION%%/inserttimestamp.so +lib/gnote/addins/%%VERSION%%/libbacklinks.so +lib/gnote/addins/%%VERSION%%/libbugzilla.so +lib/gnote/addins/%%VERSION%%/libexporttogtg.so +lib/gnote/addins/%%VERSION%%/libexporttohtml.so +lib/gnote/addins/%%VERSION%%/libfilesystemsyncservice.so +lib/gnote/addins/%%VERSION%%/libfixedwidth.so +lib/gnote/addins/%%VERSION%%/libinserttimestamp.so +lib/gnote/addins/%%VERSION%%/libnotedirectorywatcher.so +lib/gnote/addins/%%VERSION%%/libnoteoftheday.so +lib/gnote/addins/%%VERSION%%/libprintnotes.so +lib/gnote/addins/%%VERSION%%/libreadonly.so +lib/gnote/addins/%%VERSION%%/libreplacetitle.so +lib/gnote/addins/%%VERSION%%/libspecialnotes.so +lib/gnote/addins/%%VERSION%%/libstatistics.so +lib/gnote/addins/%%VERSION%%/libstickynoteimport.so +lib/gnote/addins/%%VERSION%%/libtableofcontents.so +lib/gnote/addins/%%VERSION%%/libtodo.so +lib/gnote/addins/%%VERSION%%/libtomboyimport.so +lib/gnote/addins/%%VERSION%%/libunderline.so +lib/gnote/addins/%%VERSION%%/libwebdavsyncservice.so lib/gnote/addins/%%VERSION%%/notedirectorywatcher.desktop -lib/gnote/addins/%%VERSION%%/notedirectorywatcher.so lib/gnote/addins/%%VERSION%%/noteoftheday.desktop -lib/gnote/addins/%%VERSION%%/noteoftheday.so lib/gnote/addins/%%VERSION%%/printnotes.desktop -lib/gnote/addins/%%VERSION%%/printnotes.so lib/gnote/addins/%%VERSION%%/readonly.desktop -lib/gnote/addins/%%VERSION%%/readonly.so lib/gnote/addins/%%VERSION%%/replacetitle.desktop -lib/gnote/addins/%%VERSION%%/replacetitle.so lib/gnote/addins/%%VERSION%%/specialnotes.desktop -lib/gnote/addins/%%VERSION%%/specialnotes.so lib/gnote/addins/%%VERSION%%/statistics.desktop -lib/gnote/addins/%%VERSION%%/statistics.so lib/gnote/addins/%%VERSION%%/stickynoteimport.desktop -lib/gnote/addins/%%VERSION%%/stickynoteimport.so lib/gnote/addins/%%VERSION%%/tableofcontents.desktop -lib/gnote/addins/%%VERSION%%/tableofcontents.so lib/gnote/addins/%%VERSION%%/todo.desktop -lib/gnote/addins/%%VERSION%%/todo.so lib/gnote/addins/%%VERSION%%/tomboyimport.desktop -lib/gnote/addins/%%VERSION%%/tomboyimport.so lib/gnote/addins/%%VERSION%%/underline.desktop -lib/gnote/addins/%%VERSION%%/underline.so lib/gnote/addins/%%VERSION%%/webdavsyncservice.desktop -lib/gnote/addins/%%VERSION%%/webdavsyncservice.so -lib/libgnote-3.18.so.0 -lib/libgnote-3.18.so.0.0.1 +lib/libgnote-%%SVER%%.so.0 +lib/libgnote-%%SVER%%.so.0.0.0 lib/libgnote.so man/man1/gnote.1.gz -share/appdata/gnote.appdata.xml share/applications/gnote.desktop share/dbus-1/services/org.gnome.Gnote.service %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -79,6 +78,7 @@ share/gnome-shell/search-providers/gnote-search-provider.ini %%DATADIR%%/icons/hicolor/48x48/actions/notebook-new.png %%DATADIR%%/icons/hicolor/scalable/actions/notebook-new.svg %%DATADIR%%/shell-search-provider-dbus-interfaces.xml +%%DATADIR%%/shortcuts-gnote.ui share/help/C/gnote/figures/add-notebook-search.png share/help/C/gnote/figures/add-to-notebook.png share/help/C/gnote/figures/delete-notebook.png @@ -762,3 +762,4 @@ share/locale/uk/LC_MESSAGES/gnote.mo share/locale/zh_CN/LC_MESSAGES/gnote.mo share/locale/zh_HK/LC_MESSAGES/gnote.mo share/locale/zh_TW/LC_MESSAGES/gnote.mo +share/metainfo/gnote.appdata.xml |