* [gentoo-commits] repo/gentoo:master commit in: mail-client/balsa/, mail-client/balsa/files/
@ 2020-08-29 8:27 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2020-08-29 8:27 UTC (permalink / raw
To: gentoo-commits
commit: 952e9a293c1a5c2e1a7887843c0969936e30f841
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 08:10:19 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 08:27:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952e9a29
mail-client/balsa: security cleanup
Bug: https://bugs.gentoo.org/725910
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
mail-client/balsa/Manifest | 1 -
mail-client/balsa/balsa-2.5.6-r1.ebuild | 71 ----------
.../files/balsa-2.5.6-fix-older-webkit1.patch | 156 ---------------------
.../files/balsa-2.5.6-fix-older-webkit2.patch | 53 -------
mail-client/balsa/metadata.xml | 1 -
5 files changed, 282 deletions(-)
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 66b4d991a68..46a34d7a4ab 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,2 +1 @@
-DIST balsa-2.5.6.tar.bz2 4468877 BLAKE2B 1e7f678c69121fe3472bbba8dc3d2a62680e1969934580a8a85725e84676531f1efb8432380c2d537ca584001c5cecd5c76cd033a1c1e68a292fc765bbc15f8d SHA512 a9c8094ac48b9b1a0971fe45a4658b728f93ad170ad7884c9554420a4696a7b6f5b3661bde8ab070f6a5c14a80f67551745e1d40905881429ae1d8e5874e9a68
DIST balsa-2.6.1.tar.bz2 4535550 BLAKE2B eee4530fe9bdd0f9453178fb7a9e64584193221754dd8fc75703ec5f98214999a9d323357b415ead2fc218461adb4d0d082389f236c6f864b54a90790c889130 SHA512 242c93e698390647b93f7e163b547b326675a0600ff5c50c2db3f3e08cd045e32cec4bb69f8a44ef3443d4cf03cb194ac7971d2a0e55f7c84b273a2b627e2433
diff --git a/mail-client/balsa/balsa-2.5.6-r1.ebuild b/mail-client/balsa/balsa-2.5.6-r1.ebuild
deleted file mode 100644
index b02520128ed..00000000000
--- a/mail-client/balsa/balsa-2.5.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Email client for GNOME"
-HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
-SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-
-IUSE="crypt gnome gnome-keyring kerberos ldap libnotify libressl rubrica sqlite webkit xface"
-
-# TODO: internal spell checking via enchant-2 instead of gtkspell/gspell?
-RDEPEND="
- >=app-text/gspell-1.2:0=
- >=dev-libs/glib-2.40.0:2
- net-libs/gnutls:=
- >=x11-libs/gtk+-3.10.0:3
- dev-libs/gmime:2.6
- net-mail/mailbase
- media-libs/libcanberra:=[gtk3]
- x11-themes/hicolor-icon-theme
- x11-themes/adwaita-icon-theme
- crypt? ( >=app-crypt/gpgme-1.5.0:= )
- gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 )
- gnome-keyring? ( app-crypt/libsecret )
- sqlite? ( >=dev-db/sqlite-2.8:= )
- libnotify? ( >=x11-libs/libnotify-0.7:= )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- kerberos? ( app-crypt/mit-krb5 )
- ldap? ( net-nds/openldap )
- rubrica? ( dev-libs/libxml2:2 )
- webkit? (
- net-libs/webkit-gtk:4
- app-text/html2text
- )
- xface? ( >=media-libs/compface-1.5.1:= )
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-update-icon-cache
- app-text/yelp-tools
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext
- dev-libs/libxml2:2
-"
-
-PATCHES=( "$FILESDIR"/${P}-fix-older-webkit{1,2}.patch )
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
-
-src_configure() {
- gnome2_src_configure \
- --with-canberra \
- --with-spell-checker=gspell \
- $(usex crypt --with-gpgme=gpgme-config --without-gpgme) \
- $(use_with gnome) \
- $(use_with gnome gtksourceview) \
- $(use_with gnome-keyring libsecret) \
- $(use_with kerberos gss) \
- $(use_with ldap) \
- $(use_with libnotify) \
- $(use_with rubrica) \
- $(use_with sqlite) \
- $(use_with xface compface) \
- $(usex webkit --with-html-widget=webkit2 --with-html-widget=no)
-}
diff --git a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch
deleted file mode 100644
index 227e2ac04b4..00000000000
--- a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From ea37ea940dfbcc4e6bcf8327194857a7b306a278 Mon Sep 17 00:00:00 2001
-From: Peter Bloomfield
-Date: Sat, 7 Jul 2018 14:44:26 -0400
-Subject: [PATCH] Use g_debug() instead of conditional compilation
-
-* libbalsa/html.c (lbh_navigation_policy_decision),
- (lbh_new_window_policy_decision), (lbh_response_policy_decision),
- (lbh_resource_notify_response_cb), (lbh_web_process_crashed_cb),
- (lbh_cid_cb), (libbalsa_html_new): Use g_debug() instead of
- conditionally compiled printing.
----
- libbalsa/html.c | 52 ++++++++++++++++++++++++-------------------------
- 2 files changed, 25 insertions(+), 27 deletions(-)
-
-diff --git a/libbalsa/html.c b/libbalsa/html.c
-index 17f62789e..1e5e2f500 100644
---- a/libbalsa/html.c
-+++ b/libbalsa/html.c
-@@ -44,6 +44,11 @@
- #include <string.h>
- #include <glib/gi18n.h>
-
-+#ifdef G_LOG_DOMAIN
-+# undef G_LOG_DOMAIN
-+#endif
-+#define G_LOG_DOMAIN "html"
-+
- #ifdef HAVE_HTML_WIDGET
-
- /*
-@@ -141,13 +146,6 @@ html2text(gchar ** text, gsize len)
- * Experimental support for WebKit2.
- */
-
--#define DEBUG_WEBKIT2 FALSE
--#if DEBUG_WEBKIT2
--#define d(x) x
--#else
--#define d(x)
--#endif
--
- /* WebKitContextMenuItem uses GtkAction, which is deprecated.
- * We don't use it, but it breaks the git-tree build, so we just mangle
- * it: */
-@@ -280,10 +278,10 @@ lbh_navigation_policy_decision(WebKitPolicyDecision * decision,
-
- switch (navigation_type) {
- case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED:
-- d(g_print("%s clicked %s\n", __func__, uri));
-+ g_debug("%s clicked %s", __func__, uri);
- (*info->clicked_cb) (uri);
- default:
-- d(g_print("%s uri %s, type %d, ignored\n", __func__, uri, navigation_type));
-+ g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type);
- webkit_policy_decision_ignore(decision);
- }
- }
-@@ -305,13 +303,13 @@ lbh_new_window_policy_decision(WebKitPolicyDecision * decision,
- (navigation_action)) {
- case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED:
- request = webkit_navigation_action_get_request(navigation_action);
-- d(g_print("%s clicked %s\n", __func__,
-- webkit_uri_request_get_uri(request)));
-+ g_debug("%s clicked %s", __func__,
-+ webkit_uri_request_get_uri(request));
- (*info->clicked_cb) (webkit_uri_request_get_uri(request));
- default:
-- d(g_print("%s type %d, ignored\n", __func__,
-- webkit_navigation_action_get_navigation_type
-- (navigation_action)));
-+ g_debug("%s type %d, ignored", __func__,
-+ webkit_navigation_action_get_navigation_type
-+ (navigation_action));
-
- webkit_policy_decision_ignore(decision);
- }
-@@ -321,10 +319,10 @@ static void
- lbh_response_policy_decision(WebKitPolicyDecision * decision,
- gpointer data)
- {
-- d(g_print("%s uri %s, ignored\n", __func__,
-- webkit_uri_request_get_uri
-- (webkit_response_policy_decision_get_request
-- (WEBKIT_RESPONSE_POLICY_DECISION(decision)))));
-+ g_debug("%s uri %s, ignored", __func__,
-+ webkit_uri_request_get_uri
-+ (webkit_response_policy_decision_get_request
-+ (WEBKIT_RESPONSE_POLICY_DECISION(decision))));
- webkit_policy_decision_ignore(decision);
- }
-
-@@ -453,20 +451,20 @@ lbh_resource_notify_response_cb(WebKitWebResource * resource,
-
- response = webkit_web_resource_get_response(resource);
- mime_type = webkit_uri_response_get_mime_type(response);
-- d(g_print("%s mime-type %s\n", __func__, mime_type));
-+ g_debug("%s mime-type %s", __func__, mime_type);
- if (g_ascii_strncasecmp(mime_type, "image/", 6) != 0)
- return;
-
- if (info->info_bar) {
-- d(g_print("%s %s destroy info_bar\n", __func__,
-- webkit_web_resource_get_uri(resource)));
-+ g_debug("%s %s destroy info_bar", __func__,
-+ webkit_web_resource_get_uri(resource));
- /* web_view is loading an image from its cache, so we do not
- * need to ask the user for permission to download */
- gtk_widget_destroy(info->info_bar);
- info->info_bar = NULL;
- } else {
-- d(g_print("%s %s null info_bar\n", __func__,
-- webkit_web_resource_get_uri(resource)));
-+ g_debug("%s %s null info_bar", __func__,
-+ webkit_web_resource_get_uri(resource));
- }
- }
-
-@@ -493,7 +491,7 @@ static gboolean
- lbh_web_process_crashed_cb(WebKitWebView * web_view,
- gpointer data)
- {
-- d(g_print("%s\n", __func__));
-+ g_debug("%s", __func__);
- return FALSE;
- }
-
-@@ -509,7 +507,7 @@ lbh_cid_cb(WebKitURISchemeRequest * request,
- LibBalsaMessageBody *body;
-
- path = webkit_uri_scheme_request_get_path(request);
-- d(g_print("%s path %s\n", __func__, path));
-+ g_debug("%s path %s", __func__, path);
-
- if ((body =
- libbalsa_message_get_part_by_id(info->body->message, path))) {
-@@ -616,7 +614,7 @@ libbalsa_html_new(LibBalsaMessageBody * body,
- webkit_web_context_register_uri_scheme(context, "cid", lbh_cid_cb,
- &info, NULL);
- have_registered_cid = TRUE;
-- d(g_print("%s registered cid: scheme\n", __func__));
-+ g_debug("%s registered cid: scheme", __func__);
- }
-
- settings = webkit_web_view_get_settings(web_view);
-@@ -647,7 +645,7 @@ libbalsa_html_new(LibBalsaMessageBody * body,
- if (g_regex_match_simple(src_regex, text, G_REGEX_CASELESS, 0)) {
- info->info_bar = lbh_info_bar(info);
- gtk_box_pack_start(GTK_BOX(vbox), info->info_bar, FALSE, FALSE, 0);
-- d(g_print("%s shows info_bar\n", __func__));
-+ g_debug("%s shows info_bar", __func__);
- }
-
- webkit_web_view_load_html(web_view, text, NULL);
---
-2.17.1
-
diff --git a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch
deleted file mode 100644
index d7b5eb74ba1..00000000000
--- a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 3423ca9bf48e675007b7fb1bd61b50aa97d14890 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Albrecht=20Dre=C3=9F?=
-Date: Sat, 7 Jul 2018 16:36:49 -0400
-Subject: [PATCH] html: Fix HTML rendering with webkit2gtk-4.0 < 2.20
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* README: document use of G_MESSAGES_DEBUG=…
-* libbalsa/html.c (lbh_navigation_policy_decision):
- allow the rendering of “about:blank”.
----
- libbalsa/html.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-leio: trimmed out the G_MESSAGES_DEBUG doc changes
-diff --git a/libbalsa/html.c b/libbalsa/html.c
-index 1e5e2f500..307194e0a 100644
---- a/libbalsa/html.c
-+++ b/libbalsa/html.c
-@@ -44,13 +44,13 @@
- #include <string.h>
- #include <glib/gi18n.h>
-
-+#ifdef HAVE_HTML_WIDGET
-+
- #ifdef G_LOG_DOMAIN
- # undef G_LOG_DOMAIN
- #endif
- #define G_LOG_DOMAIN "html"
-
--#ifdef HAVE_HTML_WIDGET
--
- /*
- * Used by all HTML widgets
- *
-@@ -281,8 +281,12 @@ lbh_navigation_policy_decision(WebKitPolicyDecision * decision,
- g_debug("%s clicked %s", __func__, uri);
- (*info->clicked_cb) (uri);
- default:
-- g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type);
-- webkit_policy_decision_ignore(decision);
-+ if (g_ascii_strcasecmp(uri, "about:blank") != 0) {
-+ g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type);
-+ webkit_policy_decision_ignore(decision);
-+ } else {
-+ g_debug("%s uri %s, type %d loaded", __func__, uri, navigation_type);
-+ }
- }
- }
-
---
-2.17.1
diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml
index 3f5668996d9..41e5bdd6637 100644
--- a/mail-client/balsa/metadata.xml
+++ b/mail-client/balsa/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo GNOME Desktop</name>
</maintainer>
<use>
- <flag name="crypt">Adds support for GnuPG encryption</flag>
<flag name="rubrica">Adds support for rubrica addressbook</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/balsa/, mail-client/balsa/files/
@ 2022-10-05 16:30 Matt Turner
0 siblings, 0 replies; 2+ messages in thread
From: Matt Turner @ 2022-10-05 16:30 UTC (permalink / raw
To: gentoo-commits
commit: 656e61c2af69889d3aa2f74c000990a3ee181b49
Author: Pascal Jaeger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Mon Sep 26 14:14:21 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Oct 5 16:29:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=656e61c2
mail-client/balsa: version bump to 2.6.4
Closes: https://github.com/gentoo/gentoo/pull/27476
Signed-off-by: Pascal Jaeger <pascal.jaeger <AT> leimstift.de>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
mail-client/balsa/Manifest | 1 +
mail-client/balsa/balsa-2.6.4.ebuild | 111 +++++++++++++++++++++
...6.4-depend-on-webkit2gtk-4.1-if-available.patch | 35 +++++++
...x-build-error-if-html-support-is-disabled.patch | 71 +++++++++++++
mail-client/balsa/metadata.xml | 1 +
5 files changed, 219 insertions(+)
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 1a2cc9bdec84..0f10923de5eb 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1 +1,2 @@
DIST balsa-2.6.3.tar.xz 3761940 BLAKE2B 8bcd93453a74d2b7ffaeca3131828044a9fc399db8e0e695a31dcdb5b50a400e10b3a49d9484609b59e4348758cbeff6fde30243714693e98ab046f7910d1abf SHA512 7e64f75423dd37536812854e56db1af97c00bc35f640d82c22d86e5212c766926430f1c99423f1a972daf6f20d084d4cf16d89e13deb2f1ce550c016cd132f8d
+DIST balsa-2.6.4.tar.xz 3710272 BLAKE2B 67a3462ca6bc75431a6a3f6a54feb53577111355d749e777a328b881d431856a8090e9c7beea128ee466a9b7aee01a4178b5a273541f0ffdd776a144546fc48e SHA512 7c1526e03de29e19448f0a13847dcd7138d3292221ea16f20d09bf169cf18e69df24dd76726e710470d4507e5cc4e236e1889d4c421610ecd1589a9e2338d264
diff --git a/mail-client/balsa/balsa-2.6.4.ebuild b/mail-client/balsa/balsa-2.6.4.ebuild
new file mode 100644
index 000000000000..f50208203354
--- /dev/null
+++ b/mail-client/balsa/balsa-2.6.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson xdg
+
+DESCRIPTION="Email client for GNOME"
+HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
+SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+IUSE="gnome +gnome-keyring kerberos ldap rubrica sqlite systray webkit xface"
+
+# TODO: internal spell checking via enchant-2 instead of gtkspell/gspell?
+DEPEND="
+ >=dev-libs/glib-2.48.0:2
+ >=x11-libs/gtk+-3.24.0:3
+ >=dev-libs/gmime-3.2.6:3.0
+ >=net-libs/gnutls-3.0:=
+ dev-libs/fribidi
+ >=dev-libs/libical-2.0.0:=
+ webkit? (
+ >=net-libs/webkit-gtk-2.38.0:4.1
+ >=dev-db/sqlite-3.24
+ app-text/html2text
+ )
+ >=app-crypt/gpgme-1.13.0:=
+ sqlite? ( >=dev-db/sqlite-3.24:= )
+ ldap? ( net-nds/openldap:= )
+ rubrica? ( dev-libs/libxml2:2 )
+ kerberos? ( app-crypt/mit-krb5 )
+ xface? ( >=media-libs/compface-1.5.1:= )
+ gnome? ( x11-libs/gtksourceview:4 )
+ media-libs/libcanberra[gtk3]
+ gnome-keyring? ( app-crypt/libsecret )
+ >=app-text/gspell-1.6:0=
+
+ net-mail/mailbase
+ x11-themes/hicolor-icon-theme
+ x11-themes/adwaita-icon-theme
+ dev-libs/openssl:0=
+ systray? ( x11-libs/xapp )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-util/gtk-update-icon-cache
+ dev-util/intltool
+ dev-util/itstool
+ virtual/pkgconfig
+ sys-devel/gettext
+ dev-libs/libxml2:2
+"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS TODO docs/*"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-build-error-if-html-support-is-disabled.patch
+ "${FILESDIR}"/${P}-depend-on-webkit2gtk-4.1-if-available.patch
+)
+
+src_prepare() {
+ default
+ # we don't need the package to update the icon cache. We do it ourselves in xdg_pkg_postinst
+ sed -i 's/if gtk_update_icon_cache_program.found()/if false/' images/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gnome gnome-desktop)
+ -Dflock=false
+ -Dfcntl=true
+ $(meson_use sqlite autocrypt)
+ $(meson_use systray)
+ -Dcanberra=true
+ $(meson_use xface compface)
+ $(meson_use kerberos gss)
+ $(meson_use gnome gtksourceview)
+ -Dspell-checker=gspell
+ $(meson_use ldap)
+ -Dmacosx-desktop=false
+ $(meson_use rubrica)
+ -Dosmo=false
+ $(meson_use sqlite)
+ $(meson_use gnome-keyring libsecret)
+ -Dgcr=false
+ -Dmore-warnings=true
+ -Dhelp-files=false
+ -Dlibnetclient-docs=false
+ -Dlibnetclient-test=false
+ )
+ if use webkit; then
+ emesonargs+=(-Dhtml-widget=webkit2)
+ else
+ emesonargs+=(-Dhtml-widget=no)
+ fi
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/mail-client/balsa/files/balsa-2.6.4-depend-on-webkit2gtk-4.1-if-available.patch b/mail-client/balsa/files/balsa-2.6.4-depend-on-webkit2gtk-4.1-if-available.patch
new file mode 100644
index 000000000000..ea5283cfd996
--- /dev/null
+++ b/mail-client/balsa/files/balsa-2.6.4-depend-on-webkit2gtk-4.1-if-available.patch
@@ -0,0 +1,35 @@
+From aa81a24021f3b48a7f207ef7049c0e8f25207661 Mon Sep 17 00:00:00 2001
+From: Peter Bloomfield <PeterBloomfield@bellsouth.net>
+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/mail-client/balsa/files/balsa-2.6.4-fix-build-error-if-html-support-is-disabled.patch b/mail-client/balsa/files/balsa-2.6.4-fix-build-error-if-html-support-is-disabled.patch
new file mode 100644
index 000000000000..16ca2a890e04
--- /dev/null
+++ b/mail-client/balsa/files/balsa-2.6.4-fix-build-error-if-html-support-is-disabled.patch
@@ -0,0 +1,71 @@
+From 23aef3f0e0fb68921448007b4e361b47a4eec2b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Albrecht=20Dre=C3=9F?= <albrecht.dress@netcologne.de>
+Date: Thu, 22 Sep 2022 19:53:08 +0200
+Subject: [PATCH] fix build error if HTML support is disabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Thanks to Bruce Dubbs from linuxfromscratch.org for reporting this
+issue.
+
+libbalsa/body.c: mask out HTML selection table if HTML support is
+disabled
+libbalsa/body.c: fix macros if HTML support is disabled
+
+Signed-off-by: Albrecht Dreß <albrecht.dress@netcologne.de>
+---
+ libbalsa/body.c | 4 ++++
+ libbalsa/body.h | 4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/libbalsa/body.c b/libbalsa/body.c
+index e300ae969..25d35fe77 100644
+--- a/libbalsa/body.c
++++ b/libbalsa/body.c
+@@ -65,6 +65,7 @@ libbalsa_message_body_new(LibBalsaMessage * message)
+ return body;
+ }
+
++#ifdef HAVE_HTML_WIDGET
+ static void
+ body_weak_notify(gpointer data,
+ GObject *key)
+@@ -81,6 +82,7 @@ selection_table_foreach(gpointer key,
+ {
+ g_object_weak_unref(key, body_weak_notify, user_data);
+ }
++#endif /* HAVE_HTML_WIDGET */
+
+ void
+ libbalsa_message_body_free(LibBalsaMessageBody * body)
+@@ -111,10 +113,12 @@ libbalsa_message_body_free(LibBalsaMessageBody * body)
+ if (body->mime_part)
+ g_object_unref(body->mime_part);
+
++#ifdef HAVE_HTML_WIDGET
+ if (body->selection_table != NULL) {
+ g_hash_table_foreach(body->selection_table, selection_table_foreach, body);
+ g_hash_table_destroy(body->selection_table);
+ }
++#endif /* HAVE_HTML_WIDGET */
+
+ g_free(body);
+ }
+diff --git a/libbalsa/body.h b/libbalsa/body.h
+index 2650df728..139810018 100644
+--- a/libbalsa/body.h
++++ b/libbalsa/body.h
+@@ -155,8 +155,8 @@ void libbalsa_message_body_set_mp_alt_selection(LibBalsaMessageBody *body,
+ LibBalsaMpAltSelection libbalsa_message_body_get_mp_alt_selection(LibBalsaMessageBody *body,
+ gpointer key);
+ #else
+-#define libbalsa_message_body_set_mp_alt_selection(x)
+-#define libbalsa_message_body_get_mp_alt_selection(x) LIBBALSA_MP_ALT_AUTO
++#define libbalsa_message_body_set_mp_alt_selection(x, y)
++#define libbalsa_message_body_get_mp_alt_selection(x, y) LIBBALSA_MP_ALT_AUTO
+ #endif /*HAVE_HTML_WIDGET*/
+
+ guint libbalsa_message_body_protect_mode(const LibBalsaMessageBody * body);
+--
+GitLab
diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml
index 1ee5337540c8..54f5dedb7cdc 100644
--- a/mail-client/balsa/metadata.xml
+++ b/mail-client/balsa/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<use>
<flag name="rubrica">Adds support for rubrica addressbook</flag>
+ <flag name="systray">Enable System Tray Icon support</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-05 16:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-05 16:30 [gentoo-commits] repo/gentoo:master commit in: mail-client/balsa/, mail-client/balsa/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2020-08-29 8:27 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox