* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/files/, mail-client/claws-mail/
@ 2019-02-10 0:35 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2019-02-10 0:35 UTC (permalink / raw
To: gentoo-commits
commit: 1dff9ad1d920a5f8b657735f23d00e06e2021c96
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 10 00:34:56 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb 10 00:35:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dff9ad1
mail-client/claws-mail: Removed old.
Closes: https://bugs.gentoo.org/676174
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
mail-client/claws-mail/Manifest | 4 -
mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild | 209 --------------------
mail-client/claws-mail/claws-mail-3.15.1.ebuild | 205 --------------------
mail-client/claws-mail/claws-mail-3.16.0.ebuild | 205 --------------------
mail-client/claws-mail/claws-mail-3.17.2.ebuild | 211 ---------------------
.../claws-mail-3.15.0-old_profile_segfault.patch | 80 --------
6 files changed, 914 deletions(-)
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index a65dddd169e..3e24b02faca 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,5 +1 @@
-DIST claws-mail-3.15.0.tar.xz 5665648 BLAKE2B f25356372b65f2df072eb2774fca87514c2da59811e78650e26ae58c1b518e229cba62cf1b0d0ad72107e292c9d87450f7d2508c02f34c5c9c70d944f9866823 SHA512 667cb0ea2f7c5d8e8b6046313ed7698c378f504caeeaa54348ba228317538dfc040e4ddf80f4aaa1491858a7803954e89599b1e479febe7cf1ab4bae5a638dc8
-DIST claws-mail-3.15.1.tar.xz 5665468 BLAKE2B c6d4c5875f82f836815193b330427bdd533be5445706fc437b1c30be8e52325a2b824e8a1d1332bb286ac9ea2bd4b872943709d9ff78b20a6a3ff5b781808d25 SHA512 11113ab2bc75571b9a71b11ee3f7fe4773ff7b17132f29e6637aa7b7b9a7f8ed125430ee7e5ab5c9842463d776a96be150d7c8e1e3d682b955dd582a6a6ce68c
-DIST claws-mail-3.16.0.tar.xz 5913948 BLAKE2B 6744045de6bc3945221569a9ae1cdcd849ec11c4f5dbfe966ca70c7c2ab3f5d9ded1dbd5bcedffdc756809c1802d31d955b5c6c53f20a00be5abc861db340d0f SHA512 5c96e21b4c5117b67ccfe4178c68e2f1b1449f882d6ecf22041e41f08fd607c6ce7afe6c7fdbd039da7ffc5673d366551b15d3e4b7de8d758fc1554a8eadc55e
-DIST claws-mail-3.17.2.tar.xz 6166160 BLAKE2B d31feb49cbeddbf4f95540f984c76a4d91edb95fccf2a7d97933ddaacfa9a5fedb464e602cb85a97bc75dc341bc7004cef9bea27d8dfb51d42a62d3f2f46fa1d SHA512 c68d31f7097f1b5fd5c768f4d97fd9edfbe54794e06ad6980e092743ff5ac96efbc2354021040315ef355d9a272fb71065e4c02bd8ac1804e7db7953a8cff615
DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8
diff --git a/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild b/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild
deleted file mode 100644
index 7e7feaa001c..00000000000
--- a/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +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="
- net-mail/ytnef
- 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 )
- gdata? ( >=dev-libs/libgdata-0.17.2 )
- gnutls? ( >=net-libs/gnutls-3.0 )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( >=x11-libs/gtk+-2.20:2 )
- 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 )
- 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
- )"
-
-PATCHES=(
- "${FILESDIR}/${P}-old_profile_segfault.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- 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 doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable gtk3)
- $(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
- 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() {
- 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
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.15.1.ebuild b/mail-client/claws-mail/claws-mail-3.15.1.ebuild
deleted file mode 100644
index 2392454c221..00000000000
--- a/mail-client/claws-mail/claws-mail-3.15.1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +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="
- net-mail/ytnef
- 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 )
- gdata? ( >=dev-libs/libgdata-0.17.2 )
- gnutls? ( >=net-libs/gnutls-3.0 )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( >=x11-libs/gtk+-2.20:2 )
- 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 )
- 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() {
- default
- 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 doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable gtk3)
- $(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
- 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() {
- 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
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.16.0.ebuild b/mail-client/claws-mail/claws-mail-3.16.0.ebuild
deleted file mode 100644
index cc00879ebd7..00000000000
--- a/mail-client/claws-mail/claws-mail-3.16.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +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="
- net-mail/ytnef
- 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 )
- gdata? ( >=dev-libs/libgdata-0.17.2 )
- gnutls? ( >=net-libs/gnutls-3.0 )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( >=x11-libs/gtk+-2.20:2 )
- 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 )
- 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() {
- default
- 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 doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable gtk3)
- $(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
- 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() {
- 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
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.17.2.ebuild b/mail-client/claws-mail/claws-mail-3.17.2.ebuild
deleted file mode 100644
index ba540a3ae23..00000000000
--- a/mail-client/claws-mail/claws-mail-3.17.2.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools gnome2-utils python-single-r1 xdg-utils
-
-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
- >=x11-libs/gtk+-2.24:2
- 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 )
- 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 )
- 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() {
- default
- 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() {
- 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 and trayicon plugins have been dropped entirely"
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
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
deleted file mode 100644
index b19bf8f39d6..00000000000
--- a/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/files/, mail-client/claws-mail/
@ 2022-06-26 7:02 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-06-26 7:02 UTC (permalink / raw
To: gentoo-commits
commit: c42e9678728f4b6f00a5113cfe29bb04e1687b88
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 06:53:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 07:02:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c42e9678
mail-client/claws-mail: backport Perl 5.36 patch
Maintainer timeout. This one is particularly important as failed
builds during Perl upgrade rebuilds are a major pain.
Closes: https://bugs.gentoo.org/849569
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild | 216 ++++++++++
mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild | 217 ++++++++++
.../files/claws-mail-3.19.0-perl-5.36.patch | 455 +++++++++++++++++++++
.../files/claws-mail-4.1.0-perl-5.36.patch | 454 ++++++++++++++++++++
4 files changed, 1342 insertions(+)
diff --git a/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild b/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild
new file mode 100644
index 000000000000..371f4514fc76
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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 dillo 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 )
+ 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
+ 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-util/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-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 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 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-4.1.0-r1.ebuild b/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..82ecb77243b9
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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 dillo 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 webkit 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+:3
+ 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
+ appindicator? ( dev-libs/libindicate:3[gtk] )
+ libcanberra? ( media-libs/libcanberra[gtk3] )
+ 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-util/valgrind )
+ webkit? ( net-libs/webkit-gtk:4 )
+"
+
+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}-4.1.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-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 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 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 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-3.19.0-perl-5.36.patch b/mail-client/claws-mail/files/claws-mail-3.19.0-perl-5.36.patch
new file mode 100644
index 000000000000..3f4995fcb457
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.19.0-perl-5.36.patch
@@ -0,0 +1,455 @@
+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
new file mode 100644
index 000000000000..2bbe76d85cce
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-4.1.0-perl-5.36.patch
@@ -0,0 +1,454 @@
+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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/files/, mail-client/claws-mail/
@ 2022-11-18 15:06 Bernard Cafarelli
0 siblings, 0 replies; 6+ messages in thread
From: Bernard Cafarelli @ 2022-11-18 15:06 UTC (permalink / raw
To: gentoo-commits
commit: ffe685b85f4db113a0298b6bf37155c0f02bf036
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 14:57:13 2022 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 14:57:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe685b8
mail-client/claws-mail: fix build with LTO
Closes: https://bugs.gentoo.org/859490
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild | 1 +
.../claws-mail/files/claws-mail-4.1.1-fix_lto.patch | Bin 0 -> 17076 bytes
2 files changed, 1 insertion(+)
diff --git a/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild b/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
index ebf3c59858ec..50df7b803ec3 100644
--- a/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
@@ -109,6 +109,7 @@ RDEPEND="${COMMONDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
+ "${FILESDIR}/${PN}-4.1.1-fix_lto.patch"
)
src_prepare() {
diff --git a/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch b/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch
new file mode 100644
index 000000000000..0fd4bfd58a27
Binary files /dev/null and b/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch differ
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/files/, mail-client/claws-mail/
@ 2023-04-02 20:48 Bernard Cafarelli
0 siblings, 0 replies; 6+ messages in thread
From: Bernard Cafarelli @ 2023-04-02 20:48 UTC (permalink / raw
To: gentoo-commits
commit: 33a5145d1abab8b81e5b3545c04356beb1b5d6f6
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 2 20:27:21 2023 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Apr 2 20:47:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33a5145d
mail-client/claws-mail: migrate to net-libs/webkit-gtk:4.1
Closes: https://bugs.gentoo.org/893698
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild | 216 ++++++++++++++
.../files/claws-mail-4.1.1-webkitgtk4.1.patch | 317 +++++++++++++++++++++
2 files changed, 533 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
new file mode 100644
index 000000000000..7f85e4917eb5
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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"
+QA_PKGCONFIG_VERSION="${PV}.0"
+LICENSE="GPL-3"
+
+IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
+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
+ 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 )
+ 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/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-util/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"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-bsfilter-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 dillo dillo-plugin)
+ $(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-webkitgtk4.1.patch b/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch
new file mode 100644
index 000000000000..cfd9cb6842e8
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch
@@ -0,0 +1,317 @@
+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"\"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/files/, mail-client/claws-mail/
@ 2024-01-28 10:13 Bernard Cafarelli
0 siblings, 0 replies; 6+ messages in thread
From: Bernard Cafarelli @ 2024-01-28 10:13 UTC (permalink / raw
To: gentoo-commits
commit: e044e81c7698453a7df7359f21fbf42b0998eefb
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 09:54:41 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 10:00:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e044e81c
mail-client/claws-mail: drop 4.1.0-r2, 4.1.1-r3
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
mail-client/claws-mail/Manifest | 1 -
mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild | 217 -------
mail-client/claws-mail/claws-mail-4.1.1-r3.ebuild | 216 -------
.../files/claws-mail-4.1.0-disable_gnutls.patch | 641 ---------------------
4 files changed, 1075 deletions(-)
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 10afbbca8ea9..1d802f06ad7f 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,5 +1,4 @@
DIST claws-mail-3.19.0.tar.xz 6543188 BLAKE2B eeb7df2b921dbd7ad40c845804fcabe5ddc2064fcf410e7809004be472bbe2ba8bfd89a868420a1bb76845180856fee8a0b3cde879ae67b1a1aab14442fe5d2d SHA512 88780df55873919197d3c6df5102a8eb89a586e8287419c179e1d0af839435a719814b1e3643aa783a7badeadceafda2dc3cb4a3265432b5ad3a210663922b20
DIST claws-mail-3.20.0.tar.xz 6687376 BLAKE2B 9a72e77ea922271fdb947e4f76229c89cb0fb2589921fca6fd161714a3093a137165b84b84db5cece5cb6b06998e237d524104ddddd87078dcba36a94f02e0eb SHA512 66d0087493452cf43357fbfb2338b3716ec45d202f51cce033aa3a8888ec4dac2d6eb9e652efb22bcfcab1e6c00ff650a9926114fb4647f753e44013e607d923
-DIST claws-mail-4.1.0.tar.xz 6471604 BLAKE2B 30d1725c2679e8a0b44edd6c30b15f28633c0a017935980d1412dabffdfb1f33e1c36bee3506e90af54410db222b64422155be821ba18f5e315ed411d477ed63 SHA512 83c7b1a8065628b1dcac58feb4d852b759b3fc376531572e88450b8e9517172a641f710a219b7e16bbc672dbe69853783e4edd1d7647a3f2aacb92e47be9175b
DIST claws-mail-4.1.1.tar.xz 6523688 BLAKE2B 7e1b1ae201a67e14821f415d2b51f6eebfc2896699d89f2088fa9f7f21de984f6d8e4e92791c233ec755a15184ff5e562ce96ad9d197acc4e1f8dadb3fd57c30 SHA512 4157772fd0e918bae1df11230ce52691ff86181a0c164c0c5116d1ebb91885910e2e24ff18ae5e5ad4ed1c83ef830773de0b4ab40da988607909e0c17efb26b4
DIST claws-mail-4.2.0.tar.xz 6674872 BLAKE2B b3118b45f1d3e8ae31a9c7bfa529fd5c8fda3ff8823e88a5ef078432d38d4150b05791deafff2577378ea17b03d965374755d2536ff6835ed46bcd566fefddaf SHA512 2415f246fc88b76263e1c43860c0638e08c581493333a3d846831f26cda21f0f14035a759379031d52e56aef2516bacec147a2cd5a153fc8fecf02ede64077f1
diff --git a/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild b/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild
deleted file mode 100644
index 0e559de511fe..000000000000
--- a/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,217 +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 webkit 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+:3
- 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[gtk3] )
- 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 )
- webkit? ( net-libs/webkit-gtk:4 )
-"
-
-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}-4.1.0-perl-5.36.patch"
- "${FILESDIR}/${PN}-4.1.0-disable_gnutls.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # Don't use libsoup-gnome (bug #565924)
- export HAVE_LIBSOUP_GNOME=no
-
- local myeconfargs=(
- --disable-bsfilter-plugin
- --disable-dillo-plugin
- --disable-generic-umpc
- --disable-jpilot #735118
- --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 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/claws-mail-4.1.1-r3.ebuild b/mail-client/claws-mail/claws-mail-4.1.1-r3.ebuild
deleted file mode 100644
index 9b8a1f96ad41..000000000000
--- a/mail-client/claws-mail/claws-mail-4.1.1-r3.ebuild
+++ /dev/null
@@ -1,216 +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
- 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 )
-"
-
-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"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # Don't use libsoup-gnome (bug #565924)
- export HAVE_LIBSOUP_GNOME=no
-
- local myeconfargs=(
- --disable-bsfilter-plugin
- --disable-dillo-plugin
- --disable-generic-umpc
- --disable-jpilot #735118
- --disable-python-plugin
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-alternate-addressbook
- --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.0-disable_gnutls.patch b/mail-client/claws-mail/files/claws-mail-4.1.0-disable_gnutls.patch
deleted file mode 100644
index 5bfea4727e51..000000000000
--- a/mail-client/claws-mail/files/claws-mail-4.1.0-disable_gnutls.patch
+++ /dev/null
@@ -1,641 +0,0 @@
-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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/files/, mail-client/claws-mail/
@ 2024-02-02 15:23 Bernard Cafarelli
0 siblings, 0 replies; 6+ messages in thread
From: Bernard Cafarelli @ 2024-02-02 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 42779f2ce4cc4bd17641865034e5b19ddd931c20
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 2 15:18:44 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=42779f2c
mail-client/claws-mail: backport upstream fix for gtk+ without X11
This avoids the recently introduced dependency on gtk+[X] for 4.2.0 and
live ebuild
Closes: https://bugs.gentoo.org/922657
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
...-4.2.0-r1.ebuild => claws-mail-4.2.0-r2.ebuild} | 4 +-
mail-client/claws-mail/claws-mail-9999.ebuild | 2 +-
.../files/claws-mail-4.2.0-gtksocket.patch | 214 +++++++++++++++++++++
3 files changed, 218 insertions(+), 2 deletions(-)
diff --git a/mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild b/mail-client/claws-mail/claws-mail-4.2.0-r2.ebuild
similarity index 99%
rename from mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild
rename to mail-client/claws-mail/claws-mail-4.2.0-r2.ebuild
index 5851aa86830f..7c2196034cc0 100644
--- a/mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.2.0-r2.ebuild
@@ -38,7 +38,7 @@ COMMONDEPEND="
sys-libs/zlib:=
x11-libs/cairo
x11-libs/gdk-pixbuf:2[jpeg]
- x11-libs/gtk+:3[X]
+ x11-libs/gtk+:3
x11-libs/libX11
x11-libs/pango
archive? (
@@ -114,6 +114,8 @@ RDEPEND="${COMMONDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
"${FILESDIR}/${PN}-4.1.1-fix_lto.patch"
+ "${FILESDIR}/${P}-gtksocket.patch"
+
)
src_prepare() {
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index 4490774ed8e4..ced89451d1f2 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -38,7 +38,7 @@ COMMONDEPEND="
sys-libs/zlib:=
x11-libs/cairo
x11-libs/gdk-pixbuf:2[jpeg]
- x11-libs/gtk+:3[X]
+ x11-libs/gtk+:3
x11-libs/libX11
x11-libs/pango
archive? (
diff --git a/mail-client/claws-mail/files/claws-mail-4.2.0-gtksocket.patch b/mail-client/claws-mail/files/claws-mail-4.2.0-gtksocket.patch
new file mode 100644
index 000000000000..db28228cc3a9
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-4.2.0-gtksocket.patch
@@ -0,0 +1,214 @@
+From dd4c4e5152235f9f4f319cc9fdad9227ebf688c9 Mon Sep 17 00:00:00 2001
+From: Jonathan Boeing <jonathan@claws-mail.org>
+Date: Sat, 18 Nov 2023 18:51:30 -0700
+Subject: [PATCH] Fix building on non-X11 systems
+
+Gtk Sockets and the GDK_IS_X11_DISPLAY() macro are only available when
+GDK_WINDOWING_X11 is defined
+---
+ src/action.c | 3 ++
+ src/compose.c | 78 ++++++++++++++++++--------------
+ src/plugins/dillo/dillo_viewer.c | 5 ++
+ 3 files changed, 53 insertions(+), 33 deletions(-)
+
+diff --git a/src/action.c b/src/action.c
+index d86294fbc..0c459aab6 100644
+--- a/src/action.c
++++ b/src/action.c
+@@ -30,6 +30,9 @@
+ #ifdef GDK_WINDOWING_X11
+ # include <gdk/gdkx.h>
+ #endif /* GDK_WINDOWING_X11 */
++#ifdef GDK_WINDOWING_QUARTZ
++# include <gdk/gdkquartz.h>
++#endif /* GDK_WINDOWING_QUARTZ */
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/compose.c b/src/compose.c
+index 574d89be1..b32fa6bc7 100644
+--- a/src/compose.c
++++ b/src/compose.c
+@@ -375,11 +375,11 @@ static void compose_set_ext_editor_sensitive (Compose *compose,
+ gboolean sensitive);
+ static gboolean compose_get_ext_editor_cmd_valid();
+ static gboolean compose_get_ext_editor_uses_socket();
+-#ifndef G_OS_WIN32
++#ifdef GDK_WINDOWING_X11
+ static gboolean compose_ext_editor_plug_removed_cb
+ (GtkSocket *socket,
+ Compose *compose);
+-#endif /* G_OS_WIN32 */
++#endif /* GDK_WINDOWING_X11 */
+
+ static void compose_undo_state_changed (UndoMain *undostruct,
+ gint undo_state,
+@@ -9623,11 +9623,11 @@ static gboolean compose_can_autosave(Compose *compose)
+ static void compose_exec_ext_editor(Compose *compose)
+ {
+ gchar *tmp;
+-#ifndef G_OS_WIN32
++#ifdef GDK_WINDOWING_X11
+ GtkWidget *socket;
+ Window socket_wid = 0;
+ gchar *p, *s;
+-#endif /* G_OS_WIN32 */
++#endif /* GDK_WINDOWING_X11 */
+ GPid pid;
+ GError *error = NULL;
+ gchar *cmd = NULL;
+@@ -9643,39 +9643,43 @@ static void compose_exec_ext_editor(Compose *compose)
+ return;
+ }
+
+- if (compose_get_ext_editor_uses_socket() && GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
+-#ifndef G_OS_WIN32
+- /* Only allow one socket */
+- if (compose->exteditor_socket != NULL) {
+- if (gtk_widget_is_focus(compose->exteditor_socket)) {
+- /* Move the focus off of the socket */
+- gtk_widget_child_focus(compose->window, GTK_DIR_TAB_BACKWARD);
++#ifdef GDK_WINDOWING_X11
++ if (compose_get_ext_editor_uses_socket()) {
++ if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
++ /* Only allow one socket */
++ if (compose->exteditor_socket != NULL) {
++ if (gtk_widget_is_focus(compose->exteditor_socket)) {
++ /* Move the focus off of the socket */
++ gtk_widget_child_focus(compose->window, GTK_DIR_TAB_BACKWARD);
++ }
++ g_free(tmp);
++ return;
+ }
+- g_free(tmp);
+- return;
+- }
+- /* Create the receiving GtkSocket */
+- socket = gtk_socket_new ();
+- g_signal_connect (G_OBJECT(socket), "plug-removed",
+- G_CALLBACK(compose_ext_editor_plug_removed_cb),
+- compose);
+- gtk_box_pack_start(GTK_BOX(compose->edit_vbox), socket, TRUE, TRUE, 0);
+- gtk_widget_set_size_request(socket, prefs_common.compose_width, -1);
+- /* Realize the socket so that we can use its ID */
+- gtk_widget_realize(socket);
+- socket_wid = gtk_socket_get_id(GTK_SOCKET (socket));
+- compose->exteditor_socket = socket;
++ /* Create the receiving GtkSocket */
++ socket = gtk_socket_new ();
++ g_signal_connect (G_OBJECT(socket), "plug-removed",
++ G_CALLBACK(compose_ext_editor_plug_removed_cb),
++ compose);
++ gtk_box_pack_start(GTK_BOX(compose->edit_vbox), socket, TRUE, TRUE, 0);
++ gtk_widget_set_size_request(socket, prefs_common.compose_width, -1);
++ /* Realize the socket so that we can use its ID */
++ gtk_widget_realize(socket);
++ socket_wid = gtk_socket_get_id(GTK_SOCKET (socket));
++ compose->exteditor_socket = socket;
++ } else
++ debug_print("Socket communication with an external editor is only available on X11.\n");
++ }
+ #else
+- alertpanel_error(_("Socket communication with an external editor is not available on Windows."));
++ if (compose_get_ext_editor_uses_socket()) {
++ alertpanel_error(_("Socket communication with an external editor is only available on X11."));
+ g_free(tmp);
+ return;
+-#endif /* G_OS_WIN32 */
+- } else
+- debug_print("Socket communication with an external editor is only available on X11.\n");
++ }
++#endif /* GDK_WINDOWING_X11 */
+
+ if (compose_get_ext_editor_cmd_valid()) {
++#ifdef GDK_WINDOWING_X11
+ if (compose_get_ext_editor_uses_socket() && GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
+-#ifndef G_OS_WIN32
+ p = g_strdup(prefs_common_get_ext_editor_cmd());
+ s = strstr(p, "%w");
+ s[1] = 'u';
+@@ -9684,10 +9688,12 @@ static void compose_exec_ext_editor(Compose *compose)
+ else
+ cmd = g_strdup_printf(p, socket_wid, tmp);
+ g_free(p);
+-#endif /* G_OS_WIN32 */
+ } else {
+ cmd = g_strdup_printf(prefs_common_get_ext_editor_cmd(), tmp);
+ }
++#else
++ cmd = g_strdup_printf(prefs_common_get_ext_editor_cmd(), tmp);
++#endif /* GDK_WINDOWING_X11 */
+ } else {
+ if (prefs_common_get_ext_editor_cmd())
+ g_warning("external editor command-line is invalid: '%s'",
+@@ -9776,10 +9782,12 @@ static void compose_ext_editor_closed_cb(GPid pid, gint exit_status, gpointer da
+ compose->exteditor_file = NULL;
+ compose->exteditor_pid = INVALID_PID;
+ compose->exteditor_tag = -1;
++#ifdef GDK_WINDOWING_X11
+ if (compose->exteditor_socket && GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
+ gtk_widget_destroy(compose->exteditor_socket);
+ compose->exteditor_socket = NULL;
+ }
++#endif /* GDK_WINDOWING_X11 */
+
+ }
+
+@@ -9887,6 +9895,7 @@ static void compose_set_ext_editor_sensitive(Compose *compose,
+ ext_editor_menu_entries[i], sensitive);
+ }
+
++#ifdef GDK_WINDOWING_X11
+ if (compose_get_ext_editor_uses_socket() && GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
+ if (sensitive) {
+ if (compose->exteditor_socket)
+@@ -9910,6 +9919,9 @@ static void compose_set_ext_editor_sensitive(Compose *compose,
+ } else {
+ gtk_widget_set_sensitive(compose->text, sensitive);
+ }
++#else
++ gtk_widget_set_sensitive(compose->text, sensitive);
++#endif /* GDK_WINDOWING_X11 */
+ if (compose->toolbar->send_btn)
+ gtk_widget_set_sensitive(compose->toolbar->send_btn, sensitive);
+ if (compose->toolbar->sendl_btn)
+@@ -9934,14 +9946,14 @@ static gboolean compose_get_ext_editor_uses_socket()
+ strstr(prefs_common_get_ext_editor_cmd(), "%w"));
+ }
+
+-#ifndef G_OS_WIN32
++#ifdef GDK_WINDOWING_X11
+ static gboolean compose_ext_editor_plug_removed_cb(GtkSocket *socket, Compose *compose)
+ {
+ compose->exteditor_socket = NULL;
+ /* returning FALSE allows destruction of the socket */
+ return FALSE;
+ }
+-#endif /* G_OS_WIN32 */
++#endif /* GDK_WINDOWING_X11 */
+
+ /**
+ * compose_undo_state_changed:
+diff --git a/src/plugins/dillo/dillo_viewer.c b/src/plugins/dillo/dillo_viewer.c
+index d2690bff6..8a93511d7 100644
+--- a/src/plugins/dillo/dillo_viewer.c
++++ b/src/plugins/dillo/dillo_viewer.c
+@@ -125,10 +125,15 @@ static void dillo_show_mimepart(MimeViewer *_viewer,
+ g_free(viewer->filename);
+ }
+
++#ifdef GDK_WINDOWING_X11
+ if (!GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
+ debug_print("dillo viewer only works on X11\n");
+ return;
+ }
++#else
++ debug_print("dillo viewer only works on X11\n");
++ return;
++#endif
+
+ viewer->filename = procmime_get_tmp_file_name(partinfo);
+
+--
+2.25.1
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-02 15:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-28 10:13 [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/files/, mail-client/claws-mail/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2024-02-02 15:23 Bernard Cafarelli
2023-04-02 20:48 Bernard Cafarelli
2022-11-18 15:06 Bernard Cafarelli
2022-06-26 7:02 Sam James
2019-02-10 0:35 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox