commit: f754e486e881b4d76745881346126d0b0b9e8e63
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 12:02:35 2025 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 12:02:35 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f754e486
mail-client/claws-mail: drop 4.2.0-r3
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
mail-client/claws-mail/Manifest | 1 -
mail-client/claws-mail/claws-mail-4.2.0-r3.ebuild | 223 ---------------------
.../files/claws-mail-4.2.0-gtksocket.patch | 214 --------------------
3 files changed, 438 deletions(-)
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 944f1b47edf5..6869c0d36670 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,4 +1,3 @@
DIST claws-mail-3.21.0.tar.xz 6848648 BLAKE2B
9b2c89b5b9105add54db7b55f082e965645b67ca361edb9cdb7fdc3793146332acb678f06a493b0668c6a7d36a70d471d25948b0d14d6f61b22423057014a67f
SHA512
59078bdb2d0314c63d4c63fdf493b0484c731523a2a099dd29816b14586f6ef038e36f794284d60deb45fe22b4c29bd239da49cc3b94549884742ef64d2fdcae
-DIST claws-mail-4.2.0.tar.xz 6674872 BLAKE2B
b3118b45f1d3e8ae31a9c7bfa529fd5c8fda3ff8823e88a5ef078432d38d4150b05791deafff2577378ea17b03d965374755d2536ff6835ed46bcd566fefddaf
SHA512
2415f246fc88b76263e1c43860c0638e08c581493333a3d846831f26cda21f0f14035a759379031d52e56aef2516bacec147a2cd5a153fc8fecf02ede64077f1
DIST claws-mail-4.3.0.tar.xz 6831980 BLAKE2B
e4dfb35b7f542ee514613b55286a19e2db398babc391a648edbda6d694b2e76973e1e7b6c4b7942b335898a571ffbbfef60fea1831ad4ac5ef7457a454259198
SHA512
3b0e811948d75ca2d003035d545d46d142ed4f2c1a103dc862413f9ff7a5ba612e00a7d5832836657e8d382bc7f94520496aaf60da429c72d9fb146ba12f0dfc
DIST claws-mail-4.3.1.tar.xz 6782236 BLAKE2B
e946d5462ef5455d6bd90aefb65d5ad95a558cbda2a403e3be2494c3d012bd2d9c476c6f869100870c7258d982f86569b9475f8913ef89f1b9806a7a7e1405df
SHA512
1ecd34c9d4b529dbad42febdd873a1cb06c965fbfd9c0677b20b13ccfed7dae23602bdcf63285ff267a55c4b07a5565d9e8c60622b849e1ece1b9e3046995fa9
diff --git a/mail-client/claws-mail/claws-mail-4.2.0-r3.ebuild
b/mail-client/claws-mail/claws-mail-4.2.0-r3.ebuild
deleted file mode 100644
index 580a92a2c4e0..000000000000
--- a/mail-client/claws-mail/claws-mail-4.2.0-r3.ebuild
+++ /dev/null
@@ -1,223 +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
- 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
- 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/files/claws-mail-4.2.0-gtksocket.patch
b/mail-client/claws-mail/files/claws-mail-4.2.0-gtksocket.patch
deleted file mode 100644
index db28228cc3a9..000000000000
--- a/mail-client/claws-mail/files/claws-mail-4.2.0-gtksocket.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From dd4c4e5152235f9f4f319cc9fdad9227ebf688c9 Mon Sep 17 00:00:00 2001
-From: Jonathan Boeing <[email protected]>
-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
-
