commit: ff44ce7d8a0bd527c007575c84de9b080a8a88fc Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Thu Nov 23 20:39:53 2023 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Thu Nov 23 21:53:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff44ce7d
mail-client/claws-mail: 3.20.0, 4.2.0 bumps Drop gdata plugin, removed upstream Update python compatibility Closes: https://bugs.gentoo.org/917744 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> mail-client/claws-mail/Manifest | 2 ++ ...s-mail-9999.ebuild => claws-mail-3.20.0.ebuild} | 40 ++++++++++------------ ...ws-mail-9999.ebuild => claws-mail-4.2.0.ebuild} | 9 ++--- mail-client/claws-mail/claws-mail-9999.ebuild | 2 +- 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest index 73a2cfaf6cc3..10afbbca8ea9 100644 --- a/mail-client/claws-mail/Manifest +++ b/mail-client/claws-mail/Manifest @@ -1,3 +1,5 @@ DIST claws-mail-3.19.0.tar.xz 6543188 BLAKE2B eeb7df2b921dbd7ad40c845804fcabe5ddc2064fcf410e7809004be472bbe2ba8bfd89a868420a1bb76845180856fee8a0b3cde879ae67b1a1aab14442fe5d2d SHA512 88780df55873919197d3c6df5102a8eb89a586e8287419c179e1d0af839435a719814b1e3643aa783a7badeadceafda2dc3cb4a3265432b5ad3a210663922b20 +DIST claws-mail-3.20.0.tar.xz 6687376 BLAKE2B 9a72e77ea922271fdb947e4f76229c89cb0fb2589921fca6fd161714a3093a137165b84b84db5cece5cb6b06998e237d524104ddddd87078dcba36a94f02e0eb SHA512 66d0087493452cf43357fbfb2338b3716ec45d202f51cce033aa3a8888ec4dac2d6eb9e652efb22bcfcab1e6c00ff650a9926114fb4647f753e44013e607d923 DIST claws-mail-4.1.0.tar.xz 6471604 BLAKE2B 30d1725c2679e8a0b44edd6c30b15f28633c0a017935980d1412dabffdfb1f33e1c36bee3506e90af54410db222b64422155be821ba18f5e315ed411d477ed63 SHA512 83c7b1a8065628b1dcac58feb4d852b759b3fc376531572e88450b8e9517172a641f710a219b7e16bbc672dbe69853783e4edd1d7647a3f2aacb92e47be9175b DIST claws-mail-4.1.1.tar.xz 6523688 BLAKE2B 7e1b1ae201a67e14821f415d2b51f6eebfc2896699d89f2088fa9f7f21de984f6d8e4e92791c233ec755a15184ff5e562ce96ad9d197acc4e1f8dadb3fd57c30 SHA512 4157772fd0e918bae1df11230ce52691ff86181a0c164c0c5116d1ebb91885910e2e24ff18ae5e5ad4ed1c83ef830773de0b4ab40da988607909e0c17efb26b4 +DIST claws-mail-4.2.0.tar.xz 6674872 BLAKE2B b3118b45f1d3e8ae31a9c7bfa529fd5c8fda3ff8823e88a5ef078432d38d4150b05791deafff2577378ea17b03d965374755d2536ff6835ed46bcd566fefddaf SHA512 2415f246fc88b76263e1c43860c0638e08c581493333a3d846831f26cda21f0f14035a759379031d52e56aef2516bacec147a2cd5a153fc8fecf02ede64077f1 diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-3.20.0.ebuild similarity index 86% copy from mail-client/claws-mail/claws-mail-9999.ebuild copy to mail-client/claws-mail/claws-mail-3.20.0.ebuild index 79c169e2c494..fb73d396f50e 100644 --- a/mail-client/claws-mail/claws-mail-9999.ebuild +++ b/mail-client/claws-mail/claws-mail-3.20.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit autotools desktop python-any-r1 xdg @@ -21,23 +21,22 @@ fi SLOT="0" LICENSE="GPL-3" -IUSE="archive bogofilter calendar clamav dbus debug doc +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="+appindicator archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface" REQUIRED_USE=" + appindicator? ( notification ) libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) - oauth? ( gnutls ) smime? ( pgp ) " COMMONDEPEND=" - >=dev-libs/glib-2.50:2 dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] - x11-libs/gtk+:3 + x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango archive? ( @@ -46,7 +45,6 @@ COMMONDEPEND=" ) bogofilter? ( mail-filter/bogofilter ) calendar? ( - dev-lang/perl:= >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) @@ -58,6 +56,7 @@ COMMONDEPEND=" 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 net-misc/curl media-libs/fontconfig @@ -65,16 +64,13 @@ COMMONDEPEND=" nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( - libcanberra? ( media-libs/libcanberra[gtk3] ) + dev-libs/glib:2 + appindicator? ( dev-libs/libindicate:3[gtk] ) + libcanberra? ( media-libs/libcanberra[gtk2] ) libnotify? ( x11-libs/libnotify ) ) - perl? ( dev-lang/perl:= ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0:= ) - rss? ( - dev-libs/libxml2 - net-misc/curl - ) session? ( x11-libs/libICE x11-libs/libSM @@ -85,7 +81,6 @@ COMMONDEPEND=" startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) - webkit? ( net-libs/webkit-gtk:4.1 ) " DEPEND="${COMMONDEPEND} @@ -102,6 +97,11 @@ 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=( @@ -110,18 +110,19 @@ PATCHES=( src_prepare() { default - sed -e "s/webkit2gtk-4.0/webkit2gtk-4.1/" -i configure.ac || die - eautoreconf } src_configure() { + # Don't use libsoup-gnome (bug #565924) + export HAVE_LIBSOUP_GNOME=no + local myeconfargs=( --disable-bsfilter-plugin --disable-dillo-plugin + --disable-fancy-plugin --disable-generic-umpc --disable-jpilot #735118 - --disable-python-plugin --enable-acpi_notifier-plugin --enable-address_keeper-plugin --enable-alternate-addressbook @@ -139,8 +140,6 @@ src_configure() { $(use_enable clamav clamd-plugin) $(use_enable dbus) $(use_enable debug crash-dialog) - $(use_enable debug more-addressbook-debug) - $(use_enable debug more-ldap-debug) $(use_enable doc manual) $(use_enable gnutls) $(use_enable ldap) @@ -148,12 +147,12 @@ src_configure() { $(use_enable networkmanager) $(use_enable nls) $(use_enable notification notification-plugin) - $(use_enable oauth oauth2) $(use_enable pdf pdf_viewer-plugin) $(use_enable perl perl-plugin) $(use_enable pgp pgpcore-plugin) $(use_enable pgp pgpinline-plugin) $(use_enable pgp pgpmime-plugin) + --disable-python-plugin $(use_enable rss rssyl-plugin) $(use_enable session libsm) $(use_enable sieve managesieve-plugin) @@ -164,7 +163,6 @@ src_configure() { $(use_enable startup-notification) $(use_enable svg) $(use_enable valgrind valgrind) - $(use_enable webkit fancy-plugin) $(use_enable xface compface) ) @@ -209,6 +207,6 @@ src_install() { } pkg_postinst() { - ewarn "When upgrading from version 3.x please re-load any plugin you use" + ewarn "When upgrading from version <3.18 please re-load any plugin you use" xdg_pkg_postinst } diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-4.2.0.ebuild similarity index 96% copy from mail-client/claws-mail/claws-mail-9999.ebuild copy to mail-client/claws-mail/claws-mail-4.2.0.ebuild index 79c169e2c494..ba16295a1063 100644 --- a/mail-client/claws-mail/claws-mail-9999.ebuild +++ b/mail-client/claws-mail/claws-mail-4.2.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit autotools desktop python-any-r1 xdg @@ -31,7 +31,7 @@ REQUIRED_USE=" " COMMONDEPEND=" - >=dev-libs/glib-2.50:2 + >=dev-libs/glib-2.36:2 dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= @@ -106,12 +106,11 @@ RDEPEND="${COMMONDEPEND} PATCHES=( "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" + "${FILESDIR}/${PN}-4.1.1-fix_lto.patch" ) src_prepare() { default - sed -e "s/webkit2gtk-4.0/webkit2gtk-4.1/" -i configure.ac || die - eautoreconf } @@ -139,8 +138,6 @@ src_configure() { $(use_enable clamav clamd-plugin) $(use_enable dbus) $(use_enable debug crash-dialog) - $(use_enable debug more-addressbook-debug) - $(use_enable debug more-ldap-debug) $(use_enable doc manual) $(use_enable gnutls) $(use_enable ldap) diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild index 79c169e2c494..b10aeda0e70b 100644 --- a/mail-client/claws-mail/claws-mail-9999.ebuild +++ b/mail-client/claws-mail/claws-mail-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit autotools desktop python-any-r1 xdg
