mate-session-manager: update to 1.24.2

Remove patches that were merged in 1.24.1, and add an upstream patch to
fix an issue where applications set to autostart couldn't be disabled.

Change log:

mate-session-manager 1.24.2

  * Translations update
  * Support xscreensaver when mate-screensaver is not available

mate-session-manager 1.24.1

  * Translations update
  * Using #include with system libraries
  * build: silent build warnings for distcheck
  * Accept Desktop Entry Specification v1.1
  * use default MATE_COMPILE_WARNINGS for stable branch
  * build: make libglesv2 optional

6 files changed, 53 insertions, 180 deletions

diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile
index 59d8e387959..07198a86cab 100644
--- a/x11/mate-session-manager/Makefile
+++ b/x11/mate-session-manager/Makefile
@@ -1,31 +1,23 @@
-# $NetBSD: Makefile,v 1.26 2020/08/24 04:41:42 gutteridge Exp $
+# $NetBSD: Makefile,v 1.27 2021/04/13 03:22:11 gutteridge Exp $
 
-PKGREVISION= 2
 .include "../../meta-pkgs/mate/Makefile.common"
 
-DISTNAME=	mate-session-manager-${VERSION:R}.0
+DISTNAME=	mate-session-manager-${VERSION:R}.2
 CATEGORIES=	x11
 
 COMMENT=	MATE session manager
 
 TOOL_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 TOOL_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
-TOOL_DEPENDS+=	autoconf-archive-[0-9]*:../../devel/autoconf-archive
-TOOL_DEPENDS+=	mate-common>=${VERSION}:../../devel/mate-common
 
 DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
-USE_TOOLS+=	autoreconf automake autoconf aclocal libtoolize
-
 .include "../../graphics/MesaLib/features.mk"
 PLIST_VARS+=	glesv2
 .if ${MESALIB_SUPPORTS_GLESv2} == "yes"
 PLIST.glesv2=	yes
 .endif
 
-pre-configure:
-	cd ${WRKSRC} && autoreconf -vi
-
 .include "options.mk"
 
 .include "../../devel/glib2/schemas.mk"
diff --git a/x11/mate-session-manager/distinfo b/x11/mate-session-manager/distinfo
index 7caaa4d6140..8577e3cac78 100644
--- a/x11/mate-session-manager/distinfo
+++ b/x11/mate-session-manager/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.10 2020/04/05 16:05:44 bsiegert Exp $
+$NetBSD: distinfo,v 1.11 2021/04/13 03:22:11 gutteridge Exp $
 
