this updates apostrophe to the latest version.  The changelog is
available here:

https://gitlab.gnome.org/World/apostrophe/-/blob/main/NEWS

and list new features, improvements and bug fixes.

While here I'm also setting the homepage to gitlab since it's where
apostrophe seems to be developed (but kept GH_* because they're handy)

The only issue i've found (and i don't remember if it's present also in
the current version) is that closing via the X button makes apostrophe
print an error (OSError("handle is closed")) but it exits successfully
and the file is OK.  Closing via C-q doesn't print anything.

lightly tested, including the multiwindow support.  Couldn't test the
"follow dark mode global preference".  ok?

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/editors/apostrophe/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile    8 May 2022 09:39:32 -0000       1.6
+++ Makefile    1 Jul 2022 08:13:42 -0000
@@ -1,13 +1,14 @@
 COMMENT=               distraction free editor
 
-GH_TAGNAME=            v2.5
+GH_TAGNAME=            v2.6.3
 GH_ACCOUNT=            ApostropheEditor
 GH_PROJECT=            Apostrophe
-REVISION=              2
 
 PKGNAME=               apostrophe-${GH_TAGNAME:S/v//}
 
 CATEGORIES=            editors
+
+HOMEPAGE =             https://gitlab.gnome.org/World/apostrophe
 
 # GPLv3+
 PERMIT_PACKAGE=                Yes
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/editors/apostrophe/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    16 Oct 2021 13:43:19 -0000      1.1.1.1
+++ distinfo    1 Jul 2022 08:19:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (Apostrophe-2.5.tar.gz) = S3IFW9SftysEuErS5Lt9tzn++J23vjkJlaMbmpurbIo=
-SIZE (Apostrophe-2.5.tar.gz) = 3219318
+SHA256 (Apostrophe-2.6.3.tar.gz) = HOKgfATfJsWutg6cIdWYqODLwRAG4XV75fPKN0DPxew=
+SIZE (Apostrophe-2.6.3.tar.gz) = 3278447
Index: patches/patch-data_meson_build
===================================================================
RCS file: patches/patch-data_meson_build
diff -N patches/patch-data_meson_build
--- patches/patch-data_meson_build      11 Mar 2022 18:58:27 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-Fix build with meson >= 0.60.0
-
-Index: data/meson.build
---- data/meson.build.orig
-+++ data/meson.build
-@@ -2,7 +2,6 @@
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
- desktop_file = i18n.merge_file(
--  'desktop',
-   input: configure_file(
-     input: 'org.gnome.gitlab.somas.Apostrophe.desktop.in.in',
-     output: '@BASENAME@',
-@@ -46,7 +45,6 @@ metainfo_configured = configure_file(
- # )
- 
- appdata_file = i18n.merge_file(
--  'appdata',
-   input: metainfo_configured,
-   output: '@0...@.metainfo.xml'.format(application_id),
-   po_dir: podir,
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/editors/apostrophe/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   11 Mar 2022 18:58:27 -0000      1.2
+++ pkg/PLIST   1 Jul 2022 08:23:13 -0000
@@ -15,11 +15,14 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}latex_to_PNG.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}main_window.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}markup_regex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}open_popover.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}preferences_dialog.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}preview_converter.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}preview_handler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}preview_layout_switcher.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}preview_renderer.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}preview_web_view.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}preview_window.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}search_and_replace.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/apostrophe/${MODPY_PYCACHE}stats_counter.${MODPY_PYC_MAGIC_TAG}pyc
@@ -43,11 +46,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/apostrophe/latex_to_PNG.py
 lib/python${MODPY_VERSION}/site-packages/apostrophe/main_window.py
 lib/python${MODPY_VERSION}/site-packages/apostrophe/markup_regex.py
+lib/python${MODPY_VERSION}/site-packages/apostrophe/open_popover.py
 lib/python${MODPY_VERSION}/site-packages/apostrophe/preferences_dialog.py
 lib/python${MODPY_VERSION}/site-packages/apostrophe/preview_converter.py
 lib/python${MODPY_VERSION}/site-packages/apostrophe/preview_handler.py
+lib/python${MODPY_VERSION}/site-packages/apostrophe/preview_layout_switcher.py
 lib/python${MODPY_VERSION}/site-packages/apostrophe/preview_renderer.py
 lib/python${MODPY_VERSION}/site-packages/apostrophe/preview_web_view.py
+lib/python${MODPY_VERSION}/site-packages/apostrophe/preview_window.py
 lib/python${MODPY_VERSION}/site-packages/apostrophe/search_and_replace.py
 lib/python${MODPY_VERSION}/site-packages/apostrophe/settings.py
 lib/python${MODPY_VERSION}/site-packages/apostrophe/stats_counter.py
@@ -69,7 +75,10 @@ share/apostrophe/media/
 share/apostrophe/media/apostrophe_markdown.md
 share/apostrophe/media/css/
 share/apostrophe/media/css/gtk/
