* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/, mail-client/claws-mail/files/
@ 2015-12-21 7:33 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2015-12-21 7:33 UTC (permalink / raw
To: gentoo-commits
commit: d3421c07ae09c26536c7300bca72b07490425802
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 07:33:15 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 07:33:30 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3421c07
mail-client/claws-mail: Removed old.
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
mail-client/claws-mail/Manifest | 3 -
mail-client/claws-mail/claws-mail-3.10.1.ebuild | 205 --------------------
mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild | 207 ---------------------
mail-client/claws-mail/claws-mail-3.9.3.ebuild | 204 --------------------
.../files/claws-3.9.0_fix-search-field_part1.patch | 149 ---------------
.../files/claws-3.9.0_fix-search-field_part2.patch | 16 --
| 23 ---
.../files/claws-mail-3.9.1_fix-nntp-segfault.patch | 36 ----
.../files/claws-mail-3.9.1_libsoup-check-fix.patch | 30 ---
9 files changed, 873 deletions(-)
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index e62faf3..072118c 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,7 +1,4 @@
-DIST claws-mail-3.10.1.tar.xz 6669376 SHA256 4cb7c42995b1a5d7567a0909ce2080c05eec74a4d966da7a7a872f5eba018459 SHA512 b001683522a9a2bb9b1680f8ff608172a3fe9c4f556c8aa818b4259801bc92f722093850218377aba3a5fe549f0f09164c2e7623042bca0dbf3fd1071436dc80 WHIRLPOOL 0bcf92138081cd6fe0bef18a85acc9939fe61ab87faafc27a0ded24e321b4a35c0a1f6736aee6b0eef7d2d451c037cddcb280fece1a1c38c2e8f20c45ef685f7
-DIST claws-mail-3.11.1.tar.xz 6908772 SHA256 d72381b6c9f872638cae2c208925e19bd5d4a9476bb9049742f1ba27c3efd133 SHA512 ae4f0d4299647e201e94111a6eb26cce1d6a72045c317b879a07847cfcc75c35dfdf571f2826d365800586f5798131ce95985f746f7dbdd878f3766370ab3570 WHIRLPOOL 3ddf72a97990e087cd0c8a0417d6f57ee607e62bc5d644c6fb1892f349e9646a76664888a4540b6d22f5afe065e6e1e58d63188387cc829fda6fefe55ea4183d
DIST claws-mail-3.12.0.tar.xz 6615768 SHA256 272ad6aaa066a4f5e0f26ed151b23b836a65190e6b45c049479b5e7677e4d6ca SHA512 f6eb3eb9f252f93aab21305118eca34abab3a75abb6619a7ab4a79338a640de6012eeb9ffb4a1317cc3c1abfc830b8399e82a93b430aa72c131e14f9f630b321 WHIRLPOOL 202da4117b2678a55b06f97b83e2d267719f1dcadcac5d09c1f0224409c53e2a19b6a8c0eea4d5762348c1c9f206a657496c4efb72aa9bc363e25662f21a63ab
DIST claws-mail-3.13.0.tar.xz 6582288 SHA256 365076806c63dd8a1d6f08ead6a863a01ba05819c1a860ea7bbee8fcda4bf93a SHA512 5682a5e4642870a69374dc304d446db9dfd427bf8bd6f924a1193366098e07ca63623caefa454d62b413b8bb614fc7f1c0853852a1c44908c8541e554f3439e2 WHIRLPOOL 09a1bdcd5ba34a8cc359ec9659e54b3958c59f939b1eca36489b1db3163cb9cedb70c478896e769563781cd2044aaa90ece3c00d6dc90f1ea3533f884ec5999f
DIST claws-mail-3.13.1.tar.xz 5581304 SHA256 ad3cc8227b5f6236445698d9b18b0876ebd887b6828e74439552c20ef2d92a11 SHA512 526458434ca865e05c1201c6125f59cdc6e000b854f7075fd59401ddf1d4ea2d9b17b562de4570469f383b35fce5081d1c69185373bdb588538a498231b00ee3 WHIRLPOOL e002b4b98acf390ec82e6a8b70554be37191761ae7711261100e69000907d9cf90bdc1ac6c6010d749e4f7c16cbb93c0cf95efb1edf28c8625f1b40069e8fd9d
DIST claws-mail-3.9.0.tar.bz2 7425870 SHA256 ed70975a5056b3ffc4fe6e977f0d9606febc1499763c090241b029a73ff24e65 SHA512 5cb17106fee4549464eca03c8630fa4c46ee7b236c51eefbeb00f8a3602937cbe6073617f47a94732983ec3bc8838bc80e567f2e55cce1b30db453f350f590e8 WHIRLPOOL 4f2bef9d2240037eb6fd9b62b48c7173fddbd4fcb7258d4c5e0ee0e322894d741532c2ad716fbac96e465f87fe428fa6e926a04e7e8de1beaf68b8cb0a12c9a4
-DIST claws-mail-3.9.3.tar.bz2 9463943 SHA256 53aacceab45af6c3ee1f0668956a6e3328d21ac4efcfc0aa8dfd7d7552a62372 SHA512 b9e7a686650bfc496bf7e6b8ca196a890e3c5b2cbce486f7940245e42dc7a9fc53d81f688d88e298f310fd71e378ea4ea29a57c8510cccb6312d4ba1c79e3d42 WHIRLPOOL 58a7c431e214e82f6629e881eaf04b8f587f5aab1f5e990f9e20dff875821e1b0e8e7c0ab7ab47329f20a2e384dd203ea8b3afbe58175f3a48c963917311359e
diff --git a/mail-client/claws-mail/claws-mail-3.10.1.ebuild b/mail-client/claws-mail/claws-mail-3.10.1.ebuild
deleted file mode 100644
index 40257c5..0000000
--- a/mail-client/claws-mail/claws-mail-3.10.1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib gnome2-utils eutils python-single-r1
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
-
-SRC_URI="mirror://sourceforge/${PN}/Claws%20Mail/${PV}/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
-REQUIRED_USE="networkmanager? ( dbus )
- smime? ( pgp )
- libcanberra? ( notification )
- libindicate? ( notification )
- libnotify? ( notification )"
-
-# Plugins are all integrated or dropped since 3.9.1
-PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
- !!mail-client/claws-mail-archive
- !!mail-client/claws-mail-att-remover
- !!mail-client/claws-mail-attachwarner
- !!mail-client/claws-mail-clamd
- !!mail-client/claws-mail-fancy
- !!mail-client/claws-mail-fetchinfo
- !mail-client/claws-mail-gdata
- !!mail-client/claws-mail-geolocation
- !!mail-client/claws-mail-gtkhtml
- !!mail-client/claws-mail-mailmbox
- !!mail-client/claws-mail-newmail
- !!mail-client/claws-mail-notification
- !!mail-client/claws-mail-perl
- !!mail-client/claws-mail-python
- !!mail-client/claws-mail-rssyl
- !!mail-client/claws-mail-spam-report
- !!mail-client/claws-mail-tnef-parse
- !!mail-client/claws-mail-vcalendar
- !!mail-client/claws-mail-address_keeper
- !!mail-client/claws-mail-pdf-viewer"
-
-COMMONDEPEND=">=sys-devel/gettext-0.12.1
- gdata? ( >=dev-libs/libgdata-0.6.4 )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( >=x11-libs/gtk+-2.20:2 )
- pda? ( >=app-pda/jpilot-0.99 )
- gnutls? ( >=net-libs/gnutls-2.2.0 )
- ldap? ( >=net-nds/openldap-2.0.7 )
- pgp? ( >=app-crypt/gpgme-0.4.5 )
- valgrind? ( dev-util/valgrind )
- dbus? ( >=dev-libs/dbus-glib-0.60 )
- spell? ( >=app-text/enchant-1.0.0 )
- imap? ( >=net-libs/libetpan-0.57 )
- nntp? ( >=net-libs/libetpan-0.57 )
- startup-notification? ( x11-libs/startup-notification )
- session? ( x11-libs/libSM
- x11-libs/libICE )
- archive? ( app-arch/libarchive
- >=net-misc/curl-7.9.7 )
- bogofilter? ( mail-filter/bogofilter )
- notification? (
- libnotify? ( x11-libs/libnotify )
- libcanberra? ( media-libs/libcanberra[gtk] )
- libindicate? ( dev-libs/libindicate:3[gtk] )
- dev-libs/glib
- )
- smime? ( >=app-crypt/gpgme-0.4.5 )
- calendar? ( >=net-misc/curl-7.9.7 )
- pdf? ( app-text/poppler[cairo] )
- spam-report? ( >=net-misc/curl-7.9.7 )
- webkit? ( >=net-libs/webkit-gtk-1.0:2
- >=net-libs/libsoup-gnome-2.26:2.4 )
-"
-
-DEPEND="${PLUGINBLOCK}
- ${COMMONDEPEND}
- app-arch/xz-utils
- xface? ( >=media-libs/compface-1.4 )
- virtual/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
- pdf? ( app-text/ghostscript-gpl )
- clamav? ( app-antivirus/clamav )
- networkmanager? ( net-misc/networkmanager )
- perl? ( dev-lang/perl )
- python? ( ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.3 )
- rss? ( net-misc/curl
- dev-libs/libxml2 )
- app-misc/mime-types
- x11-misc/shared-mime-info"
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug crash-dialog)
- $(use_enable valgrind valgrind)
- $(use_enable doc manual)
- $(use_enable gtk3)
- $(use_enable ipv6)
- $(use_enable ldap)
- $(use_enable dbus dbus)
- $(use_enable networkmanager)
- $(use_enable pda jpilot)
- $(use_enable session libsm)
- $(use_enable spell enchant)
- $(use_enable gnutls)
- $(use_enable startup-notification)
- $(use_enable xface compface)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable gdata gdata-plugin)
- $(use_enable notification notification-plugin)
- $(use_enable pdf pdf_viewer-plugin)
- $(use_enable perl perl-plugin)
- $(use_enable pgp pgpmime-plugin)
- $(use_enable pgp pgpinline-plugin)
- $(use_enable pgp pgpcore-plugin)
- $(use_enable python python-plugin)
- $(use_enable rss rssyl-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable webkit fancy-plugin)
- --enable-new-addrbook
- --enable-nls
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --disable-generic-umpc
- --disable-bsfilter-plugin
- --disable-geolocation-plugin
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- autotools-utils_src_configure
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- autotools-utils_src_install
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png || die
- local res resdir
- for res in 64x64 128x128 ; do
- resdir="/usr/share/icons/hicolor/${res}/apps"
- insinto ${resdir}
- newins ${PN}-${res}.png ${PN}.png || die
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh || die
- doexe tb2claws-mail update-po uudec uuooffice || die
-
- # kill useless files
- rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
- ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild
deleted file mode 100644
index 46fb1b2..0000000
--- a/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib gnome2-utils eutils python-single-r1
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
-
-SRC_URI="mirror://sourceforge/${PN}/Claws%20Mail/${PV}/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
-REQUIRED_USE="networkmanager? ( dbus )
- smime? ( pgp )
- libcanberra? ( notification )
- libindicate? ( notification )
- libnotify? ( notification )"
-
-# Plugins are all integrated or dropped since 3.9.1
-PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
- !!mail-client/claws-mail-archive
- !!mail-client/claws-mail-att-remover
- !!mail-client/claws-mail-attachwarner
- !!mail-client/claws-mail-clamd
- !!mail-client/claws-mail-fancy
- !!mail-client/claws-mail-fetchinfo
- !mail-client/claws-mail-gdata
- !!mail-client/claws-mail-geolocation
- !!mail-client/claws-mail-gtkhtml
- !!mail-client/claws-mail-mailmbox
- !!mail-client/claws-mail-newmail
- !!mail-client/claws-mail-notification
- !!mail-client/claws-mail-perl
- !!mail-client/claws-mail-python
- !!mail-client/claws-mail-rssyl
- !!mail-client/claws-mail-spam-report
- !!mail-client/claws-mail-tnef-parse
- !!mail-client/claws-mail-vcalendar
- !!mail-client/claws-mail-address_keeper
- !!mail-client/claws-mail-pdf-viewer"
-
-COMMONDEPEND=">=sys-devel/gettext-0.12.1
- gdata? ( >=dev-libs/libgdata-0.6.4 )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( >=x11-libs/gtk+-2.20:2 )
- pda? ( >=app-pda/jpilot-0.99 )
- gnutls? ( >=net-libs/gnutls-2.2.0 )
- ldap? ( >=net-nds/openldap-2.0.7 )
- pgp? ( >=app-crypt/gpgme-0.4.5 )
- valgrind? ( dev-util/valgrind )
- dbus? ( >=dev-libs/dbus-glib-0.60 )
- spell? ( >=app-text/enchant-1.0.0 )
- imap? ( >=net-libs/libetpan-0.57 )
- nntp? ( >=net-libs/libetpan-0.57 )
- startup-notification? ( x11-libs/startup-notification )
- session? ( x11-libs/libSM
- x11-libs/libICE )
- archive? ( app-arch/libarchive
- >=net-misc/curl-7.9.7 )
- bogofilter? ( mail-filter/bogofilter )
- notification? (
- libnotify? ( x11-libs/libnotify )
- libcanberra? ( media-libs/libcanberra[gtk] )
- libindicate? ( dev-libs/libindicate:3[gtk] )
- dev-libs/glib:2
- )
- smime? ( >=app-crypt/gpgme-0.4.5 )
- calendar? ( >=net-misc/curl-7.9.7 )
- pdf? ( app-text/poppler[cairo] )
- spam-report? ( >=net-misc/curl-7.9.7 )
- webkit? ( >=net-libs/webkit-gtk-1.0:2
- >=net-libs/libsoup-gnome-2.26:2.4 )
-"
-
-DEPEND="${PLUGINBLOCK}
- ${COMMONDEPEND}
- app-arch/xz-utils
- xface? ( >=media-libs/compface-1.4 )
- virtual/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
- pdf? ( app-text/ghostscript-gpl )
- clamav? ( app-antivirus/clamav )
- networkmanager? ( net-misc/networkmanager )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.3 )
- rss? ( net-misc/curl
- dev-libs/libxml2 )
- app-misc/mime-types
- x11-misc/shared-mime-info"
-
-PATCHES=( "${FILESDIR}/${P}_RSSyl-encodings-fix.patch" )
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug crash-dialog)
- $(use_enable valgrind valgrind)
- $(use_enable doc manual)
- $(use_enable gtk3)
- $(use_enable ipv6)
- $(use_enable ldap)
- $(use_enable dbus dbus)
- $(use_enable networkmanager)
- $(use_enable pda jpilot)
- $(use_enable session libsm)
- $(use_enable spell enchant)
- $(use_enable gnutls)
- $(use_enable startup-notification)
- $(use_enable xface compface)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable gdata gdata-plugin)
- $(use_enable notification notification-plugin)
- $(use_enable pdf pdf_viewer-plugin)
- $(use_enable perl perl-plugin)
- $(use_enable pgp pgpmime-plugin)
- $(use_enable pgp pgpinline-plugin)
- $(use_enable pgp pgpcore-plugin)
- $(use_enable python python-plugin)
- $(use_enable rss rssyl-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable webkit fancy-plugin)
- --enable-new-addrbook
- --enable-nls
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --disable-generic-umpc
- --disable-bsfilter-plugin
- --disable-geolocation-plugin
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- autotools-utils_src_configure
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- autotools-utils_src_install
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png || die
- local res resdir
- for res in 64x64 128x128 ; do
- resdir="/usr/share/icons/hicolor/${res}/apps"
- insinto ${resdir}
- newins ${PN}-${res}.png ${PN}.png || die
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh || die
- doexe tb2claws-mail update-po uudec uuooffice || die
-
- # kill useless files
- rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
- ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.9.3.ebuild b/mail-client/claws-mail/claws-mail-3.9.3.ebuild
deleted file mode 100644
index 6f53b68..0000000
--- a/mail-client/claws-mail/claws-mail-3.9.3.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib gnome2-utils eutils python-single-r1
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
-
-SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
-REQUIRED_USE="networkmanager? ( dbus )
- smime? ( pgp )
- libcanberra? ( notification )
- libindicate? ( notification )
- libnotify? ( notification )"
-
-# Plugins are all integrated or dropped since 3.9.1
-PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
- !!mail-client/claws-mail-archive
- !!mail-client/claws-mail-att-remover
- !!mail-client/claws-mail-attachwarner
- !!mail-client/claws-mail-clamd
- !!mail-client/claws-mail-fancy
- !!mail-client/claws-mail-fetchinfo
- !mail-client/claws-mail-gdata
- !!mail-client/claws-mail-geolocation
- !!mail-client/claws-mail-gtkhtml
- !!mail-client/claws-mail-mailmbox
- !!mail-client/claws-mail-newmail
- !!mail-client/claws-mail-notification
- !!mail-client/claws-mail-perl
- !!mail-client/claws-mail-python
- !!mail-client/claws-mail-rssyl
- !!mail-client/claws-mail-spam-report
- !!mail-client/claws-mail-tnef-parse
- !!mail-client/claws-mail-vcalendar
- !!mail-client/claws-mail-address_keeper
- !!mail-client/claws-mail-pdf-viewer"
-
-COMMONDEPEND=">=sys-devel/gettext-0.12.1
- gdata? ( >=dev-libs/libgdata-0.6.4 )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( >=x11-libs/gtk+-2.20:2 )
- pda? ( >=app-pda/jpilot-0.99 )
- gnutls? ( >=net-libs/gnutls-2.2.0 )
- ldap? ( >=net-nds/openldap-2.0.7 )
- pgp? ( >=app-crypt/gpgme-0.4.5 )
- valgrind? ( dev-util/valgrind )
- dbus? ( >=dev-libs/dbus-glib-0.60 )
- spell? ( >=app-text/enchant-1.0.0 )
- imap? ( >=net-libs/libetpan-0.57 )
- nntp? ( >=net-libs/libetpan-0.57 )
- startup-notification? ( x11-libs/startup-notification )
- session? ( x11-libs/libSM
- x11-libs/libICE )
- archive? ( app-arch/libarchive
- >=net-misc/curl-7.9.7 )
- bogofilter? ( mail-filter/bogofilter )
- notification? (
- libnotify? ( x11-libs/libnotify )
- libcanberra? ( media-libs/libcanberra[gtk] )
- libindicate? ( dev-libs/libindicate:3[gtk] )
- dev-libs/glib
- )
- smime? ( >=app-crypt/gpgme-0.4.5 )
- calendar? ( >=net-misc/curl-7.9.7 )
- pdf? ( app-text/poppler[cairo] )
- spam-report? ( >=net-misc/curl-7.9.7 )
- webkit? ( >=net-libs/webkit-gtk-1.0:2
- >=net-libs/libsoup-gnome-2.26:2.4 )
-"
-
-DEPEND="${PLUGINBLOCK}
- ${COMMONDEPEND}
- xface? ( >=media-libs/compface-1.4 )
- virtual/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
- pdf? ( app-text/ghostscript-gpl )
- clamav? ( app-antivirus/clamav )
- networkmanager? ( net-misc/networkmanager )
- perl? ( dev-lang/perl )
- python? ( ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.3 )
- rss? ( net-misc/curl
- dev-libs/libxml2 )
- app-misc/mime-types
- x11-misc/shared-mime-info"
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug crash-dialog)
- $(use_enable valgrind valgrind)
- $(use_enable doc manual)
- $(use_enable gtk3)
- $(use_enable ipv6)
- $(use_enable ldap)
- $(use_enable dbus dbus)
- $(use_enable networkmanager)
- $(use_enable pda jpilot)
- $(use_enable session libsm)
- $(use_enable spell enchant)
- $(use_enable gnutls)
- $(use_enable startup-notification)
- $(use_enable xface compface)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable gdata gdata-plugin)
- $(use_enable notification notification-plugin)
- $(use_enable pdf pdf_viewer-plugin)
- $(use_enable perl perl-plugin)
- $(use_enable pgp pgpmime-plugin)
- $(use_enable pgp pgpinline-plugin)
- $(use_enable pgp pgpcore-plugin)
- $(use_enable python python-plugin)
- $(use_enable rss rssyl-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable webkit fancy-plugin)
- --enable-new-addrbook
- --enable-nls
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --disable-generic-umpc
- --disable-bsfilter-plugin
- --disable-geolocation-plugin
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- autotools-utils_src_configure
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- autotools-utils_src_install
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png || die
- local res resdir
- for res in 64x64 128x128 ; do
- resdir="/usr/share/icons/hicolor/${res}/apps"
- insinto ${resdir}
- newins ${PN}-${res}.png ${PN}.png || die
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh || die
- doexe tb2claws-mail update-po uudec uuooffice || die
-
- # kill useless files
- rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
- ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part1.patch b/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part1.patch
deleted file mode 100644
index 0bdadd6..0000000
--- a/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part1.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-Make combo search field work again.
-
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=455590
-Upstream commit: http://www.claws-mail.org/tracker/getpatchset.php?ver=3.9.0cvs8
---- src/advsearch.c 24 Oct 2012 07:48:24 -0000 1.1.2.7
-+++ src/advsearch.c 16 Nov 2012 13:10:05 -0000 1.1.2.8
-@@ -314,32 +314,6 @@
- return returnstr;
- }
-
--// --------------------------
--
--static gchar *expand_tag_search_string(const gchar *search_string)
--{
-- gchar *newstr = NULL;
-- gchar **words = search_string ? g_strsplit(search_string, " ", -1):NULL;
-- gint i = 0;
-- while (words && words[i] && *words[i]) {
-- g_strstrip(words[i]);
-- if (!newstr) {
-- newstr = g_strdup_printf("tag matchcase \"%s\"", words[i]);
-- } else {
-- gint o_len = strlen(newstr);
-- gint s_len = 17; /* strlen("|tag matchcase \"\"") */
-- gint n_len = s_len + strlen(words[i]);
-- newstr = g_realloc(newstr, o_len + n_len + 1);
-- strcpy(newstr + o_len, "|tag matchcase \"");
-- strcpy(newstr + o_len + (s_len - 1), words[i]);
-- strcpy(newstr + o_len + (n_len - 1), "\"");
-- }
-- i++;
-- }
-- g_strfreev(words);
-- return newstr;
--}
--
- static void prepare_matcher_extended(AdvancedSearch *search)
- {
- gchar *newstr = advsearch_expand_search_string(search->request.matchstring);
-@@ -350,19 +324,51 @@
- }
- }
-
-+#define debug_matcher_list(prefix, list) \
-+do { \
-+ gchar *str = list ? matcherlist_to_string(list) : g_strdup("(NULL)"); \
-+ \
-+ debug_print("%s: %s\n", prefix, str); \
-+ \
-+ g_free(str); \
-+} while(0)
-+
- static void prepare_matcher_tag(AdvancedSearch *search)
- {
-- char *newstr = expand_tag_search_string(search->request.matchstring);
-- search->predicate = matcher_parser_get_cond(newstr, &search->is_fast);
-- g_free(newstr);
-+ gchar **words = search->request.matchstring
-+ ? g_strsplit(search->request.matchstring, " ", -1)
-+ : NULL;
-+ gint i = 0;
-+
-+ if (search->predicate == NULL) {
-+ search->predicate = g_new0(MatcherList, 1);
-+ search->predicate->bool_and = FALSE;
-+ search->is_fast = TRUE;
-+ }
-+
-+ while (words && words[i] && *words[i]) {
-+ MatcherProp *matcher;
-+
-+ g_strstrip(words[i]);
-+
-+ matcher = matcherprop_new(MATCHCRITERIA_TAG, NULL,
-+ MATCHTYPE_MATCHCASE, words[i], 0);
-+
-+ search->predicate->matchers = g_slist_prepend(search->predicate->matchers, matcher);
-+
-+ i++;
-+ }
-+ g_strfreev(words);
- }
-
- static void prepare_matcher_header(AdvancedSearch *search, gint match_header)
- {
- MatcherProp *matcher;
-
-- if (search->predicate == NULL)
-+ if (search->predicate == NULL) {
- search->predicate = g_new0(MatcherList, 1);
-+ search->predicate->bool_and = FALSE;
-+ }
-
- matcher = matcherprop_new(match_header, NULL, MATCHTYPE_MATCHCASE,
- search->request.matchstring, 0);
-@@ -373,10 +379,18 @@
- static void prepare_matcher_mixed(AdvancedSearch *search)
- {
- prepare_matcher_tag(search);
-+ debug_matcher_list("tag matcher list", search->predicate);
-+
-+ /* we want an OR search */
-+ if (search->predicate)
-+ search->predicate->bool_and = FALSE;
-
- prepare_matcher_header(search, MATCHCRITERIA_SUBJECT);
-+ debug_matcher_list("tag + subject matcher list", search->predicate);
- prepare_matcher_header(search, MATCHCRITERIA_FROM);
-+ debug_matcher_list("tag + subject + from matcher list", search->predicate);
- prepare_matcher_header(search, MATCHCRITERIA_TO);
-+ debug_matcher_list("tag + subject + from + to matcher list", search->predicate);
- }
-
- static void prepare_matcher(AdvancedSearch *search)
-@@ -398,26 +412,32 @@
- switch (search->request.type) {
- case ADVANCED_SEARCH_SUBJECT:
- prepare_matcher_header(search, MATCHCRITERIA_SUBJECT);
-+ debug_matcher_list("subject search", search->predicate);
- break;
-
- case ADVANCED_SEARCH_FROM:
- prepare_matcher_header(search, MATCHCRITERIA_FROM);
-+ debug_matcher_list("from search", search->predicate);
- break;
-
- case ADVANCED_SEARCH_TO:
- prepare_matcher_header(search, MATCHCRITERIA_TO);
-+ debug_matcher_list("to search", search->predicate);
- break;
-
- case ADVANCED_SEARCH_TAG:
-- prepare_matcher_header(search, MATCHCRITERIA_TAG);
-+ prepare_matcher_tag(search);
-+ debug_matcher_list("tag search", search->predicate);
- break;
-
- case ADVANCED_SEARCH_MIXED:
- prepare_matcher_mixed(search);
-+ debug_matcher_list("mixed search", search->predicate);
- break;
-
- case ADVANCED_SEARCH_EXTENDED:
- prepare_matcher_extended(search);
-+ debug_matcher_list("extended search", search->predicate);
- break;
-
- default:
-
diff --git a/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part2.patch b/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part2.patch
deleted file mode 100644
index bb8a78a..0000000
--- a/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Make combo search field work again.
-
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=455590
-Upstream commit: http://www.claws-mail.org/tracker/getpatchset.php?ver=3.9.0cvs9
-
---- src/advsearch.c 16 Nov 2012 13:10:05 -0000 1.1.2.8
-+++ src/advsearch.c 16 Nov 2012 13:11:55 -0000 1.1.2.9
-@@ -368,6 +368,7 @@
- if (search->predicate == NULL) {
- search->predicate = g_new0(MatcherList, 1);
- search->predicate->bool_and = FALSE;
-+ search->is_fast = TRUE;
- }
-
- matcher = matcherprop_new(match_header, NULL, MATCHTYPE_MATCHCASE,
-
diff --git a/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch b/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch
deleted file mode 100644
index 82e13b2..0000000
--- a/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Andrej Kacian <ticho@claws-mail.org>
-Date: Thu, 1 Jan 2015 22:36:36 +0000 (+0100)
-Subject: RSSyl: Fix handling of feeds with encodings unknown to expat. Turns out the only...
-X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d05156031070efe6104695acad93aa879bc0f084
-
-RSSyl: Fix handling of feeds with encodings unknown to expat. Turns out the only thing missing was that HAVE_ICONV macro (from config.h) was not defined in parser.c, so our "unknown encoding" expat handler function did nothing. Fixes bug #3339.
----
-
-diff --git a/src/plugins/rssyl/libfeed/parser.c b/src/plugins/rssyl/libfeed/parser.c
-index bb0bb0d..14f4a36 100644
---- a/src/plugins/rssyl/libfeed/parser.c
-+++ b/src/plugins/rssyl/libfeed/parser.c
-@@ -17,6 +17,10 @@
- * Boston, MA 02111-1307, USA.
- */
-
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #include <glib.h>
- #include <curl/curl.h>
- #include <expat.h>
diff --git a/mail-client/claws-mail/files/claws-mail-3.9.1_fix-nntp-segfault.patch b/mail-client/claws-mail/files/claws-mail-3.9.1_fix-nntp-segfault.patch
deleted file mode 100644
index 0abc372..0000000
--- a/mail-client/claws-mail/files/claws-mail-3.9.1_fix-nntp-segfault.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-claws-mail 3.9.1 reproducible segfaults on exit when compiled with NNTP support.
-
-Apparently the pointer returned by account_get_list() is truncated to an integer due to a missing function definition:
-
-(gdb) r
-Starting program: /usr/local/bin/claws-mail
-[New LWP 101084]
-[New Thread 80ac06400 (LWP 101084)]
-
-Program received signal SIGSEGV, Segmentation fault.
-[Switching to Thread 80ac06400 (LWP 101084)]
-0x00000000005331f9 in nntp_disconnect_all (have_connectivity=1) at news.c:1418
-1418 for (list = account_get_list(); list != NULL; list = list->next) {
-(gdb) where
-#0 0x00000000005331f9 in nntp_disconnect_all (have_connectivity=1) at news.c:1418
-#1 0x0000000000669cf3 in nntp_main_done (have_connectivity=1) at nntp-thread.c:163
-#2 0x00000000004e59aa in exit_claws (mainwin=0x80acf23c0) at main.c:1811
-#3 0x00000000004e2627 in main (argc=1, argv=0x7fffffffd8b0) at main.c:1739
-(gdb) p list
-$1 = (GList *) 0xb836a00
-
-
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=469838
-Upstream bug: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2924
-Upstream fix: http://git.claws-mail.org/?p=claws.git;a=patch;h=8891f6e23e51b38c54c7b717fa0922cb101b76a2
-
---- a/src/news.c
-+++ b/src/news.c
-@@ -56,6 +56,7 @@
- #include "remotefolder.h"
- #include "alertpanel.h"
- #include "inc.h"
-+#include "account.h"
- #ifdef USE_GNUTLS
- # include "ssl.h"
- #endif
diff --git a/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch b/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch
deleted file mode 100644
index 3b5c452..0000000
--- a/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-libsoup is not obligatory, but nonetheless a mandatory check existed.
-Fixed in releases >3.9.1
-
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=469014
-Upstream commit: http://git.claws-mail.org/?p=claws.git;a=commitdiff;h=d04c724c9e74f7c5d1f247e41a21e472790d9992
-
-
---- configure.ac.orig
-+++ configure.ac
-@@ -1107,14 +1107,17 @@
- AC_SUBST(WEBKIT_CFLAGS)
-
- dnl libsoup ********************************************************************
--PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4)
-+PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
-+if test x"$HAVE_LIBSOUP" = xyes; then
-+ AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
-+fi
- AC_SUBST(LIBSOUP_CFLAGS)
- AC_SUBST(LIBSOUP_LIBS)
-
- dnl libsoup-gnome **************************************************************
- PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, HAVE_LIBSOUP_GNOME=yes, HAVE_LIBSOUP_GNOME=no)
- if test x"$HAVE_LIBSOUP_GNOME" = xyes; then
-- AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup is available])
-+ AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup_gnome is available])
- fi
- AC_SUBST(LIBSOUP_GNOME_CFLAGS)
- AC_SUBST(LIBSOUP_GNOME_LIBS)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/, mail-client/claws-mail/files/
@ 2017-08-11 19:57 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2017-08-11 19:57 UTC (permalink / raw
To: gentoo-commits
commit: dbd1e3e95fcff251b6232544a313873a24a3de9b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 19:57:22 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 19:57:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd1e3e9
mail-client/claws-mail: Revbump to fix segfault (bug #618376).
Package-Manager: Portage-2.3.6, Repoman-2.3.3
...l-3.15.0.ebuild => claws-mail-3.15.0-r1.ebuild} | 8 ++-
.../claws-mail-3.15.0-old_profile_segfault.patch | 80 ++++++++++++++++++++++
2 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/mail-client/claws-mail/claws-mail-3.15.0.ebuild b/mail-client/claws-mail/claws-mail-3.15.0-r1.ebuild
similarity index 97%
rename from mail-client/claws-mail/claws-mail-3.15.0.ebuild
rename to mail-client/claws-mail/claws-mail-3.15.0-r1.ebuild
index 190562439d1..c92913afd86 100644
--- a/mail-client/claws-mail/claws-mail-3.15.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.15.0-r1.ebuild
@@ -85,6 +85,10 @@ RDEPEND="${COMMONDEPEND}
net-misc/curl
)"
+PATCHES=(
+ "${FILESDIR}/${P}-old_profile_segfault.patch"
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
@@ -148,7 +152,7 @@ src_configure() {
)
# libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp; then
+ if use imap || use nntp ; then
myeconfargs+=( --enable-libetpan )
else
myeconfargs+=( --disable-libetpan )
@@ -183,7 +187,7 @@ src_install() {
doexe tb2claws-mail update-po uudec uuooffice
# kill useless files
- rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+ rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
}
pkg_preinst() {
diff --git a/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch b/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch
new file mode 100644
index 00000000000..b19bf8f39d6
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch
@@ -0,0 +1,80 @@
+From: Ricardo Mones <ricardo@mones.org>
+Date: Wed, 9 Aug 2017 14:48:38 +0000 (+0200)
+Subject: Fix bug #3855: segfault at startup with old profile and IMAP account
+X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=667c9d3eaf0487193cc7873e6d3a63959a03d7f9;hp=63677adb68c57479f6bc7534cfbf2f234b1f4fb1
+
+Fix bug #3855: segfault at startup with old profile and IMAP account
+
+Revert "Remove duplicated code and include".
+
+This reverts commit 300f811f3bbf10455ca55d9b01da6705dd1e07bb.
+---
+
+diff --git a/src/imap.c b/src/imap.c
+index 0e1e777..25bb283 100644
+--- a/src/imap.c
++++ b/src/imap.c
+@@ -77,6 +77,8 @@ typedef struct _IMAPSession IMAPSession;
+ typedef struct _IMAPNameSpace IMAPNameSpace;
+ typedef struct _IMAPFolderItem IMAPFolderItem;
+
++#include "prefs_account.h"
++
+ #define IMAP_FOLDER(obj) ((IMAPFolder *)obj)
+ #define IMAP_FOLDER_ITEM(obj) ((IMAPFolderItem *)obj)
+ #define IMAP_SESSION(obj) ((IMAPSession *)obj)
+@@ -425,6 +427,7 @@ static gint imap_get_flags (Folder *folder,
+ FolderItem *item,
+ MsgInfoList *msglist,
+ GHashTable *msgflags);
++static gchar *imap_folder_get_path (Folder *folder);
+ static gchar *imap_item_get_path (Folder *folder,
+ FolderItem *item);
+ static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item);
+@@ -3042,6 +3045,35 @@ static FolderItem *imap_create_special_folder(Folder *folder,
+ return new_item;
+ }
+
++static gchar *imap_folder_get_path(Folder *folder)
++{
++ gchar *folder_path;
++
++ g_return_val_if_fail(folder != NULL, NULL);
++ g_return_val_if_fail(folder->account != NULL, NULL);
++
++#ifdef G_OS_WIN32
++ gchar *sanitized_dirname = g_strdup(folder->account->recv_server);
++ g_strdelimit(sanitized_dirname, ":", ',');
++#endif
++
++ folder_path = g_strconcat(get_imap_cache_dir(),
++ G_DIR_SEPARATOR_S,
++#ifdef G_OS_WIN32
++ sanitized_dirname,
++#else
++ folder->account->recv_server,
++#endif
++ G_DIR_SEPARATOR_S,
++ folder->account->userid,
++ NULL);
++
++#ifdef G_OS_WIN32
++ g_free(sanitized_dirname);
++#endif
++ return folder_path;
++}
++
+ #ifdef G_OS_WIN32
+ static gchar *imap_encode_unsafe_chars(const gchar *str)
+ {
+@@ -3078,9 +3110,8 @@ static gchar *imap_item_get_path(Folder *folder, FolderItem *item)
+ gchar *item_path = NULL;
+
+ g_return_val_if_fail(folder != NULL, NULL);
+- g_return_val_if_fail(folder->account != NULL, NULL);
+ g_return_val_if_fail(item != NULL, NULL);
+- folder_path = prefs_account_cache_dir(folder->account, FALSE);
++ folder_path = imap_folder_get_path(folder);
+
+ g_return_val_if_fail(folder_path != NULL, NULL);
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/, mail-client/claws-mail/files/
@ 2019-11-06 10:34 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2019-11-06 10:34 UTC (permalink / raw
To: gentoo-commits
commit: 5b0e6266bd24396be963ccb4bbb22fe339b30138
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 6 10:26:08 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Nov 6 10:34:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0e6266
mail-client/claws-mail: Fixed build against net-libs/libetpan-1.9.4
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
mail-client/claws-mail/claws-mail-3.17.4.ebuild | 8 +-
.../claws-mail-3.17.4-libetpan_pkgconfig.patch | 97 ++++++++++++++++++++++
2 files changed, 104 insertions(+), 1 deletion(-)
diff --git a/mail-client/claws-mail/claws-mail-3.17.4.ebuild b/mail-client/claws-mail/claws-mail-3.17.4.ebuild
index 0cec94b7a4b..0655468d001 100644
--- a/mail-client/claws-mail/claws-mail-3.17.4.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.4.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
LICENSE="GPL-3"
IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+
REQUIRED_USE="libcanberra? ( notification )
libindicate? ( notification )
libnotify? ( notification )
@@ -105,7 +106,12 @@ RDEPEND="${COMMONDEPEND}
rss? (
dev-libs/libxml2
net-misc/curl
- )"
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-libetpan_pkgconfig.patch
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
diff --git a/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch b/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch
new file mode 100644
index 00000000000..572380d2e05
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch
@@ -0,0 +1,97 @@
+diff --git a/configure.ac b/configure.ac
+index 412a3f014..6a80c2a92 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -908,38 +908,62 @@ fi
+ dnl Libetpan
+ AC_MSG_CHECKING([whether to use libetpan])
+ if test x"$enable_libetpan" = xyes; then
+- AC_MSG_RESULT(yes)
+- libetpan_result=no
+- AC_PATH_PROG(libetpanconfig, [libetpan-config])
+- if test "x$libetpanconfig" != "x"; then
+- CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`"
+- AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
+- if test "x$libetpan_result" = "xyes"; then
+- AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
+- LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`"
+- AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
+- AC_MSG_RESULT([$libetpan_result])
+- fi
+- fi
+- if test "x$libetpan_result" = "xyes"; then
+- LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
+- LIBETPAN_LIBS="`$libetpanconfig --libs`"
+- LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
+- if test "$LIBETPAN_VERSION" -lt "57"; then
+- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
+- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
++ AC_MSG_RESULT(yes)
++
++ libetpan_config=no
++ libetpan_result=no
++ libetpan_versiontype=0
++
++ # since 1.9.4, libetpan uses pkg-config
++ PKG_CHECK_MODULES([LIBETPAN], [libetpan >= 1.9.4],
++ [
++ LIBETPAN_VERSION=`pkg-config --modversion | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
++ libetpan_config=yes
++ ],
++ [
++ # before 1.9.4, libetpan uses its own libetpan-config script
++ AC_PATH_PROG(libetpanconfig, [libetpan-config])
++ if test "x$libetpanconfig" != "x"; then
++ LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
++ LIBETPAN_LIBS="`$libetpanconfig --libs`"
++ # support libetpan version like x.x and x.x.x
++ libetpan_versiontype=`$libetpanconfig --version | tr -dc . | wc -c`
++ if test $libetpan_versiontype -eq 1; then
++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
++ else
++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
++ fi
++ libetpan_config=yes
++ fi
++ ])
++ if test "x$libetpan_config" = "xyes"; then
++ CPPFLAGS="$CPPFLAGS $LIBETPAN_FLAGS"
++ AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
++ if test "x$libetpan_result" = "xyes"; then
++ AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
++ LIBS="$LIBS $LIBETPAN_LIBS"
++ AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
++ AC_MSG_RESULT([$libetpan_result])
++ fi
++ fi
++ if test "x$libetpan_result" = "xyes"; then
++ if test $libetpan_versiontype -eq 1; then
++ if test "$LIBETPAN_VERSION" -lt "57"; then
++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
+ AC_MSG_ERROR([libetpan 0.57 not found])
+- fi
+- AC_SUBST(LIBETPAN_FLAGS)
+- AC_SUBST(LIBETPAN_LIBS)
+- AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
+- else
+- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
+- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
+- AC_MSG_ERROR([libetpan 0.57 not found])
+- fi
++ fi
++ fi
++ AC_SUBST(LIBETPAN_FLAGS)
++ AC_SUBST(LIBETPAN_LIBS)
++ AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNit TP support.)
++ else
++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
++ AC_MSG_ERROR([libetpan 0.57 not found])
++ fi
+ else
+- AC_MSG_RESULT(no)
++ AC_MSG_RESULT(no)
+ fi
+ AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/, mail-client/claws-mail/files/
@ 2020-03-09 14:31 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2020-03-09 14:31 UTC (permalink / raw
To: gentoo-commits
commit: 30f0f43174dc9d18c2f2fa9e345fd0a94707ad5b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 9 14:30:52 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 9 14:31:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f0f431
mail-client/claws-mail: Revbump to depend on app-text/enchant:2
Bug: https://bugs.gentoo.org/708928
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
...ail-9999.ebuild => claws-mail-3.17.5-r1.ebuild} | 13 +++---
mail-client/claws-mail/claws-mail-9999.ebuild | 6 ++-
.../claws-mail-3.17.5-enchant-2_default.patch | 46 ++++++++++++++++++++++
3 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild
similarity index 94%
copy from mail-client/claws-mail/claws-mail-9999.ebuild
copy to mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild
index f54e1858e57..e00884c0c0f 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild
@@ -20,7 +20,8 @@ fi
SLOT="0"
LICENSE="GPL-3"
-IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+
REQUIRED_USE="libcanberra? ( notification )
libindicate? ( notification )
libnotify? ( notification )
@@ -34,6 +35,7 @@ COMMONDEPEND="
sys-libs/zlib:=
x11-libs/cairo
x11-libs/gdk-pixbuf:2[jpeg]
+ >=x11-libs/gtk+-2.24:2
x11-libs/libX11
x11-libs/pango
archive? (
@@ -52,8 +54,6 @@ COMMONDEPEND="
gdata? ( >=dev-libs/libgdata-0.17.2 )
dillo? ( www-client/dillo )
gnutls? ( >=net-libs/gnutls-3.0 )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( >=x11-libs/gtk+-2.24:2 )
imap? ( >=net-libs/libetpan-0.57 )
ldap? ( >=net-nds/openldap-2.0.7 )
litehtml? (
@@ -79,7 +79,7 @@ COMMONDEPEND="
)
smime? ( >=app-crypt/gpgme-1.0.0 )
spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-1.0.0:0= )
+ 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 )
@@ -109,6 +109,10 @@ RDEPEND="${COMMONDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
@@ -146,7 +150,6 @@ src_configure() {
$(use_enable doc manual)
$(use_enable gdata gdata-plugin)
$(use_enable gnutls)
- $(use_enable gtk3)
$(use_enable ipv6)
$(use_enable ldap)
$(use_enable litehtml litehtml_viewer-plugin)
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index f54e1858e57..935280af79f 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -79,7 +79,7 @@ COMMONDEPEND="
)
smime? ( >=app-crypt/gpgme-1.0.0 )
spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-1.0.0:0= )
+ 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 )
@@ -109,6 +109,10 @@ RDEPEND="${COMMONDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
diff --git a/mail-client/claws-mail/files/claws-mail-3.17.5-enchant-2_default.patch b/mail-client/claws-mail/files/claws-mail-3.17.5-enchant-2_default.patch
new file mode 100644
index 00000000000..c9c9bd444e0
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.17.5-enchant-2_default.patch
@@ -0,0 +1,46 @@
+From 826770e2dae8646a613dbe07685be68b4dc83b62 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 9 Mar 2020 15:21:55 +0100
+Subject: [PATCH] Only check for enchant-2
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 18 +++++-------------
+ 1 file changed, 5 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8ab413657..e1159d45e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -591,23 +591,15 @@ dnl enchant is used for spell checking
+ AC_MSG_CHECKING([whether to use enchant])
+ AC_MSG_RESULT($enable_enchant)
+ if test $enable_enchant = yes; then
+- PKG_CHECK_MODULES(ENCHANT, enchant >= 1.4.0,
++ PKG_CHECK_MODULES(ENCHANT, enchant-2 >= 2.0.0,
+ [
+- AC_DEFINE(USE_ENCHANT, 1, enchant)
+- echo "Building with enchant"
++ AC_DEFINE(USE_ENCHANT, 1, enchant-2)
++ echo "Building with enchant-2"
+ enable_enchant=yes
+ ],
+ [
+- PKG_CHECK_MODULES(ENCHANT, enchant-2 >= 2.0.0,
+- [
+- AC_DEFINE(USE_ENCHANT, 1, enchant-2)
+- echo "Building with enchant-2"
+- enable_enchant=yes
+- ],
+- [
+- echo "Building without enchant-notification"
+- enable_enchant=no
+- ])
++ echo "Building without enchant-notification"
++ enable_enchant=no
+ ])
+ AC_SUBST(ENCHANT_CFLAGS)
+ AC_SUBST(ENCHANT_LIBS)
+--
+2.25.1
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/, mail-client/claws-mail/files/
@ 2020-07-13 13:35 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2020-07-13 13:35 UTC (permalink / raw
To: gentoo-commits
commit: 0a78fbd4139029a5417376bf26be66d34f19a2d0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 13:34:37 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 13:35:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a78fbd4
mail-client/claws-mail: Removed old
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
mail-client/claws-mail/Manifest | 2 -
mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild | 217 -------------------
mail-client/claws-mail/claws-mail-3.17.4.ebuild | 232 ---------------------
mail-client/claws-mail/claws-mail-3.17.5.ebuild | 220 -------------------
.../claws-mail-3.17.4-libetpan_pkgconfig.patch | 97 ---------
5 files changed, 768 deletions(-)
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 5051444187a..d47d3827e31 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,4 +1,2 @@
-DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8
-DIST claws-mail-3.17.4.tar.xz 6280252 BLAKE2B 8ddce2e5dfb3ae0ddb646c4f5a81d7e4c3834d2fa7a7f7a7326bf6e160291db4ba5954737bb61a4ae86ebaaab72a695d2e351fe2cf89b187eba4341f5d9b0cd9 SHA512 4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012
DIST claws-mail-3.17.5.tar.xz 6290944 BLAKE2B b060d4513ecd61ba8589d701970c733b683d93b03beb22e37669e9856797f6d0d404c09a49f0a1d9c8a576807806ec22959079c9ff79786d226ea6b6f3817904 SHA512 a1d3576eba70b83a6fe70aafead3d80681e6372d146b573f5d43fee63bdcf84b5350d4dc8a4290b11d11320381417253d893daee8169c110e294178d10ea542f
DIST claws-mail-3.17.6.tar.xz 6400692 BLAKE2B ce5fc914db89835a2a678e68da950d7487e8df919847f3d69baabc73012908f3853dcb274ae4c0e1a4f0f46fb38903b77fe7a2aa7e5b9169bd8eb597035d2ce5 SHA512 07fdf7fce722ee1e50aa155bca720323a58842b372d8295bed33c7245fce5790a1bd3ed7462130664a218a804ab6bd1ba3663ee3e53fbbac6a4a477dd676ede0
diff --git a/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
deleted file mode 100644
index 624d90174a9..00000000000
--- a/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools desktop python-single-r1 xdg
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-if [[ "${PV}" == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
-else
- SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
-REQUIRED_USE="libcanberra? ( notification )
- libindicate? ( notification )
- libnotify? ( notification )
- networkmanager? ( dbus )
- python? ( ${PYTHON_REQUIRED_USE} )
- smime? ( pgp )"
-
-COMMONDEPEND="
- dev-libs/nettle:=
- net-mail/ytnef
- sys-libs/zlib:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2[jpeg]
- >=x11-libs/gtk+-2.24:2
- x11-libs/libX11
- x11-libs/pango
- archive? (
- app-arch/libarchive
- >=net-misc/curl-7.9.7
- )
- bogofilter? ( mail-filter/bogofilter )
- calendar? (
- >=dev-libs/libical-2.0.0:=
- >=net-misc/curl-7.9.7
- )
- dbus? (
- >=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 )
- nls? ( >=sys-devel/gettext-0.18 )
- nntp? ( >=net-libs/libetpan-0.57 )
- notification? (
- dev-libs/glib:2
- libcanberra? ( media-libs/libcanberra[gtk] )
- libindicate? ( dev-libs/libindicate:3[gtk] )
- libnotify? ( x11-libs/libnotify )
- )
- pda? ( >=app-pda/jpilot-0.99 )
- pdf? ( app-text/poppler[cairo] )
- pgp? ( >=app-crypt/gpgme-1.0.0 )
- session? (
- x11-libs/libICE
- x11-libs/libSM
- )
- smime? ( >=app-crypt/gpgme-1.0.0 )
- spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-1.0.0:0= )
- startup-notification? ( x11-libs/startup-notification )
- svg? ( >=gnome-base/librsvg-2.40.5 )
- valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${COMMONDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig
- xface? ( >=media-libs/compface-1.4 )"
-
-RDEPEND="${COMMONDEPEND}
- app-misc/mime-types
- x11-misc/shared-mime-info
- clamav? ( app-antivirus/clamav )
- networkmanager? ( net-misc/networkmanager )
- pdf? ( app-text/ghostscript-gpl )
- perl? ( dev-lang/perl:= )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.3
- )
- rss? (
- dev-libs/libxml2
- net-misc/curl
- )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- xdg_src_prepare
- eautoreconf
-}
-
-src_configure() {
- # Don't use libsoup-gnome (bug #565924)
- export HAVE_LIBSOUP_GNOME=no
-
- local myeconfargs=(
- --disable-bsfilter-plugin
- --disable-fancy-plugin
- --disable-generic-umpc
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-alternate-addressbook
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --with-password-encryption=$(usex gnutls gnutls old)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable dbus)
- $(use_enable debug crash-dialog)
- $(use_enable dillo dillo-plugin)
- $(use_enable doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable ipv6)
- $(use_enable ldap)
- $(use_enable networkmanager)
- $(use_enable nls)
- $(use_enable notification notification-plugin)
- $(use_enable pda jpilot)
- $(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)
- $(use_enable python python-plugin)
- $(use_enable rss rssyl-plugin)
- $(use_enable session libsm)
- $(use_enable sieve managesieve-plugin)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable spell enchant)
- $(use_enable startup-notification)
- $(use_enable svg)
- $(use_enable valgrind valgrind)
- $(use_enable xface compface)
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp ; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- default
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png
- local size
- for size in 64 128 ; do
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools || die
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh
- doexe tb2claws-mail update-po uudec uuooffice
-
- # kill useless files
- rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
- ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/mail-client/claws-mail/claws-mail-3.17.4.ebuild b/mail-client/claws-mail/claws-mail-3.17.4.ebuild
deleted file mode 100644
index 7605fda66b2..00000000000
--- a/mail-client/claws-mail/claws-mail-3.17.4.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools desktop python-single-r1 xdg
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-if [[ "${PV}" == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
-else
- SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
-
-REQUIRED_USE="libcanberra? ( notification )
- libindicate? ( notification )
- libnotify? ( notification )
- networkmanager? ( dbus )
- python? ( ${PYTHON_REQUIRED_USE} )
- smime? ( pgp )"
-
-COMMONDEPEND="
- dev-libs/nettle:=
- net-mail/ytnef
- sys-libs/zlib:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2[jpeg]
- >=x11-libs/gtk+-2.24:2
- x11-libs/libX11
- x11-libs/pango
- archive? (
- app-arch/libarchive
- >=net-misc/curl-7.9.7
- )
- bogofilter? ( mail-filter/bogofilter )
- calendar? (
- >=dev-libs/libical-2.0.0:=
- >=net-misc/curl-7.9.7
- )
- dbus? (
- >=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
- 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[gtk] )
- libindicate? ( dev-libs/libindicate:3[gtk] )
- libnotify? ( x11-libs/libnotify )
- )
- pda? ( >=app-pda/jpilot-0.99 )
- pdf? ( app-text/poppler[cairo] )
- pgp? ( >=app-crypt/gpgme-1.0.0 )
- session? (
- x11-libs/libICE
- x11-libs/libSM
- )
- smime? ( >=app-crypt/gpgme-1.0.0 )
- spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-1.0.0:0= )
- startup-notification? ( x11-libs/startup-notification )
- svg? ( >=gnome-base/librsvg-2.40.5 )
- valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${COMMONDEPEND}
- xface? ( >=media-libs/compface-1.4 )
-"
-BDEPEND="
- app-arch/xz-utils
- virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
- app-misc/mime-types
- x11-misc/shared-mime-info
- clamav? ( app-antivirus/clamav )
- networkmanager? ( net-misc/networkmanager )
- pdf? ( app-text/ghostscript-gpl )
- perl? ( dev-lang/perl:= )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.3
- )
- rss? (
- dev-libs/libxml2
- net-misc/curl
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-libetpan_pkgconfig.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- xdg_src_prepare
- eautoreconf
-}
-
-src_configure() {
- # Don't use libsoup-gnome (bug #565924)
- export HAVE_LIBSOUP_GNOME=no
-
- local myeconfargs=(
- --disable-bsfilter-plugin
- --disable-fancy-plugin
- --disable-generic-umpc
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-alternate-addressbook
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --with-password-encryption=$(usex gnutls gnutls old)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable dbus)
- $(use_enable debug crash-dialog)
- $(use_enable dillo dillo-plugin)
- $(use_enable doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable ipv6)
- $(use_enable ldap)
- $(use_enable litehtml litehtml_viewer-plugin)
- $(use_enable networkmanager)
- $(use_enable nls)
- $(use_enable notification notification-plugin)
- $(use_enable pda jpilot)
- $(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)
- $(use_enable python python-plugin)
- $(use_enable rss rssyl-plugin)
- $(use_enable session libsm)
- $(use_enable sieve managesieve-plugin)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable spell enchant)
- $(use_enable startup-notification)
- $(use_enable svg)
- $(use_enable valgrind valgrind)
- $(use_enable xface compface)
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp ; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- default
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png
- local size
- for size in 64 128 ; do
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools || die
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh
- doexe tb2claws-mail update-po uudec uuooffice
-
- # kill useless files
- rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
- ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/mail-client/claws-mail/claws-mail-3.17.5.ebuild b/mail-client/claws-mail/claws-mail-3.17.5.ebuild
deleted file mode 100644
index ca84bca5173..00000000000
--- a/mail-client/claws-mail/claws-mail-3.17.5.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools desktop python-single-r1 xdg
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-if [[ "${PV}" == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
-else
- SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
-
-REQUIRED_USE="libcanberra? ( notification )
- libindicate? ( notification )
- libnotify? ( notification )
- networkmanager? ( dbus )
- python? ( ${PYTHON_REQUIRED_USE} )
- smime? ( pgp )"
-
-COMMONDEPEND="
- dev-libs/nettle:=
- net-mail/ytnef
- sys-libs/zlib:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2[jpeg]
- >=x11-libs/gtk+-2.24:2
- x11-libs/libX11
- x11-libs/pango
- archive? (
- app-arch/libarchive
- >=net-misc/curl-7.9.7
- )
- bogofilter? ( mail-filter/bogofilter )
- calendar? (
- >=dev-libs/libical-2.0.0:=
- >=net-misc/curl-7.9.7
- )
- dbus? (
- >=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
- 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[gtk] )
- libindicate? ( dev-libs/libindicate:3[gtk] )
- libnotify? ( x11-libs/libnotify )
- )
- pda? ( >=app-pda/jpilot-0.99 )
- pdf? ( app-text/poppler[cairo] )
- pgp? ( >=app-crypt/gpgme-1.0.0 )
- session? (
- x11-libs/libICE
- x11-libs/libSM
- )
- smime? ( >=app-crypt/gpgme-1.0.0 )
- spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-1.0.0:0= )
- startup-notification? ( x11-libs/startup-notification )
- svg? ( >=gnome-base/librsvg-2.40.5 )
- valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${COMMONDEPEND}
- xface? ( >=media-libs/compface-1.4 )
-"
-BDEPEND="
- app-arch/xz-utils
- virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
- app-misc/mime-types
- x11-misc/shared-mime-info
- clamav? ( app-antivirus/clamav )
- networkmanager? ( net-misc/networkmanager )
- pdf? ( app-text/ghostscript-gpl )
- perl? ( dev-lang/perl:= )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.3
- )
- rss? (
- dev-libs/libxml2
- net-misc/curl
- )
-"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- xdg_src_prepare
- eautoreconf
-}
-
-src_configure() {
- # Don't use libsoup-gnome (bug #565924)
- export HAVE_LIBSOUP_GNOME=no
-
- local myeconfargs=(
- --disable-bsfilter-plugin
- --disable-fancy-plugin
- --disable-generic-umpc
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-alternate-addressbook
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --with-password-encryption=$(usex gnutls gnutls old)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable dbus)
- $(use_enable debug crash-dialog)
- $(use_enable dillo dillo-plugin)
- $(use_enable doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable ipv6)
- $(use_enable ldap)
- $(use_enable litehtml litehtml_viewer-plugin)
- $(use_enable networkmanager)
- $(use_enable nls)
- $(use_enable notification notification-plugin)
- $(use_enable pda jpilot)
- $(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)
- $(use_enable python python-plugin)
- $(use_enable rss rssyl-plugin)
- $(use_enable session libsm)
- $(use_enable sieve managesieve-plugin)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable spell enchant)
- $(use_enable startup-notification)
- $(use_enable svg)
- $(use_enable valgrind valgrind)
- $(use_enable xface compface)
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp ; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- default
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png
- local size
- for size in 64 128 ; do
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools || die
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh
- doexe tb2claws-mail update-po uudec uuooffice
-
- # kill useless files
- rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
- ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
- xdg_pkg_postinst
-}
diff --git a/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch b/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch
deleted file mode 100644
index 572380d2e05..00000000000
--- a/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 412a3f014..6a80c2a92 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -908,38 +908,62 @@ fi
- dnl Libetpan
- AC_MSG_CHECKING([whether to use libetpan])
- if test x"$enable_libetpan" = xyes; then
-- AC_MSG_RESULT(yes)
-- libetpan_result=no
-- AC_PATH_PROG(libetpanconfig, [libetpan-config])
-- if test "x$libetpanconfig" != "x"; then
-- CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`"
-- AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
-- if test "x$libetpan_result" = "xyes"; then
-- AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
-- LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`"
-- AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
-- AC_MSG_RESULT([$libetpan_result])
-- fi
-- fi
-- if test "x$libetpan_result" = "xyes"; then
-- LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
-- LIBETPAN_LIBS="`$libetpanconfig --libs`"
-- LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
-- if test "$LIBETPAN_VERSION" -lt "57"; then
-- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
-- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
-+ AC_MSG_RESULT(yes)
-+
-+ libetpan_config=no
-+ libetpan_result=no
-+ libetpan_versiontype=0
-+
-+ # since 1.9.4, libetpan uses pkg-config
-+ PKG_CHECK_MODULES([LIBETPAN], [libetpan >= 1.9.4],
-+ [
-+ LIBETPAN_VERSION=`pkg-config --modversion | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
-+ libetpan_config=yes
-+ ],
-+ [
-+ # before 1.9.4, libetpan uses its own libetpan-config script
-+ AC_PATH_PROG(libetpanconfig, [libetpan-config])
-+ if test "x$libetpanconfig" != "x"; then
-+ LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
-+ LIBETPAN_LIBS="`$libetpanconfig --libs`"
-+ # support libetpan version like x.x and x.x.x
-+ libetpan_versiontype=`$libetpanconfig --version | tr -dc . | wc -c`
-+ if test $libetpan_versiontype -eq 1; then
-+ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
-+ else
-+ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
-+ fi
-+ libetpan_config=yes
-+ fi
-+ ])
-+ if test "x$libetpan_config" = "xyes"; then
-+ CPPFLAGS="$CPPFLAGS $LIBETPAN_FLAGS"
-+ AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
-+ if test "x$libetpan_result" = "xyes"; then
-+ AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
-+ LIBS="$LIBS $LIBETPAN_LIBS"
-+ AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
-+ AC_MSG_RESULT([$libetpan_result])
-+ fi
-+ fi
-+ if test "x$libetpan_result" = "xyes"; then
-+ if test $libetpan_versiontype -eq 1; then
-+ if test "$LIBETPAN_VERSION" -lt "57"; then
-+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
-+ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
- AC_MSG_ERROR([libetpan 0.57 not found])
-- fi
-- AC_SUBST(LIBETPAN_FLAGS)
-- AC_SUBST(LIBETPAN_LIBS)
-- AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
-- else
-- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
-- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
-- AC_MSG_ERROR([libetpan 0.57 not found])
-- fi
-+ fi
-+ fi
-+ AC_SUBST(LIBETPAN_FLAGS)
-+ AC_SUBST(LIBETPAN_LIBS)
-+ AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNit TP support.)
-+ else
-+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
-+ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
-+ AC_MSG_ERROR([libetpan 0.57 not found])
-+ fi
- else
-- AC_MSG_RESULT(no)
-+ AC_MSG_RESULT(no)
- fi
- AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/, mail-client/claws-mail/files/
@ 2022-07-23 20:21 Bernard Cafarelli
0 siblings, 0 replies; 9+ messages in thread
From: Bernard Cafarelli @ 2022-07-23 20:21 UTC (permalink / raw
To: gentoo-commits
commit: 6991b46ae6606e1ff7c74ed02883d105f2bef970
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 20:21:18 2022 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 20:21:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6991b46a
mail-client/claws-mail: fix build with USE=-gnutls
Closes: https://bugs.gentoo.org/859583
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild | 1 +
.../files/claws-mail-4.1.0-disable_gnutls.patch | 641 +++++++++++++++++++++
2 files changed, 642 insertions(+)
diff --git a/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild b/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild
index 658ae84baa6a..38275a2493c8 100644
--- a/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild
@@ -111,6 +111,7 @@ RDEPEND="${COMMONDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
"${FILESDIR}/${PN}-4.1.0-perl-5.36.patch"
+ "${FILESDIR}/${PN}-4.1.0-disable_gnutls.patch"
)
src_prepare() {
diff --git a/mail-client/claws-mail/files/claws-mail-4.1.0-disable_gnutls.patch b/mail-client/claws-mail/files/claws-mail-4.1.0-disable_gnutls.patch
new file mode 100644
index 000000000000..5bfea4727e51
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-4.1.0-disable_gnutls.patch
@@ -0,0 +1,641 @@
+diff -Naur claws-mail-4.1.0.orig/src/common/smtp.c claws-mail-4.1.0/src/common/smtp.c
+--- claws-mail-4.1.0.orig/src/common/smtp.c 2022-03-19 13:03:24.000000000 +0100
++++ claws-mail-4.1.0/src/common/smtp.c 2022-07-23 22:10:48.323673856 +0200
+@@ -1,6 +1,6 @@
+ /*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
++ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -42,11 +42,11 @@
+ static gint smtp_auth(SMTPSession *session);
+ #ifdef USE_GNUTLS
+ static gint smtp_starttls(SMTPSession *session);
++static gint smtp_auth_oauth2(SMTPSession *session);
+ #endif
+ static gint smtp_auth_cram_md5(SMTPSession *session);
+ static gint smtp_auth_login(SMTPSession *session);
+ static gint smtp_auth_plain(SMTPSession *session);
+-static gint smtp_auth_oauth2(SMTPSession *session);
+
+ static gint smtp_ehlo(SMTPSession *session);
+ static gint smtp_ehlo_recv(SMTPSession *session, const gchar *msg);
+@@ -176,11 +176,13 @@
+ &&
+ (session->avail_auth_type & SMTPAUTH_PLAIN) != 0)
+ smtp_auth_plain(session);
++#ifdef USE_GNUTLS
+ else if ((session->forced_auth_type == SMTPAUTH_OAUTH2
+ || session->forced_auth_type == 0)
+ &&
+ (session->avail_auth_type & SMTPAUTH_OAUTH2) != 0)
+ smtp_auth_oauth2(session);
++#endif
+ else if (session->forced_auth_type == 0) {
+ log_warning(LOG_PROTOCOL, _("No SMTP AUTH method available\n"));
+ return SM_AUTHFAIL;
+@@ -323,8 +325,10 @@
+ session->avail_auth_type |= SMTPAUTH_CRAM_MD5;
+ if (strcasestr(p, "DIGEST-MD5"))
+ session->avail_auth_type |= SMTPAUTH_DIGEST_MD5;
++#ifdef USE_GNUTLS
+ if (strcasestr(p, "XOAUTH2"))
+ session->avail_auth_type |= SMTPAUTH_OAUTH2;
++#endif
+ }
+ if (g_ascii_strncasecmp(p, "SIZE", 4) == 0) {
+ p += 5;
+@@ -399,7 +403,7 @@
+ return SM_OK;
+ }
+
+-
++#ifdef USE_GNUTLS
+ static gint smtp_auth_oauth2(SMTPSession *session)
+ {
+ gchar buf[MESSAGEBUFSIZE], *b64buf, *out;
+@@ -428,6 +432,7 @@
+
+ return SM_OK;
+ }
++#endif
+
+ static gint smtp_auth_login(SMTPSession *session)
+ {
+@@ -547,7 +552,9 @@
+ case SMTP_AUTH_PLAIN:
+ case SMTP_AUTH_LOGIN_USER:
+ case SMTP_AUTH_LOGIN_PASS:
++#ifdef USE_GNUTLS
+ case SMTP_AUTH_OAUTH2:
++#endif
+ case SMTP_AUTH_CRAM_MD5:
+ log_print(LOG_PROTOCOL, "ESMTP< %s\n", msg);
+ break;
+@@ -670,7 +677,9 @@
+ break;
+ case SMTP_AUTH_PLAIN:
+ case SMTP_AUTH_LOGIN_PASS:
++#ifdef USE_GNUTLS
+ case SMTP_AUTH_OAUTH2:
++#endif
+ case SMTP_AUTH_CRAM_MD5:
+ ret = smtp_from(smtp_session);
+ break;
+diff -Naur claws-mail-4.1.0.orig/src/etpan/imap-thread.c claws-mail-4.1.0/src/etpan/imap-thread.c
+--- claws-mail-4.1.0.orig/src/etpan/imap-thread.c 2022-03-19 13:03:24.000000000 +0100
++++ claws-mail-4.1.0/src/etpan/imap-thread.c 2022-07-23 22:10:48.324673857 +0200
+@@ -1,6 +1,6 @@
+ /*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+- * Copyright (C) 2005-2016 DINH Viet Hoa and the Claws Mail team
++ * Copyright (C) 2005-2022 the Claws Mail team and DINH Viet Hoa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -999,9 +999,11 @@
+ param->type, NULL, NULL, NULL,
+ NULL, param->login,
+ param->password, NULL);
+- else if (!strcmp(param->type, "XOAUTH2")) {
++#ifdef USE_GNUTLS
++ else if (!strcmp(param->type, "XOAUTH2"))
+ r = mailimap_oauth2_authenticate(param->imap, param->login, param->password);
+- } else
++#endif
++ else
+ r = mailimap_authenticate(param->imap,
+ param->type, NULL, NULL, NULL,
+ param->login, param->login,
+diff -Naur claws-mail-4.1.0.orig/src/imap.c claws-mail-4.1.0/src/imap.c
+--- claws-mail-4.1.0.orig/src/imap.c 2022-03-19 13:03:24.000000000 +0100
++++ claws-mail-4.1.0/src/imap.c 2022-07-23 22:10:48.325673859 +0200
+@@ -72,7 +72,9 @@
+ #include "main.h"
+ #include "passwordstore.h"
+ #include "file-utils.h"
++#ifdef USE_GNUTLS
+ #include "oauth2.h"
++#endif
+
+ typedef struct _IMAPFolder IMAPFolder;
+ typedef struct _IMAPSession IMAPSession;
+@@ -913,9 +915,11 @@
+ case IMAP_AUTH_PLAIN:
+ ok = imap_cmd_login(session, user, pass, "PLAIN");
+ break;
++#ifdef USE_GNUTLS
+ case IMAP_AUTH_OAUTH2:
+ ok = imap_cmd_login(session, user, pass, "XOAUTH2");
+ break;
++#endif
+ case IMAP_AUTH_LOGIN:
+ ok = imap_cmd_login(session, user, pass, "LOGIN");
+ break;
+@@ -932,7 +936,9 @@
+ "\t DIGEST-MD5 %d\n"
+ "\t SCRAM-SHA-1 %d\n"
+ "\t PLAIN %d\n"
++#ifdef USE_GNUTLS
+ "\t OAUTH2 %d\n"
++#endif
+ "\t LOGIN %d\n"
+ "\t GSSAPI %d\n",
+ imap_has_capability(session, "ANONYMOUS"),
+@@ -940,7 +946,9 @@
+ imap_has_capability(session, "DIGEST-MD5"),
+ imap_has_capability(session, "SCRAM-SHA-1"),
+ imap_has_capability(session, "PLAIN"),
++#ifdef USE_GNUTLS
+ imap_has_capability(session, "XOAUTH2"),
++#endif
+ imap_has_capability(session, "LOGIN"),
+ imap_has_capability(session, "GSSAPI"));
+ if (imap_has_capability(session, "CRAM-MD5"))
+@@ -957,8 +965,10 @@
+ ok = imap_cmd_login(session, user, pass, "GSSAPI");
+ if (ok == MAILIMAP_ERROR_LOGIN) /* we always try plaintext login before giving up */
+ ok = imap_cmd_login(session, user, pass, "plaintext");
++#ifdef USE_GNUTLS
+ if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "XOAUTH2"))
+ ok = imap_cmd_login(session, user, pass, "XOAUTH2");
++#endif
+ }
+
+ if (ok == MAILIMAP_NO_ERROR)
+@@ -993,12 +1003,12 @@
+ "compiled with SASL support and the "
+ "LOGIN SASL plugin is installed.");
+ }
+-
++#ifdef USE_GNUTLS
+ if (type == IMAP_AUTH_OAUTH2) {
+ ext_info = _("\n\nOAuth2 error. Check and correct your OAuth2 "
+ "account preferences.");
+ }
+-
++#endif
+ if (time(NULL) - last_login_err > 10) {
+ if (!prefs_common.no_recv_err_panel) {
+ alertpanel_error_log(_("Connection to %s failed: "
+@@ -1320,10 +1330,10 @@
+ gboolean failed = FALSE;
+ gint ok = MAILIMAP_NO_ERROR;
+ g_return_val_if_fail(account->userid != NULL, MAILIMAP_ERROR_BAD_STATE);
+-
++#ifdef USE_GNUTLS
+ if(account->imap_auth_type == IMAP_AUTH_OAUTH2)
+ oauth2_check_passwds (account);
+-
++#endif
+ if (!password_get(account->userid, account->recv_server, "imap",
+ SESSION(session)->port, &acc_pass)) {
+ acc_pass = passwd_store_get_account(account->account_id,
+diff -Naur claws-mail-4.1.0.orig/src/inc.c claws-mail-4.1.0/src/inc.c
+--- claws-mail-4.1.0.orig/src/inc.c 2022-03-19 13:03:24.000000000 +0100
++++ claws-mail-4.1.0/src/inc.c 2022-07-23 22:10:48.325673859 +0200
+@@ -61,7 +61,9 @@
+ #include "hooks.h"
+ #include "logwindow.h"
+ #include "passwordstore.h"
++#ifdef USE_GNUTLS
+ #include "oauth2.h"
++#endif
+
+ extern SessionStats session_stats;
+
+@@ -633,11 +635,12 @@
+ manage_window_focus_in
+ (inc_dialog->dialog->window,
+ NULL, NULL);
+-
++#ifdef USE_GNUTLS
+ if(pop3_session->ac_prefs->use_pop_auth &&
+ pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2)
+ oauth2_check_passwds (pop3_session->ac_prefs);
+-
++#endif
++
+ if (password_get(pop3_session->user,
+ pop3_session->ac_prefs->recv_server,
+ "pop3", pop3_get_port(pop3_session),
+diff -Naur claws-mail-4.1.0.orig/src/oauth2.c claws-mail-4.1.0/src/oauth2.c
+--- claws-mail-4.1.0.orig/src/oauth2.c 2022-03-19 13:03:24.000000000 +0100
++++ claws-mail-4.1.0/src/oauth2.c 2022-07-23 22:10:48.325673859 +0200
+@@ -22,6 +22,8 @@
+ #include "claws-features.h"
+ #endif
+
++#ifdef USE_GNUTLS
++
+ #include <glib.h>
+ #ifdef ENABLE_NLS
+ #include <glib/gi18n.h>
+@@ -715,3 +717,5 @@
+
+ return (0);
+ }
++
++#endif /* USE_GNUTLS */
+diff -Naur claws-mail-4.1.0.orig/src/oauth2.h claws-mail-4.1.0/src/oauth2.h
+--- claws-mail-4.1.0.orig/src/oauth2.h 2022-03-19 13:03:24.000000000 +0100
++++ claws-mail-4.1.0/src/oauth2.h 2022-07-23 22:10:48.325673859 +0200
+@@ -1,6 +1,6 @@
+ /*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+- * Copyright (C) 2020 the Claws Mail team
++ * Copyright (C) 2020-2022 the Claws Mail team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -21,6 +21,8 @@
+ #include "claws-features.h"
+ #endif
+
++#ifdef USE_GNUTLS
++
+ #include <glib.h>
+
+ #include "socket.h"
+@@ -79,3 +81,5 @@
+ gint oauth2_use_refresh_token (Oauth2Service provider, OAUTH2Data *OAUTH2Data);
+ guchar* oauth2_decode(const gchar *in);
+ void oauth2_encode(const gchar *in);
++
++#endif /* USE_GNUTLS */
+diff -Naur claws-mail-4.1.0.orig/src/pop.c claws-mail-4.1.0/src/pop.c
+--- claws-mail-4.1.0.orig/src/pop.c 2022-03-19 13:03:24.000000000 +0100
++++ claws-mail-4.1.0/src/pop.c 2022-07-23 22:10:48.325673859 +0200
+@@ -1,6 +1,6 @@
+ /*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
++ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -178,6 +178,7 @@
+ return PS_SUCCESS;
+ }
+
++#ifdef USE_GNUTLS
+ static gint pop3_getauth_oauth2_send(Pop3Session *session)
+ {
+ gchar buf[MESSAGEBUFSIZE], *b64buf, *out;
+@@ -202,6 +203,7 @@
+ g_free(out);
+ return PS_SUCCESS;
+ }
++#endif
+
+ static gint pop3_getrange_stat_send(Pop3Session *session)
+ {
+@@ -533,8 +535,10 @@
+
+ if (!g_ascii_strncasecmp(buf, "PASS ", 5))
+ log_print(LOG_PROTOCOL, "POP> PASS ********\n");
++#ifdef USE_GNUTLS
+ else if (!g_ascii_strncasecmp(buf, "AUTH XOAUTH2 ", 13))
+ log_print(LOG_PROTOCOL, "POP> AUTH XOAUTH2 ********\n");
++#endif
+ else
+ log_print(LOG_PROTOCOL, "POP> %s\n", buf);
+
+@@ -989,12 +993,12 @@
+ #ifdef USE_GNUTLS
+ if (pop3_session->ac_prefs->ssl_pop == SSL_STARTTLS)
+ val = pop3_stls_send(pop3_session);
++ else if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2)
++ val = pop3_getauth_oauth2_send(pop3_session);
+ else
+ #endif
+ if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_APOP)
+ val = pop3_getauth_apop_send(pop3_session);
+- else if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2)
+- val = pop3_getauth_oauth2_send(pop3_session);
+ else
+ val = pop3_getauth_user_send(pop3_session);
+ break;
+@@ -1015,7 +1019,9 @@
+ break;
+ case POP3_GETAUTH_PASS:
+ case POP3_GETAUTH_APOP:
++#ifdef USE_GNUTLS
+ case POP3_GETAUTH_OAUTH2:
++#endif
+ if (!pop3_session->pop_before_smtp)
+ val = pop3_getrange_stat_send(pop3_session);
+ else
+diff -Naur claws-mail-4.1.0.orig/src/prefs_account.c claws-mail-4.1.0/src/prefs_account.c
+--- claws-mail-4.1.0.orig/src/prefs_account.c 2022-03-19 13:03:24.000000000 +0100
++++ claws-mail-4.1.0/src/prefs_account.c 2022-07-23 22:14:18.477957308 +0200
+@@ -1,6 +1,6 @@
+ /*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+- * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
++ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -54,7 +54,9 @@
+ #include "smtp.h"
+ #include "imap.h"
+ #include "pop.h"
++#ifdef USE_GNUTLS
+ #include "oauth2.h"
++#endif
+ #include "remotefolder.h"
+ #include "combobox.h"
+ #include "setup.h"
+@@ -200,6 +202,7 @@
+ GtkWidget *pop_auth_minutes_lbl;
+ } SendPage;
+
++#ifdef USE_GNUTLS
+ typedef struct Oauth2Page
+ {
+ PrefsPage page;
+@@ -218,6 +221,7 @@
+ GtkWidget *oauth2_client_secret_entry;
+
+ } Oauth2Page;
++#endif
+
+ typedef struct
+ {
+@@ -373,7 +377,9 @@
+ static BasicPage basic_page;
+ static ReceivePage receive_page;
+ static SendPage send_page;
++#ifdef USE_GNUTLS
+ static Oauth2Page oauth2_page;
++#endif
+ static ComposePage compose_page;
+ static TemplatesPage templates_page;
+ static PrivacyPage privacy_page;
+@@ -416,7 +422,8 @@
+ static void prefs_account_pop_auth_type_set_data_from_optmenu
+ (PrefParam *pparam);
+ static void prefs_account_pop_auth_type_set_optmenu (PrefParam *pparam);
+-
++
++#ifdef USE_GNUTLS
+ static void prefs_account_oauth2_provider_set_data_from_optmenu
+ (PrefParam *pparam);
+ static void prefs_account_oauth2_provider_set_optmenu (PrefParam *pparam);
+@@ -425,6 +432,7 @@
+ static void prefs_account_oauth2_set_sensitivity(void);
+ static void prefs_account_oauth2_set_auth_sensitivity(void);
+ static void prefs_account_oauth2_obtain_tokens(GtkButton *button, gpointer data);
++#endif
+ static void prefs_account_set_autochk_interval_from_widgets(PrefParam *pparam);
+ static void prefs_account_set_autochk_interval_to_widgets(PrefParam *pparam);
+
+@@ -652,6 +660,7 @@
+ };
+
+ static PrefParam oauth2_param[] = {
++#ifdef USE_GNUTLS
+ {"oauth2_auth_provider", "0", &tmp_ac_prefs.oauth2_provider, P_ENUM,
+ &oauth2_page.oauth2_auth_optmenu,
+ prefs_account_oauth2_provider_set_data_from_optmenu,
+@@ -668,6 +677,23 @@
+
+ {"oauth2_client_secret", NULL, &tmp_ac_prefs.oauth2_client_secret, P_STRING,
+ &oauth2_page.oauth2_client_secret_entry, prefs_set_data_from_entry, prefs_set_entry},
++#else
++ {"oauth2_auth_provider", "0", &tmp_ac_prefs.oauth2_provider, P_ENUM,
++ NULL, NULL, NULL},
++
++ {"oauth2_date", 0, &tmp_ac_prefs.oauth2_date, P_INT,
++ NULL, NULL, NULL},
++
++ {"oauth2_authcode", NULL, &tmp_ac_prefs.oauth2_authcode, P_PASSWORD,
++ NULL, NULL, NULL},
++
++ {"oauth2_client_id", NULL, &tmp_ac_prefs.oauth2_client_id, P_STRING,
++ NULL, NULL, NULL},
++
++ {"oauth2_client_secret", NULL, &tmp_ac_prefs.oauth2_client_secret, P_STRING,
++ NULL, NULL, NULL},
++
++#endif
+
+ {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
+ };
+@@ -1624,8 +1650,9 @@
+ COMBOBOX_ADD (menu2, _("Select"), 0);
+ COMBOBOX_ADD (menu2, NULL, 0);
+ COMBOBOX_ADD (menu2, "APOP", POPAUTH_APOP);
++#ifdef USE_GNUTLS
+ COMBOBOX_ADD (menu2, "OAuth2", POPAUTH_OAUTH2);
+-
++#endif
+ SET_TOGGLE_SENSITIVITY (pop_auth_checkbtn, vbox5);
+
+ PACK_CHECK_BUTTON (vbox2, rmmail_checkbtn,
+@@ -1762,7 +1789,9 @@
+ COMBOBOX_ADD (menu, "SCRAM-SHA-1", IMAP_AUTH_SCRAM_SHA1);
+ COMBOBOX_ADD (menu, "PLAIN", IMAP_AUTH_PLAIN);
+ COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
++#ifdef USE_GNUTLS
+ COMBOBOX_ADD (menu, "OAUTH2", IMAP_AUTH_OAUTH2);
++#endif
+
+ hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
+ gtk_widget_show (hbox1);
+@@ -2019,7 +2048,9 @@
+ COMBOBOX_ADD (menu, "PLAIN", SMTPAUTH_PLAIN);
+ COMBOBOX_ADD (menu, "LOGIN", SMTPAUTH_LOGIN);
+ COMBOBOX_ADD (menu, "CRAM-MD5", SMTPAUTH_CRAM_MD5);
++#ifdef USE_GNUTLS
+ COMBOBOX_ADD (menu, "OAUTH2", SMTPAUTH_OAUTH2);
++#endif
+ COMBOBOX_ADD (menu, "DIGEST-MD5", SMTPAUTH_DIGEST_MD5);
+ gtk_list_store_set(menu, &iter, COMBOBOX_SENS, FALSE, -1);
+
+@@ -2165,6 +2196,7 @@
+ page->page.widget = vbox1;
+ }
+
++#ifdef USE_GNUTLS
+ static void oauth2_create_widget_func(PrefsPage * _page,
+ GtkWindow * window,
+ gpointer data)
+@@ -2379,6 +2411,7 @@
+ /* oauth2_encode(OAUTH2info[0][OA2_CLIENT_ID]); */
+
+ }
++#endif
+
+ static void compose_create_widget_func(PrefsPage * _page,
+ GtkWindow * window,
+@@ -3612,8 +3645,10 @@
+ gtk_entry_get_text(GTK_ENTRY(basic_page.pass_entry)),
+ FALSE);
+
++#ifdef USE_GNUTLS
+ /* Manual password change - reset expiry on OAUTH2 tokens*/
+ passwd_store_set_account(tmp_ac_prefs.account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, "0", FALSE);
++#endif
+
+ if (protocol == A_IMAP4 || protocol == A_NNTP) {
+ new_id = g_strdup_printf("#%s/%s",
+@@ -3656,13 +3691,15 @@
+ PWS_ACCOUNT_SEND,
+ gtk_entry_get_text(GTK_ENTRY(send_page.smtp_pass_entry)),
+ FALSE);
+-
++#ifdef USE_GNUTLS
+ /* Manual password change - reset expiry on OAUTH2 tokens*/
+ passwd_store_set_account(tmp_ac_prefs.account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, "0", FALSE);
++#endif
+
+ return 0;
+ }
+
++#ifdef USE_GNUTLS
+ static gint prefs_oauth2_apply(void)
+ {
+ prefs_set_data_from_dialog(oauth2_param);
+@@ -3675,6 +3712,7 @@
+
+ return 0;
+ }
++#endif
+
+ static gint prefs_compose_apply(void)
+ {
+@@ -3773,10 +3811,12 @@
+ /* SendPage *page = (SendPage *) _page; */
+ }
+
++#ifdef USE_GNUTLS
+ static void oauth2_destroy_widget_func(PrefsPage *_page)
+ {
+ /* Oauth2Page *page = (Oauth2Page *) _page; */
+ }
++#endif
+
+ static void compose_destroy_widget_func(PrefsPage *_page)
+ {
+@@ -3840,6 +3880,7 @@
+ return prefs_send_apply() >= 0;
+ }
+
++#ifdef USE_GNUTLS
+ static gboolean oauth2_can_close_func(PrefsPage *_page)
+ {
+ Oauth2Page *page = (Oauth2Page *) _page;
+@@ -3849,6 +3890,7 @@
+
+ return prefs_oauth2_apply() >= 0;
+ }
++#endif
+
+ static gboolean compose_can_close_func(PrefsPage *_page)
+ {
+@@ -3945,6 +3987,7 @@
+ cancelled = FALSE;
+ }
+
++#ifdef USE_GNUTLS
+ static void oauth2_save_func(PrefsPage *_page)
+ {
+ Oauth2Page *page = (Oauth2Page *) _page;
+@@ -3955,6 +3998,7 @@
+ if (prefs_oauth2_apply() >= 0)
+ cancelled = FALSE;
+ }
++#endif
+
+ static void compose_save_func(PrefsPage *_page)
+ {
+@@ -4090,6 +4134,7 @@
+ prefs_account_register_page((PrefsPage *) &send_page);
+ }
+
++#ifdef USE_GNUTLS
+ static void register_oauth2_page(void)
+ {
+ static gchar *path[3];
+@@ -4107,6 +4152,7 @@
+
+ prefs_account_register_page((PrefsPage *) &oauth2_page);
+ }
++#endif
+
+ static void register_compose_page(void)
+ {
+@@ -4296,7 +4342,9 @@
+ hooks_register_hook(SSL_CERT_GET_PASSWORD, sslcert_get_password, NULL);
+ #endif
+ register_proxy_page();
++#ifdef USE_GNUTLS
+ register_oauth2_page();
++#endif
+ register_advanced_page();
+ }
+
+@@ -5043,6 +5091,7 @@
+ combobox_select_by_data(optmenu, type);
+ }
+
++#ifdef USE_GNUTLS
+ static void prefs_account_oauth2_provider_set_data_from_optmenu(PrefParam *pparam)
+ {
+ *((Oauth2Service *)pparam->data) =
+@@ -5177,6 +5226,7 @@
+ g_free(trim_text);
+ g_free(OAUTH2Data);
+ }
++#endif
+
+ static void prefs_account_set_autochk_interval_to_widgets(PrefParam *pparam)
+ {
+diff -Naur claws-mail-4.1.0.orig/src/prefs_account.h claws-mail-4.1.0/src/prefs_account.h
+--- claws-mail-4.1.0.orig/src/prefs_account.h 2022-03-19 13:03:24.000000000 +0100
++++ claws-mail-4.1.0/src/prefs_account.h 2022-07-23 22:10:48.328673863 +0200
+@@ -1,6 +1,6 @@
+ /*
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
++ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+diff -Naur claws-mail-4.1.0.orig/src/send_message.c claws-mail-4.1.0/src/send_message.c
+--- claws-mail-4.1.0.orig/src/send_message.c 2022-03-19 13:03:24.000000000 +0100
++++ claws-mail-4.1.0/src/send_message.c 2022-07-23 22:10:48.328673863 +0200
+@@ -57,7 +57,9 @@
+ #include "log.h"
+ #include "passwordstore.h"
+ #include "file-utils.h"
++#ifdef USE_GNUTLS
+ #include "oauth2.h"
++#endif
+
+ typedef struct _SendProgressDialog SendProgressDialog;
+
+@@ -282,6 +284,9 @@
+ strlen(ac_prefs->gnutls_priority))
+ session->gnutls_priority = g_strdup(ac_prefs->gnutls_priority);
+ session->use_tls_sni = ac_prefs->use_tls_sni;
++
++ if (ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
++ oauth2_check_passwds (ac_prefs);
+ #else
+ if (ac_prefs->ssl_smtp != SSL_NONE) {
+ if (alertpanel_full(_("Insecure connection"),
+@@ -299,9 +304,6 @@
+ }
+ port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
+ #endif
+-
+- if(ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
+- oauth2_check_passwds (ac_prefs);
+
+ if (ac_prefs->use_smtp_auth) {
+ smtp_session->forced_auth_type = ac_prefs->smtp_auth_type;
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/, mail-client/claws-mail/files/
@ 2023-07-04 17:24 Bernard Cafarelli
0 siblings, 0 replies; 9+ messages in thread
From: Bernard Cafarelli @ 2023-07-04 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 92eccfef050524124fad4d344739d2a8b2ae834e
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 4 17:17:37 2023 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jul 4 17:20:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92eccfef
mail-client/claws-mail: fix litehtml plugin compilation with gcc13
Closes: https://bugs.gentoo.org/905839
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild | 1 +
.../files/claws-mail-4.1.1-litehtml_gcc13.patch | 37 ++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild b/mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild
index 51002e15d537..323186d925d1 100644
--- a/mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild
@@ -110,6 +110,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
"${FILESDIR}/${PN}-4.1.1-fix_lto.patch"
"${FILESDIR}/${P}-webkitgtk4.1.patch"
+ "${FILESDIR}/${P}-litehtml_gcc13.patch"
)
src_prepare() {
diff --git a/mail-client/claws-mail/files/claws-mail-4.1.1-litehtml_gcc13.patch b/mail-client/claws-mail/files/claws-mail-4.1.1-litehtml_gcc13.patch
new file mode 100644
index 000000000000..10da0463b843
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-4.1.1-litehtml_gcc13.patch
@@ -0,0 +1,37 @@
+From a9a16a253ed3865a51db5e306539d3494087dafd Mon Sep 17 00:00:00 2001
+From: Paul <paul@claws-mail.org>
+Date: Wed, 19 Apr 2023 16:42:07 +0100
+Subject: [PATCH] fix bug 4648, 'fails to build with gcc 13'
+
+---
+ src/plugins/litehtml_viewer/litehtml/html.h | 1 +
+ src/plugins/litehtml_viewer/litehtml/num_cvt.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/plugins/litehtml_viewer/litehtml/html.h b/src/plugins/litehtml_viewer/litehtml/html.h
+index 4151b1225..20457f155 100644
+--- a/src/plugins/litehtml_viewer/litehtml/html.h
++++ b/src/plugins/litehtml_viewer/litehtml/html.h
+@@ -9,6 +9,7 @@
+ #include <cstring>
+ #include <algorithm>
+ #include <sstream>
++#include <cstdint>
+ #include "os_types.h"
+ #include "types.h"
+ #include "background.h"
+diff --git a/src/plugins/litehtml_viewer/litehtml/num_cvt.h b/src/plugins/litehtml_viewer/litehtml/num_cvt.h
+index 515e46d62..367dcc36a 100644
+--- a/src/plugins/litehtml_viewer/litehtml/num_cvt.h
++++ b/src/plugins/litehtml_viewer/litehtml/num_cvt.h
+@@ -2,6 +2,7 @@
+ #define NUM_CVT_H
+
+ #include <string>
++#include <cstdint>
+ #include "os_types.h"
+
+ namespace litehtml
+--
+2.25.1
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/, mail-client/claws-mail/files/
@ 2024-02-02 15:23 Bernard Cafarelli
0 siblings, 0 replies; 9+ messages in thread
From: Bernard Cafarelli @ 2024-02-02 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 636e7775097e7e3b030823e4898b8c01866e3c70
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 2 15:21:36 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 15:23:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=636e7775
mail-client/claws-mail: drop 3.19.0-r3, 3.20.0-r1
Now 3.x versions are not built with libcanberra support
Closes: https://bugs.gentoo.org/774918
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
mail-client/claws-mail/Manifest | 1 -
mail-client/claws-mail/claws-mail-3.19.0-r3.ebuild | 215 ----------
mail-client/claws-mail/claws-mail-3.20.0-r1.ebuild | 212 ----------
.../files/claws-mail-3.19.0-perl-5.36.patch | 455 ---------------------
.../files/claws-mail-4.1.0-perl-5.36.patch | 454 --------------------
5 files changed, 1337 deletions(-)
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 1d802f06ad7f..f1e681526700 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,4 +1,3 @@
-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.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-3.19.0-r3.ebuild b/mail-client/claws-mail/claws-mail-3.19.0-r3.ebuild
deleted file mode 100644
index 9f90987ab021..000000000000
--- a/mail-client/claws-mail/claws-mail-3.19.0-r3.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit autotools desktop python-any-r1 xdg
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-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"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE="+appindicator archive bogofilter calendar clamav dbus debug doc gdata +gnutls +imap ipv6 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 )
- smime? ( pgp )
-"
-
-COMMONDEPEND="
- dev-libs/nettle:=
- net-mail/ytnef
- sys-libs/zlib:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2[jpeg]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/pango
- archive? (
- app-arch/libarchive
- >=net-misc/curl-7.9.7
- )
- bogofilter? ( mail-filter/bogofilter )
- calendar? (
- >=dev-libs/libical-2.0.0:=
- >=net-misc/curl-7.9.7
- )
- dbus? (
- >=dev-libs/dbus-glib-0.60
- sys-apps/dbus
- )
- gdata? ( >=dev-libs/libgdata-0.17.2 )
- 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:=
- net-misc/curl
- media-libs/fontconfig
- )
- nls? ( >=sys-devel/gettext-0.18 )
- nntp? ( >=net-libs/libetpan-0.57 )
- notification? (
- dev-libs/glib:2
- appindicator? ( dev-libs/libindicate:3[gtk] )
- libcanberra? ( media-libs/libcanberra[gtk2] )
- libnotify? ( x11-libs/libnotify )
- )
- pdf? ( app-text/poppler[cairo] )
- pgp? ( >=app-crypt/gpgme-1.0.0:= )
- session? (
- x11-libs/libICE
- x11-libs/libSM
- )
- smime? ( >=app-crypt/gpgme-1.0.0:= )
- spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-2.0.0:2= )
- startup-notification? ( x11-libs/startup-notification )
- svg? ( >=gnome-base/librsvg-2.40.5 )
- valgrind? ( dev-debug/valgrind )
-"
-
-DEPEND="${COMMONDEPEND}
- xface? ( >=media-libs/compface-1.4 )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- app-arch/xz-utils
- virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
- app-misc/mime-types
- x11-misc/shared-mime-info
- 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}-3.19.0-perl-5.36.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-fancy-plugin
- --disable-generic-umpc
- --disable-jpilot #735118
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-alternate-addressbook
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --with-password-encryption=$(usex gnutls gnutls old)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable dbus)
- $(use_enable debug crash-dialog)
- $(use_enable doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable ipv6)
- $(use_enable ldap)
- $(use_enable litehtml litehtml_viewer-plugin)
- $(use_enable networkmanager)
- $(use_enable nls)
- $(use_enable notification notification-plugin)
- $(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)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable spell enchant)
- $(use_enable startup-notification)
- $(use_enable svg)
- $(use_enable valgrind valgrind)
- $(use_enable xface compface)
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp ; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- default
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png
- local size
- for size in 64 128 ; do
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools || die
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh
- doexe tb2claws-mail update-po uudec uuooffice
-
- # kill useless files
- find "${ED}"/usr/$(get_libdir)/${PN}/plugins/ \
- \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_postinst() {
- 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-3.20.0-r1.ebuild b/mail-client/claws-mail/claws-mail-3.20.0-r1.ebuild
deleted file mode 100644
index e6f4a6b9c789..000000000000
--- a/mail-client/claws-mail/claws-mail-3.20.0-r1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools desktop python-any-r1 xdg
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-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"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-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 )
- smime? ( pgp )
-"
-
-COMMONDEPEND="
- dev-libs/nettle:=
- net-mail/ytnef
- sys-libs/zlib:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2[jpeg]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/pango
- archive? (
- app-arch/libarchive
- >=net-misc/curl-7.9.7
- )
- bogofilter? ( mail-filter/bogofilter )
- calendar? (
- >=dev-libs/libical-2.0.0:=
- >=net-misc/curl-7.9.7
- )
- dbus? (
- >=dev-libs/dbus-glib-0.60
- sys-apps/dbus
- )
- 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:=
- net-misc/curl
- media-libs/fontconfig
- )
- nls? ( >=sys-devel/gettext-0.18 )
- nntp? ( >=net-libs/libetpan-0.57 )
- notification? (
- dev-libs/glib:2
- appindicator? ( dev-libs/libindicate:3[gtk] )
- libcanberra? ( media-libs/libcanberra[gtk2] )
- libnotify? ( x11-libs/libnotify )
- )
- pdf? ( app-text/poppler[cairo] )
- pgp? ( >=app-crypt/gpgme-1.0.0:= )
- session? (
- x11-libs/libICE
- x11-libs/libSM
- )
- smime? ( >=app-crypt/gpgme-1.0.0:= )
- spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-2.0.0:2= )
- startup-notification? ( x11-libs/startup-notification )
- svg? ( >=gnome-base/librsvg-2.40.5 )
- valgrind? ( dev-debug/valgrind )
-"
-
-DEPEND="${COMMONDEPEND}
- xface? ( >=media-libs/compface-1.4 )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- app-arch/xz-utils
- virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
- app-misc/mime-types
- x11-misc/shared-mime-info
- 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"
-)
-
-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-fancy-plugin
- --disable-generic-umpc
- --disable-jpilot #735118
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-alternate-addressbook
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-ipv6
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --with-password-encryption=$(usex gnutls gnutls old)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable dbus)
- $(use_enable debug crash-dialog)
- $(use_enable doc manual)
- $(use_enable gnutls)
- $(use_enable ldap)
- $(use_enable litehtml litehtml_viewer-plugin)
- $(use_enable networkmanager)
- $(use_enable nls)
- $(use_enable notification notification-plugin)
- $(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)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable spell enchant)
- $(use_enable startup-notification)
- $(use_enable svg)
- $(use_enable valgrind valgrind)
- $(use_enable xface compface)
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp ; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- default
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png
- local size
- for size in 64 128 ; do
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools || die
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh
- doexe tb2claws-mail update-po uudec uuooffice
-
- # kill useless files
- find "${ED}"/usr/$(get_libdir)/${PN}/plugins/ \
- \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version <3.18 please re-load any plugin you use"
- xdg_pkg_postinst
-}
diff --git a/mail-client/claws-mail/files/claws-mail-3.19.0-perl-5.36.patch b/mail-client/claws-mail/files/claws-mail-3.19.0-perl-5.36.patch
deleted file mode 100644
index 3f4995fcb457..000000000000
--- a/mail-client/claws-mail/files/claws-mail-3.19.0-perl-5.36.patch
+++ /dev/null
@@ -1,455 +0,0 @@
-https://git.claws-mail.org/?p=claws.git;a=commitdiff;h=5fee50c54a370fdfb5241bd4c4c16281a741762e
-https://bugs.gentoo.org/849569
-
-From 5fee50c54a370fdfb5241bd4c4c16281a741762e Mon Sep 17 00:00:00 2001
-From: Ricardo Mones <ricardo@mones.org>
-Date: Sat, 23 Apr 2022 19:26:16 +0200
-Subject: [PATCH] Fix building perl plugin since perl v5.35.2
-
-Using XSRETURN_* macros in expressions is now deprecated:
-https://github.com/Perl/perl5/commit/7169efc77525df70484a824bff4ceebd1fafc760
---- a/src/plugins/perl/perl_plugin.c
-+++ b/src/plugins/perl/perl_plugin.c
-@@ -577,76 +577,182 @@ static XS(XS_ClawsMail_filter_init)
-
- /* msginfo */
- case 1:
-- msginfo->size ? XSRETURN_UV(msginfo->size) : XSRETURN_UNDEF;
-+ if (msginfo->size) {
-+ XSRETURN_UV(msginfo->size);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 2:
-- msginfo->date ? XSRETURN_PV(msginfo->date) : XSRETURN_UNDEF;
-+ if (msginfo->date) {
-+ XSRETURN_PV(msginfo->date);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 3:
-- msginfo->from ? XSRETURN_PV(msginfo->from) : XSRETURN_UNDEF;
-+ if (msginfo->from) {
-+ XSRETURN_PV(msginfo->from);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 4:
-- msginfo->to ? XSRETURN_PV(msginfo->to) : XSRETURN_UNDEF;
-+ if (msginfo->to) {
-+ XSRETURN_PV(msginfo->to);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 5:
-- msginfo->cc ? XSRETURN_PV(msginfo->cc) : XSRETURN_UNDEF;
-+ if (msginfo->cc) {
-+ XSRETURN_PV(msginfo->cc);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 6:
-- msginfo->newsgroups ? XSRETURN_PV(msginfo->newsgroups) : XSRETURN_UNDEF;
-+ if (msginfo->newsgroups) {
-+ XSRETURN_PV(msginfo->newsgroups);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 7:
-- msginfo->subject ? XSRETURN_PV(msginfo->subject) : XSRETURN_UNDEF;
-+ if (msginfo->subject) {
-+ XSRETURN_PV(msginfo->subject);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 8:
-- msginfo->msgid ? XSRETURN_PV(msginfo->msgid) : XSRETURN_UNDEF;
-+ if (msginfo->msgid) {
-+ XSRETURN_PV(msginfo->msgid);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 9:
-- msginfo->inreplyto ? XSRETURN_PV(msginfo->inreplyto) : XSRETURN_UNDEF;
-+ if (msginfo->inreplyto) {
-+ XSRETURN_PV(msginfo->inreplyto);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 10:
-- msginfo->xref ? XSRETURN_PV(msginfo->xref) : XSRETURN_UNDEF;
-+ if (msginfo->xref) {
-+ XSRETURN_PV(msginfo->xref);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 11:
- xface = procmsg_msginfo_get_avatar(msginfo, AVATAR_XFACE);
-- xface ? XSRETURN_PV(xface) : XSRETURN_UNDEF;
-+ if (xface) {
-+ XSRETURN_PV(xface);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 12:
-- (msginfo->extradata && msginfo->extradata->dispositionnotificationto) ?
-- XSRETURN_PV(msginfo->extradata->dispositionnotificationto) : XSRETURN_UNDEF;
-+ if (msginfo->extradata && msginfo->extradata->dispositionnotificationto) {
-+ XSRETURN_PV(msginfo->extradata->dispositionnotificationto);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 13:
-- (msginfo->extradata && msginfo->extradata->returnreceiptto) ?
-- XSRETURN_PV(msginfo->extradata->returnreceiptto) : XSRETURN_UNDEF;
-+ if (msginfo->extradata && msginfo->extradata->returnreceiptto) {
-+ XSRETURN_PV(msginfo->extradata->returnreceiptto);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 14:
- EXTEND(SP, g_slist_length(msginfo->references));
- ii = 0;
- for(walk = msginfo->references; walk != NULL; walk = g_slist_next(walk))
- XST_mPV(ii++,walk->data ? (gchar*) walk->data: "");
-- ii ? XSRETURN(ii) : XSRETURN_UNDEF;
-+ if (ii) {
-+ XSRETURN(ii);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 15:
-- msginfo->score ? XSRETURN_IV(msginfo->score) : XSRETURN_UNDEF;
-+ if (msginfo->score) {
-+ XSRETURN_IV(msginfo->score);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 17:
-- msginfo->plaintext_file ?
-- XSRETURN_PV(msginfo->plaintext_file) : XSRETURN_UNDEF;
-+ if (msginfo->plaintext_file) {
-+ XSRETURN_PV(msginfo->plaintext_file);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 19:
-- msginfo->hidden ? XSRETURN_IV(msginfo->hidden) : XSRETURN_UNDEF;
-+ if (msginfo->hidden) {
-+ XSRETURN_IV(msginfo->hidden);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 20:
- if((charp = procmsg_get_message_file_path(msginfo)) != NULL) {
- strncpy2(buf,charp,sizeof(buf));
- g_free(charp);
- XSRETURN_PV(buf);
- }
-- else
-+ else {
- XSRETURN_UNDEF;
-+ }
- case 21:
-- (msginfo->extradata && msginfo->extradata->partial_recv) ?
-- XSRETURN_PV(msginfo->extradata->partial_recv) : XSRETURN_UNDEF;
-+ if (msginfo->extradata && msginfo->extradata->partial_recv) {
-+ XSRETURN_PV(msginfo->extradata->partial_recv);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 22:
-- msginfo->total_size ? XSRETURN_IV(msginfo->total_size) : XSRETURN_UNDEF;
-+ if (msginfo->total_size) {
-+ XSRETURN_IV(msginfo->total_size);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 23:
-- (msginfo->extradata && msginfo->extradata->account_server) ?
-- XSRETURN_PV(msginfo->extradata->account_server) : XSRETURN_UNDEF;
-+ if (msginfo->extradata && msginfo->extradata->account_server) {
-+ XSRETURN_PV(msginfo->extradata->account_server);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 24:
-- (msginfo->extradata && msginfo->extradata->account_login) ?
-- XSRETURN_PV(msginfo->extradata->account_login) : XSRETURN_UNDEF;
-+ if (msginfo->extradata && msginfo->extradata->account_login) {
-+ XSRETURN_PV(msginfo->extradata->account_login);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 25:
-- msginfo->planned_download ?
-- XSRETURN_IV(msginfo->planned_download) : XSRETURN_UNDEF;
-+ if (msginfo->planned_download) {
-+ XSRETURN_IV(msginfo->planned_download);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
-
- /* general */
- case 100:
-- if(manual_filtering)
-+ if(manual_filtering) {
- XSRETURN_YES;
-- else
-+ }
-+ else {
- XSRETURN_NO;
-+ }
- default:
- g_warning("Perl plugin: wrong argument to ClawsMail::C::init");
- XSRETURN_UNDEF;
-@@ -664,8 +770,9 @@ static XS(XS_ClawsMail_open_mail_file)
- XSRETURN_UNDEF;
- }
- file = procmsg_get_message_file_path(msginfo);
-- if(!file)
-+ if(!file) {
- XSRETURN_UNDEF;
-+ }
- if((message_file = claws_fopen(file, "rb")) == NULL) {
- FILE_OP_ERROR(file, "claws_fopen");
- g_warning("Perl plugin: file open error in ClawsMail::C::open_mail_file");
-@@ -718,8 +825,9 @@ static XS(XS_ClawsMail_get_next_header)
- g_free(buf);
- XSRETURN(2);
- }
-- else
-+ else {
- XSRETURN_EMPTY;
-+ }
- }
-
- /* ClawsMail::C::get_next_body_line */
-@@ -736,10 +844,12 @@ static XS(XS_ClawsMail_get_next_body_line)
- g_warning("Perl plugin: message file not open. Use ClawsMail::C::open_message_file first");
- XSRETURN_UNDEF;
- }
-- if(claws_fgets(buf, sizeof(buf), message_file) != NULL)
-+ if(claws_fgets(buf, sizeof(buf), message_file) != NULL) {
- XSRETURN_PV(buf);
-- else
-+ }
-+ else {
- XSRETURN_UNDEF;
-+ }
- }
-
-
-@@ -772,57 +882,65 @@ static XS(XS_ClawsMail_check_flag)
- filter_log_write(LOG_MATCH,"marked");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 2:
- if(MSG_IS_UNREAD(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"unread");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 3:
- if(MSG_IS_DELETED(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"deleted");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 4:
- if(MSG_IS_NEW(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"new");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 5:
- if(MSG_IS_REPLIED(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"replied");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 6:
- if(MSG_IS_FORWARDED(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"forwarded");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 7:
- if(MSG_IS_LOCKED(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"locked");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 8:
- if(MSG_IS_IGNORE_THREAD(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"ignore_thread");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- default:
- g_warning("Perl plugin: unknown argument to ClawsMail::C::check_flag");
- XSRETURN_UNDEF;
-@@ -845,8 +963,9 @@ static XS(XS_ClawsMail_colorlabel)
- filter_log_write(LOG_MATCH,"colorlabel");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- }
-
- /* ClawsMail::C::age_greater(int) */
-@@ -866,8 +985,9 @@ static XS(XS_ClawsMail_age_greater)
- filter_log_write(LOG_MATCH,"age_greater");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- }
-
- /* ClawsMail::C::age_lower(int) */
-@@ -887,8 +1007,9 @@ static XS(XS_ClawsMail_age_lower)
- filter_log_write(LOG_MATCH,"age_lower");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- }
-
- /* ClawsMail::C::tagged() */
-@@ -900,7 +1021,12 @@ static XS(XS_ClawsMail_tagged)
- XSRETURN_UNDEF;
- }
-
-- return msginfo->tags ? XSRETURN_YES : XSRETURN_NO;
-+ if (msginfo->tags) {
-+ XSRETURN_YES;
-+ }
-+ else {
-+ XSRETURN_NO;
-+ }
- }
-
- /* ClawsMail::C::get_tags() */
-@@ -1032,10 +1158,12 @@ static XS(XS_ClawsMail_make_sure_folder_exists)
-
- identifier = SvPV_nolen(ST(0));
- item = folder_get_item_from_identifier(identifier);
-- if(item)
-+ if(item) {
- XSRETURN_YES;
-- else
-+ }
-+ else {
- XSRETURN_NO;
-+ }
- }
-
-
-@@ -1066,8 +1194,9 @@ static XS(XS_ClawsMail_addr_in_addressbook)
- filter_log_write(LOG_MATCH,"addr_in_addressbook");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- }
-
-
-@@ -1348,8 +1477,9 @@ static XS(XS_ClawsMail_forward)
-
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_UNDEF;
-+ }
- }
-
- /* ClawsMail::C::redirect(int,char*) */
-@@ -1373,8 +1503,9 @@ static XS(XS_ClawsMail_redirect)
- account = account_find_from_id(account_id);
- compose = compose_redirect(account, msginfo, TRUE);
-
-- if (compose->account->protocol == A_NNTP)
-+ if (compose->account->protocol == A_NNTP) {
- XSRETURN_UNDEF;
-+ }
- else
- compose_entry_append(compose, dest, COMPOSE_TO, PREF_NONE);
-
-@@ -1389,8 +1520,9 @@ static XS(XS_ClawsMail_redirect)
-
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_UNDEF;
-+ }
- }
-
-
-@@ -1472,8 +1604,9 @@ static XS(XS_ClawsMail_get_attribute_value)
- attribute_value = get_attribute_value(addr,attr,bookname);
- }
-
-- if(attribute_value)
-+ if(attribute_value) {
- XSRETURN_PV(attribute_value);
-+ }
- XSRETURN_PV("");
- }
-
diff --git a/mail-client/claws-mail/files/claws-mail-4.1.0-perl-5.36.patch b/mail-client/claws-mail/files/claws-mail-4.1.0-perl-5.36.patch
deleted file mode 100644
index 2bbe76d85cce..000000000000
--- a/mail-client/claws-mail/files/claws-mail-4.1.0-perl-5.36.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-https://git.claws-mail.org/?p=claws.git;a=commitdiff;h=1465ce9c0eb6151a3eaeebb10fd4ffa6db3d69db
-https://bugs.gentoo.org/849569
-
-From: Ricardo Mones <ricardo@mones.org>
-Date: Sat, 23 Apr 2022 19:26:16 +0200
-Subject: [PATCH] Fix building perl plugin since perl v5.35.2
-
-Using XSRETURN_* macros in expressions is now deprecated:
-https://github.com/Perl/perl5/commit/7169efc77525df70484a824bff4ceebd1fafc760
---- a/src/plugins/perl/perl_plugin.c
-+++ b/src/plugins/perl/perl_plugin.c
-@@ -577,76 +577,182 @@ static XS(XS_ClawsMail_filter_init)
-
- /* msginfo */
- case 1:
-- msginfo->size ? XSRETURN_UV(msginfo->size) : XSRETURN_UNDEF;
-+ if (msginfo->size) {
-+ XSRETURN_UV(msginfo->size);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 2:
-- msginfo->date ? XSRETURN_PV(msginfo->date) : XSRETURN_UNDEF;
-+ if (msginfo->date) {
-+ XSRETURN_PV(msginfo->date);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 3:
-- msginfo->from ? XSRETURN_PV(msginfo->from) : XSRETURN_UNDEF;
-+ if (msginfo->from) {
-+ XSRETURN_PV(msginfo->from);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 4:
-- msginfo->to ? XSRETURN_PV(msginfo->to) : XSRETURN_UNDEF;
-+ if (msginfo->to) {
-+ XSRETURN_PV(msginfo->to);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 5:
-- msginfo->cc ? XSRETURN_PV(msginfo->cc) : XSRETURN_UNDEF;
-+ if (msginfo->cc) {
-+ XSRETURN_PV(msginfo->cc);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 6:
-- msginfo->newsgroups ? XSRETURN_PV(msginfo->newsgroups) : XSRETURN_UNDEF;
-+ if (msginfo->newsgroups) {
-+ XSRETURN_PV(msginfo->newsgroups);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 7:
-- msginfo->subject ? XSRETURN_PV(msginfo->subject) : XSRETURN_UNDEF;
-+ if (msginfo->subject) {
-+ XSRETURN_PV(msginfo->subject);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 8:
-- msginfo->msgid ? XSRETURN_PV(msginfo->msgid) : XSRETURN_UNDEF;
-+ if (msginfo->msgid) {
-+ XSRETURN_PV(msginfo->msgid);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 9:
-- msginfo->inreplyto ? XSRETURN_PV(msginfo->inreplyto) : XSRETURN_UNDEF;
-+ if (msginfo->inreplyto) {
-+ XSRETURN_PV(msginfo->inreplyto);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 10:
-- msginfo->xref ? XSRETURN_PV(msginfo->xref) : XSRETURN_UNDEF;
-+ if (msginfo->xref) {
-+ XSRETURN_PV(msginfo->xref);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 11:
- xface = procmsg_msginfo_get_avatar(msginfo, AVATAR_XFACE);
-- xface ? XSRETURN_PV(xface) : XSRETURN_UNDEF;
-+ if (xface) {
-+ XSRETURN_PV(xface);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 12:
-- (msginfo->extradata && msginfo->extradata->dispositionnotificationto) ?
-- XSRETURN_PV(msginfo->extradata->dispositionnotificationto) : XSRETURN_UNDEF;
-+ if (msginfo->extradata && msginfo->extradata->dispositionnotificationto) {
-+ XSRETURN_PV(msginfo->extradata->dispositionnotificationto);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 13:
-- (msginfo->extradata && msginfo->extradata->returnreceiptto) ?
-- XSRETURN_PV(msginfo->extradata->returnreceiptto) : XSRETURN_UNDEF;
-+ if (msginfo->extradata && msginfo->extradata->returnreceiptto) {
-+ XSRETURN_PV(msginfo->extradata->returnreceiptto);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 14:
- EXTEND(SP, g_slist_length(msginfo->references));
- ii = 0;
- for(walk = msginfo->references; walk != NULL; walk = g_slist_next(walk))
- XST_mPV(ii++,walk->data ? (gchar*) walk->data: "");
-- ii ? XSRETURN(ii) : XSRETURN_UNDEF;
-+ if (ii) {
-+ XSRETURN(ii);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 15:
-- msginfo->score ? XSRETURN_IV(msginfo->score) : XSRETURN_UNDEF;
-+ if (msginfo->score) {
-+ XSRETURN_IV(msginfo->score);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 17:
-- msginfo->plaintext_file ?
-- XSRETURN_PV(msginfo->plaintext_file) : XSRETURN_UNDEF;
-+ if (msginfo->plaintext_file) {
-+ XSRETURN_PV(msginfo->plaintext_file);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 19:
-- msginfo->hidden ? XSRETURN_IV(msginfo->hidden) : XSRETURN_UNDEF;
-+ if (msginfo->hidden) {
-+ XSRETURN_IV(msginfo->hidden);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 20:
- if((charp = procmsg_get_message_file_path(msginfo)) != NULL) {
- strncpy2(buf,charp,sizeof(buf));
- g_free(charp);
- XSRETURN_PV(buf);
- }
-- else
-+ else {
- XSRETURN_UNDEF;
-+ }
- case 21:
-- (msginfo->extradata && msginfo->extradata->partial_recv) ?
-- XSRETURN_PV(msginfo->extradata->partial_recv) : XSRETURN_UNDEF;
-+ if (msginfo->extradata && msginfo->extradata->partial_recv) {
-+ XSRETURN_PV(msginfo->extradata->partial_recv);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 22:
-- msginfo->total_size ? XSRETURN_IV(msginfo->total_size) : XSRETURN_UNDEF;
-+ if (msginfo->total_size) {
-+ XSRETURN_IV(msginfo->total_size);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 23:
-- (msginfo->extradata && msginfo->extradata->account_server) ?
-- XSRETURN_PV(msginfo->extradata->account_server) : XSRETURN_UNDEF;
-+ if (msginfo->extradata && msginfo->extradata->account_server) {
-+ XSRETURN_PV(msginfo->extradata->account_server);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 24:
-- (msginfo->extradata && msginfo->extradata->account_login) ?
-- XSRETURN_PV(msginfo->extradata->account_login) : XSRETURN_UNDEF;
-+ if (msginfo->extradata && msginfo->extradata->account_login) {
-+ XSRETURN_PV(msginfo->extradata->account_login);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
- case 25:
-- msginfo->planned_download ?
-- XSRETURN_IV(msginfo->planned_download) : XSRETURN_UNDEF;
-+ if (msginfo->planned_download) {
-+ XSRETURN_IV(msginfo->planned_download);
-+ }
-+ else {
-+ XSRETURN_UNDEF;
-+ }
-
- /* general */
- case 100:
-- if(manual_filtering)
-+ if(manual_filtering) {
- XSRETURN_YES;
-- else
-+ }
-+ else {
- XSRETURN_NO;
-+ }
- default:
- g_warning("Perl plugin: wrong argument to ClawsMail::C::init");
- XSRETURN_UNDEF;
-@@ -664,8 +770,9 @@ static XS(XS_ClawsMail_open_mail_file)
- XSRETURN_UNDEF;
- }
- file = procmsg_get_message_file_path(msginfo);
-- if(!file)
-+ if(!file) {
- XSRETURN_UNDEF;
-+ }
- if((message_file = claws_fopen(file, "rb")) == NULL) {
- FILE_OP_ERROR(file, "claws_fopen");
- g_warning("Perl plugin: file open error in ClawsMail::C::open_mail_file");
-@@ -718,8 +825,9 @@ static XS(XS_ClawsMail_get_next_header)
- g_free(buf);
- XSRETURN(2);
- }
-- else
-+ else {
- XSRETURN_EMPTY;
-+ }
- }
-
- /* ClawsMail::C::get_next_body_line */
-@@ -736,10 +844,12 @@ static XS(XS_ClawsMail_get_next_body_line)
- g_warning("Perl plugin: message file not open. Use ClawsMail::C::open_message_file first");
- XSRETURN_UNDEF;
- }
-- if(claws_fgets(buf, sizeof(buf), message_file) != NULL)
-+ if(claws_fgets(buf, sizeof(buf), message_file) != NULL) {
- XSRETURN_PV(buf);
-- else
-+ }
-+ else {
- XSRETURN_UNDEF;
-+ }
- }
-
-
-@@ -772,57 +882,65 @@ static XS(XS_ClawsMail_check_flag)
- filter_log_write(LOG_MATCH,"marked");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 2:
- if(MSG_IS_UNREAD(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"unread");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 3:
- if(MSG_IS_DELETED(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"deleted");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 4:
- if(MSG_IS_NEW(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"new");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 5:
- if(MSG_IS_REPLIED(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"replied");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 6:
- if(MSG_IS_FORWARDED(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"forwarded");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 7:
- if(MSG_IS_LOCKED(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"locked");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- case 8:
- if(MSG_IS_IGNORE_THREAD(msginfo->flags)) {
- filter_log_write(LOG_MATCH,"ignore_thread");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- default:
- g_warning("Perl plugin: unknown argument to ClawsMail::C::check_flag");
- XSRETURN_UNDEF;
-@@ -845,8 +963,9 @@ static XS(XS_ClawsMail_colorlabel)
- filter_log_write(LOG_MATCH,"colorlabel");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- }
-
- /* ClawsMail::C::age_greater(int) */
-@@ -866,8 +985,9 @@ static XS(XS_ClawsMail_age_greater)
- filter_log_write(LOG_MATCH,"age_greater");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- }
-
- /* ClawsMail::C::age_lower(int) */
-@@ -887,8 +1007,9 @@ static XS(XS_ClawsMail_age_lower)
- filter_log_write(LOG_MATCH,"age_lower");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- }
-
- /* ClawsMail::C::tagged() */
-@@ -900,7 +1021,12 @@ static XS(XS_ClawsMail_tagged)
- XSRETURN_UNDEF;
- }
-
-- return msginfo->tags ? XSRETURN_YES : XSRETURN_NO;
-+ if (msginfo->tags) {
-+ XSRETURN_YES;
-+ }
-+ else {
-+ XSRETURN_NO;
-+ }
- }
-
- /* ClawsMail::C::get_tags() */
-@@ -1032,10 +1158,12 @@ static XS(XS_ClawsMail_make_sure_folder_exists)
-
- identifier = SvPV_nolen(ST(0));
- item = folder_get_item_from_identifier(identifier);
-- if(item)
-+ if(item) {
- XSRETURN_YES;
-- else
-+ }
-+ else {
- XSRETURN_NO;
-+ }
- }
-
-
-@@ -1066,8 +1194,9 @@ static XS(XS_ClawsMail_addr_in_addressbook)
- filter_log_write(LOG_MATCH,"addr_in_addressbook");
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_NO;
-+ }
- }
-
-
-@@ -1348,8 +1477,9 @@ static XS(XS_ClawsMail_forward)
-
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_UNDEF;
-+ }
- }
-
- /* ClawsMail::C::redirect(int,char*) */
-@@ -1373,8 +1503,9 @@ static XS(XS_ClawsMail_redirect)
- account = account_find_from_id(account_id);
- compose = compose_redirect(account, msginfo, TRUE);
-
-- if (compose->account->protocol == A_NNTP)
-+ if (compose->account->protocol == A_NNTP) {
- XSRETURN_UNDEF;
-+ }
- else
- compose_entry_append(compose, dest, COMPOSE_TO, PREF_NONE);
-
-@@ -1389,8 +1520,9 @@ static XS(XS_ClawsMail_redirect)
-
- XSRETURN_YES;
- }
-- else
-+ else {
- XSRETURN_UNDEF;
-+ }
- }
-
-
-@@ -1472,8 +1604,9 @@ static XS(XS_ClawsMail_get_attribute_value)
- attribute_value = get_attribute_value(addr,attr,bookname);
- }
-
-- if(attribute_value)
-+ if(attribute_value) {
- XSRETURN_PV(attribute_value);
-+ }
- XSRETURN_PV("");
- }
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/, mail-client/claws-mail/files/
@ 2024-09-20 17:42 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2024-09-20 17:42 UTC (permalink / raw
To: gentoo-commits
commit: d4fc16e951141ee37d791a4ecae8d940ee32077a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 17:33:02 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 17:42:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4fc16e9
mail-client/claws-mail: drop 4.1.1-r4
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
mail-client/claws-mail/Manifest | 1 -
mail-client/claws-mail/claws-mail-4.1.1-r4.ebuild | 215 --------------
.../files/claws-mail-4.1.1-litehtml_gcc13.patch | 37 ---
.../files/claws-mail-4.1.1-webkitgtk4.1.patch | 317 ---------------------
mail-client/claws-mail/metadata.xml | 1 -
5 files changed, 571 deletions(-)
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 6710c55648e9..88d5718ac324 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,4 +1,3 @@
DIST claws-mail-3.21.0.tar.xz 6848648 BLAKE2B 9b2c89b5b9105add54db7b55f082e965645b67ca361edb9cdb7fdc3793146332acb678f06a493b0668c6a7d36a70d471d25948b0d14d6f61b22423057014a67f SHA512 59078bdb2d0314c63d4c63fdf493b0484c731523a2a099dd29816b14586f6ef038e36f794284d60deb45fe22b4c29bd239da49cc3b94549884742ef64d2fdcae
-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
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-r4.ebuild b/mail-client/claws-mail/claws-mail-4.1.1-r4.ebuild
deleted file mode 100644
index 902c4bdc278a..000000000000
--- a/mail-client/claws-mail/claws-mail-4.1.1-r4.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit autotools desktop python-any-r1 xdg
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-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"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE="archive bogofilter calendar clamav dbus debug 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"
-REQUIRED_USE="
- libcanberra? ( notification )
- libnotify? ( notification )
- networkmanager? ( dbus )
- oauth? ( gnutls )
- smime? ( pgp )
-"
-
-COMMONDEPEND="
- >=dev-libs/glib-2.36:2
- dev-libs/nettle:=
- net-mail/ytnef
- sys-libs/zlib:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2[jpeg]
- x11-libs/gtk+:3[X]
- x11-libs/libX11
- x11-libs/pango
- archive? (
- app-arch/libarchive
- >=net-misc/curl-7.9.7
- )
- bogofilter? ( mail-filter/bogofilter )
- calendar? (
- dev-lang/perl:=
- >=dev-libs/libical-2.0.0:=
- >=net-misc/curl-7.9.7
- )
- dbus? (
- >=dev-libs/dbus-glib-0.60
- sys-apps/dbus
- )
- gdata? ( >=dev-libs/libgdata-0.17.2 )
- gnutls? ( >=net-libs/gnutls-3.0 )
- imap? ( >=net-libs/libetpan-0.57 )
- ldap? ( >=net-nds/openldap-2.0.7:= )
- litehtml? (
- >=dev-libs/gumbo-0.10:=
- net-misc/curl
- media-libs/fontconfig
- )
- nls? ( >=sys-devel/gettext-0.18 )
- nntp? ( >=net-libs/libetpan-0.57 )
- notification? (
- 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:= )
- rss? (
- dev-libs/libxml2
- net-misc/curl
- )
- session? (
- x11-libs/libICE
- x11-libs/libSM
- )
- smime? ( >=app-crypt/gpgme-1.0.0:= )
- spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-2.0.0:2= )
- startup-notification? ( x11-libs/startup-notification )
- svg? ( >=gnome-base/librsvg-2.40.5 )
- valgrind? ( dev-debug/valgrind )
- webkit? ( net-libs/webkit-gtk:4.1 )
-"
-
-DEPEND="${COMMONDEPEND}
- xface? ( >=media-libs/compface-1.4 )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- app-arch/xz-utils
- virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
- app-misc/mime-types
- x11-misc/shared-mime-info
- clamav? ( app-antivirus/clamav )
- networkmanager? ( net-misc/networkmanager )
- pdf? ( app-text/ghostscript-gpl )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
- "${FILESDIR}/${PN}-4.1.1-fix_lto.patch"
- "${FILESDIR}/${P}-webkitgtk4.1.patch"
- "${FILESDIR}/${P}-litehtml_gcc13.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- 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
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-ipv6
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --with-password-encryption=$(usex gnutls gnutls old)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable dbus)
- $(use_enable debug crash-dialog)
- $(use_enable doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable ldap)
- $(use_enable litehtml litehtml_viewer-plugin)
- $(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)
- $(use_enable rss rssyl-plugin)
- $(use_enable session libsm)
- $(use_enable sieve managesieve-plugin)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable spell enchant)
- $(use_enable startup-notification)
- $(use_enable svg)
- $(use_enable valgrind valgrind)
- $(use_enable webkit fancy-plugin)
- $(use_enable xface compface)
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp ; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- default
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png
- local size
- for size in 64 128 ; do
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools || die
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh
- doexe tb2claws-mail update-po uudec uuooffice
-
- # kill useless files
- find "${ED}"/usr/$(get_libdir)/${PN}/plugins/ \
- \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version 3.x please re-load any plugin you use"
- xdg_pkg_postinst
-}
diff --git a/mail-client/claws-mail/files/claws-mail-4.1.1-litehtml_gcc13.patch b/mail-client/claws-mail/files/claws-mail-4.1.1-litehtml_gcc13.patch
deleted file mode 100644
index 10da0463b843..000000000000
--- a/mail-client/claws-mail/files/claws-mail-4.1.1-litehtml_gcc13.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a9a16a253ed3865a51db5e306539d3494087dafd Mon Sep 17 00:00:00 2001
-From: Paul <paul@claws-mail.org>
-Date: Wed, 19 Apr 2023 16:42:07 +0100
-Subject: [PATCH] fix bug 4648, 'fails to build with gcc 13'
-
----
- src/plugins/litehtml_viewer/litehtml/html.h | 1 +
- src/plugins/litehtml_viewer/litehtml/num_cvt.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/plugins/litehtml_viewer/litehtml/html.h b/src/plugins/litehtml_viewer/litehtml/html.h
-index 4151b1225..20457f155 100644
---- a/src/plugins/litehtml_viewer/litehtml/html.h
-+++ b/src/plugins/litehtml_viewer/litehtml/html.h
-@@ -9,6 +9,7 @@
- #include <cstring>
- #include <algorithm>
- #include <sstream>
-+#include <cstdint>
- #include "os_types.h"
- #include "types.h"
- #include "background.h"
-diff --git a/src/plugins/litehtml_viewer/litehtml/num_cvt.h b/src/plugins/litehtml_viewer/litehtml/num_cvt.h
-index 515e46d62..367dcc36a 100644
---- a/src/plugins/litehtml_viewer/litehtml/num_cvt.h
-+++ b/src/plugins/litehtml_viewer/litehtml/num_cvt.h
-@@ -2,6 +2,7 @@
- #define NUM_CVT_H
-
- #include <string>
-+#include <cstdint>
- #include "os_types.h"
-
- namespace litehtml
---
-2.25.1
-
diff --git a/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch b/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch
deleted file mode 100644
index cfd9cb6842e8..000000000000
--- a/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-diff -Naur claws-mail-4.1.1.orig/configure.ac claws-mail-4.1.1/configure.ac
---- claws-mail-4.1.1.orig/configure.ac 2022-10-20 10:13:00.000000000 +0200
-+++ claws-mail-4.1.1/configure.ac 2023-04-02 22:12:14.715133250 +0200
-@@ -1238,26 +1238,10 @@
- AC_SUBST(EXPAT_LIBS)
-
- dnl webkit *********************************************************************
--PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0 >= 2.18.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
-+PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.1 >= 2.18.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
- AC_SUBST(WEBKIT_LIBS)
- AC_SUBST(WEBKIT_CFLAGS)
-
--dnl libsoup ********************************************************************
--PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
--if test x"$HAVE_LIBSOUP" = xyes; then
-- AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
--fi
--AC_SUBST(LIBSOUP_CFLAGS)
--AC_SUBST(LIBSOUP_LIBS)
--
--dnl libsoup-gnome **************************************************************
--PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, HAVE_LIBSOUP_GNOME=yes, HAVE_LIBSOUP_GNOME=no)
--if test x"$HAVE_LIBSOUP_GNOME" = xyes; then
-- AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup_gnome is available])
--fi
--AC_SUBST(LIBSOUP_GNOME_CFLAGS)
--AC_SUBST(LIBSOUP_GNOME_LIBS)
--
- dnl libarchive *****************************************************************
- PKG_CHECK_MODULES(LIBARCHIVE, libarchive, HAVE_ARCHIVE=yes, HAVE_ARCHIVE=no)
- AC_SUBST(ARCHIVE_LIBS)
-@@ -1573,7 +1557,7 @@
- dependencies_missing=""
-
- if test x"$HAVE_WEBKIT" = xno; then
-- dependencies_missing="libwebkit2gtk-4.0 $dependencies_missing"
-+ dependencies_missing="libwebkit2gtk-4.1 $dependencies_missing"
- fi
- if test x"$HAVE_CURL" = xno; then
- dependencies_missing="libcurl $dependencies_missing"
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.c claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.c
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.c 2022-05-06 12:11:04.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.c 2023-04-02 22:07:34.285867703 +0200
-@@ -46,11 +46,8 @@
-
- FancyPrefs fancy_prefs;
-
--static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str);
-+// static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str);
-
--#ifdef HAVE_LIBSOUP_GNOME
--static void prefs_disable_fancy_proxy(GtkWidget *checkbox, GtkWidget *block);
--#endif
- typedef struct _FancyPrefsPage FancyPrefsPage;
-
- struct _FancyPrefsPage {
-@@ -61,11 +58,8 @@
- GtkWidget *enable_plugins;
- GtkWidget *enable_java;
- GtkWidget *open_external;
--#ifdef HAVE_LIBSOUP_GNOME
-- GtkWidget *gnome_proxy_checkbox;
--#endif
-- GtkWidget *proxy_checkbox;
-- GtkWidget *proxy_str;
-+/* GtkWidget *proxy_checkbox;
-+ GtkWidget *proxy_str; */
- GtkWidget *stylesheet;
- };
-
-@@ -84,14 +78,10 @@
- NULL, NULL, NULL},
- {"enable_java", "FALSE", &fancy_prefs.enable_java, P_BOOL,
- NULL, NULL, NULL},
--#ifdef HAVE_LIBSOUP_GNOME
-- {"enable_gnome_proxy","FALSE", &fancy_prefs.enable_gnome_proxy, P_BOOL,
-- NULL, NULL, NULL},
--#endif
-- {"enable_proxy", "FALSE", &fancy_prefs.enable_proxy, P_BOOL,
-+/* {"enable_proxy", "FALSE", &fancy_prefs.enable_proxy, P_BOOL,
- NULL, NULL, NULL},
- {"proxy_server", "http://SERVERNAME:PORT", &fancy_prefs.proxy_str, P_STRING,
-- NULL, NULL, NULL},
-+ NULL, NULL, NULL}, */
- {"stylesheet", "", &fancy_prefs.stylesheet, P_STRING, NULL, NULL, NULL},
- {0,0,0,0,0,0,0}
- };
-@@ -180,14 +170,11 @@
- FancyPrefsPage *prefs_page = (FancyPrefsPage *) page;
-
- GtkWidget *vbox;
--#ifdef HAVE_LIBSOUP_GNOME
-- GtkWidget *gnome_proxy_checkbox;
--#endif
-- GtkWidget *proxy_checkbox;
-+/* GtkWidget *proxy_checkbox;
- GtkWidget *proxy_str;
- GtkWidget *vbox_proxy;
- GtkWidget *frame_proxy;
--
-+*/
- GtkWidget *frame_remote;
- GtkWidget *vbox_remote;
- GtkWidget *remote_label;
-@@ -204,25 +191,12 @@
- vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
- gtk_widget_show(vbox);
--
-+/*
- GtkWidget *block = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
-
- vbox_proxy = gtkut_get_options_frame(vbox, &frame_proxy, _("Proxy"));
--#ifdef HAVE_LIBSOUP_GNOME
-- gnome_proxy_checkbox = gtk_check_button_new_with_label(_("Use GNOME's proxy settings"));
-- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gnome_proxy_checkbox),
-- fancy_prefs.enable_gnome_proxy);
-- gtk_box_pack_start(GTK_BOX(vbox_proxy), gnome_proxy_checkbox, FALSE, FALSE, 0);
-- gtk_widget_show(gnome_proxy_checkbox);
-- g_signal_connect(G_OBJECT(gnome_proxy_checkbox), "toggled",
-- G_CALLBACK(prefs_disable_fancy_proxy), block);
--#endif
- proxy_checkbox = gtk_check_button_new_with_label(_("Use proxy"));
- proxy_str = gtk_entry_new();
--#ifdef HAVE_LIBSOUP_GNOME
-- if (fancy_prefs.enable_gnome_proxy)
-- gtk_widget_set_sensitive(proxy_checkbox, FALSE);
--#endif
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(proxy_checkbox),
- fancy_prefs.enable_proxy);
- prefs_set_proxy_entry_sens(proxy_checkbox, GTK_ENTRY(proxy_str));
-@@ -234,7 +208,7 @@
- gtk_box_pack_start(GTK_BOX(block), proxy_str, TRUE, TRUE, 0);
- gtk_box_pack_start(GTK_BOX(vbox_proxy), block, FALSE, FALSE, 0);
- gtk_widget_show_all(vbox_proxy);
--
-+*/
- vbox_remote = gtkut_get_options_frame(vbox, &frame_remote, _("Remote resources"));
- remote_label = gtk_label_new(_("Loading remote resources can lead to some privacy issues.\n"
- "When remote content loading is disabled, nothing will be requested\n"
-@@ -323,12 +297,8 @@
- pref_set_entry_from_pref(GTK_ENTRY(stylesheet), fancy_prefs.stylesheet);
- g_signal_emit_by_name(G_OBJECT(stylesheet), "changed", stylesheet_edit_button);
-
--
--#ifdef HAVE_LIBSOUP_GNOME
-- prefs_page->gnome_proxy_checkbox = gnome_proxy_checkbox;
--#endif
-- prefs_page->proxy_checkbox = proxy_checkbox;
-- prefs_page->proxy_str = proxy_str;
-+/* prefs_page->proxy_checkbox = proxy_checkbox;
-+ prefs_page->proxy_str = proxy_str; */
- prefs_page->enable_remote_content = enable_remote_content;
- prefs_page->enable_images = enable_images;
- prefs_page->enable_scripts = enable_scripts;
-@@ -374,25 +344,12 @@
- const gchar *stylesheet = gtk_entry_get_text(GTK_ENTRY(widget));
- gtk_widget_set_sensitive(GTK_WIDGET(data), (*stylesheet)? TRUE: FALSE);
- }
--
-+/*
- static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str) {
- gtk_widget_set_sensitive(GTK_WIDGET(entry_str),
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
- }
--
--#ifdef HAVE_LIBSOUP_GNOME
--static void prefs_disable_fancy_proxy(GtkWidget *checkbox, GtkWidget *block) {
-- gboolean toggle = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox));
-- gtk_widget_set_sensitive(block, !toggle);
-- GList *list = g_list_first(gtk_container_get_children(GTK_CONTAINER(block)));
-- if (toggle) {
-- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(list->data), FALSE);
-- }
-- else {
-- gtk_widget_set_sensitive(GTK_WIDGET(list->data), TRUE);
-- }
--}
--#endif
-+*/
- static void destroy_fancy_prefs_page(PrefsPage *page)
- {
- /* Do nothing! */
-@@ -425,10 +382,6 @@
- {
- FancyPrefsPage *prefs_page = (FancyPrefsPage *) page;
-
--#ifdef HAVE_LIBSOUP_GNOME
-- fancy_prefs.enable_gnome_proxy = gtk_toggle_button_get_active
-- (GTK_TOGGLE_BUTTON(prefs_page->gnome_proxy_checkbox));
--#endif
- fancy_prefs.enable_images = gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(prefs_page->enable_images));
- fancy_prefs.enable_remote_content = gtk_toggle_button_get_active
-@@ -441,9 +394,9 @@
- (GTK_TOGGLE_BUTTON(prefs_page->enable_java));
- fancy_prefs.open_external = combobox_get_active_data
- (GTK_COMBO_BOX(prefs_page->open_external));
-- fancy_prefs.enable_proxy = gtk_toggle_button_get_active
-+/* fancy_prefs.enable_proxy = gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(prefs_page->proxy_checkbox));
-- fancy_prefs.proxy_str = pref_get_pref_from_entry(GTK_ENTRY(prefs_page->proxy_str));
-+ fancy_prefs.proxy_str = pref_get_pref_from_entry(GTK_ENTRY(prefs_page->proxy_str)); */
- #ifdef G_OS_WIN32
- /* pref_get_pref_from_entry() escapes the backslashes in strings,
- * we do not want that, since this entry contains a Windows path.
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.h claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.h
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.h 2022-05-06 12:11:04.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.h 2023-04-02 22:07:34.285867703 +0200
-@@ -1,6 +1,6 @@
- /*
- * Claws Mail -- A GTK based, lightweight, and fast e-mail client
-- * Copyright(C) 1999-2014 the Claws Mail Team
-+ * Copyright(C) 1999-2023 the Claws Mail Team
- * == Fancy Plugin ==
- * This file Copyright (C) 2009 -2014 Salvatore De Paolis
- * <iwkse@claws-mail.org> and the Claws Mail Team
-@@ -35,11 +35,8 @@
- gboolean enable_java;
- gboolean open_external;
- gint zoom_level;
--#ifdef HAVE_LIBSOUP_GNOME
-- gboolean enable_gnome_proxy;
--#endif
-- gboolean enable_proxy;
-- gchar *proxy_str;
-+ // gboolean enable_proxy;
-+ // gchar *proxy_str;
- gchar *stylesheet;
- };
-
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.c claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.c
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.c 2022-10-20 09:16:02.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.c 2023-04-02 22:07:34.285867703 +0200
-@@ -1,7 +1,7 @@
- /*
- * Claws Mail -- A GTK based, lightweight, and fast e-mail client
- * == Fancy Plugin ==
-- * Copyright(C) 1999-2022 the Claws Mail Team
-+ * Copyright(C) 1999-2023 the Claws Mail Team
- * This file Copyright (C) 2009-2014 Salvatore De Paolis
- * <iwkse@claws-mail.org> and the Claws Mail Team
- *
-@@ -1106,23 +1106,6 @@
- viewer->mimeviewer.scroll_one_line = fancy_scroll_one_line;
- viewer->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
-
--/*#ifdef HAVE_LIBSOUP_GNOME
-- TODO webkit_get_default_session() missing
-- * enum WebKitNetworkProxySettings
-- * */
-- /* Use GNOME proxy settings through libproxy */
--/* if (fancy_prefs.enable_gnome_proxy) {
-- SoupSession *session = webkit_get_default_session();
-- soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-- }
--#endif
--
-- if (fancy_prefs.enable_proxy) {
-- SoupSession *session = webkit_get_default_session();
-- SoupURI* pURI = soup_uri_new(fancy_prefs.proxy_str);
-- g_object_set(session, "proxy-uri", pURI, NULL);
-- }
--*/
- viewer->settings = webkit_settings_new();
- g_object_set(viewer->settings, "user-agent", "Fancy Viewer", NULL);
- viewer->scrollwin = gtk_scrolled_window_new(NULL, NULL);
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.h claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.h
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.h 2022-10-19 16:49:50.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.h 2023-04-02 22:07:34.285867703 +0200
-@@ -1,8 +1,8 @@
- /*
- * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * == Fancy Plugin ==
-- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail Team
-- * This file Copyright (C) 2009-2013 Salvatore De Paolis <iwkse@claws-mail.org>
-+ * Copyright (C) 1999-2023 the Claws Mail Team
-+ * This file Copyright (C) 2009-2023 Salvatore De Paolis <iwkse@claws-mail.org>
- * and the Claws Mail Team
- *
- * This program is free software; you can redistribute it and/or modify
-@@ -51,10 +51,6 @@
- #include <curl/curlver.h>
- #include "filesel.h"
-
--#ifdef HAVE_LIBSOUP_GNOME
--#include <libsoup/soup-gnome.h>
--#endif
--
- typedef enum _NavigationMode {
- NAV_DEFAULT,
- NAV_INNER,
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/Makefile.am claws-mail-4.1.1/src/plugins/fancy/Makefile.am
---- claws-mail-4.1.1.orig/src/plugins/fancy/Makefile.am 2022-10-20 09:16:02.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/Makefile.am 2023-04-02 22:07:34.285867703 +0200
-@@ -1,4 +1,4 @@
--# Copyright 1999-2022 the Claws Mail team.
-+# Copyright 1999-2023 the Claws Mail team.
- # This file is part of Claws Mail package, and distributed under the
- # terms of the General Public License version 3 (or later).
- # See COPYING file for license details.
-@@ -28,7 +28,6 @@
- fancy_la_LIBADD = $(plugin_libadd) \
- $(GTK_LIBS) \
- $(WEBKIT_LIBS) \
-- $(LIBSOUP_GNOME_LIBS) \
- $(CURL_LIBS)
-
- fancy_la_CPPFLAGS = \
-@@ -37,7 +36,6 @@
- $(GTK_CFLAGS) \
- $(ENCHANT_CFLAGS) \
- $(WEBKIT_CFLAGS) \
-- $(LIBSOUP_GNOME_CFLAGS) \
- $(CURL_CFLAGS) \
- -DFANCY_WEB_EXTENSIONS_DIR=\""$(pkglibdir)/plugins/web_extensions"\" \
- -DFANCY_WEB_EXTENSION_FILE=\""fancywebextension"\"
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index 6727b3320653..71ee587a179a 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -8,7 +8,6 @@
<use>
<flag name="archive">Enable archiving plugin</flag>
<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
- <flag name="gdata">Enable plugin for access to Google data providers</flag>
<flag name="libcanberra">Enable sound notification in connection with USE=notification</flag>
<flag name="libnotify">Enable notification on the desktop in connection with USE=notification</flag>
<flag name="litehtml">Enable <pkg>dev-libs/gumbo</pkg> html viewer plugin</flag>
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-09-20 17:42 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-04 17:24 [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/, mail-client/claws-mail/files/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2024-09-20 17:42 Andreas Sturmlechner
2024-02-02 15:23 Bernard Cafarelli
2022-07-23 20:21 Bernard Cafarelli
2020-07-13 13:35 Lars Wendler
2020-03-09 14:31 Lars Wendler
2019-11-06 10:34 Lars Wendler
2017-08-11 19:57 Lars Wendler
2015-12-21 7:33 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox