deskutils/gnote: Update to 41.0

3 files changed, 113 insertions, 70 deletions

diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index f34657563bf4..bf2a210716b9 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -1,7 +1,7 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
 
 PORTNAME=	gnote
-PORTVERSION=	40.2
+PORTVERSION=	41.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 
@@ -12,8 +12,8 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool
-LIB_DEPENDS=	libgtkspell3-3.so:textproc/gtkspell3 \
-		libenchant.so:textproc/enchant \
+LIB_DEPENDS=	libenchant.so:textproc/enchant \
+		libgtkspell3-3.so:textproc/gtkspell3 \
 		libsecret-1.so:security/libsecret \
 		libuuid.so:misc/e2fsprogs-libuuid
 
@@ -21,18 +21,18 @@ PORTSCOUT=	limitw:1,even
 
 USE_GNOME=	gtkmm30 intltool libxml2 libxslt
 USE_XORG=	x11
-USES=		desktop-file-utils compiler:c++11-lib gettext gmake \
-		gnome libtool localbase pathfix pkgconfig tar:xz xorg
+USES=		compiler:c++11-lib desktop-file-utils gettext gnome localbase \
+		meson pathfix pkgconfig python:3.6+,build tar:xz xorg
 INSTALLS_ICONS=	yes
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
+BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 GLIB_SCHEMAS=	org.gnome.gnote.gschema.xml
 
 DOCS=		AUTHORS ChangeLog NEWS README TODO
 
-PLIST_SUB+=	VERSION=${PORTVERSION} SVER=${PORTVERSION:R}
+PLIST_SUB+=	SVER=${PORTVERSION:R} \
+		VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/deskutils/gnote/distinfo b/deskutils/gnote/distinfo
index 428d7d0fb104..4f0d965f0b26 100644
--- a/deskutils/gnote/distinfo
+++ b/deskutils/gnote/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630535513
-SHA256 (gnote-40.2.tar.xz) = 7e1b1ec1cccc060269b07427e4360d14be55dc8100272e01714c0cca9e6bd805
-SIZE (gnote-40.2.tar.xz) = 3422560
+TIMESTAMP = 1632868928
+SHA256 (gnote-41.0.tar.xz) = ffd1aed8a332a6031800590b914433445bc582e435abbef1d771e210143a3200
+SIZE (gnote-41.0.tar.xz) = 3164592
diff --git a/deskutils/gnote/pkg-plist b/deskutils/gnote/pkg-plist
index e9a085ac9a13..0628c2f451a9 100644
--- a/deskutils/gnote/pkg-plist
+++ b/deskutils/gnote/pkg-plist
@@ -1,49 +1,49 @@
 bin/gnote
-lib/gnote/addins/%%VERSION%%/backlinks.desktop
-lib/gnote/addins/%%VERSION%%/bugzilla.desktop
-lib/gnote/addins/%%VERSION%%/exporttogtg.desktop
-lib/gnote/addins/%%VERSION%%/exporttohtml.desktop
-lib/gnote/addins/%%VERSION%%/filesystemsyncservice.desktop
-lib/gnote/addins/%%VERSION%%/fixedwidth.desktop
-lib/gnote/addins/%%VERSION%%/gvfssyncservice.desktop
-lib/gnote/addins/%%VERSION%%/inserttimestamp.desktop
-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%%/libgvfssyncservice.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%%/noteoftheday.desktop
-lib/gnote/addins/%%VERSION%%/printnotes.desktop
-lib/gnote/addins/%%VERSION%%/readonly.desktop
-lib/gnote/addins/%%VERSION%%/replacetitle.desktop
-lib/gnote/addins/%%VERSION%%/specialnotes.desktop
-lib/gnote/addins/%%VERSION%%/statistics.desktop
-lib/gnote/addins/%%VERSION%%/stickynoteimport.desktop
-lib/gnote/addins/%%VERSION%%/tableofcontents.desktop
-lib/gnote/addins/%%VERSION%%/todo.desktop
-lib/gnote/addins/%%VERSION%%/tomboyimport.desktop
-lib/gnote/addins/%%VERSION%%/underline.desktop
-lib/gnote/addins/%%VERSION%%/webdavsyncservice.desktop
-lib/libgnote-40.so.2
-lib/libgnote-40.so.2.0.0
-lib/libgnote.so
+lib/gnote/plugins/41/backlinks.desktop
+lib/gnote/plugins/41/bugzilla.desktop
+lib/gnote/plugins/41/exporttogtg.desktop
+lib/gnote/plugins/41/exporttohtml.desktop
+lib/gnote/plugins/41/filesystemsyncservice.desktop
+lib/gnote/plugins/41/fixedwidth.desktop
+lib/gnote/plugins/41/gvfssyncservice.desktop
+lib/gnote/plugins/41/inserttimestamp.desktop
+lib/gnote/plugins/41/libbacklinks.so
+lib/gnote/plugins/41/libbugzilla.so
+lib/gnote/plugins/41/libexporttogtg.so
+lib/gnote/plugins/41/libexporttohtml.so
+lib/gnote/plugins/41/libfilesystemsyncservice.so
+lib/gnote/plugins/41/libfixedwidth.so
+lib/gnote/plugins/41/libgvfssyncservice.so
+lib/gnote/plugins/41/libinserttimestamp.so
+lib/gnote/plugins/41/libnotedirectorywatcher.so
+lib/gnote/plugins/41/libnoteoftheday.so
+lib/gnote/plugins/41/libprintnotes.so
+lib/gnote/plugins/41/libreadonly.so
+lib/gnote/plugins/41/libreplacetitle.so
+lib/gnote/plugins/41/libspecialnotes.so
+lib/gnote/plugins/41/libstatistics.so
+lib/gnote/plugins/41/libstickynoteimport.so
+lib/gnote/plugins/41/libtableofcontents.so
+lib/gnote/plugins/41/libtodo.so
+lib/gnote/plugins/41/libtomboyimport.so
+lib/gnote/plugins/41/libunderline.so
+lib/gnote/plugins/41/libwebdavsyncservice.so
+lib/gnote/plugins/41/notedirectorywatcher.desktop
+lib/gnote/plugins/41/noteoftheday.desktop
+lib/gnote/plugins/41/printnotes.desktop
+lib/gnote/plugins/41/readonly.desktop
+lib/gnote/plugins/41/replacetitle.desktop
+lib/gnote/plugins/41/specialnotes.desktop
+lib/gnote/plugins/41/statistics.desktop
+lib/gnote/plugins/41/stickynoteimport.desktop
+lib/gnote/plugins/41/tableofcontents.desktop
+lib/gnote/plugins/41/todo.desktop
+lib/gnote/plugins/41/tomboyimport.desktop
+lib/gnote/plugins/41/underline.desktop
+lib/gnote/plugins/41/webdavsyncservice.desktop
+lib/libgnote-41.so
+lib/libgnote-41.so.0
+lib/libgnote-41.so.0.0.0
 man/man1/gnote.1.gz
 share/applications/org.gnome.Gnote.desktop
 share/dbus-1/services/org.gnome.Gnote.service
