diff --git a/mail/geary/Makefile b/mail/geary/Makefile index 899d1ea5be38..0d84353c076d 100644 --- a/mail/geary/Makefile +++ b/mail/geary/Makefile @@ -1,56 +1,54 @@ PORTNAME= geary -PORTVERSION= 40.0 -PORTREVISION= 14 +PORTVERSION= 46.0 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome -PATCH_SITES= https://gitlab.gnome.org/GNOME/geary/-/commit/ -PATCHFILES= 0f75e7a84a39492d0748cec2ba6028e08cae3644.diff:-p1 \ - 4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.diff:-p1 \ - 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.diff:-p1 - MAINTAINER= gnome@FreeBSD.org COMMENT= Mail client for GNOME WWW= https://wiki.gnome.org/Apps/Geary LICENSE= BSD2CLAUSE CC-BY-3.0 LGPL21+ LICENSE_COMB= multi -BUILD_DEPENDS= itstool:textproc/itstool +BUILD_DEPENDS= itstool:textproc/itstool \ + iso-codes>0:misc/iso-codes LIB_DEPENDS= libappstream-glib.so:devel/appstream-glib \ - libcanberra.so:audio/libcanberra \ libenchant-2.so:textproc/enchant2 \ libfolks.so:net-im/folks \ libgcr-base-3.so:security/gcr3 \ libgee-0.8.so:devel/libgee \ libgmime-3.0.so:mail/gmime30 \ libgoa-1.0.so:net/gnome-online-accounts \ libgspell-1.so:textproc/gspell \ libhandy-1.so:x11-toolkits/libhandy \ libicuuc.so:devel/icu \ libjson-glib-1.0.so:devel/json-glib \ libnotify.so:devel/libnotify \ libpeas-gtk-1.0.so:devel/libpeas \ libsecret-1.so:security/libsecret \ - libsoup-2.4.so:devel/libsoup \ + libsoup-3.0.so:devel/libsoup3 \ libstemmer.so:textproc/snowballstemmer \ - libunwind.so:devel/libunwind \ - libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \ - libytnef.so:converters/ytnef + libytnef.so:converters/ytnef \ + libwebkit2gtk-4.1.so:www/webkit2-gtk@41 -USES= compiler:c11 cpe desktop-file-utils gettext gnome meson pkgconfig \ - python:build shebangfix sqlite tar:xz vala:build +USES= compiler:c11 cpe desktop-file-utils gettext gnome localbase:ldflags \ + meson pkgconfig python:build shebangfix sqlite tar:xz vala:build CPE_VENDOR= gnome -USE_GNOME= cairo gsound gtk30 libxml2 +USE_GNOME= cairo gdkpixbuf glib20 gsound gtk30 libxml2 GLIB_SCHEMAS= org.gnome.Geary.gschema.xml USE_LDCONFIG= yes SHEBANG_FILES= desktop/geary-attach -MESON_ARGS= -Dprofile=release -Dvaladoc=disabled +MESON_ARGS= -Dprofile=release -Dvaladoc=disabled \ + -Dlibunwind=disabled \ + -Diso_639_xml=${LOCALBASE}/share/xml/iso-codes/iso_639.xml \ + -Diso_3166_xml=${LOCALBASE}/share/xml/iso-codes/iso_3166.xml BINARY_ALIAS= python3=${PYTHON_VERSION} CFLAGS+= -Wno-error=int-conversion +PLIST_SUB= VERSION=${PORTVERSION} + .include diff --git a/mail/geary/distinfo b/mail/geary/distinfo index b1b9798dcf37..59674b77a1d5 100644 --- a/mail/geary/distinfo +++ b/mail/geary/distinfo @@ -1,9 +1,3 @@ -TIMESTAMP = 1619150359 -SHA256 (gnome/geary-40.0.tar.xz) = 3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0 -SIZE (gnome/geary-40.0.tar.xz) = 2490940 -SHA256 (gnome/0f75e7a84a39492d0748cec2ba6028e08cae3644.diff) = b25728b284b8268de4f52d6064dacd70f4c65cc53bb10fba7e280218383f697a -SIZE (gnome/0f75e7a84a39492d0748cec2ba6028e08cae3644.diff) = 581 -SHA256 (gnome/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.diff) = 5f1edaf6f755a4ca01d806b70a36fde7ba9a881d4e48de4a2e6027f4458b9e84 -SIZE (gnome/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.diff) = 1883 -SHA256 (gnome/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.diff) = 99a1dd00319fa1061c620f6e3b764fc70402695c06618dc0c530bc6875bb64dd -SIZE (gnome/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.diff) = 1090 +TIMESTAMP = 1749648618 +SHA256 (gnome/geary-46.0.tar.xz) = afad151302817ddf098b5e416e7ac7f2d5eea567a3b80bb90bd3c62afd13b9a1 +SIZE (gnome/geary-46.0.tar.xz) = 2489980 diff --git a/mail/geary/files/patch-meson.build b/mail/geary/files/patch-meson.build deleted file mode 100644 index d6767378dd40..000000000000 --- a/mail/geary/files/patch-meson.build +++ /dev/null @@ -1,20 +0,0 @@ ---- meson.build.orig 2021-04-23 03:57:02 UTC -+++ meson.build -@@ -94,7 +94,7 @@ libmath = cc.find_library('m') - libpeas = dependency('libpeas-1.0', version: '>= 1.24.0') - libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0') - libsecret = dependency('libsecret-1', version: '>= 0.11') --libstemmer_dep = cc.find_library('stemmer') -+libstemmer_dep = cc.find_library('stemmer', dirs: [ '/usr/local/lib/' ]) - libsoup = dependency('libsoup-2.4', version: '>= 2.48') - libunwind_dep = dependency( - 'libunwind', version: '>= 1.1', required: get_option('libunwind') -@@ -114,7 +114,7 @@ webkit2gtk_web_extension = dependency('webkit2gtk-web- - icu_uc = declare_dependency( - dependencies: [ - valac.find_library('icu-uc', dirs: [vapi_dir]), -- cc.find_library('icuuc'), -+ cc.find_library('icuuc', dirs: [ '/usr/local/lib/' ]), - ], - ) - diff --git a/mail/geary/files/patch-src_engine_api_geary-client-service.vala b/mail/geary/files/patch-src_engine_api_geary-client-service.vala new file mode 100644 index 000000000000..5ac304384d7e --- /dev/null +++ b/mail/geary/files/patch-src_engine_api_geary-client-service.vala @@ -0,0 +1,15 @@ +--- src/engine/api/geary-client-service.vala.orig 2023-07-05 12:44:13 UTC ++++ src/engine/api/geary-client-service.vala +@@ -25,9 +25,9 @@ public abstract class Geary.ClientService : BaseObject + private const int BECAME_REACHABLE_TIMEOUT_SEC = 3; + private const int BECAME_UNREACHABLE_TIMEOUT_SEC = 1; + +- private const string LOGIND_DBUS_NAME = "org.freedesktop.login1"; +- private const string LOGIND_DBUS_PATH = "/org/freedesktop/login1"; +- private const string LOGIND_DBUS_INTERFACE = "org.freedesktop.login1.Manager"; ++ private const string LOGIND_DBUS_NAME = "org.freedesktop.ConsoleKit"; ++ private const string LOGIND_DBUS_PATH = "/org/freedesktop/ConsoleKit/Manager"; ++ private const string LOGIND_DBUS_INTERFACE = "org.freedesktop.ConsoleKit.Manager"; + + /** + * Denotes the service's current status. diff --git a/mail/geary/pkg-plist b/mail/geary/pkg-plist index 6a8e12314055..3ce66343b286 100644 --- a/mail/geary/pkg-plist +++ b/mail/geary/pkg-plist @@ -1,326 +1,348 @@ bin/geary -lib/geary/libgeary-client-40.0.so +lib/geary/libgeary-client-%%VERSION%%.so lib/geary/plugins/desktop-notifications/desktop-notifications.plugin lib/geary/plugins/desktop-notifications/libdesktop-notifications.so lib/geary/plugins/email-templates/email-templates.plugin lib/geary/plugins/email-templates/libemail-templates.so lib/geary/plugins/folder-highlight/folder-highlight.plugin lib/geary/plugins/folder-highlight/libfolder-highlight.so lib/geary/plugins/mail-merge/libmail-merge.so lib/geary/plugins/mail-merge/mail-merge.plugin lib/geary/plugins/notification-badge/libnotification-badge.so lib/geary/plugins/notification-badge/notification-badge.plugin lib/geary/plugins/sent-sound/libsent-sound.so lib/geary/plugins/sent-sound/sent-sound.plugin lib/geary/plugins/special-folders/libspecial-folders.so lib/geary/plugins/special-folders/special-folders.plugin lib/geary/web-extensions/libgeary-web-process.so share/applications/geary-autostart.desktop share/applications/org.gnome.Geary.desktop share/dbus-1/services/org.gnome.Geary.service %%DATADIR%%/sql/version-001.sql %%DATADIR%%/sql/version-002.sql %%DATADIR%%/sql/version-003.sql %%DATADIR%%/sql/version-004.sql %%DATADIR%%/sql/version-005.sql %%DATADIR%%/sql/version-006.sql %%DATADIR%%/sql/version-007.sql %%DATADIR%%/sql/version-008.sql %%DATADIR%%/sql/version-009.sql %%DATADIR%%/sql/version-010.sql %%DATADIR%%/sql/version-011.sql %%DATADIR%%/sql/version-012.sql %%DATADIR%%/sql/version-013.sql %%DATADIR%%/sql/version-014.sql %%DATADIR%%/sql/version-015.sql %%DATADIR%%/sql/version-016.sql %%DATADIR%%/sql/version-017.sql %%DATADIR%%/sql/version-018.sql %%DATADIR%%/sql/version-019.sql %%DATADIR%%/sql/version-020.sql %%DATADIR%%/sql/version-021.sql %%DATADIR%%/sql/version-022.sql %%DATADIR%%/sql/version-023.sql %%DATADIR%%/sql/version-024.sql %%DATADIR%%/sql/version-025.sql %%DATADIR%%/sql/version-026.sql %%DATADIR%%/sql/version-027.sql %%DATADIR%%/sql/version-028.sql %%DATADIR%%/sql/version-029.sql %%DATADIR%%/sql/version-030.sql share/help/C/geary/accounts.page share/help/C/geary/archive.page share/help/C/geary/bugs.page share/help/C/geary/contributing.page share/help/C/geary/figures/geary.svg share/help/C/geary/index.page share/help/C/geary/label.page share/help/C/geary/limits.page share/help/C/geary/overview.page share/help/C/geary/preferences.page share/help/C/geary/search.page share/help/C/geary/shortcuts.page share/help/C/geary/star.page share/help/C/geary/write.page share/help/ca/geary/accounts.page share/help/ca/geary/archive.page share/help/ca/geary/bugs.page share/help/ca/geary/contributing.page share/help/ca/geary/figures/geary.svg share/help/ca/geary/index.page share/help/ca/geary/label.page share/help/ca/geary/limits.page share/help/ca/geary/overview.page share/help/ca/geary/preferences.page share/help/ca/geary/search.page share/help/ca/geary/shortcuts.page share/help/ca/geary/star.page share/help/ca/geary/write.page share/help/cs/geary/accounts.page share/help/cs/geary/archive.page share/help/cs/geary/bugs.page share/help/cs/geary/contributing.page share/help/cs/geary/figures/geary.svg share/help/cs/geary/index.page share/help/cs/geary/label.page share/help/cs/geary/limits.page share/help/cs/geary/overview.page share/help/cs/geary/preferences.page share/help/cs/geary/search.page share/help/cs/geary/shortcuts.page share/help/cs/geary/star.page share/help/cs/geary/write.page share/help/de/geary/accounts.page share/help/de/geary/archive.page share/help/de/geary/bugs.page share/help/de/geary/contributing.page share/help/de/geary/figures/geary.svg share/help/de/geary/index.page share/help/de/geary/label.page share/help/de/geary/limits.page share/help/de/geary/overview.page share/help/de/geary/preferences.page share/help/de/geary/search.page share/help/de/geary/shortcuts.page share/help/de/geary/star.page share/help/de/geary/write.page share/help/el/geary/accounts.page share/help/el/geary/archive.page share/help/el/geary/bugs.page share/help/el/geary/contributing.page share/help/el/geary/figures/geary.svg share/help/el/geary/index.page share/help/el/geary/label.page share/help/el/geary/limits.page share/help/el/geary/overview.page share/help/el/geary/preferences.page share/help/el/geary/search.page share/help/el/geary/shortcuts.page share/help/el/geary/star.page share/help/el/geary/write.page share/help/es/geary/accounts.page share/help/es/geary/archive.page share/help/es/geary/bugs.page share/help/es/geary/contributing.page share/help/es/geary/figures/geary.svg share/help/es/geary/index.page share/help/es/geary/label.page share/help/es/geary/limits.page share/help/es/geary/overview.page share/help/es/geary/preferences.page share/help/es/geary/search.page share/help/es/geary/shortcuts.page share/help/es/geary/star.page share/help/es/geary/write.page +share/help/eu/geary/accounts.page +share/help/eu/geary/archive.page +share/help/eu/geary/bugs.page +share/help/eu/geary/contributing.page +share/help/eu/geary/figures/geary.svg +share/help/eu/geary/index.page +share/help/eu/geary/label.page +share/help/eu/geary/limits.page +share/help/eu/geary/overview.page +share/help/eu/geary/preferences.page +share/help/eu/geary/search.page +share/help/eu/geary/shortcuts.page +share/help/eu/geary/star.page +share/help/eu/geary/write.page share/help/fr/geary/accounts.page share/help/fr/geary/archive.page share/help/fr/geary/bugs.page share/help/fr/geary/contributing.page share/help/fr/geary/figures/geary.svg share/help/fr/geary/index.page share/help/fr/geary/label.page share/help/fr/geary/limits.page share/help/fr/geary/overview.page share/help/fr/geary/preferences.page share/help/fr/geary/search.page share/help/fr/geary/shortcuts.page share/help/fr/geary/star.page share/help/fr/geary/write.page share/help/id/geary/accounts.page share/help/id/geary/archive.page share/help/id/geary/bugs.page share/help/id/geary/contributing.page share/help/id/geary/figures/geary.svg share/help/id/geary/index.page share/help/id/geary/label.page share/help/id/geary/limits.page share/help/id/geary/overview.page share/help/id/geary/preferences.page share/help/id/geary/search.page share/help/id/geary/shortcuts.page share/help/id/geary/star.page share/help/id/geary/write.page share/help/it/geary/accounts.page share/help/it/geary/archive.page share/help/it/geary/bugs.page share/help/it/geary/contributing.page share/help/it/geary/figures/geary.svg share/help/it/geary/index.page share/help/it/geary/label.page share/help/it/geary/limits.page share/help/it/geary/overview.page share/help/it/geary/preferences.page share/help/it/geary/search.page share/help/it/geary/shortcuts.page share/help/it/geary/star.page share/help/it/geary/write.page share/help/pl/geary/accounts.page share/help/pl/geary/archive.page share/help/pl/geary/bugs.page share/help/pl/geary/contributing.page share/help/pl/geary/figures/geary.svg share/help/pl/geary/index.page share/help/pl/geary/label.page share/help/pl/geary/limits.page share/help/pl/geary/overview.page share/help/pl/geary/preferences.page share/help/pl/geary/search.page share/help/pl/geary/shortcuts.page share/help/pl/geary/star.page share/help/pl/geary/write.page share/help/pt_BR/geary/accounts.page share/help/pt_BR/geary/archive.page share/help/pt_BR/geary/bugs.page share/help/pt_BR/geary/contributing.page share/help/pt_BR/geary/figures/geary.svg share/help/pt_BR/geary/index.page share/help/pt_BR/geary/label.page share/help/pt_BR/geary/limits.page share/help/pt_BR/geary/overview.page share/help/pt_BR/geary/preferences.page share/help/pt_BR/geary/search.page share/help/pt_BR/geary/shortcuts.page share/help/pt_BR/geary/star.page share/help/pt_BR/geary/write.page +share/help/ru/geary/accounts.page +share/help/ru/geary/archive.page +share/help/ru/geary/bugs.page +share/help/ru/geary/contributing.page +share/help/ru/geary/figures/geary.svg +share/help/ru/geary/index.page +share/help/ru/geary/label.page +share/help/ru/geary/limits.page +share/help/ru/geary/overview.page +share/help/ru/geary/preferences.page +share/help/ru/geary/search.page +share/help/ru/geary/shortcuts.page +share/help/ru/geary/star.page +share/help/ru/geary/write.page share/help/sv/geary/accounts.page share/help/sv/geary/archive.page share/help/sv/geary/bugs.page share/help/sv/geary/contributing.page share/help/sv/geary/figures/geary.svg share/help/sv/geary/index.page share/help/sv/geary/label.page share/help/sv/geary/limits.page share/help/sv/geary/overview.page share/help/sv/geary/preferences.page share/help/sv/geary/search.page share/help/sv/geary/shortcuts.page share/help/sv/geary/star.page share/help/sv/geary/write.page share/help/tr/geary/accounts.page share/help/tr/geary/archive.page share/help/tr/geary/bugs.page share/help/tr/geary/contributing.page share/help/tr/geary/figures/geary.svg share/help/tr/geary/index.page share/help/tr/geary/label.page share/help/tr/geary/limits.page share/help/tr/geary/overview.page share/help/tr/geary/preferences.page share/help/tr/geary/search.page share/help/tr/geary/shortcuts.page share/help/tr/geary/star.page share/help/tr/geary/write.page share/help/uk/geary/accounts.page share/help/uk/geary/archive.page share/help/uk/geary/bugs.page share/help/uk/geary/contributing.page share/help/uk/geary/figures/geary.svg share/help/uk/geary/index.page share/help/uk/geary/label.page share/help/uk/geary/limits.page share/help/uk/geary/overview.page share/help/uk/geary/preferences.page share/help/uk/geary/search.page share/help/uk/geary/shortcuts.page share/help/uk/geary/star.page share/help/uk/geary/write.page share/icons/hicolor/scalable/actions/close-symbolic.svg share/icons/hicolor/scalable/actions/detach-symbolic.svg share/icons/hicolor/scalable/actions/edit-symbolic.svg share/icons/hicolor/scalable/actions/font-color-symbolic.svg share/icons/hicolor/scalable/actions/font-size-symbolic.svg share/icons/hicolor/scalable/actions/format-ordered-list-symbolic-rtl.svg share/icons/hicolor/scalable/actions/format-ordered-list-symbolic.svg share/icons/hicolor/scalable/actions/format-text-remove-symbolic.svg share/icons/hicolor/scalable/actions/format-toolbar-toggle-symbolic.svg share/icons/hicolor/scalable/actions/format-unordered-list-symbolic-rtl.svg share/icons/hicolor/scalable/actions/format-unordered-list-symbolic.svg share/icons/hicolor/scalable/actions/mail-archive-symbolic.svg share/icons/hicolor/scalable/actions/mail-drafts-symbolic-rtl.svg share/icons/hicolor/scalable/actions/mail-drafts-symbolic.svg -share/icons/hicolor/scalable/actions/mail-forward-symbolic-rtl.svg -share/icons/hicolor/scalable/actions/mail-forward-symbolic.svg share/icons/hicolor/scalable/actions/mail-inbox-symbolic.svg share/icons/hicolor/scalable/actions/mail-outbox-symbolic.svg -share/icons/hicolor/scalable/actions/mail-reply-all-symbolic-rtl.svg -share/icons/hicolor/scalable/actions/mail-reply-all-symbolic.svg -share/icons/hicolor/scalable/actions/mail-reply-sender-symbolic-rtl.svg -share/icons/hicolor/scalable/actions/mail-reply-sender-symbolic.svg share/icons/hicolor/scalable/actions/mail-sent-symbolic-rtl.svg share/icons/hicolor/scalable/actions/mail-sent-symbolic.svg -share/icons/hicolor/scalable/actions/marker-symbolic.svg share/icons/hicolor/scalable/actions/tag-symbolic-rtl.svg share/icons/hicolor/scalable/actions/tag-symbolic.svg share/icons/hicolor/scalable/actions/text-x-generic-symbolic.svg share/icons/hicolor/scalable/apps/org.gnome.Geary.svg share/icons/hicolor/symbolic/apps/org.gnome.Geary-symbolic.svg share/locale/ar/LC_MESSAGES/geary.mo share/locale/be/LC_MESSAGES/geary.mo share/locale/bs/LC_MESSAGES/geary.mo share/locale/ca/LC_MESSAGES/geary.mo share/locale/cs/LC_MESSAGES/geary.mo share/locale/da/LC_MESSAGES/geary.mo share/locale/de/LC_MESSAGES/geary.mo share/locale/el/LC_MESSAGES/geary.mo share/locale/en_CA/LC_MESSAGES/geary.mo share/locale/en_GB/LC_MESSAGES/geary.mo share/locale/eo/LC_MESSAGES/geary.mo share/locale/es/LC_MESSAGES/geary.mo share/locale/et/LC_MESSAGES/geary.mo share/locale/eu/LC_MESSAGES/geary.mo share/locale/fa/LC_MESSAGES/geary.mo share/locale/fi/LC_MESSAGES/geary.mo share/locale/fr/LC_MESSAGES/geary.mo share/locale/fur/LC_MESSAGES/geary.mo share/locale/gl/LC_MESSAGES/geary.mo share/locale/he/LC_MESSAGES/geary.mo share/locale/hi/LC_MESSAGES/geary.mo share/locale/hr/LC_MESSAGES/geary.mo share/locale/hu/LC_MESSAGES/geary.mo share/locale/id/LC_MESSAGES/geary.mo +share/locale/ie/LC_MESSAGES/geary.mo share/locale/it/LC_MESSAGES/geary.mo share/locale/ja/LC_MESSAGES/geary.mo share/locale/kk/LC_MESSAGES/geary.mo share/locale/km/LC_MESSAGES/geary.mo share/locale/lt/LC_MESSAGES/geary.mo share/locale/ms/LC_MESSAGES/geary.mo share/locale/nb/LC_MESSAGES/geary.mo share/locale/nl/LC_MESSAGES/geary.mo share/locale/oc/LC_MESSAGES/geary.mo share/locale/pl/LC_MESSAGES/geary.mo share/locale/pt/LC_MESSAGES/geary.mo share/locale/pt_BR/LC_MESSAGES/geary.mo share/locale/ro/LC_MESSAGES/geary.mo share/locale/ru/LC_MESSAGES/geary.mo share/locale/sk/LC_MESSAGES/geary.mo share/locale/sl/LC_MESSAGES/geary.mo share/locale/sr/LC_MESSAGES/geary.mo share/locale/sr@latin/LC_MESSAGES/geary.mo share/locale/sv/LC_MESSAGES/geary.mo share/locale/te/LC_MESSAGES/geary.mo share/locale/tr/LC_MESSAGES/geary.mo share/locale/uk/LC_MESSAGES/geary.mo share/locale/vi/LC_MESSAGES/geary.mo share/locale/zh_CN/LC_MESSAGES/geary.mo share/locale/zh_TW/LC_MESSAGES/geary.mo share/metainfo/org.gnome.Geary.appdata.xml