From 2a12628f69d7067fc3fb6226e9f3bed16788b882 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 25 Feb 2024 05:05:12 -0800 Subject: [PATCH] balsa: update to 2.6.4. --- srcpkgs/balsa/patches/gtk-iconcache.patch | 30 ++++++++++++++++++ srcpkgs/balsa/patches/libwebkit2gtk41.patch | 34 +++++++++++++++++++++ srcpkgs/balsa/template | 17 ++++++----- 3 files changed, 73 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/balsa/patches/gtk-iconcache.patch create mode 100644 srcpkgs/balsa/patches/libwebkit2gtk41.patch diff --git a/srcpkgs/balsa/patches/gtk-iconcache.patch b/srcpkgs/balsa/patches/gtk-iconcache.patch new file mode 100644 index 00000000000000..7ff958c3844e33 --- /dev/null +++ b/srcpkgs/balsa/patches/gtk-iconcache.patch @@ -0,0 +1,30 @@ +From c7bfec5fc780fa04813f303321a93ad80bf25a4a Mon Sep 17 00:00:00 2001 +From: Peter Bloomfield +Date: Sat, 23 Sep 2023 14:37:29 +0000 +Subject: [PATCH] images/meson.build: Ensure icon_cache_dir exists + +--- + images/meson.build | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/images/meson.build b/images/meson.build +index 049891c20..9e1cce35a 100644 +--- a/images/meson.build ++++ b/images/meson.build +@@ -17,9 +17,13 @@ balsa_imgs = [ + balsa_bitmaps_dir = join_paths(get_option('datadir'), 'balsa', 'pixmaps') + install_data(balsa_imgs, install_dir : balsa_bitmaps_dir) + +-gtk_update_icon_cache_program = find_program('gtk-update-icon-cache') ++gtk_update_icon_cache_program = find_program('gtk-update-icon-cache', required : false) + if gtk_update_icon_cache_program.found() + icon_cache_dir = join_paths(get_option('prefix'), get_option('datadir'), 'balsa') ++ mkdir_program = find_program('mkdir', required : false) ++ if mkdir_program.found() ++ run_command(mkdir_program, '-p', icon_cache_dir, check : false) ++ endif # mkdir_program.found() + if meson.version().version_compare('>=0.55') + meson.add_install_script(gtk_update_icon_cache_program, '--ignore-theme-index', icon_cache_dir) + else # meson.version().version_compare('>=0.55') +-- +GitLab diff --git a/srcpkgs/balsa/patches/libwebkit2gtk41.patch b/srcpkgs/balsa/patches/libwebkit2gtk41.patch new file mode 100644 index 00000000000000..21184670e7b361 --- /dev/null +++ b/srcpkgs/balsa/patches/libwebkit2gtk41.patch @@ -0,0 +1,34 @@ +From aa81a24021f3b48a7f207ef7049c0e8f25207661 Mon Sep 17 00:00:00 2001 +From: Peter Bloomfield +Date: Sun, 2 Oct 2022 15:17:29 -0400 +Subject: [PATCH] meson.build: Depend on webkit2gtk-4.1 if available + +Build against webkit2gtk-4.1 if available, falling back to webkit2gtk-4.0. + +webkit2gtk-4.1 has the same API as webkit2gtk-4.0, so no code changes +are needed, but it links against libsoup-3.0 instead of libsoup-2.4. + +See https://discourse.gnome.org/t/removing-libsoup-2-for-gnome-45/10846 +for some discussion. +--- + meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 801f619c7..bee3040f6 100644 +--- a/meson.build ++++ b/meson.build +@@ -169,7 +169,10 @@ libnetclient_deps = [glib_dep, + # HTML widget + # + if html_widget == 'webkit2' +- html_dep = dependency('webkit2gtk-4.0', version : '>= 2.28.0') ++ html_dep = dependency('webkit2gtk-4.1', required : false) ++ if not html_dep.found() ++ html_dep = dependency('webkit2gtk-4.0', version : '>= 2.28.0') ++ endif + htmlpref_dep = dependency('sqlite3', version : '>= 3.24.0') + balsa_web_extensions = join_paths(get_option('prefix'), get_option('libdir'), 'balsa') + add_project_arguments('-DBALSA_WEB_EXTENSIONS="' + balsa_web_extensions + '"', language : 'c') +-- +GitLab diff --git a/srcpkgs/balsa/template b/srcpkgs/balsa/template index af0f741d186047..56f9f435b0b454 100644 --- a/srcpkgs/balsa/template +++ b/srcpkgs/balsa/template @@ -1,17 +1,18 @@ # Template file for 'balsa' pkgname=balsa -version=2.6.3 +version=2.6.4 revision=1 -build_style=gnu-configure -configure_args="--without-gnome --with-libsecret --with-gpgme --with-sqlite - --with-html-widget=webkit2 --with-spell-checker=gspell" -hostmakedepends="automake gettext-devel intltool pkg-config" -makedepends="gspell-devel gmime3-devel gnutls-devel gpgme-devel iso-codes - libesmtp-devel libnotify-devel libsecret-devel webkit2gtk-devel libical-devel" +build_style=meson +configure_args="-Dlibsecret=true -Dsqlite=true + -Dhtml-widget=webkit2 -Dspell-checker=gspell" +hostmakedepends="gettext-devel pkg-config glib-devel" +makedepends="gspell-devel gmime3-devel gnutls-devel gpgme-devel iso-codes sqlite-devel + libesmtp-devel libnotify-devel libsecret-devel libwebkit2gtk41-devel libical-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Email client for GNOME" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://pawsa.fedorapeople.org/balsa/" +changelog="https://gitlab.gnome.org/GNOME/balsa/-/raw/master/NEWS" distfiles="https://pawsa.fedorapeople.org/balsa/balsa-${version}.tar.xz" -checksum=d4d04576c9a5026064f7d480b34531faf59543f2e4d57c48a6fa5c76661e1dd4 +checksum=befa5984511db33d41f2b1ecbfc99e22a15d45d08efe5d737b5174a1a6ac8fc1