@@ -55,8 +55,6 @@ share/dbus-1/services/org.gnome.Gnote.service
 share/gnome-shell/search-providers/org.gnome.Gnote.search-provider.ini
 %%DATADIR%%/exporttohtml.xsl
 %%DATADIR%%/gnote-introspect.xml
-%%DATADIR%%/icons/hicolor/16x16/actions/note-new.png
-%%DATADIR%%/icons/hicolor/16x16/actions/notebook-new.png
 %%DATADIR%%/icons/hicolor/16x16/apps/bug.png
 %%DATADIR%%/icons/hicolor/16x16/places/note.png
 %%DATADIR%%/icons/hicolor/16x16/places/notebook.png
@@ -65,20 +63,14 @@ share/gnome-shell/search-providers/org.gnome.Gnote.search-provider.ini
 %%DATADIR%%/icons/hicolor/16x16/status/pin-up.png
 %%DATADIR%%/icons/hicolor/22x22/actions/filter-note-all.png
 %%DATADIR%%/icons/hicolor/22x22/actions/filter-note-unfiled.png
-%%DATADIR%%/icons/hicolor/22x22/actions/note-new.png
-%%DATADIR%%/icons/hicolor/22x22/actions/notebook-new.png
 %%DATADIR%%/icons/hicolor/22x22/places/active-notes.png
 %%DATADIR%%/icons/hicolor/22x22/places/note.png
 %%DATADIR%%/icons/hicolor/22x22/places/notebook.png
 %%DATADIR%%/icons/hicolor/22x22/places/special-notes.png
 %%DATADIR%%/icons/hicolor/24x24/actions/filter-note-all.png
 %%DATADIR%%/icons/hicolor/24x24/actions/filter-note-unfiled.png
-%%DATADIR%%/icons/hicolor/24x24/actions/note-new.png
-%%DATADIR%%/icons/hicolor/24x24/actions/notebook-new.png
 %%DATADIR%%/icons/hicolor/24x24/places/note.png
 %%DATADIR%%/icons/hicolor/24x24/places/notebook.png
-%%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
@@ -481,6 +473,56 @@ share/help/hu/gnote/gnote-synchronization.page
 share/help/hu/gnote/gnote-template-notes.page
 share/help/hu/gnote/gnote-working-with-notebooks.page
 share/help/hu/gnote/index.page
