From 7ba2774e1182b65f50c5534d64152768dc26c94c Mon Sep 17 00:00:00 2001
From: gutteridge <gutteridge@pkgsrc.org>
Date: Sun, 15 Dec 2019 08:02:50 +0000
Subject: wmakerconf: fix build with glib2 2.62

Address build failure reported by Arthur Barlow on pkgsrc-users.
---
 wm/wmakerconf/Makefile                         |  4 ++--
 wm/wmakerconf/distinfo                         |  5 +++--
 wm/wmakerconf/patches/patch-src_misc.c         | 18 ++++++++++++++++++
 wm/wmakerconf/patches/patch-src_themebrowser.c | 21 ++++++++++++++++++---
 4 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 wm/wmakerconf/patches/patch-src_misc.c

diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 006f1373426..62eb9cf20d4 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2019/08/11 13:24:15 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2019/12/15 08:02:50 gutteridge Exp $
 
 DISTNAME=	wmakerconf-2.11
-PKGREVISION=	51
+PKGREVISION=	52
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://starplot.org/wmakerconf/
 
diff --git a/wm/wmakerconf/distinfo b/wm/wmakerconf/distinfo
index b1853a0baf4..fd90e9fe35c 100644
--- a/wm/wmakerconf/distinfo
+++ b/wm/wmakerconf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/02 23:42:55 agc Exp $
+$NetBSD: distinfo,v 1.11 2019/12/15 08:02:50 gutteridge Exp $
 
 SHA1 (wmakerconf-2.11.tar.gz) = 2c2409aad8b0348c2801c4350047a5468a800e48
 RMD160 (wmakerconf-2.11.tar.gz) = 18d661836272ae21f9d79398359b37b97b0a396a
@@ -10,7 +10,8 @@ SHA1 (patch-ad) = ebcd4d319c9f0cd995f6b43b30bf4446daf24934
 SHA1 (patch-ae) = b656967929071c09bef3315588fede877e839ce6
 SHA1 (patch-af) = c6f05d30ee645d0e7ff1ed574208d5819beeceac
 SHA1 (patch-src_menu.c) = 9ae1df8b5b60881181f75ce409dc29593fe71210
+SHA1 (patch-src_misc.c) = 8e25ce66bcf11e285222df2425dbbe52a5d8adfa
 SHA1 (patch-src_rootmenu.c) = 2e327c2b1b3937e98a5e34f9de65c2d3c726403e
-SHA1 (patch-src_themebrowser.c) = 4b4620d322770aa2806a3c483e94bf4d27381501
+SHA1 (patch-src_themebrowser.c) = 18e17a51d9ee52969d29ab2388d2e0e84cc6373f
 SHA1 (patch-src_window.c) = 4aa5f9f16276c0325b4d0a0b9d39289a89cec4c9
 SHA1 (patch-src_wmconfig.c) = 66d40308389977e9476593586ec8060acef41cae
diff --git a/wm/wmakerconf/patches/patch-src_misc.c b/wm/wmakerconf/patches/patch-src_misc.c
new file mode 100644
index 00000000000..9b3ee79783b
--- /dev/null
+++ b/wm/wmakerconf/patches/patch-src_misc.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_misc.c,v 1.1 2019/12/15 08:02:50 gutteridge Exp $
+
+Avoid deprecated glib2 functions that now cause errors.
+
+--- src/misc.c.orig	2004-12-05 01:49:32.000000000 +0000
++++ src/misc.c
+@@ -482,9 +482,9 @@ copy_file (const char *dst, const char *
+       if (dir)				/* directory is destination */
+       {
+ 	 closedir (dir);
+-	 if (streq (dst, g_dirname (src)))
++	 if (streq (dst, g_path_get_dirname (src)))
+ 	    return 0;
+-	 dst_name = g_strconcat (dst, "/", g_basename (src), NULL);
++	 dst_name = g_strconcat (dst, "/", g_path_get_basename (src), NULL);
+       }
+       else
+ 	 dst_name = g_strdup (dst);
diff --git a/wm/wmakerconf/patches/patch-src_themebrowser.c b/wm/wmakerconf/patches/patch-src_themebrowser.c
index be6dd1f8a9e..9f90bf231dd 100644
--- a/wm/wmakerconf/patches/patch-src_themebrowser.c
+++ b/wm/wmakerconf/patches/patch-src_themebrowser.c
@@ -1,10 +1,11 @@
-$NetBSD: patch-src_themebrowser.c,v 1.1 2013/05/22 18:01:25 tron Exp $
+$NetBSD: patch-src_themebrowser.c,v 1.2 2019/12/15 08:02:50 gutteridge Exp $
 
 Fix build with WindowMaker 0.95.4 and change hard coded path name.
+Also avoid deprecated glib2 functions that now cause errors.
 
 --- src/themebrowser.c.orig	2005-02-25 23:37:44.000000000 +0000
-+++ src/themebrowser.c	2013-05-22 18:55:24.000000000 +0100
-@@ -2705,7 +2705,7 @@
++++ src/themebrowser.c
+@@ -2705,7 +2705,7 @@ save_theme_backend (GtkWidget *widget, g
  	 oldfiles = g_list_remove (oldfiles, tmp);
  	 Free (tmp);
        }
@@ -13,3 +14,17 @@ Fix build with WindowMaker 0.95.4 and change hard coded path name.
        {
  	 dialog_popup (DIALOG_ERROR, NULL, NULL,
  		       _("Can't save theme file\n`%s'\n"
+@@ -3532,11 +3532,11 @@ compute_preview (GtkWidget *progress_bar
+ 
+    if (!path)
+    {
+-      DIR *dir = opendir (g_dirname (pname));
++      DIR *dir = opendir (g_path_get_dirname (pname));
+ 
+       if (!dir)				/* Make ~/.wmakerconf directory */
+       {
+-	 if (make_directory (g_dirname (pname)))
++	 if (make_directory (g_path_get_dirname (pname)))
+ 	 {
+ 	    Free (pname);
+ 	    return;
-- 
cgit v1.2.3