gentoo auto-resync : 25:02:2025 - 19:25:33

5 files changed, 35 insertions, 246 deletions

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 6bd5fff191ac..d570b91d3d9e 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,11 +1,10 @@
 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05
 AUX claws-mail-4.1.1-fix_lto.patch 368 BLAKE2B 8925e93d1785361b23b6cf0b107606fe50aa5b1c369ba36e4be463bbdd51930a727f8f4e17467ea41fb5bda9fb05d9a2aab1a09f3b04b731ce2854247226d7ae SHA512 0e9e180d2d3303d416d3d3accab49f1a43ebada337a6ca1916c2bbaadeb801039209d2f68f2f78448ee421da947216ee584e1c2aba18b5c221b34b5d4f6655b8
-AUX claws-mail-4.2.0-gtksocket.patch 7480 BLAKE2B debc702b86ecf27944c76a5b1c011e62990016174c41bdac315b5022f4587fc45242ae24ae2bd7d9802f74236a04b5ea2955ff3ee2762e453ef9a1b871974144 SHA512 c00b1d55523f5f60c609d9d58cae95861ff65c2a8a9f4f22029f53df6a9394abf679732714b01c58f67995aff8a7763b002feae2d412ba4d6bc5d147dbc41515
 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
 EBUILD claws-mail-3.21.0-r1.ebuild 5300 BLAKE2B 3bf76da7d4901a53fedefdc7c46b4afabee2a0673b081d5df91a8c97f17aed4c45af147af10824ba6592c67b07f294691c79a3c261cc25f6f8f0730ef8140672 SHA512 a0052f06853b8240b40ca7684d8dd5af9dc3a07e076138b7cf87d3979b8ee4d3788eec22b595900317d56e2b273afbfd1edd3c493d99db3ea6a1312aad962138
-EBUILD claws-mail-4.2.0-r3.ebuild 5726 BLAKE2B d8cb32aa69413eabefbbeb4f07ac0d0870969df0b53d273fa8f9836a8db5a65fb64250372d1ea0656c1b436dae621bd205cb686dbd4942e4c6b5a87f83e78693 SHA512 490ce84cda18aa4d8b608fc75729cbbebf54afd38c418d69ffceddf3584d7153a79c542e7a048a7d00882458f6e1ea1a253a3d88105d09413a3f623af4ab674b
-EBUILD claws-mail-4.3.0-r2.ebuild 5797 BLAKE2B f8bbbeec6ccdbcd37a80668d36f673853386f2a6eab0340664c2e894abbdc46b83d00e9062eabe1a65bf3ca63d9be696d676e8cb28f01e485d8b8522c85e4f88 SHA512 ae16408f9b9e585bbda5c0124c9864cd27001f486f6539bc35981026210853e6f2e91c8c63389f1e9a6174d727a8ff39e9fa3a51f50d6bba68e6ef014df69b7b
-EBUILD claws-mail-9999.ebuild 5810 BLAKE2B 4d36105b6e6122d61cd62f3fc1b5974b8d221629dd014127040a624c2bbf4aa3fdb51f9873162f3779bf3907131b600294f5246b73b9dc942575d3232eb0c9e1 SHA512 c69abdcdf4355481ace052e1e77f53981898707fbc7ef5b541c07eab7fa024536878b38db61c41cd4a5a7d55cb4b6cfde0fb5238127ff386257d131e88e3a765
+EBUILD claws-mail-4.3.0-r2.ebuild 5795 BLAKE2B b2ed059838bcc4c3d49fd44484a09a59ede16827bfdff5aa72028ce70e9cea9654b9c59d2dbb6121ba9ece4e8ae4c51815ede1475ca2e78ce5cc72c3423b93ff SHA512 9492f45c4055b0fb49ead6309d5ddfdf5ef1b423ec495a56fb4bc4f5418f0c246a07ed39b6c15fef8522362a034974c2faad785fcf95013bb1adb401c1b1f23e
+EBUILD claws-mail-4.3.1.ebuild 5880 BLAKE2B a6933b58f545fb4ceedd5eb41e14e8e3360af0b12d679903bca0bc54d0ab6c17833d22be1cc72d11e93ec8db0105f7f48c82c84d6f7b6e642f15e1270747007d SHA512 d4f8cf7e1bd62db4c4120fc17cb079bd9acd99b291119a01ac9ffe062411923cbde64920f669bad55cecd01e4ce00e26bc9109be640611e0b2fc751fd4a54f3c
+EBUILD claws-mail-9999.ebuild 5889 BLAKE2B e524b8081e2aa274e522cef63aff7cb1acf0e67557698c691a6fff7a84dd146e8f4a46116826ffbfb4ff6ef328591e926cf0cffd7c2931b2d8b87546210c98da SHA512 c97b4ea4b9cd77cdd81f20031d0bac4c9f0436b8d28e7bed2b30811e9557cdf4de7d4e9bd7da890e48c0cfd8575d1026b5b723adc83c12cc1ac8bf32e84c7fdc
 MISC metadata.xml 1292 BLAKE2B 10b606071c9dd64ff986e6da0b7331f0b57c71e3c91437bcae62a4dd7c1eaec77dc03280589399613ed61e5ae08f686ac04fe73e7f1567d84ce8d98a2f22bdd6 SHA512 c91b7fd38b54cdec285f4d11b3a9333e38949e4676137a463be48868f61e5ce37c7a77fbb1e636a1044ec1fa7304e4a7659b1924ceed9c0028c870c6baaf1304
