From 2c8583274e5bec0dae6bb0977dc3e5e79dd66450 Mon Sep 17 00:00:00 2001 From: Robert Clausecker Date: Fri, 24 May 2024 20:29:51 +0200 Subject: [PATCH] mail/geary: update webkit2gtk3 API version to 4.1 Pull Request: https://github.com/freebsd/freebsd-ports/pull/266 --- mail/geary/Makefile | 6 +++--- mail/geary/files/patch-meson.build | 34 +++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/mail/geary/Makefile b/mail/geary/Makefile index fa8b53d737387..2c2cf91e8eae9 100644 --- a/mail/geary/Makefile +++ b/mail/geary/Makefile @@ -1,6 +1,6 @@ PORTNAME= geary PORTVERSION= 40.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= mail gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome @@ -33,10 +33,10 @@ 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-gtk3 \ + libwebkit2gtk-4.1.so:www/webkit2-gtk3 \ libytnef.so:converters/ytnef USES= compiler:c11 cpe desktop-file-utils gettext gnome meson pkgconfig \ diff --git a/mail/geary/files/patch-meson.build b/mail/geary/files/patch-meson.build index d6767378dd400..93ea20a35372e 100644 --- a/mail/geary/files/patch-meson.build +++ b/mail/geary/files/patch-meson.build @@ -1,15 +1,43 @@ --- meson.build.orig 2021-04-23 03:57:02 UTC +++ meson.build -@@ -94,7 +94,7 @@ libmath = cc.find_library('m') +@@ -67,7 +67,7 @@ sqlite = dependency('sqlite3', version: '>= 3.24') + gmime = dependency('gmime-3.0', version: '>= 3.2.4') + gtk = dependency('gtk+-3.0', version: '>=' + target_gtk) + sqlite = dependency('sqlite3', version: '>= 3.24') +-webkit2gtk = dependency('webkit2gtk-4.0', version: '>=' + target_webkit) ++webkit2gtk = dependency('webkit2gtk-4.1', version: '>=' + target_webkit) + + # Secondary deps - keep sorted alphabetically + # We need appdata.its from appstream-glib: +@@ -87,15 +87,15 @@ iso_codes = dependency('iso-codes') + gthread = dependency('gthread-2.0', version: '>=' + target_glib) + icu_uc = dependency('icu-uc', version: '>=60') + iso_codes = dependency('iso-codes') +-javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit) ++javascriptcoregtk = dependency('javascriptcoregtk-4.1', version: '>=' + target_webkit) + json_glib = dependency('json-glib-1.0', version: '>= 1.0') + libhandy = dependency('libhandy-1', version: '>= 1.2.1', required: false) + 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') +-libsoup = dependency('libsoup-2.4', version: '>= 2.48') +libstemmer_dep = cc.find_library('stemmer', dirs: [ '/usr/local/lib/' ]) - libsoup = dependency('libsoup-2.4', version: '>= 2.48') ++libsoup = dependency('libsoup-3.0', version: '>= 2.48') libunwind_dep = dependency( 'libunwind', version: '>= 1.1', required: get_option('libunwind') -@@ -114,7 +114,7 @@ webkit2gtk_web_extension = dependency('webkit2gtk-web- + ) +@@ -105,7 +105,7 @@ posix = valac.find_library('posix') + libxml = dependency('libxml-2.0', version: '>= 2.7.8') + libytnef = dependency('libytnef', version: '>= 1.9.3', required: get_option('tnef')) + posix = valac.find_library('posix') +-webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit) ++webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.1', version: '>=' + target_webkit) + + # System dependencies above ensures appropriate versions for the + # following libraries, but the declared dependency is what we actually +@@ -114,7 +114,7 @@ icu_uc = declare_dependency( icu_uc = declare_dependency( dependencies: [ valac.find_library('icu-uc', dirs: [vapi_dir]),