-SHA1 (mate-session-manager-1.24.0.tar.xz) = 1dbe592fb0cf89bb40d2ae37a43bd87293da8700
-RMD160 (mate-session-manager-1.24.0.tar.xz) = a255a2f899fd5875d3d214c26e7bd7b81d280bb0
-SHA512 (mate-session-manager-1.24.0.tar.xz) = ee519c8ded1f2df26e62a1384439e8929942d19560c258c91010f8d34bcc7518975406fbc0a5b76d4e73e954cdc2ea106d71476e446573d4a77d2704f6cc9e37
-Size (mate-session-manager-1.24.0.tar.xz) = 709712 bytes
-SHA1 (patch-configure.ac) = eda3d9633c6b4f8d2eb0740a638e7f72a7c6d596
-SHA1 (patch-tools_Makefile.am) = b0f40141c77be3c95b87ae1def4b613e523ea6be
-SHA1 (patch-tools_mate-session-check-accelerated.c) = f3e8940162f663612df477f0eca6dd892d0b146c
+SHA1 (mate-session-manager-1.24.2.tar.xz) = b21501f4529046268f367f8efd9a247a825ad5fd
+RMD160 (mate-session-manager-1.24.2.tar.xz) = 99a74590eb77c70b8e077c2f1aaf78d2b756e55c
+SHA512 (mate-session-manager-1.24.2.tar.xz) = f474a76ebb77cf9f1370ccb48f1f7ce464f68ffc14086097dec2f37a23d589525cfc43da39286bf80383eb893fd85a6e9fd7074e94d75de51c01fa69338e059e
+Size (mate-session-manager-1.24.2.tar.xz) = 712372 bytes
+SHA1 (patch-capplet_gsm-properties-dialog.c) = ffb9d0fa89fe2367a96a5a0d0acd38146f5fb774
diff --git a/x11/mate-session-manager/patches/patch-capplet_gsm-properties-dialog.c b/x11/mate-session-manager/patches/patch-capplet_gsm-properties-dialog.c
new file mode 100644
index 00000000000..8c2cd2a6ea1
--- /dev/null
+++ b/x11/mate-session-manager/patches/patch-capplet_gsm-properties-dialog.c
@@ -0,0 +1,45 @@
+$NetBSD: patch-capplet_gsm-properties-dialog.c,v 1.1 2021/04/13 03:22:11 gutteridge Exp $
+
+autostart: fix disabling services in dialog
+https://github.com/mate-desktop/mate-session-manager/pull/272
+
+--- capplet/gsm-properties-dialog.c.orig	2021-03-27 10:41:10.000000000 +0000
++++ capplet/gsm-properties-dialog.c
+@@ -179,10 +179,6 @@ append_app (GsmPropertiesDialog *dialog,
+             GspApp              *app)
+ {
+         GtkTreeIter   iter;
+-        if (find_by_app (GTK_TREE_MODEL (dialog->list_store),
+-                         &iter, app)) {
+-                return;
+-        }
+ 
+         gtk_list_store_append (dialog->list_store, &iter);
+         _fill_iter_from_app (dialog->list_store, &iter, app);
+@@ -196,7 +192,17 @@ _app_added (GsmPropertiesDialog *dialog,
+             GspApp              *app,
+             GspAppManager       *manager)
+ {
+-        append_app (dialog, app);
++        GtkTreeIter   iter;
++        if (find_by_app (GTK_TREE_MODEL (dialog->list_store),
++                         &iter, app)) {
++                return;
++        }
++
++        gtk_list_store_append (dialog->list_store, &iter);
++        _fill_iter_from_app (dialog->list_store, &iter, app);
++
++        g_signal_connect_swapped (app, "changed",
++                                  G_CALLBACK (_app_changed), dialog);
+ }
+ 
+ static void
+@@ -694,7 +700,6 @@ setup_dialog (GsmPropertiesDialog *dialo
+                                   G_CALLBACK (_app_removed), dialog);
+ 
+         populate_model (dialog);
+-        update_tree_view (dialog);
+ }
+ 
+ static GObject *
diff --git a/x11/mate-session-manager/patches/patch-configure.ac b/x11/mate-session-manager/patches/patch-configure.ac
deleted file mode 100644
index d21ca447891..00000000000
--- a/x11/mate-session-manager/patches/patch-configure.ac
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2020/04/05 16:05:44 bsiegert Exp $
-
-Make GLESv2 optional.
-https://github.com/mate-desktop/mate-session-manager/pull/237
-
---- configure.ac.orig	2020-02-10 12:43:35.000000000 +0000
-+++ configure.ac
-@@ -63,12 +63,24 @@ PKG_CHECK_MODULES(ICE, ice)
- PKG_CHECK_MODULES(XEXT, xext xau)
- PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= $GTK_REQUIRED)
- PKG_CHECK_MODULES(GL_TEST, xcomposite gl glib-2.0 epoxy)
--PKG_CHECK_MODULES(GLES_TEST, egl glesv2)
- 
- PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
- 
- PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-3.0)
- 
-+dnl ====================================================================
-+dnl GLESV2 (optional)
-+dnl ====================================================================
-+
-+AC_ARG_WITH([libglesv2], AC_HELP_STRING([--without-libglesv2], [disable GLESV2 support]))
-+have_glesv2=no
-+if test x$with_libglesv2 != xno; then
-+    PKG_CHECK_MODULES(GLES_TEST, egl glesv2, have_glesv2=yes, have_glesv2=no)
-+fi
-+if test "x$have_glesv2" = "xyes"; then
-+  AC_DEFINE(HAVE_GLESV2, 1, [GLESV2 Support.])
-+fi
-+AM_CONDITIONAL([HAVE_GLESV2], [test "x$have_glesv2" = "xyes"])
- 
- dnl ====================================================================
- dnl Option to set the default window manager
-@@ -356,6 +368,7 @@ echo "
-         Default WM:               ${with_default_wm}
-         Systemd support:          ${use_systemd}
-         Elogind support:          ${use_elogind}
-+        GLES2 support:            ${have_glesv2}
-         IPv6 support:             ${have_full_ipv6}
-         Backtrace support:        ${have_backtrace}
-         XRender support:          ${have_xrender}
diff --git a/x11/mate-session-manager/patches/patch-tools_Makefile.am b/x11/mate-session-manager/patches/patch-tools_Makefile.am
deleted file mode 100644
index c9dd5835e87..00000000000
--- a/x11/mate-session-manager/patches/patch-tools_Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-tools_Makefile.am,v 1.1 2020/04/05 16:05:44 bsiegert Exp $
-
-Make GLESv2 optional.
-https://github.com/mate-desktop/mate-session-manager/pull/237
-
---- tools/Makefile.am.orig	2020-02-10 12:43:35.000000000 +0000
-+++ tools/Makefile.am
-@@ -1,8 +1,7 @@
- bin_PROGRAMS = mate-session-save mate-session-inhibit
- libexec_PROGRAMS = \
- 	mate-session-check-accelerated \
--	mate-session-check-accelerated-gl-helper \
--	mate-session-check-accelerated-gles-helper
-+	mate-session-check-accelerated-gl-helper
- 
- AM_CPPFLAGS =					\
- 	$(MATE_SESSION_CFLAGS)			\
-@@ -31,6 +30,9 @@ mate_session_inhibit_CPPFLAGS =			\
- mate_session_inhibit_LDADD =			\
- 	$(MATE_SESSION_LIBS)
- 
-+if HAVE_GLESV2
-+libexec_PROGRAMS += mate-session-check-accelerated-gles-helper
-+
- mate_session_check_accelerated_gles_helper_SOURCES =	\
- 	mate-session-check-accelerated-common.h		\
- 	mate-session-check-accelerated-gles-helper.c
-@@ -46,6 +48,7 @@ mate_session_check_accelerated_gles_help
- 	$(GLES_TEST_LIBS)				\
- 	$(GTK3_LIBS)					\
- 	$(X11_LIBS)
-+endif
- 
- mate_session_check_accelerated_gl_helper_SOURCES =	\
- 	mate-session-check-accelerated-common.h		\
diff --git a/x11/mate-session-manager/patches/patch-tools_mate-session-check-accelerated.c b/x11/mate-session-manager/patches/patch-tools_mate-session-check-accelerated.c
deleted file mode 100644
index e70f9850151..00000000000
--- a/x11/mate-session-manager/patches/patch-tools_mate-session-check-accelerated.c
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-tools_mate-session-check-accelerated.c,v 1.1 2020/04/05 16:05:44 bsiegert Exp $
-
-Make GLESv2 optional.
-https://github.com/mate-desktop/mate-session-manager/pull/237
-
---- tools/mate-session-check-accelerated.c.orig	2020-02-10 12:43:35.000000000 +0000
-+++ tools/mate-session-check-accelerated.c
-@@ -21,6 +21,8 @@
-  *   Colin Walters <walters@verbum.org>
-  */
- 
-+#include <config.h>
-+
- #include <string.h>
- #include <unistd.h>
- #include <stdlib.h>
-@@ -131,13 +133,17 @@ main (int argc, char **argv)
-         GdkDisplay *display = NULL;
-         int estatus;
-         char *gl_helper_argv[] = { LIBEXECDIR "/mate-session-check-accelerated-gl-helper", "--print-renderer", NULL };
-+#ifdef HAVE_GLESV2
-         char *gles_helper_argv[] = { LIBEXECDIR "/mate-session-check-accelerated-gles-helper", "--print-renderer", NULL };
-+        GError *gles_error = NULL;
-+        char *gles_renderer_string = NULL;
-+#endif
-         char *renderer_string = NULL;
--        char *gl_renderer_string = NULL, *gles_renderer_string = NULL;
-+        char *gl_renderer_string = NULL;
-         gboolean gl_software_rendering = FALSE, gles_software_rendering = FALSE;
-         Window rootwin;
-         glong is_accelerated, is_software_rendering;
--        GError *gl_error = NULL, *gles_error = NULL;
-+        GError *gl_error = NULL;
- 
-         gtk_init (NULL, NULL);
- 
-@@ -241,6 +247,7 @@ main (int argc, char **argv)
-                 g_printerr ("mate-session-check-accelerated: GL Helper exited with code %d\n", estatus);
-         }
- 
-+#ifdef HAVE_GLESV2
-         /* Then, try the GLES helper */
-         if (g_spawn_sync (NULL, (char **) gles_helper_argv, NULL, 0,
-                            NULL, NULL, &gles_renderer_string, NULL, &estatus, &gles_error)) {
-@@ -253,6 +260,7 @@ main (int argc, char **argv)
- 
-                 g_printerr ("mate-session-check-accelerated: GLES Helper exited with code %d\n", estatus);
-         }
-+#endif
- 
-         /* If we got here, GL software rendering is our best bet */
-         if (gl_software_rendering || gles_software_rendering) {
-@@ -261,8 +269,10 @@ main (int argc, char **argv)
- 
-                 if (gl_software_rendering)
-                         renderer_string = gl_renderer_string;
-+#ifdef HAVE_GLESV2
-                 else if (gles_software_rendering)
-                         renderer_string = gles_renderer_string;
-+#endif
- 
-                 goto finish;
-         }
-@@ -273,10 +283,12 @@ main (int argc, char **argv)
-                 g_clear_error (&gl_error);
-         }
- 
-+#ifdef HAVE_GLESV2
-         if (gles_error != NULL) {
-                 g_printerr ("mate-session-check-accelerated: Failed to run GLES helper: %s\n", gles_error->message);
-                 g_clear_error (&gles_error);
-         }
-+#endif
- 
-  finish:
- 	if (is_accelerated) {
-@@ -306,7 +318,9 @@ main (int argc, char **argv)
-         gdk_display_sync (display);
- 
-         g_free (gl_renderer_string);
-+#ifdef HAVE_GLESV2
-         g_free (gles_renderer_string);
-+#endif
- 
-         return is_accelerated ? 0 : 1;
- }