diff --git a/mail-client/claws-mail/claws-mail-4.3.0-r2.ebuild b/mail-client/claws-mail/claws-mail-4.3.0-r2.ebuild
index 8aa8a4427924..32f0d974a10a 100644
--- a/mail-client/claws-mail/claws-mail-4.3.0-r2.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	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"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 SLOT="0"
diff --git a/mail-client/claws-mail/claws-mail-4.2.0-r3.ebuild b/mail-client/claws-mail/claws-mail-4.3.1.ebuild
index 580a92a2c4e0..8f861d32ca7a 100644
--- a/mail-client/claws-mail/claws-mail-4.2.0-r3.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
-inherit autotools desktop python-single-r1 xdg
+inherit desktop python-single-r1 xdg
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
 HOMEPAGE="https://www.claws-mail.org/"
@@ -15,16 +15,15 @@ if [[ "${PV}" == *9999 ]] ; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
 
-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"
+IUSE="appindicator 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 )
+	notification? ( || ( appindicator libcanberra libnotify ) )
 	networkmanager? ( dbus )
 	oauth? ( gnutls )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -32,7 +31,7 @@ REQUIRED_USE="
 "
 
 COMMONDEPEND="
-	>=dev-libs/glib-2.36:2
+	>=dev-libs/glib-2.50:2
 	dev-libs/nettle:=
 	net-mail/ytnef
 	sys-libs/zlib:=
@@ -66,13 +65,17 @@ COMMONDEPEND="
 	nls? ( >=sys-devel/gettext-0.18 )
 	nntp? ( >=net-libs/libetpan-0.57 )
 	notification? (
+		appindicator? ( dev-libs/libayatana-appindicator )
 		libcanberra? ( || (
 			media-libs/libcanberra-gtk3
 			media-libs/libcanberra[gtk3(-)]
 		) )
 		libnotify? ( x11-libs/libnotify )
 	)
-	perl? ( dev-lang/perl:= )
+	perl? (
+		dev-lang/perl:=
+		virtual/libcrypt:=
+		)
 	pdf? ( app-text/poppler[cairo] )
 	pgp? ( >=app-crypt/gpgme-1.0.0:= )
 	python? (
@@ -105,6 +108,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	app-arch/xz-utils
 	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
 "
 RDEPEND="${COMMONDEPEND}
 	app-misc/mime-types
@@ -117,15 +121,9 @@ 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() {
-	default
-	eautoreconf
-}
-
 src_configure() {
 	local myeconfargs=(
 		--disable-bsfilter-plugin
@@ -149,6 +147,9 @@ src_configure() {
 		$(use_enable clamav clamd-plugin)
 		$(use_enable dbus)
 		$(use_enable debug crash-dialog)
+		$(use_enable debug more-addressbook-debug)
+		$(use_enable debug more-ldap-debug)
+		$(use_enable debug more-archive-debug)
 		$(use_enable doc manual)
 		$(use_enable gnutls)
 		$(use_enable ldap)
@@ -188,7 +189,7 @@ src_configure() {
 }
 
 src_install() {
-	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* )
 	default
 
 	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index b1796b1dda0a..10d67b420d30 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit autotools desktop python-single-r1 xdg
 
@@ -15,16 +15,15 @@ if [[ "${PV}" == *9999 ]] ; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
 
-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"
+IUSE="appindicator 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 )
+	notification? ( || ( appindicator libcanberra libnotify ) )
 	networkmanager? ( dbus )
 	oauth? ( gnutls )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -66,13 +65,17 @@ COMMONDEPEND="
 	nls? ( >=sys-devel/gettext-0.18 )
 	nntp? ( >=net-libs/libetpan-0.57 )
 	notification? (
+		appindicator? ( dev-libs/libayatana-appindicator )
 		libcanberra? ( || (
 			media-libs/libcanberra-gtk3
 			media-libs/libcanberra[gtk3(-)]
 		) )
 		libnotify? ( x11-libs/libnotify )
 	)
-	perl? ( dev-lang/perl:= )
+	perl? (
+		dev-lang/perl:=
+		virtual/libcrypt:=
+		)
 	pdf? ( app-text/poppler[cairo] )
 	pgp? ( >=app-crypt/gpgme-1.0.0:= )
 	python? (
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 <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
-