summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/geary/Makefile32
-rw-r--r--mail/geary/distinfo12
-rw-r--r--mail/geary/files/patch-meson.build20
-rw-r--r--mail/geary/files/patch-src_engine_api_geary-client-service.vala15
-rw-r--r--mail/geary/pkg-plist38
5 files changed, 63 insertions, 54 deletions
diff --git a/mail/geary/Makefile b/mail/geary/Makefile
index 899d1ea5be38..0d84353c076d 100644
--- a/mail/geary/Makefile
+++ b/mail/geary/Makefile
@@ -1,15 +1,9 @@
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
@@ -17,9 +11,9 @@ 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 \
@@ -33,24 +27,28 @@ LIB_DEPENDS= libappstream-glib.so:devel/appstream-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 <bsd.port.mk>
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,5 +1,5 @@
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
@@ -132,6 +132,20 @@ 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
@@ -202,6 +216,20 @@ 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
@@ -258,17 +286,10 @@ 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
@@ -298,6 +319,7 @@ 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 21:26:32 +0000