+share/help/id/gnote/figures/add-notebook-search.png
+share/help/id/gnote/figures/add-to-notebook.png
+share/help/id/gnote/figures/delete-notebook.png
+share/help/id/gnote/figures/gnote-addin-table-of-contents.png
+share/help/id/gnote/figures/gnote-new-note.png
+share/help/id/gnote/figures/gnote-pindown.png
+share/help/id/gnote/figures/gnote-pinup.png
+share/help/id/gnote/figures/gnote-preferences-add-ins.png
+share/help/id/gnote/figures/gnote-preferences-editing.png
+share/help/id/gnote/figures/gnote-preferences-synchronization.png
+share/help/id/gnote/figures/gnote-search-all-notes.png
+share/help/id/gnote/figures/gnote-sync-progress.png
+share/help/id/gnote/figures/gnote-syncprefs-advanced.png
+share/help/id/gnote/figures/gnote-syncprefs-gvfs.png
+share/help/id/gnote/figures/gnote-syncprefs-local.png
+share/help/id/gnote/figures/gnote-syncprefs-webdav.png
+share/help/id/gnote/figures/gnote-template-note.png
+share/help/id/gnote/figures/gnote-tools.png
+share/help/id/gnote/figures/logo32.png
+share/help/id/gnote/figures/note-template.png
+share/help/id/gnote/figures/notebook-icon.png
+share/help/id/gnote/gnote-addin-bugzillalink.page
+share/help/id/gnote/gnote-addin-fixedwidth.page
+share/help/id/gnote/gnote-addin-html.page
+share/help/id/gnote/gnote-addin-notedirwatcher.page
+share/help/id/gnote/gnote-addin-noteoftheday.page
+share/help/id/gnote/gnote-addin-print.page
+share/help/id/gnote/gnote-addin-readonly.page
+share/help/id/gnote/gnote-addin-replacetitle.page
+share/help/id/gnote/gnote-addin-specialnotes.page
+share/help/id/gnote/gnote-addin-sync-gvfs.page
+share/help/id/gnote/gnote-addin-sync-local.page
+share/help/id/gnote/gnote-addin-sync-webdav.page
+share/help/id/gnote/gnote-addin-tableofcontents.page
+share/help/id/gnote/gnote-addin-timestamp.page
+share/help/id/gnote/gnote-addin-underline.page
+share/help/id/gnote/gnote-addins-preferences.page
+share/help/id/gnote/gnote-bulleted-lists.page
+share/help/id/gnote/gnote-common-problems.page
+share/help/id/gnote/gnote-creating-notes.page
+share/help/id/gnote/gnote-deleting-notes.page
+share/help/id/gnote/gnote-editing-notes.page
+share/help/id/gnote/gnote-introduction.page
+share/help/id/gnote/gnote-links.page
+share/help/id/gnote/gnote-notes-preferences.page
+share/help/id/gnote/gnote-searching-notes.page
+share/help/id/gnote/gnote-synchronization.page
+share/help/id/gnote/gnote-template-notes.page
+share/help/id/gnote/gnote-working-with-notebooks.page
+share/help/id/gnote/index.page
 share/help/lt/gnote/figures/add-notebook-search.png
 share/help/lt/gnote/figures/add-to-notebook.png
 share/help/lt/gnote/figures/delete-notebook.png
@@ -831,12 +873,12 @@ share/help/zh_CN/gnote/gnote-synchronization.page
 share/help/zh_CN/gnote/gnote-template-notes.page
 share/help/zh_CN/gnote/gnote-working-with-notebooks.page
 share/help/zh_CN/gnote/index.page
-share/icons/hicolor/16x16/apps/org.gnome.Gnote.png
-share/icons/hicolor/22x22/apps/org.gnome.Gnote.png
-share/icons/hicolor/24x24/apps/org.gnome.Gnote.png
-share/icons/hicolor/256x256/apps/org.gnome.Gnote.png
-share/icons/hicolor/32x32/apps/org.gnome.Gnote.png
-share/icons/hicolor/48x48/apps/org.gnome.Gnote.png
+share/icons/hicolor/16x16/apps/org.gnome.Gnote.svg
+share/icons/hicolor/22x22/apps/org.gnome.Gnote.svg
+share/icons/hicolor/24x24/apps/org.gnome.Gnote.svg
+share/icons/hicolor/256x256/apps/org.gnome.Gnote.svg
+share/icons/hicolor/32x32/apps/org.gnome.Gnote.svg
+share/icons/hicolor/48x48/apps/org.gnome.Gnote.svg
 share/icons/hicolor/scalable/apps/org.gnome.Gnote.svg
 share/locale/ar/LC_MESSAGES/gnote.mo
 share/locale/as/LC_MESSAGES/gnote.mo
@@ -870,6 +912,7 @@ share/locale/lv/LC_MESSAGES/gnote.mo
 share/locale/ml/LC_MESSAGES/gnote.mo
 share/locale/mr/LC_MESSAGES/gnote.mo
 share/locale/nb/LC_MESSAGES/gnote.mo
+share/locale/nl/LC_MESSAGES/gnote.mo
 share/locale/oc/LC_MESSAGES/gnote.mo
 share/locale/or/LC_MESSAGES/gnote.mo
 share/locale/pa/LC_MESSAGES/gnote.mo