From b61d6d3dc5156dca3878454ff35a98171f2dfa45 Mon Sep 17 00:00:00 2001 From: Victor Kustov Date: Sun, 15 Sep 2024 21:05:57 +0300 Subject: [PATCH] mail-client/claws-mail: get 4.3.0 and patch Signed-off-by: Victor Kustov --- mail-client/claws-mail/Manifest | 2 +- ...r99.ebuild => claws-mail-4.3.0-r99.ebuild} | 68 +++++++++---------- .../files/claws-mail-4.1.1-fix_lto.patch | 10 +++ mail-client/claws-mail/metadata.xml | 3 +- 4 files changed, 46 insertions(+), 37 deletions(-) rename mail-client/claws-mail/{claws-mail-4.1.1-r99.ebuild => claws-mail-4.3.0-r99.ebuild} (81%) create mode 100644 mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest index 263163d..a9d6064 100644 --- a/mail-client/claws-mail/Manifest +++ b/mail-client/claws-mail/Manifest @@ -1 +1 @@ -DIST claws-mail-4.1.1.tar.xz 6523688 BLAKE2B 7e1b1ae201a67e14821f415d2b51f6eebfc2896699d89f2088fa9f7f21de984f6d8e4e92791c233ec755a15184ff5e562ce96ad9d197acc4e1f8dadb3fd57c30 SHA512 4157772fd0e918bae1df11230ce52691ff86181a0c164c0c5116d1ebb91885910e2e24ff18ae5e5ad4ed1c83ef830773de0b4ab40da988607909e0c17efb26b4 +DIST claws-mail-4.3.0.tar.xz 6831980 BLAKE2B e4dfb35b7f542ee514613b55286a19e2db398babc391a648edbda6d694b2e76973e1e7b6c4b7942b335898a571ffbbfef60fea1831ad4ac5ef7457a454259198 SHA512 3b0e811948d75ca2d003035d545d46d142ed4f2c1a103dc862413f9ff7a5ba612e00a7d5832836657e8d382bc7f94520496aaf60da429c72d9fb146ba12f0dfc diff --git a/mail-client/claws-mail/claws-mail-4.1.1-r99.ebuild b/mail-client/claws-mail/claws-mail-4.3.0-r99.ebuild similarity index 81% rename from mail-client/claws-mail/claws-mail-4.1.1-r99.ebuild rename to mail-client/claws-mail/claws-mail-4.3.0-r99.ebuild index 4e20dd8..22dde5d 100644 --- a/mail-client/claws-mail/claws-mail-4.1.1-r99.ebuild +++ b/mail-client/claws-mail/claws-mail-4.3.0-r99.ebuild @@ -1,37 +1,38 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools desktop python-any-r1 xdg +inherit desktop python-single-r1 xdg DESCRIPTION="An email client (and news reader) based on GTK+" HOMEPAGE="https://www.claws-mail.org/" +LICENSE="GPL-3" +SLOT="0" + if [[ "${PV}" == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git" else SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" fi -SLOT="0" -QA_PKGCONFIG_VERSION="${PV}.0" -LICENSE="GPL-3" - -IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface" +IUSE="archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface" REQUIRED_USE=" libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) oauth? ( gnutls ) + python? ( ${PYTHON_REQUIRED_USE} ) smime? ( pgp ) " COMMONDEPEND=" + >=dev-libs/glib-2.50:2 dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= @@ -46,6 +47,7 @@ COMMONDEPEND=" ) bogofilter? ( mail-filter/bogofilter ) calendar? ( + dev-lang/perl:= >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) @@ -53,26 +55,33 @@ COMMONDEPEND=" >=dev-libs/dbus-glib-0.60 sys-apps/dbus ) - gdata? ( >=dev-libs/libgdata-0.17.2 ) - dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7:= ) litehtml? ( - >=dev-libs/glib-2.36:2 - >=dev-libs/gumbo-0.10 + >=dev-libs/gumbo-0.10:= net-misc/curl media-libs/fontconfig ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( - dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk3] ) libnotify? ( x11-libs/libnotify ) ) + perl? ( dev-lang/perl:= ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + ) + rss? ( + dev-libs/libxml2 + net-misc/curl + ) session? ( x11-libs/libICE x11-libs/libSM @@ -82,8 +91,8 @@ COMMONDEPEND=" spell? ( >=app-text/enchant-2.0.0:2= ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) - valgrind? ( dev-util/valgrind ) - webkit? ( net-libs/webkit-gtk:4 ) + valgrind? ( dev-debug/valgrind ) + webkit? ( net-libs/webkit-gtk:4.1 ) " DEPEND="${COMMONDEPEND} @@ -100,33 +109,22 @@ RDEPEND="${COMMONDEPEND} clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) - perl? ( dev-lang/perl:= ) - rss? ( - dev-libs/libxml2 - net-misc/curl - ) " PATCHES=( "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" + "${FILESDIR}/${PN}-4.1.1-fix_lto.patch" "${FILESDIR}/${PN}-4.1.1-Fix-bug-4224-by-using-ring-buffer.patch" -# "${FILESDIR}/debug.patch" -) +# "${FILESDIR}/debug.patch -src_prepare() { - default - eautoreconf -} +) src_configure() { - # Don't use libsoup-gnome (bug #565924) - export HAVE_LIBSOUP_GNOME=no - local myeconfargs=( --disable-bsfilter-plugin + --disable-dillo-plugin --disable-generic-umpc --disable-jpilot #735118 - --disable-python-plugin --enable-acpi_notifier-plugin --enable-address_keeper-plugin --enable-alternate-addressbook @@ -144,9 +142,10 @@ src_configure() { $(use_enable clamav clamd-plugin) $(use_enable dbus) $(use_enable debug crash-dialog) - $(use_enable dillo dillo-plugin) + $(use_enable debug more-addressbook-debug) + $(use_enable debug more-ldap-debug) + $(use_enable debug more-archive-debug) $(use_enable doc manual) - $(use_enable gdata gdata-plugin) $(use_enable gnutls) $(use_enable ldap) $(use_enable litehtml litehtml_viewer-plugin) @@ -159,6 +158,7 @@ src_configure() { $(use_enable pgp pgpcore-plugin) $(use_enable pgp pgpinline-plugin) $(use_enable pgp pgpmime-plugin) + $(use_enable python python-plugin) $(use_enable rss rssyl-plugin) $(use_enable session libsm) $(use_enable sieve managesieve-plugin) @@ -184,7 +184,7 @@ src_configure() { } src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) + local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* ) default # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps diff --git a/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch b/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch new file mode 100644 index 0000000..10fc798 --- /dev/null +++ b/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch @@ -0,0 +1,10 @@ +diff -Naur claws-mail-4.1.1.orig/src/common/utils.h claws-mail-4.1.1/src/common/utils.h +--- claws-mail-4.1.1.orig/src/common/utils.h 2022-05-06 12:11:04.000000000 +0200 ++++ claws-mail-4.1.1/src/common/utils.h 2022-11-18 15:52:41.647794172 +0100 +@@ -24,6 +24,7 @@ + #define __UTILS_H__ + + #ifdef HAVE_CONFIG_H ++# include "config.h" + #include "claws-features.h" + #endif diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml index 3568245..6727b33 100644 --- a/mail-client/claws-mail/metadata.xml +++ b/mail-client/claws-mail/metadata.xml @@ -8,7 +8,6 @@ Enable archiving plugin Build mail-filter/bogofilter plugin - Enable dillo html viewer plugin Enable plugin for access to Google data providers Enable sound notification in connection with USE=notification Enable notification on the desktop in connection with USE=notification @@ -16,10 +15,10 @@ Notification for new mail in different way, see also USE flags libcanberra, libindicate and libnotify Enable OAuth2 authentication support Enable PGP support + Enable plugin for Python scripting Build plugin for sieve filter support Build plugin for S/MIME support Enable plugin for spam reporting to various services Build mail-filter/spamassassin plugin - Add support for memory debugging using valgrind