From 5939313f229e6fcf374fb7e9ee4f8675b05ab293 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Feb 2024 17:45:32 +0000 Subject: gentoo auto-resync : 02:02:2024 - 17:45:32 --- mail-client/Manifest.gz | Bin 3388 -> 3386 bytes mail-client/claws-mail/Manifest | 10 +- mail-client/claws-mail/claws-mail-3.19.0-r3.ebuild | 215 ---------- mail-client/claws-mail/claws-mail-3.20.0-r1.ebuild | 212 ---------- mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild | 218 ---------- mail-client/claws-mail/claws-mail-4.2.0-r2.ebuild | 220 ++++++++++ mail-client/claws-mail/claws-mail-9999.ebuild | 2 +- .../files/claws-mail-3.19.0-perl-5.36.patch | 455 --------------------- .../files/claws-mail-4.1.0-perl-5.36.patch | 454 -------------------- .../files/claws-mail-4.2.0-gtksocket.patch | 214 ++++++++++ 10 files changed, 438 insertions(+), 1562 deletions(-) delete mode 100644 mail-client/claws-mail/claws-mail-3.19.0-r3.ebuild delete mode 100644 mail-client/claws-mail/claws-mail-3.20.0-r1.ebuild delete mode 100644 mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild create mode 100644 mail-client/claws-mail/claws-mail-4.2.0-r2.ebuild delete mode 100644 mail-client/claws-mail/files/claws-mail-3.19.0-perl-5.36.patch delete mode 100644 mail-client/claws-mail/files/claws-mail-4.1.0-perl-5.36.patch create mode 100644 mail-client/claws-mail/files/claws-mail-4.2.0-gtksocket.patch (limited to 'mail-client') diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz index 8e41c0fc6848..41942458b9c4 100644 Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest index 44f27c825d6e..93150794ea02 100644 --- a/mail-client/claws-mail/Manifest +++ b/mail-client/claws-mail/Manifest @@ -1,17 +1,13 @@ AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05 -AUX claws-mail-3.19.0-perl-5.36.patch 11254 BLAKE2B 0c348bc581a83e068dcf9afa0d0b526fe831983d86576e2eb2a4cb2b6c07a0e6d28f71eea1865e5b44e2849d981741b5552598ed4387184e07d90c1b42928c72 SHA512 38699d82ac108012bd9416dc67b0f1bb50bfea30bdd5df36d49ea899f2dc905ec53d77bff2f33a17741eecbf533019f50825bbde46af5e9c29e20001b8aef499 -AUX claws-mail-4.1.0-perl-5.36.patch 11183 BLAKE2B ecbdfcfb8ecbf73bc8e74cc90de173a15b1a2634c0a55455a63933f53bccb1639bd475018e864d02e5aa248b14e25c43a6de0c7356a6ec7c3d352f2879e4c6ae SHA512 105ab6596aa540bc901e30072371271e8c9874bdc97dac0ff15084bed1b44a5dbaca1e5e9548e32c648e8599ac8dccae041dd42ad202dd3f224dc138e19625aa AUX claws-mail-4.1.1-fix_lto.patch 368 BLAKE2B 8925e93d1785361b23b6cf0b107606fe50aa5b1c369ba36e4be463bbdd51930a727f8f4e17467ea41fb5bda9fb05d9a2aab1a09f3b04b731ce2854247226d7ae SHA512 0e9e180d2d3303d416d3d3accab49f1a43ebada337a6ca1916c2bbaadeb801039209d2f68f2f78448ee421da947216ee584e1c2aba18b5c221b34b5d4f6655b8 AUX claws-mail-4.1.1-litehtml_gcc13.patch 1135 BLAKE2B c2b327a272862c4ade64f43b12ed0610061b9b68e5f0560a628eaaa0481987f347c31d7a46db31ce6d8cc1d668d5cdecef767dd2a1ffe8c2c745ca0a604941ff SHA512 5c6fa56b439d5073042acc0b432147fd920661c489912653288108387f8529a6011830f7c445d2925fc5486f4dbf7fa1a5f90f17a6e3c5d3ea68599149096e51 AUX claws-mail-4.1.1-webkitgtk4.1.patch 12462 BLAKE2B 4368d262ad952cdf1098409378c4015b853ec7e0988ad682f47b269f77e30e96e23e1712fa53c26360cfef17785fd0595e0dee88486f77f359db95e37695987a SHA512 0034b29ea759ff7be68cc92f7ebf1f49e7e77006f8e2e266269bfce105b9672ba56aa26bdd145d11c9c7cf9263b97a5f39fe1154cf79e553b1a0c8a21a38af0f -DIST claws-mail-3.19.0.tar.xz 6543188 BLAKE2B eeb7df2b921dbd7ad40c845804fcabe5ddc2064fcf410e7809004be472bbe2ba8bfd89a868420a1bb76845180856fee8a0b3cde879ae67b1a1aab14442fe5d2d SHA512 88780df55873919197d3c6df5102a8eb89a586e8287419c179e1d0af839435a719814b1e3643aa783a7badeadceafda2dc3cb4a3265432b5ad3a210663922b20 +AUX claws-mail-4.2.0-gtksocket.patch 7480 BLAKE2B debc702b86ecf27944c76a5b1c011e62990016174c41bdac315b5022f4587fc45242ae24ae2bd7d9802f74236a04b5ea2955ff3ee2762e453ef9a1b871974144 SHA512 c00b1d55523f5f60c609d9d58cae95861ff65c2a8a9f4f22029f53df6a9394abf679732714b01c58f67995aff8a7763b002feae2d412ba4d6bc5d147dbc41515 DIST claws-mail-3.20.0.tar.xz 6687376 BLAKE2B 9a72e77ea922271fdb947e4f76229c89cb0fb2589921fca6fd161714a3093a137165b84b84db5cece5cb6b06998e237d524104ddddd87078dcba36a94f02e0eb SHA512 66d0087493452cf43357fbfb2338b3716ec45d202f51cce033aa3a8888ec4dac2d6eb9e652efb22bcfcab1e6c00ff650a9926114fb4647f753e44013e607d923 DIST claws-mail-4.1.1.tar.xz 6523688 BLAKE2B 7e1b1ae201a67e14821f415d2b51f6eebfc2896699d89f2088fa9f7f21de984f6d8e4e92791c233ec755a15184ff5e562ce96ad9d197acc4e1f8dadb3fd57c30 SHA512 4157772fd0e918bae1df11230ce52691ff86181a0c164c0c5116d1ebb91885910e2e24ff18ae5e5ad4ed1c83ef830773de0b4ab40da988607909e0c17efb26b4 DIST claws-mail-4.2.0.tar.xz 6674872 BLAKE2B b3118b45f1d3e8ae31a9c7bfa529fd5c8fda3ff8823e88a5ef078432d38d4150b05791deafff2577378ea17b03d965374755d2536ff6835ed46bcd566fefddaf SHA512 2415f246fc88b76263e1c43860c0638e08c581493333a3d846831f26cda21f0f14035a759379031d52e56aef2516bacec147a2cd5a153fc8fecf02ede64077f1 -EBUILD claws-mail-3.19.0-r3.ebuild 5621 BLAKE2B d22014990d6d28fe6bc3a3419240fc340c4fdb6c58c0ca0bd24695261a13a9c7cc850efc0d54bc52b15fd04a6499166a17db550f078ccfd13c352efb71b2874e SHA512 fe7b48f24cda6a1d15f8098ddb945215c609bb61a5d1d5f4059df5a40f63dd78f5e02efefc9317c4344dd1c44a3bb3cad8f41602e582926cb31e167e8172d598 -EBUILD claws-mail-3.20.0-r1.ebuild 5499 BLAKE2B b5bbdb62bd631facaab18657ad35fd101e2c2f78bd6c842237b9d48b4dcb47156f8f2d9a4f6c4f832da7937e04e6b5622d7ded9f0f8befd68d51540d3e6eea40 SHA512 fec2c9469f6b7e6c0006eb5b2a891df098f3413418968308d3fb51d5d024f0969ec37ff9928422a564e4f9d4969c3070eb8314e305d4387e1d17007a4e71c3ef EBUILD claws-mail-3.20.0-r2.ebuild 5400 BLAKE2B 7a57ec2e4adf3071d321b0648874feba4de3de9a2e180e7bbd54c52a78849e6369495c6fc1c3342017714bbb8451aa1c1f41caa2bf916a743b3d254d28fa888c SHA512 ce06e7de353792aeed8b7630232719252a1f1bb7d36b916faaef6d10652c8cf3822c485b3afecdaf54cddc1533b76980bdb68a8e892d906c282c17e4abe7fdf8 EBUILD claws-mail-4.1.1-r4.ebuild 5638 BLAKE2B a96c2a34350ecf4adfdc9d1da538a5d430f7071ac7a01dd303abbc79cac8aeef7d481c253e6bfea67588c998937671e802d902af9288ea4df4ead7770f671cee SHA512 51c1cc196d0c9c932e7ec54c154209b830dd18779dd4f6804707d1d2861920f87931b51ad9c92faa9c28811168082d36a0faddde1d073d53df0111b28d413a2c -EBUILD claws-mail-4.2.0-r1.ebuild 5653 BLAKE2B f26845d4db9a4f480f278cc75f917102965ca0b0715af6ddf8da54938959288ca6f55f6dbab267d316c794d677d0669f1237282ec5e2a4e7cd2d8caa6bb59cbc SHA512 057547c5364b7a75081813b10980555a922f43334832b68fae4be4be130fefa7d6aadcbc3660475fdbd23395e5af638834cedb1cfcb4808b2cacaa461823eeeb -EBUILD claws-mail-9999.ebuild 5762 BLAKE2B 556189a82c42601a5b430181e4321e177070b9f7b645e601fc3d7edf5aca523ebd99dfffc2332f30ced9222703ba2c8fea52e8b892d02a2969ebad11831f485b SHA512 8736a37f233acfc30dbe40bae8439b40c884dc3ac651d9b59b530d62382b37a2251a01e7517b06b61ccdf759790a5ce8244de7238c2ee3cca4f3be7fda5703a7 +EBUILD claws-mail-4.2.0-r2.ebuild 5687 BLAKE2B 489a4dd9707407fe47df506c21c64ad98254f9dc6939da76edef5e3e798e4035baa5d8c8a95f2cee389d57b3f6124023cfaa3b2572d145eef26b914b0cb2740b SHA512 bbcb0c1f80555430034f5b522b06d2b90b5f523d44a4cb0fb63abd6cc04e4f7716d92583b20304217ad57a62d60e8b9c61cdf780fcf50b5211af4f93337b4202 +EBUILD claws-mail-9999.ebuild 5759 BLAKE2B 72f46f491e453571b8b1fcc853d1946bd7c23c21102cb5aa893b4fb12d640de8ee09f071611b09766be09b8b2552a1d07caae5f0eaa8ad90774429a966603ec5 SHA512 d8ed88e904fd8fd115250c862fe2df5e9e793d6c0124dfd3c3cb302c58c02588f858857d28403d1ae56d2a9acf5a04d45e4858ac04a77c14ba906e0877d14aaf MISC metadata.xml 1370 BLAKE2B d4e8a3be1636876f73dd0e789bbd1e62cc35e938b84623c4d177746bdd758bea5dd4bbb7d3c58077cac0554c1c6948f07fc4bf883eec70928f76c3fd495faf85 SHA512 e13f1ab08ddebc27da373923d20d4cfc292313a2f63438d55bd4843c90555ead1e4678345c2df6272ed784d52e305ccbaeda749b34e36f325e1de89a63b08e76 diff --git a/mail-client/claws-mail/claws-mail-3.19.0-r3.ebuild b/mail-client/claws-mail/claws-mail-3.19.0-r3.ebuild deleted file mode 100644 index 9f90987ab021..000000000000 --- a/mail-client/claws-mail/claws-mail-3.19.0-r3.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) - -inherit autotools desktop python-any-r1 xdg - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="https://www.claws-mail.org/" - -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git" -else - SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -SLOT="0" -LICENSE="GPL-3" - -IUSE="+appindicator archive bogofilter calendar clamav dbus debug doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface" -REQUIRED_USE=" - appindicator? ( notification ) - libcanberra? ( notification ) - libnotify? ( notification ) - networkmanager? ( dbus ) - smime? ( pgp ) -" - -COMMONDEPEND=" - dev-libs/nettle:= - net-mail/ytnef - sys-libs/zlib:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2[jpeg] - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/pango - archive? ( - app-arch/libarchive - >=net-misc/curl-7.9.7 - ) - bogofilter? ( mail-filter/bogofilter ) - calendar? ( - >=dev-libs/libical-2.0.0:= - >=net-misc/curl-7.9.7 - ) - dbus? ( - >=dev-libs/dbus-glib-0.60 - sys-apps/dbus - ) - gdata? ( >=dev-libs/libgdata-0.17.2 ) - gnutls? ( >=net-libs/gnutls-3.0 ) - imap? ( >=net-libs/libetpan-0.57 ) - ldap? ( >=net-nds/openldap-2.0.7:= ) - litehtml? ( - >=dev-libs/glib-2.36:2 - >=dev-libs/gumbo-0.10:= - net-misc/curl - media-libs/fontconfig - ) - nls? ( >=sys-devel/gettext-0.18 ) - nntp? ( >=net-libs/libetpan-0.57 ) - notification? ( - dev-libs/glib:2 - appindicator? ( dev-libs/libindicate:3[gtk] ) - libcanberra? ( media-libs/libcanberra[gtk2] ) - libnotify? ( x11-libs/libnotify ) - ) - pdf? ( app-text/poppler[cairo] ) - pgp? ( >=app-crypt/gpgme-1.0.0:= ) - session? ( - x11-libs/libICE - x11-libs/libSM - ) - smime? ( >=app-crypt/gpgme-1.0.0:= ) - spam-report? ( >=net-misc/curl-7.9.7 ) - spell? ( >=app-text/enchant-2.0.0:2= ) - startup-notification? ( x11-libs/startup-notification ) - svg? ( >=gnome-base/librsvg-2.40.5 ) - valgrind? ( dev-debug/valgrind ) -" - -DEPEND="${COMMONDEPEND} - xface? ( >=media-libs/compface-1.4 ) -" -BDEPEND=" - ${PYTHON_DEPS} - app-arch/xz-utils - virtual/pkgconfig -" -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - x11-misc/shared-mime-info - clamav? ( app-antivirus/clamav ) - networkmanager? ( net-misc/networkmanager ) - pdf? ( app-text/ghostscript-gpl ) - perl? ( dev-lang/perl:= ) - rss? ( - dev-libs/libxml2 - net-misc/curl - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" - "${FILESDIR}/${PN}-3.19.0-perl-5.36.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Don't use libsoup-gnome (bug #565924) - export HAVE_LIBSOUP_GNOME=no - - local myeconfargs=( - --disable-bsfilter-plugin - --disable-dillo-plugin - --disable-fancy-plugin - --disable-generic-umpc - --disable-jpilot #735118 - --enable-acpi_notifier-plugin - --enable-address_keeper-plugin - --enable-alternate-addressbook - --enable-att_remover-plugin - --enable-attachwarner-plugin - --enable-fetchinfo-plugin - --enable-mailmbox-plugin - --enable-newmail-plugin - --enable-tnef_parse-plugin - --with-password-encryption=$(usex gnutls gnutls old) - $(use_enable archive archive-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable calendar vcalendar-plugin) - $(use_enable clamav clamd-plugin) - $(use_enable dbus) - $(use_enable debug crash-dialog) - $(use_enable doc manual) - $(use_enable gdata gdata-plugin) - $(use_enable gnutls) - $(use_enable ipv6) - $(use_enable ldap) - $(use_enable litehtml litehtml_viewer-plugin) - $(use_enable networkmanager) - $(use_enable nls) - $(use_enable notification notification-plugin) - $(use_enable pdf pdf_viewer-plugin) - $(use_enable perl perl-plugin) - $(use_enable pgp pgpcore-plugin) - $(use_enable pgp pgpinline-plugin) - $(use_enable pgp pgpmime-plugin) - --disable-python-plugin - $(use_enable rss rssyl-plugin) - $(use_enable session libsm) - $(use_enable sieve managesieve-plugin) - $(use_enable smime smime-plugin) - $(use_enable spam-report spam_report-plugin) - $(use_enable spamassassin spamassassin-plugin) - $(use_enable spell enchant) - $(use_enable startup-notification) - $(use_enable svg) - $(use_enable valgrind valgrind) - $(use_enable xface compface) - ) - - # libetpan is needed if user wants nntp or imap functionality - if use imap || use nntp ; then - myeconfargs+=( --enable-libetpan ) - else - myeconfargs+=( --disable-libetpan ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) - default - - # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins ${PN}.png - local size - for size in 64 128 ; do - newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png - done - - docinto tools - dodoc tools/README* - - domenu ${PN}.desktop - - einfo "Installing extra tools" - cd "${S}"/tools || die - exeinto /usr/$(get_libdir)/${PN}/tools - doexe *.pl *.py *.conf *.sh - doexe tb2claws-mail update-po uudec uuooffice - - # kill useless files - find "${ED}"/usr/$(get_libdir)/${PN}/plugins/ \ - \( -name "*.a" -o -name "*.la" \) -delete || die -} - -pkg_postinst() { - ewarn "When upgrading from version <3.18 please re-load any plugin you use" - xdg_pkg_postinst -} diff --git a/mail-client/claws-mail/claws-mail-3.20.0-r1.ebuild b/mail-client/claws-mail/claws-mail-3.20.0-r1.ebuild deleted file mode 100644 index e6f4a6b9c789..000000000000 --- a/mail-client/claws-mail/claws-mail-3.20.0-r1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit autotools desktop python-any-r1 xdg - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="https://www.claws-mail.org/" - -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git" -else - SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -SLOT="0" -LICENSE="GPL-3" - -IUSE="+appindicator archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface" -REQUIRED_USE=" - appindicator? ( notification ) - libcanberra? ( notification ) - libnotify? ( notification ) - networkmanager? ( dbus ) - smime? ( pgp ) -" - -COMMONDEPEND=" - dev-libs/nettle:= - net-mail/ytnef - sys-libs/zlib:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2[jpeg] - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/pango - archive? ( - app-arch/libarchive - >=net-misc/curl-7.9.7 - ) - bogofilter? ( mail-filter/bogofilter ) - calendar? ( - >=dev-libs/libical-2.0.0:= - >=net-misc/curl-7.9.7 - ) - dbus? ( - >=dev-libs/dbus-glib-0.60 - sys-apps/dbus - ) - gnutls? ( >=net-libs/gnutls-3.0 ) - imap? ( >=net-libs/libetpan-0.57 ) - ldap? ( >=net-nds/openldap-2.0.7:= ) - litehtml? ( - >=dev-libs/glib-2.36:2 - >=dev-libs/gumbo-0.10:= - net-misc/curl - media-libs/fontconfig - ) - nls? ( >=sys-devel/gettext-0.18 ) - nntp? ( >=net-libs/libetpan-0.57 ) - notification? ( - dev-libs/glib:2 - appindicator? ( dev-libs/libindicate:3[gtk] ) - libcanberra? ( media-libs/libcanberra[gtk2] ) - libnotify? ( x11-libs/libnotify ) - ) - pdf? ( app-text/poppler[cairo] ) - pgp? ( >=app-crypt/gpgme-1.0.0:= ) - session? ( - x11-libs/libICE - x11-libs/libSM - ) - smime? ( >=app-crypt/gpgme-1.0.0:= ) - spam-report? ( >=net-misc/curl-7.9.7 ) - spell? ( >=app-text/enchant-2.0.0:2= ) - startup-notification? ( x11-libs/startup-notification ) - svg? ( >=gnome-base/librsvg-2.40.5 ) - valgrind? ( dev-debug/valgrind ) -" - -DEPEND="${COMMONDEPEND} - xface? ( >=media-libs/compface-1.4 ) -" -BDEPEND=" - ${PYTHON_DEPS} - app-arch/xz-utils - virtual/pkgconfig -" -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - x11-misc/shared-mime-info - clamav? ( app-antivirus/clamav ) - networkmanager? ( net-misc/networkmanager ) - pdf? ( app-text/ghostscript-gpl ) - perl? ( dev-lang/perl:= ) - rss? ( - dev-libs/libxml2 - net-misc/curl - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Don't use libsoup-gnome (bug #565924) - export HAVE_LIBSOUP_GNOME=no - - local myeconfargs=( - --disable-bsfilter-plugin - --disable-dillo-plugin - --disable-fancy-plugin - --disable-generic-umpc - --disable-jpilot #735118 - --enable-acpi_notifier-plugin - --enable-address_keeper-plugin - --enable-alternate-addressbook - --enable-att_remover-plugin - --enable-attachwarner-plugin - --enable-fetchinfo-plugin - --enable-ipv6 - --enable-mailmbox-plugin - --enable-newmail-plugin - --enable-tnef_parse-plugin - --with-password-encryption=$(usex gnutls gnutls old) - $(use_enable archive archive-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable calendar vcalendar-plugin) - $(use_enable clamav clamd-plugin) - $(use_enable dbus) - $(use_enable debug crash-dialog) - $(use_enable doc manual) - $(use_enable gnutls) - $(use_enable ldap) - $(use_enable litehtml litehtml_viewer-plugin) - $(use_enable networkmanager) - $(use_enable nls) - $(use_enable notification notification-plugin) - $(use_enable pdf pdf_viewer-plugin) - $(use_enable perl perl-plugin) - $(use_enable pgp pgpcore-plugin) - $(use_enable pgp pgpinline-plugin) - $(use_enable pgp pgpmime-plugin) - --disable-python-plugin - $(use_enable rss rssyl-plugin) - $(use_enable session libsm) - $(use_enable sieve managesieve-plugin) - $(use_enable smime smime-plugin) - $(use_enable spam-report spam_report-plugin) - $(use_enable spamassassin spamassassin-plugin) - $(use_enable spell enchant) - $(use_enable startup-notification) - $(use_enable svg) - $(use_enable valgrind valgrind) - $(use_enable xface compface) - ) - - # libetpan is needed if user wants nntp or imap functionality - if use imap || use nntp ; then - myeconfargs+=( --enable-libetpan ) - else - myeconfargs+=( --disable-libetpan ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) - default - - # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins ${PN}.png - local size - for size in 64 128 ; do - newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png - done - - docinto tools - dodoc tools/README* - - domenu ${PN}.desktop - - einfo "Installing extra tools" - cd "${S}"/tools || die - exeinto /usr/$(get_libdir)/${PN}/tools - doexe *.pl *.py *.conf *.sh - doexe tb2claws-mail update-po uudec uuooffice - - # kill useless files - find "${ED}"/usr/$(get_libdir)/${PN}/plugins/ \ - \( -name "*.a" -o -name "*.la" \) -delete || die -} - -pkg_postinst() { - ewarn "When upgrading from version <3.18 please re-load any plugin you use" - xdg_pkg_postinst -} diff --git a/mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild b/mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild deleted file mode 100644 index 5851aa86830f..000000000000 --- a/mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit autotools desktop python-single-r1 xdg - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="https://www.claws-mail.org/" - -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="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 +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface" -REQUIRED_USE=" - libcanberra? ( notification ) - libnotify? ( notification ) - networkmanager? ( dbus ) - oauth? ( gnutls ) - python? ( ${PYTHON_REQUIRED_USE} ) - smime? ( pgp ) -" - -COMMONDEPEND=" - >=dev-libs/glib-2.36:2 - dev-libs/nettle:= - net-mail/ytnef - sys-libs/zlib:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2[jpeg] - x11-libs/gtk+:3[X] - x11-libs/libX11 - x11-libs/pango - archive? ( - app-arch/libarchive - >=net-misc/curl-7.9.7 - ) - bogofilter? ( mail-filter/bogofilter ) - calendar? ( - dev-lang/perl:= - >=dev-libs/libical-2.0.0:= - >=net-misc/curl-7.9.7 - ) - dbus? ( - >=dev-libs/dbus-glib-0.60 - sys-apps/dbus - ) - 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:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - ') - ) - rss? ( - dev-libs/libxml2 - net-misc/curl - ) - session? ( - x11-libs/libICE - x11-libs/libSM - ) - smime? ( >=app-crypt/gpgme-1.0.0:= ) - spam-report? ( >=net-misc/curl-7.9.7 ) - spell? ( >=app-text/enchant-2.0.0:2= ) - startup-notification? ( x11-libs/startup-notification ) - svg? ( >=gnome-base/librsvg-2.40.5 ) - valgrind? ( dev-debug/valgrind ) - webkit? ( net-libs/webkit-gtk:4.1 ) -" - -DEPEND="${COMMONDEPEND} - xface? ( >=media-libs/compface-1.4 ) -" -BDEPEND=" - ${PYTHON_DEPS} - app-arch/xz-utils - virtual/pkgconfig -" -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - x11-misc/shared-mime-info - clamav? ( app-antivirus/clamav ) - networkmanager? ( net-misc/networkmanager ) - pdf? ( app-text/ghostscript-gpl ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" - "${FILESDIR}/${PN}-4.1.1-fix_lto.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - 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-ipv6 - --enable-mailmbox-plugin - --enable-newmail-plugin - --enable-tnef_parse-plugin - --with-password-encryption=$(usex gnutls gnutls old) - $(use_enable archive archive-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable calendar vcalendar-plugin) - $(use_enable clamav clamd-plugin) - $(use_enable dbus) - $(use_enable debug crash-dialog) - $(use_enable doc manual) - $(use_enable gnutls) - $(use_enable ldap) - $(use_enable litehtml litehtml_viewer-plugin) - $(use_enable networkmanager) - $(use_enable nls) - $(use_enable notification notification-plugin) - $(use_enable 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 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 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.2.0-r2.ebuild b/mail-client/claws-mail/claws-mail-4.2.0-r2.ebuild new file mode 100644 index 000000000000..7c2196034cc0 --- /dev/null +++ b/mail-client/claws-mail/claws-mail-4.2.0-r2.ebuild @@ -0,0 +1,220 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools desktop python-single-r1 xdg + +DESCRIPTION="An email client (and news reader) based on GTK+" +HOMEPAGE="https://www.claws-mail.org/" + +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="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 +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface" +REQUIRED_USE=" + libcanberra? ( notification ) + libnotify? ( notification ) + networkmanager? ( dbus ) + oauth? ( gnutls ) + python? ( ${PYTHON_REQUIRED_USE} ) + smime? ( pgp ) +" + +COMMONDEPEND=" + >=dev-libs/glib-2.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 + ) + 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:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + ) + rss? ( + dev-libs/libxml2 + net-misc/curl + ) + session? ( + x11-libs/libICE + x11-libs/libSM + ) + smime? ( >=app-crypt/gpgme-1.0.0:= ) + spam-report? ( >=net-misc/curl-7.9.7 ) + spell? ( >=app-text/enchant-2.0.0:2= ) + startup-notification? ( x11-libs/startup-notification ) + svg? ( >=gnome-base/librsvg-2.40.5 ) + valgrind? ( dev-debug/valgrind ) + webkit? ( net-libs/webkit-gtk:4.1 ) +" + +DEPEND="${COMMONDEPEND} + xface? ( >=media-libs/compface-1.4 ) +" +BDEPEND=" + ${PYTHON_DEPS} + app-arch/xz-utils + virtual/pkgconfig +" +RDEPEND="${COMMONDEPEND} + app-misc/mime-types + x11-misc/shared-mime-info + clamav? ( app-antivirus/clamav ) + networkmanager? ( net-misc/networkmanager ) + pdf? ( app-text/ghostscript-gpl ) +" + +PATCHES=( + "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" + "${FILESDIR}/${PN}-4.1.1-fix_lto.patch" + "${FILESDIR}/${P}-gtksocket.patch" + +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + 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-ipv6 + --enable-mailmbox-plugin + --enable-newmail-plugin + --enable-tnef_parse-plugin + --with-password-encryption=$(usex gnutls gnutls old) + $(use_enable archive archive-plugin) + $(use_enable bogofilter bogofilter-plugin) + $(use_enable calendar vcalendar-plugin) + $(use_enable clamav clamd-plugin) + $(use_enable dbus) + $(use_enable debug crash-dialog) + $(use_enable doc manual) + $(use_enable gnutls) + $(use_enable ldap) + $(use_enable litehtml litehtml_viewer-plugin) + $(use_enable networkmanager) + $(use_enable nls) + $(use_enable notification notification-plugin) + $(use_enable 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 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 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-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-3.19.0-perl-5.36.patch b/mail-client/claws-mail/files/claws-mail-3.19.0-perl-5.36.patch deleted file mode 100644 index 3f4995fcb457..000000000000 --- a/mail-client/claws-mail/files/claws-mail-3.19.0-perl-5.36.patch +++ /dev/null @@ -1,455 +0,0 @@ -https://git.claws-mail.org/?p=claws.git;a=commitdiff;h=5fee50c54a370fdfb5241bd4c4c16281a741762e -https://bugs.gentoo.org/849569 - -From 5fee50c54a370fdfb5241bd4c4c16281a741762e Mon Sep 17 00:00:00 2001 -From: Ricardo Mones -Date: Sat, 23 Apr 2022 19:26:16 +0200 -Subject: [PATCH] Fix building perl plugin since perl v5.35.2 - -Using XSRETURN_* macros in expressions is now deprecated: -https://github.com/Perl/perl5/commit/7169efc77525df70484a824bff4ceebd1fafc760 ---- a/src/plugins/perl/perl_plugin.c -+++ b/src/plugins/perl/perl_plugin.c -@@ -577,76 +577,182 @@ static XS(XS_ClawsMail_filter_init) - - /* msginfo */ - case 1: -- msginfo->size ? XSRETURN_UV(msginfo->size) : XSRETURN_UNDEF; -+ if (msginfo->size) { -+ XSRETURN_UV(msginfo->size); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 2: -- msginfo->date ? XSRETURN_PV(msginfo->date) : XSRETURN_UNDEF; -+ if (msginfo->date) { -+ XSRETURN_PV(msginfo->date); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 3: -- msginfo->from ? XSRETURN_PV(msginfo->from) : XSRETURN_UNDEF; -+ if (msginfo->from) { -+ XSRETURN_PV(msginfo->from); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 4: -- msginfo->to ? XSRETURN_PV(msginfo->to) : XSRETURN_UNDEF; -+ if (msginfo->to) { -+ XSRETURN_PV(msginfo->to); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 5: -- msginfo->cc ? XSRETURN_PV(msginfo->cc) : XSRETURN_UNDEF; -+ if (msginfo->cc) { -+ XSRETURN_PV(msginfo->cc); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 6: -- msginfo->newsgroups ? XSRETURN_PV(msginfo->newsgroups) : XSRETURN_UNDEF; -+ if (msginfo->newsgroups) { -+ XSRETURN_PV(msginfo->newsgroups); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 7: -- msginfo->subject ? XSRETURN_PV(msginfo->subject) : XSRETURN_UNDEF; -+ if (msginfo->subject) { -+ XSRETURN_PV(msginfo->subject); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 8: -- msginfo->msgid ? XSRETURN_PV(msginfo->msgid) : XSRETURN_UNDEF; -+ if (msginfo->msgid) { -+ XSRETURN_PV(msginfo->msgid); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 9: -- msginfo->inreplyto ? XSRETURN_PV(msginfo->inreplyto) : XSRETURN_UNDEF; -+ if (msginfo->inreplyto) { -+ XSRETURN_PV(msginfo->inreplyto); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 10: -- msginfo->xref ? XSRETURN_PV(msginfo->xref) : XSRETURN_UNDEF; -+ if (msginfo->xref) { -+ XSRETURN_PV(msginfo->xref); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 11: - xface = procmsg_msginfo_get_avatar(msginfo, AVATAR_XFACE); -- xface ? XSRETURN_PV(xface) : XSRETURN_UNDEF; -+ if (xface) { -+ XSRETURN_PV(xface); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 12: -- (msginfo->extradata && msginfo->extradata->dispositionnotificationto) ? -- XSRETURN_PV(msginfo->extradata->dispositionnotificationto) : XSRETURN_UNDEF; -+ if (msginfo->extradata && msginfo->extradata->dispositionnotificationto) { -+ XSRETURN_PV(msginfo->extradata->dispositionnotificationto); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 13: -- (msginfo->extradata && msginfo->extradata->returnreceiptto) ? -- XSRETURN_PV(msginfo->extradata->returnreceiptto) : XSRETURN_UNDEF; -+ if (msginfo->extradata && msginfo->extradata->returnreceiptto) { -+ XSRETURN_PV(msginfo->extradata->returnreceiptto); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 14: - EXTEND(SP, g_slist_length(msginfo->references)); - ii = 0; - for(walk = msginfo->references; walk != NULL; walk = g_slist_next(walk)) - XST_mPV(ii++,walk->data ? (gchar*) walk->data: ""); -- ii ? XSRETURN(ii) : XSRETURN_UNDEF; -+ if (ii) { -+ XSRETURN(ii); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 15: -- msginfo->score ? XSRETURN_IV(msginfo->score) : XSRETURN_UNDEF; -+ if (msginfo->score) { -+ XSRETURN_IV(msginfo->score); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 17: -- msginfo->plaintext_file ? -- XSRETURN_PV(msginfo->plaintext_file) : XSRETURN_UNDEF; -+ if (msginfo->plaintext_file) { -+ XSRETURN_PV(msginfo->plaintext_file); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 19: -- msginfo->hidden ? XSRETURN_IV(msginfo->hidden) : XSRETURN_UNDEF; -+ if (msginfo->hidden) { -+ XSRETURN_IV(msginfo->hidden); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 20: - if((charp = procmsg_get_message_file_path(msginfo)) != NULL) { - strncpy2(buf,charp,sizeof(buf)); - g_free(charp); - XSRETURN_PV(buf); - } -- else -+ else { - XSRETURN_UNDEF; -+ } - case 21: -- (msginfo->extradata && msginfo->extradata->partial_recv) ? -- XSRETURN_PV(msginfo->extradata->partial_recv) : XSRETURN_UNDEF; -+ if (msginfo->extradata && msginfo->extradata->partial_recv) { -+ XSRETURN_PV(msginfo->extradata->partial_recv); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 22: -- msginfo->total_size ? XSRETURN_IV(msginfo->total_size) : XSRETURN_UNDEF; -+ if (msginfo->total_size) { -+ XSRETURN_IV(msginfo->total_size); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 23: -- (msginfo->extradata && msginfo->extradata->account_server) ? -- XSRETURN_PV(msginfo->extradata->account_server) : XSRETURN_UNDEF; -+ if (msginfo->extradata && msginfo->extradata->account_server) { -+ XSRETURN_PV(msginfo->extradata->account_server); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 24: -- (msginfo->extradata && msginfo->extradata->account_login) ? -- XSRETURN_PV(msginfo->extradata->account_login) : XSRETURN_UNDEF; -+ if (msginfo->extradata && msginfo->extradata->account_login) { -+ XSRETURN_PV(msginfo->extradata->account_login); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - case 25: -- msginfo->planned_download ? -- XSRETURN_IV(msginfo->planned_download) : XSRETURN_UNDEF; -+ if (msginfo->planned_download) { -+ XSRETURN_IV(msginfo->planned_download); -+ } -+ else { -+ XSRETURN_UNDEF; -+ } - - /* general */ - case 100: -- if(manual_filtering) -+ if(manual_filtering) { - XSRETURN_YES; -- else -+ } -+ else { - XSRETURN_NO; -+ } - default: - g_warning("Perl plugin: wrong argument to ClawsMail::C::init"); - XSRETURN_UNDEF; -@@ -664,8 +770,9 @@ static XS(XS_ClawsMail_open_mail_file) - XSRETURN_UNDEF; - } - file = procmsg_get_message_file_path(msginfo); -- if(!file) -+ if(!file) { - XSRETURN_UNDEF; -+ } - if((message_file = claws_fopen(file, "rb")) == NULL) { - FILE_OP_ERROR(file, "claws_fopen"); - g_warning("Perl plugin: file open error in ClawsMail::C::open_mail_file"); -@@ -718,8 +825,9 @@ static XS(XS_ClawsMail_get_next_header) - g_free(buf); - XSRETURN(2); - } -- else -+ else { - XSRETURN_EMPTY; -+ } - } - - /* ClawsMail::C::get_next_body_line */ -@@ -736,10 +844,12 @@ static XS(XS_ClawsMail_get_next_body_line) - g_warning("Perl plugin: message file not open. Use ClawsMail::C::open_message_file first"); - XSRETURN_UNDEF; - } -- if(claws_fgets(buf, sizeof(buf), message_file) != NULL) -+ if(claws_fgets(buf, sizeof(buf), message_file) != NULL) { - XSRETURN_PV(buf); -- else -+ } -+ else { - XSRETURN_UNDEF; -+ } - } - - -@@ -772,57 +882,65 @@ static XS(XS_ClawsMail_check_flag) - filter_log_write(LOG_MATCH,"marked"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - case 2: - if(MSG_IS_UNREAD(msginfo->flags)) { - filter_log_write(LOG_MATCH,"unread"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - case 3: - if(MSG_IS_DELETED(msginfo->flags)) { - filter_log_write(LOG_MATCH,"deleted"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - case 4: - if(MSG_IS_NEW(msginfo->flags)) { - filter_log_write(LOG_MATCH,"new"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - case 5: - if(MSG_IS_REPLIED(msginfo->flags)) { - filter_log_write(LOG_MATCH,"replied"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - case 6: - if(MSG_IS_FORWARDED(msginfo->flags)) { - filter_log_write(LOG_MATCH,"forwarded"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - case 7: - if(MSG_IS_LOCKED(msginfo->flags)) { - filter_log_write(LOG_MATCH,"locked"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - case 8: - if(MSG_IS_IGNORE_THREAD(msginfo->flags)) { - filter_log_write(LOG_MATCH,"ignore_thread"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - default: - g_warning("Perl plugin: unknown argument to ClawsMail::C::check_flag"); - XSRETURN_UNDEF; -@@ -845,8 +963,9 @@ static XS(XS_ClawsMail_colorlabel) - filter_log_write(LOG_MATCH,"colorlabel"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - } - - /* ClawsMail::C::age_greater(int) */ -@@ -866,8 +985,9 @@ static XS(XS_ClawsMail_age_greater) - filter_log_write(LOG_MATCH,"age_greater"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - } - - /* ClawsMail::C::age_lower(int) */ -@@ -887,8 +1007,9 @@ static XS(XS_ClawsMail_age_lower) - filter_log_write(LOG_MATCH,"age_lower"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - } - - /* ClawsMail::C::tagged() */ -@@ -900,7 +1021,12 @@ static XS(XS_ClawsMail_tagged) - XSRETURN_UNDEF; - } - -- return msginfo->tags ? XSRETURN_YES : XSRETURN_NO; -+ if (msginfo->tags) { -+ XSRETURN_YES; -+ } -+ else { -+ XSRETURN_NO; -+ } - } - - /* ClawsMail::C::get_tags() */ -@@ -1032,10 +1158,12 @@ static XS(XS_ClawsMail_make_sure_folder_exists) - - identifier = SvPV_nolen(ST(0)); - item = folder_get_item_from_identifier(identifier); -- if(item) -+ if(item) { - XSRETURN_YES; -- else -+ } -+ else { - XSRETURN_NO; -+ } - } - - -@@ -1066,8 +1194,9 @@ static XS(XS_ClawsMail_addr_in_addressbook) - filter_log_write(LOG_MATCH,"addr_in_addressbook"); - XSRETURN_YES; - } -- else -+ else { - XSRETURN_NO; -+ } - } - - -@@ -1348,8 +1477,9 @@ static XS(XS_ClawsMail_forward) - - XSRETURN_YES; - } -- else -+ else { - XSRETURN_UNDEF; -+ } - } - - /* ClawsMail::C::redirect(int,char*) */ -@@ -1373,8 +1503,9 @@ static XS(XS_ClawsMail_redirect) - account = account_find_from_id(account_id); - compose = compose_redirect(account, msginfo, TRUE); - -- if (compose->account->protocol == A_NNTP) -+ if (compose->account->protocol == A_NNTP) { - XSRETURN_UNDEF; -+ } - else - compose_entry_append(compose, dest, COMPOSE_TO, PREF_NONE); - -@@ -1389,8 +1520,9 @@ static XS(XS_ClawsMail_redirect) - - XSRETURN_YES; - } -- else -+ else { - XSRETURN_UNDEF; -+ } - } - - -@@ -1472,8 +1604,9 @@ static XS(XS_ClawsMail_get_attribute_value) - attribute_value = get_attribute_value(addr,attr,bookname); - } - -- if(attribute_value) -+ if(attribute_value) { - XSRETURN_PV(attribute_value); -+ } - XSRETURN_PV(""); - } - diff --git a/mail-client/claws-mail/files/claws-mail-4.1.0-perl-5.36.patch b/mail-client/claws-mail/files/claws-mail-4.1.0-perl-5.36.patch deleted file mode 100644 index 2bbe76d85cce..000000000000 --- a/mail-client/claws-mail/files/claws-mail-4.1.0-perl-5.36.patch +++ /dev/null @@ -1,454 +0,0 @@ -https://git.claws-mail.org/?p=claws.git;a=commitdiff;h=1465ce9c0eb6151a3eaeebb10fd4ffa6db3d69db -https://bugs.gentoo.org/849569 - -From: Ricardo Mones -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.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 +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 + #endif /* GDK_WINDOWING_X11 */ ++#ifdef GDK_WINDOWING_QUARTZ ++# include ++#endif /* GDK_WINDOWING_QUARTZ */ + #include + #include + #include +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 + -- cgit v1.2.3