x11-wm/fvwm3: Update to 1.0.8

New upstream release.
Changes: https://github.com/fvwmorg/fvwm3/releases/tag/1.0.8

4 files changed, 4 insertions, 148 deletions

diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile
index a3df66724324..7cdd052bed48 100644
--- a/x11-wm/fvwm3/Makefile
+++ b/x11-wm/fvwm3/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	fvwm3
-DISTVERSION=	1.0.7
-PORTREVISION=	3
+DISTVERSION=	1.0.8
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/fvwmorg/fvwm3/releases/download/${DISTVERSION}/ \
 		http://fvwm.sourceforge.net/generated/icon_download/:icons
@@ -25,7 +24,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	ac_cv_path_PYTHON=${PYTHON_CMD}
 
 CONFLICTS_INSTALL=	fvwm
-SUB_FILES=		fvwm3.desktop
 PLIST_SUB=		DISTVERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=		FRIBIDI GO ICONS ICONV MANPAGES NLS PERL PNG SVG \
@@ -75,11 +73,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/,${LOCALBASE}/etc/,g' \
 		${WRKSRC}/bin/fvwm-menu-desktop.in
 
-post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
-	${INSTALL_DATA} ${WRKDIR}/fvwm3.desktop \
-		${STAGEDIR}${PREFIX}/share/xsessions
-
 post-install-ICONS-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/fvwm3/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/${FVWM_ICONS}/*.xpm \
diff --git a/x11-wm/fvwm3/distinfo b/x11-wm/fvwm3/distinfo
index 52ac18570852..f0e7cdd87e9f 100644
--- a/x11-wm/fvwm3/distinfo
+++ b/x11-wm/fvwm3/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1689061517
-SHA256 (fvwm3-1.0.7.tar.gz) = 3aacd7cfeff60db1bcd9c77332dc575fe7711d2d306f0479525378dc6db3d31e
-SIZE (fvwm3-1.0.7.tar.gz) = 4512128
+TIMESTAMP = 1693994462
+SHA256 (fvwm3-1.0.8.tar.gz) = 7d017c4824afc891efbdb237a32ba59e2cd94542acefab03e1d98edc31d340eb
+SIZE (fvwm3-1.0.8.tar.gz) = 5644021
 SHA256 (fvwm_icons-20070101.tar.bz2) = 86b0164430a3087f5cb8d55eb43a8676bbce495814b30c6844eb127f952642ab
 SIZE (fvwm_icons-20070101.tar.bz2) = 330862
diff --git a/x11-wm/fvwm3/files/fvwm3.desktop.in b/x11-wm/fvwm3/files/fvwm3.desktop.in
deleted file mode 100644
index 0ebd7c193340..000000000000
--- a/x11-wm/fvwm3/files/fvwm3.desktop.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=FVWM3
-Comment=The fvwm3 window manager
-Type=Application
-Exec=%%PREFIX%%/bin/fvwm3
diff --git a/x11-wm/fvwm3/files/patch-fvwm_ewmh__names.c b/x11-wm/fvwm3/files/patch-fvwm_ewmh__names.c
deleted file mode 100644
index 8d80396b058e..000000000000
--- a/x11-wm/fvwm3/files/patch-fvwm_ewmh__names.c
+++ /dev/null
@@ -1,132 +0,0 @@
-Revert b7ae07c34bb9172b8aba964023c2febc178f7f97, see
-https://github.com/fvwmorg/fvwm3/issues/873
-
---- fvwm/ewmh_names.c.orig	2023-07-06 21:03:44 UTC
-+++ fvwm/ewmh_names.c
-@@ -125,14 +125,15 @@ int EWMH_WMIconName(
- {
- 	int size = 0;
- 	char *val;
--	char *text;
-+	char *tmp_str;
-+	FlocaleCharset *fc = NULL;
- 
- 	if (!FiconvSupport)
- 	{
- 		return 0;
- 	}
- 
--	text = val = ewmh_AtomGetByName(
-+	val = ewmh_AtomGetByName(
- 		FW_W(fw), "_NET_WM_ICON_NAME",
- 		EWMH_ATOM_LIST_PROPERTY_NOTIFY, &size);
- 
-@@ -141,25 +142,28 @@ int EWMH_WMIconName(
- 		SET_HAS_EWMH_WM_ICON_NAME(fw,0);
- 		return 0;
- 	}
--	if (IS_ICON_FONT_LOADED(fw) && fw->icon_font != NULL && fw->icon_font->fftf.fftfont[0] == NULL)
-+	if (IS_ICON_FONT_LOADED(fw) && fw->icon_font != NULL)
- 	{
--		text = FiconvUtf8ToCharset(dpy, fw->icon_font->str_fc, val, size);
--		free(val);
-+		fc = fw->icon_font->str_fc;
- 	}
--	if (text == NULL)
-+
-+	tmp_str = (char *)FiconvUtf8ToCharset(
-+		dpy, fc, (const char *) val, size);
-+	free(val);
-+	if (tmp_str == NULL)
- 	{
- 		SET_HAS_EWMH_WM_ICON_NAME(fw, 0);
- 		return 0;
- 	}
--	if (strlen(text) > MAX_ICON_NAME_LEN)
-+	if (strlen(tmp_str) > MAX_ICON_NAME_LEN)
- 	{
--		text[MAX_ICON_NAME_LEN] = 0;
-+		tmp_str[MAX_ICON_NAME_LEN] = 0;
- 	}
- 	SET_HAS_EWMH_WM_ICON_NAME(fw, 1);
--	if (fw->icon_name.name && strcmp(text, fw->icon_name.name) == 0)
-+	if (fw->icon_name.name && strcmp(tmp_str, fw->icon_name.name) == 0)
- 	{
- 		/* migo: some apps update their names every second */
--		free(text);
-+		free(tmp_str);
- 		return 0;
- 	}
- 
-@@ -169,7 +173,7 @@ int EWMH_WMIconName(
- 		free_window_names(fw, False, True);
- 	}
- 
--	fw->icon_name.name = text;
-+	fw->icon_name.name = tmp_str;
- 
- 	SET_WAS_ICON_NAME_PROVIDED(fw, 1);
- 
-@@ -189,13 +193,14 @@ int EWMH_WMName(
- {
- 	int size = 0;
- 	char *val;
--	char *text;
-+	char *tmp_str;
-+	FlocaleCharset *fc = NULL;
- 	int what_changed;
- 
- 	if (!FiconvSupport)
- 		return 0;
- 
--	text = val = ewmh_AtomGetByName(
-+	val = ewmh_AtomGetByName(
- 		FW_W(fw), "_NET_WM_NAME",
- 		EWMH_ATOM_LIST_PROPERTY_NOTIFY, &size);
- 
-@@ -204,25 +209,28 @@ int EWMH_WMName(
- 		SET_HAS_EWMH_WM_NAME(fw,0);
- 		return 0;
- 	}
--	if (IS_WINDOW_FONT_LOADED(fw) && fw->title_font != NULL && fw->title_font->fftf.fftfont[0] == NULL)
-+	if (IS_WINDOW_FONT_LOADED(fw) && fw->title_font != NULL)
- 	{
--		text = FiconvUtf8ToCharset(dpy, fw->title_font->str_fc, val, size);
--		free(val);
-+		fc = fw->title_font->str_fc;
- 	}
--	if (text == NULL)
-+
-+	tmp_str = (char *)FiconvUtf8ToCharset(
-+		dpy, fc, (const char *) val, size);
-+	free(val);
-+	if (tmp_str == NULL)
- 	{
- 		SET_HAS_EWMH_WM_NAME(fw,0);
- 		return 0;
- 	}
--	if (strlen(text) > MAX_WINDOW_NAME_LEN)
-+	if (strlen(tmp_str) > MAX_WINDOW_NAME_LEN)
- 	{
--		text[MAX_WINDOW_NAME_LEN] = 0;
-+		tmp_str[MAX_WINDOW_NAME_LEN] = 0;
- 	}
- 	SET_HAS_EWMH_WM_NAME(fw, 1);
--	if (fw->name.name && strcmp(text, fw->name.name) == 0)
-+	if (fw->name.name && strcmp(tmp_str, fw->name.name) == 0)
- 	{
- 		/* migo: some apps update their names every second */
--		free(text);
-+		free(tmp_str);
- 		return 0;
- 	}
- 
-@@ -232,7 +240,7 @@ int EWMH_WMName(
- 		free_window_names(fw, True, False);
- 	}
- 
--	fw->name.name = text;
-+	fw->name.name = tmp_str;
- 
- 	if (ev == NULL)
- 	{