+share/apostrophe/media/css/gtk/Adwaita-dark-hc.scss
 share/apostrophe/media/css/gtk/Adwaita-dark.scss
+share/apostrophe/media/css/gtk/Adwaita-hc.scss
+share/apostrophe/media/css/gtk/Adwaita-sepia-hc.scss
 share/apostrophe/media/css/gtk/Adwaita-sepia.scss
 share/apostrophe/media/css/gtk/Adwaita.scss
 share/apostrophe/media/css/gtk/_base.scss
@@ -86,6 +95,7 @@ share/apostrophe/media/css/web/highcontr
 share/apostrophe/media/css/web/highcontrast_inverse.css
 share/apostrophe/media/formats.json
 share/apostrophe/media/icons/
+share/apostrophe/media/icons/checkmark-symbolic.svg
 share/apostrophe/media/icons/preview-layout-full-width-symbolic.svg
 share/apostrophe/media/icons/preview-layout-half-height-symbolic.svg
 share/apostrophe/media/icons/preview-layout-half-width-symbolic.svg
@@ -100,37 +110,50 @@ share/apostrophe/reference_files/referen
 share/apostrophe/ui/
 share/apostrophe/ui/About.ui.in
 share/apostrophe/ui/Export.ui
-share/apostrophe/ui/ExportPopover.ui
 share/apostrophe/ui/Headerbar.ui
-share/apostrophe/ui/Menu.ui
 share/apostrophe/ui/Preferences.ui
+share/apostrophe/ui/PreviewLayoutSwitcher.ui
 share/apostrophe/ui/PreviewLayoutSwitcherItem.ui
+share/apostrophe/ui/PreviewWindow.ui
 share/apostrophe/ui/Recents.ui
+share/apostrophe/ui/SearchBar.ui
 share/apostrophe/ui/Shortcuts.ui
 share/apostrophe/ui/TexliveWarning.ui
+share/apostrophe/ui/TextView.ui
 share/apostrophe/ui/ThemeSwitcher.ui
 share/apostrophe/ui/Window.ui
 share/applications/org.gnome.gitlab.somas.Apostrophe.desktop
 share/glib-2.0/schemas/org.gnome.gitlab.somas.Apostrophe.gschema.xml
 share/icons/hicolor/scalable/apps/org.gnome.gitlab.somas.Apostrophe.svg
 
share/icons/hicolor/symbolic/apps/org.gnome.gitlab.somas.Apostrophe-symbolic.svg
-share/locale/ca_ES/
-share/locale/ca_ES/LC_MESSAGES/
-share/locale/ca_ES/LC_MESSAGES/apostrophe.mo
+share/locale/ca/LC_MESSAGES/apostrophe.mo
 share/locale/cs/LC_MESSAGES/apostrophe.mo
+share/locale/da/LC_MESSAGES/apostrophe.mo
 share/locale/de/LC_MESSAGES/apostrophe.mo
 share/locale/en_GB/LC_MESSAGES/apostrophe.mo
 share/locale/es/LC_MESSAGES/apostrophe.mo
 share/locale/eu/LC_MESSAGES/apostrophe.mo
+share/locale/fa/LC_MESSAGES/apostrophe.mo
+share/locale/fi/LC_MESSAGES/apostrophe.mo
 share/locale/fr/LC_MESSAGES/apostrophe.mo
+share/locale/gl/LC_MESSAGES/apostrophe.mo
+share/locale/he/LC_MESSAGES/apostrophe.mo
+share/locale/hr/LC_MESSAGES/apostrophe.mo
 share/locale/hu/LC_MESSAGES/apostrophe.mo
+share/locale/id/LC_MESSAGES/apostrophe.mo
 share/locale/it/LC_MESSAGES/apostrophe.mo
+share/locale/nl/LC_MESSAGES/apostrophe.mo
+share/locale/oc/LC_MESSAGES/apostrophe.mo
 share/locale/pl/LC_MESSAGES/apostrophe.mo
+share/locale/pt/LC_MESSAGES/apostrophe.mo
 share/locale/pt_BR/LC_MESSAGES/apostrophe.mo
 share/locale/ru/LC_MESSAGES/apostrophe.mo
 share/locale/si/LC_MESSAGES/apostrophe.mo
+share/locale/sl/LC_MESSAGES/apostrophe.mo
+share/locale/sr/LC_MESSAGES/apostrophe.mo
 share/locale/sv/LC_MESSAGES/apostrophe.mo
 share/locale/tr/LC_MESSAGES/apostrophe.mo
+share/locale/uk/LC_MESSAGES/apostrophe.mo
 share/locale/vi/LC_MESSAGES/apostrophe.mo
 share/locale/zh_CN/LC_MESSAGES/apostrophe.mo
 share/locale/zh_TW/LC_MESSAGES/apostrophe.mo

Reply via email to