commit: b59cd72ed73dec43ff8aa6a73cdc82750a333971 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jun 12 19:39:02 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 12 19:56:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b59cd72e
mail-client/balsa: fix crash w/ newer gtk Thanks to NeddySeagoon for testing. Doing this one straight-to-stable as going to bump to 2.6.5 in the commit after in ~arch. Signed-off-by: Sam James <sam <AT> gentoo.org> mail-client/balsa/balsa-2.6.4-r3.ebuild | 115 +++++++++++++++++++++ .../balsa/files/balsa-2.6.4-gtk-crash.patch | 29 ++++++ 2 files changed, 144 insertions(+) diff --git a/mail-client/balsa/balsa-2.6.4-r3.ebuild b/mail-client/balsa/balsa-2.6.4-r3.ebuild new file mode 100644 index 000000000000..7c741ae5cbde --- /dev/null +++ b/mail-client/balsa/balsa-2.6.4-r3.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2025 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="amd64 x86" + +IUSE="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 + media-libs/libcanberra[gtk3(-)] + ) + 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 + "${FILESDIR}"/${PN}-2.6.4-gtk-crash.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 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-gtk-crash.patch b/mail-client/balsa/files/balsa-2.6.4-gtk-crash.patch new file mode 100644 index 000000000000..59455242c089 --- /dev/null +++ b/mail-client/balsa/files/balsa-2.6.4-gtk-crash.patch @@ -0,0 +1,29 @@ +https://gitlab.gnome.org/GNOME/balsa/-/issues/96 +https://gitlab.gnome.org/GNOME/balsa/-/commit/d7830018c209de532797d8cc0937c7e8f80a5410 + +From 60f42713369c3026f74d9211e5bbe7efcb5b8640 Mon Sep 17 00:00:00 2001 +From: Peter Bloomfield <[email protected]> +Date: Tue, 4 Mar 2025 10:46:30 +0000 +Subject: [PATCH] balsa-mime-widget-text: Fix "leave" handler + +--- + src/balsa-mime-widget-text.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c +index d65dd2808..159ff9027 100644 +--- a/src/balsa-mime-widget-text.c ++++ b/src/balsa-mime-widget-text.c +@@ -202,10 +202,6 @@ mwt_controller_motion_cb(GtkEventControllerMotion * motion, + + static void + mwt_controller_leave_cb(GtkEventControllerMotion * motion, +- gdouble x, +- gdouble y, +- GdkCrossingMode mode, +- GdkNotifyType detail, + gpointer user_data) + { + BalsaMimeWidgetText *mwt = user_data; +-- +GitLab
